blame | history | patch | commit | commitdiff
Normand Briere
2019-08-16 83d0c2fa0bd2e96448f776144e1a89cdb1bb6998 
 ObjEditor.java
....@@ -43,6 +43,35 @@
4343     
4444     static ObjEditor theFrame;
4545 
46
+    public void AllocProjectedVertices(Object3D object)
47
+    {
48
+        assert (object.projectedVertices != null);
49
+
50
+        if (object.projectedVertices.length <= 2)
51
+        {
52
+            // Side effect...
53
+            Object3D.cVector2[] keep = object.projectedVertices;
54
+            object.projectedVertices = new Object3D.cVector2[3];
55
+            for (int i = 0; i < 3; i++)
56
+            {
57
+                if (i < keep.length)
58
+                {
59
+                    object.projectedVertices[i] = keep[i];
60
+                } else
61
+                {
62
+                    object.projectedVertices[i] = new Object3D.cVector2();
63
+                }
64
+                /*
65
+                if(keep.length == 0)
66
+                object.projectedVertices[0] = new Object3D.cVector2();
67
+                else
68
+                object.projectedVertices[0] = keep[0];
69
+                object.projectedVertices[1] = new Object3D.cVector2();
70
+                 */
71
+            }
72
+        }
73
+    }
74
+
4675     public cGridBag GetSeparator()
4776     {
4877         cGridBag separator = new cGridBag();
....@@ -75,8 +104,16 @@
75104         return new cCheckBox(icon, border);
76105     }
77106 
107
+    static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
108
+    
78109     ImageIcon GetIcon(String name)
79110     {
111
+        javax.swing.ImageIcon iconCache = icons.get(name);
112
+        if (iconCache != null)
113
+        {
114
+            return iconCache;
115
+        }
116
+        
80117         try
81118         {
82119             BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
....@@ -94,10 +131,14 @@
94131 //            }
95132 
96133             javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
134
+            
135
+            icons.put(name, icon);
136
+            
97137             return icon;
98138         }
99139         catch (Exception e)
100140         {
141
+            //icons.put(name, null);
101142             return null;
102143         }
103144     }
....@@ -347,7 +388,8 @@
347388         //parent = p;
348389 
349390         GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
350
-        System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
391
+        if (Globals.DEBUG)
392
+            System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
351393         //gd.setFullScreenWindow(this);
352394         //setResizable(false);
353395         //if (!isDisplayable())
....@@ -433,7 +475,7 @@
433475         
434476         ChangeListener changeListener = new ChangeListener()
435477         {
436
-            String name;
478
+            //String name;
437479             
438480             public void stateChanged(ChangeEvent changeEvent)
439481             {
....@@ -453,33 +495,34 @@
453495 //                        EditSelection(false);
454496 //                }
455497 
456
-                if (objectPanel.getSelectedIndex() == 4)
457
-                {
458
-                    name = copy.skyboxname;
459
-                    
460
-                    if (name == null)
461
-                    {
462
-                        name = "";
463
-                    }
464
-                    
465
-                    copy.skyboxname = "cubemaps/default-skyboxes/rgb";
466
-                    copy.skyboxext = "jpg";
467
-                }
468
-                else
469
-                {
470
-                    if (name != null)
471
-                    {
472
-                        if (name.equals(""))
473
-                        {
474
-                            copy.skyboxname = null;
475
-                            copy.skyboxext = null;
476
-                        }
477
-                        else
478
-                        {
479
-                            copy.skyboxname = name;
480
-                        }
481
-                    }
482
-                }
498
+//                if (objectPanel.getSelectedIndex() == 4)
499
+//                {
500
+//                    name = copy.skyboxname;
501
+//                    
502
+//                    if (name == null)
503
+//                    {
504
+//                        name = "";
505
+//                    }
506
+//                    
507
+//                    copy.skyboxname = "cubemaps/default-skyboxes/rgb";
508
+//                    copy.skyboxext = "jpg";
509
+//                }
510
+//                else
511
+//                {
512
+//                    if (name != null)
513
+//                    {
514
+//                        if (name.equals(""))
515
+//                        {
516
+//                            copy.skyboxname = null;
517
+//                            copy.skyboxext = null;
518
+//                        }
519
+//                        else
520
+//                        {
521
+//                            copy.skyboxname = name;
522
+//                        }
523
+//                    }
524
+//                }
525
+                cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
483526                 
484527 //                refreshContents(false); // To refresh Info tab
485528                 cameraView.repaint();
....@@ -908,18 +951,24 @@
908951         boolean temp = CameraPane.SWITCH;
909952         CameraPane.SWITCH = false;
910953         
911
-        object.ExtractBigData(versiontable);
954
+        if (Grafreed.grafreed.universe.versiontable == null)
955
+            Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
956
+         
957
+        object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
912958         // if (copy == client)
913959         
914960         Object3D versions[] = object.versionlist;
961
+        java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
915962         object.versionlist = null;
963
+        object.versiontable = null;
916964         
917965         //byte[] compress = Compress(copy);
918966         Object3D compress = (Object3D)Grafreed.clone(object);
919967         
920968         object.versionlist = versions;
969
+        object.versiontable = versiontable; // if Grafreed.grafreed.universe
921970         
922
-        object.RestoreBigData(versiontable);
971
+        object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
923972         
924973         CameraPane.SWITCH = temp;
925974         
....@@ -1281,14 +1330,14 @@
12811330             
12821331         liveCB = AddCheckBox(setupPanel, "Live", copy.live);
12831332                 liveCB.setToolTipText("Animate object");
1333
+        markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
1334
+        markCB.setToolTipText("Set target transform");
12841335         selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
12851336                 selectableCB.setToolTipText("Make object selectable");
12861337 //            Return();
12871338                 
12881339         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
12891340                 hideCB.setToolTipText("Hide object");
1290
-        markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1291
-        markCB.setToolTipText("As animation target transform");
12921341         
12931342         ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
12941343         
....@@ -1490,6 +1539,7 @@
14901539 
14911540         if (cam == null || !(copy.get(0) instanceof cGroup))
14921541         {
1542
+        if (Globals.DEBUG)
14931543             System.out.println("CREATE CAMERAS");
14941544             cams = new cTemplate();
14951545             cams.name = "Cameras";
....@@ -1615,14 +1665,14 @@
16151665 
16161666         //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
16171667         //tmp.setName("Edit");
1618
-        objectPanel.add(materialPanel);
1619
-        objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1620
-        objectPanel.setToolTipTextAt(0, "Material");
1621
-    
16221668         objectPanel.add(toolboxPanel);
1623
-        objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1624
-        objectPanel.setToolTipTextAt(1, "Objects & textures");
1669
+        objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
1670
+        objectPanel.setToolTipTextAt(0, "Objects & textures");
16251671 
1672
+        objectPanel.add(materialPanel);
1673
+        objectPanel.setIconAt(1, GetIcon("icons/material.png"));
1674
+        objectPanel.setToolTipTextAt(1, "Material");
1675
+    
16261676         objectPanel.add(skyboxPanel);
16271677         objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
16281678         objectPanel.setToolTipTextAt(2, "Backgrounds");
....@@ -1676,9 +1726,9 @@
16761726         scenePanel.add(tabbedPane);
16771727 
16781728         //if (Globals.ADVANCED)
1679
-            tabbedPane.add(infoPanel);
1680
-        tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1681
-        tabbedPane.setToolTipTextAt(3, "Information");
1729
+//            tabbedPane.add(infoPanel);
1730
+//        tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1731
+//        tabbedPane.setToolTipTextAt(3, "Information");
16821732         
16831733         /*
16841734         cTree jTree = new cTree(null);
....@@ -1776,7 +1826,7 @@
17761826 
17771827         frame.getContentPane().setLayout(new BorderLayout());
17781828         /**/
1779
-        JTabbedPane worldPane = new JTabbedPane();
1829
+        //JTabbedPane worldPane = new JTabbedPane();
17801830         //worldPane.add(bigPanel);
17811831         //worldPane.add(worldPanel);
17821832                 /**/
....@@ -2147,6 +2197,21 @@
21472197         });
21482198         presetpanel.add(bump0);
21492199         
2200
+        cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
2201
+        borderShader.setToolTipText("Border fade");
2202
+        borderShader.addMouseListener(new MouseAdapter()
2203
+        {
2204
+            public void mouseClicked(MouseEvent e)
2205
+            {
2206
+                borderfadeField.setFloat(0.5);
2207
+                opacityField.setFloat(0.75);
2208
+
2209
+                materialtouched = true;
2210
+                applySelf();
2211
+            }
2212
+        });
2213
+        presetpanel.add(borderShader);
2214
+        
21502215         cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
21512216         halo.setToolTipText("Halo");
21522217         halo.addMouseListener(new MouseAdapter()
....@@ -2254,9 +2319,20 @@
22542319 
22552320         cGridBag huepanel = new cGridBag();
22562321             cGridBag huelabel = new cGridBag();
2257
-        skin = GetLabel("icons/hue.png", false);
2258
-        skin.fit = true;
2259
-            huelabel.add(skin);
2322
+        cLabel hue = GetLabel("icons/hue.png", false);
2323
+        hue.fit = true;
2324
+        
2325
+        hue.addMouseListener(new MouseAdapter()
2326
+        {
2327
+            public void mousePressed(MouseEvent e)
2328
+            {
2329
+                int x = e.getX();
2330
+                
2331
+                colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
2332
+            }
2333
+        });
2334
+        
2335
+            huelabel.add(hue);
22602336             huelabel.preferredWidth = 20;
22612337             huepanel.add(new cGridBag()); // Label
22622338             huepanel.add(huelabel); // Field/slider
....@@ -3532,32 +3608,8 @@
35323608 
35333609         if (multiplyToggle != null)
35343610                 multiplyToggle.setSelected(mat.multiply);
3535
-
3536
-        assert (object.projectedVertices != null);
3537
-
3538
-        if (object.projectedVertices.length <= 2)
3539
-        {
3540
-            // Side effect...
3541
-            Object3D.cVector2[] keep = object.projectedVertices;
3542
-            object.projectedVertices = new Object3D.cVector2[3];
3543
-            for (int i = 0; i < 3; i++)
3544
-            {
3545
-                if (i < keep.length)
3546
-                {
3547
-                    object.projectedVertices[i] = keep[i];
3548
-                } else
3549
-                {
3550
-                    object.projectedVertices[i] = new Object3D.cVector2();
3551
-                }
3552
-                /*
3553
-                if(keep.length == 0)
3554
-                object.projectedVertices[0] = new Object3D.cVector2();
3555
-                else
3556
-                object.projectedVertices[0] = keep[0];
3557
-                object.projectedVertices[1] = new Object3D.cVector2();
3558
-                 */
3559
-            }
3560
-        }
3611
+        
3612
+        AllocProjectedVertices(object);
35613613 
35623614         SetMaterial(mat, object.projectedVertices);
35633615     }
....@@ -3867,7 +3919,7 @@
38673919             //System.out.println("ObjEditor " + event);
38683920             applySelf0(true);
38693921             //parent.applySelf();
3870
-            objEditor.refreshContents();
3922
+     // conflicts with requestFocus       objEditor.refreshContents();
38713923         } else if (source == resetButton)
38723924         {
38733925             CameraPane.fullreset = true;
....@@ -4179,8 +4231,6 @@
41794231         return true;
41804232     }
41814233 
4182
-    java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
4183
-    
41844234     void DeleteVersion()
41854235     {
41864236         for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
....@@ -4188,7 +4238,11 @@
41884238             copy.versionlist[i] = copy.versionlist[i+1];
41894239         }
41904240         
4191
-        CopyChanged();
4241
+        if (copy.versionlist[copy.versionindex] == null)
4242
+            copy.versionindex -= 1;
4243
+        
4244
+        if (copy.versionindex != -1)
4245
+            CopyChanged();
41924246         
41934247         SetVersionStates();
41944248     }
....@@ -4301,7 +4355,7 @@
43014355         boolean temp = CameraPane.SWITCH;
43024356         CameraPane.SWITCH = false;
43034357         
4304
-        copy.ExtractBigData(versiontable);
4358
+        copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
43054359         
43064360         copy.clear();
43074361         
....@@ -4313,7 +4367,7 @@
43134367             copy.add(obj.get(i));
43144368         }
43154369         
4316
-        copy.RestoreBigData(versiontable);
4370
+        copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
43174371         
43184372         CameraPane.SWITCH = temp;
43194373         
....@@ -4376,8 +4430,8 @@
43764430         previousVersionButton.setEnabled(copy.versionindex > 0);
43774431         nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
43784432         
4379
-        deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
4380
-                                        copy.versionlist[copy.versionindex + 1] != null);
4433
+        deleteVersionButton.setEnabled(copy.versionindex != -1);
4434
+                                        //copy.versionlist[copy.versionindex + 1] != null);
43814435         
43824436         muteSlider = true;
43834437         versionSlider.setMinimum(0);
....@@ -4442,7 +4496,7 @@
44424496 
44434497     public boolean Replace()
44444498     {
4445
-        System.err.println("Replace");
4499
+        //System.err.println("Replace");
44464500         
44474501         //cRadio tab = GetCurrentTab();
44484502         
....@@ -4780,6 +4834,8 @@
47804834         {
47814835             if (muteSlider)
47824836                 return;
4837
+            
4838
+            Replace();
47834839             
47844840             int version = versionSlider.getInteger();
47854841             
....@@ -5143,6 +5199,8 @@
51435199         
51445200         if (previousVersionButton != null && copy.versionlist != null)
51455201             SetVersionStates();
5202
+        
5203
+        cameraView.requestFocusInWindow();
51465204     }
51475205     
51485206     static TweenManager tweenManager = new TweenManager();
....@@ -5174,7 +5232,7 @@
51745232 //                group = (Composite) group.get(0);
51755233 //            }
51765234 
5177
-        System.out.println("makeSomething of " + thing);
5235
+        //System.out.println("makeSomething of " + thing);
51785236 
51795237         /*
51805238         if (deselect && jList != null)
....@@ -5528,6 +5586,7 @@
55285586 
55295587             copy.versionlist = readobj.versionlist;
55305588             copy.versionindex = readobj.versionindex;
5589
+            copy.versiontable = readobj.versiontable;
55315590             
55325591         if (copy.versionlist == null)
55335592         {
....@@ -5535,7 +5594,7 @@
55355594             copy.versionlist = new Object3D[100];
55365595             copy.versionindex = -1;
55375596             
5538
-            Save(true);
5597
+            //Save(true);
55395598         }
55405599         
55415600             //? SetUndoStates();