blame | history | patch | commit | commitdiff
Normand Briere
2019-08-17 07c0c67b88160b51e61c5c1d2b9b602daafa44a9 
 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())
....@@ -384,6 +426,9 @@
384426 
385427     static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
386428 
429
+    // This is to refresh the UI of the material panel.
430
+    boolean patchMaterial;
431
+    
387432     void SetupMenu()
388433     {
389434         frame.setMenuBar(menuBar = new MenuBar());
....@@ -433,7 +478,7 @@
433478         
434479         ChangeListener changeListener = new ChangeListener()
435480         {
436
-            String name;
481
+            //String name;
437482             
438483             public void stateChanged(ChangeEvent changeEvent)
439484             {
....@@ -453,33 +498,34 @@
453498 //                        EditSelection(false);
454499 //                }
455500 
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
-                }
501
+//                if (objectPanel.getSelectedIndex() == 4)
502
+//                {
503
+//                    name = copy.skyboxname;
504
+//                    
505
+//                    if (name == null)
506
+//                    {
507
+//                        name = "";
508
+//                    }
509
+//                    
510
+//                    copy.skyboxname = "cubemaps/default-skyboxes/rgb";
511
+//                    copy.skyboxext = "jpg";
512
+//                }
513
+//                else
514
+//                {
515
+//                    if (name != null)
516
+//                    {
517
+//                        if (name.equals(""))
518
+//                        {
519
+//                            copy.skyboxname = null;
520
+//                            copy.skyboxext = null;
521
+//                        }
522
+//                        else
523
+//                        {
524
+//                            copy.skyboxname = name;
525
+//                        }
526
+//                    }
527
+//                }
528
+                cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
483529                 
484530 //                refreshContents(false); // To refresh Info tab
485531                 cameraView.repaint();
....@@ -908,18 +954,24 @@
908954         boolean temp = CameraPane.SWITCH;
909955         CameraPane.SWITCH = false;
910956         
911
-        object.ExtractBigData(versiontable);
957
+        if (Grafreed.grafreed.universe.versiontable == null)
958
+            Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
959
+         
960
+        object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
912961         // if (copy == client)
913962         
914963         Object3D versions[] = object.versionlist;
964
+        java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
915965         object.versionlist = null;
966
+        object.versiontable = null;
916967         
917968         //byte[] compress = Compress(copy);
918969         Object3D compress = (Object3D)Grafreed.clone(object);
919970         
920971         object.versionlist = versions;
972
+        object.versiontable = versiontable; // if Grafreed.grafreed.universe
921973         
922
-        object.RestoreBigData(versiontable);
974
+        object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
923975         
924976         CameraPane.SWITCH = temp;
925977         
....@@ -1281,14 +1333,14 @@
12811333             
12821334         liveCB = AddCheckBox(setupPanel, "Live", copy.live);
12831335                 liveCB.setToolTipText("Animate object");
1336
+        markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
1337
+        markCB.setToolTipText("Set target transform");
12841338         selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
12851339                 selectableCB.setToolTipText("Make object selectable");
12861340 //            Return();
12871341                 
12881342         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
12891343                 hideCB.setToolTipText("Hide object");
1290
-        markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1291
-        markCB.setToolTipText("As animation target transform");
12921344         
12931345         ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
12941346         
....@@ -1490,6 +1542,7 @@
14901542 
14911543         if (cam == null || !(copy.get(0) instanceof cGroup))
14921544         {
1545
+        if (Globals.DEBUG)
14931546             System.out.println("CREATE CAMERAS");
14941547             cams = new cTemplate();
14951548             cams.name = "Cameras";
....@@ -1615,14 +1668,14 @@
16151668 
16161669         //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
16171670         //tmp.setName("Edit");
1618
-        objectPanel.add(materialPanel);
1619
-        objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1620
-        objectPanel.setToolTipTextAt(0, "Material");
1621
-    
16221671         objectPanel.add(toolboxPanel);
1623
-        objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1624
-        objectPanel.setToolTipTextAt(1, "Objects & textures");
1672
+        objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
1673
+        objectPanel.setToolTipTextAt(0, "Objects & textures");
16251674 
1675
+        objectPanel.add(materialPanel);
1676
+        objectPanel.setIconAt(1, GetIcon("icons/material.png"));
1677
+        objectPanel.setToolTipTextAt(1, "Material");
1678
+    
16261679         objectPanel.add(skyboxPanel);
16271680         objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
16281681         objectPanel.setToolTipTextAt(2, "Backgrounds");
....@@ -1639,6 +1692,10 @@
16391692         objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
16401693         objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
16411694         
1695
+        patchMaterial = true;
1696
+        cameraView.patchMaterial = this;
1697
+        objectPanel.setSelectedIndex(1);
1698
+                
16421699         /*
16431700         aConstraints.gridx = 0;
16441701         aConstraints.gridwidth = 1;
....@@ -1676,9 +1733,9 @@
16761733         scenePanel.add(tabbedPane);
16771734 
16781735         //if (Globals.ADVANCED)
1679
-            tabbedPane.add(infoPanel);
1680
-        tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1681
-        tabbedPane.setToolTipTextAt(3, "Information");
1736
+//            tabbedPane.add(infoPanel);
1737
+//        tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1738
+//        tabbedPane.setToolTipTextAt(3, "Information");
16821739         
16831740         /*
16841741         cTree jTree = new cTree(null);
....@@ -1776,7 +1833,7 @@
17761833 
17771834         frame.getContentPane().setLayout(new BorderLayout());
17781835         /**/
1779
-        JTabbedPane worldPane = new JTabbedPane();
1836
+        //JTabbedPane worldPane = new JTabbedPane();
17801837         //worldPane.add(bigPanel);
17811838         //worldPane.add(worldPanel);
17821839                 /**/
....@@ -1836,7 +1893,15 @@
18361893                 
18371894                 // Skin
18381895                 colorField.setFloat(material.color);
1839
-                saturationField.setFloat(material.modulation);
1896
+                float saturation = material.modulation;
1897
+                
1898
+                if (!cameraView.Skinshader)
1899
+                {
1900
+                    saturation /= 1.5;
1901
+                }
1902
+                
1903
+                saturationField.setFloat(saturation);
1904
+                
18401905                 subsurfaceField.setFloat(material.subsurface);
18411906                 selfshadowField.setFloat(material.diffuseness);
18421907                 diffusenessField.setFloat(material.factor);
....@@ -2147,6 +2212,21 @@
21472212         });
21482213         presetpanel.add(bump0);
21492214         
2215
+        cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
2216
+        borderShader.setToolTipText("Border fade");
2217
+        borderShader.addMouseListener(new MouseAdapter()
2218
+        {
2219
+            public void mouseClicked(MouseEvent e)
2220
+            {
2221
+                borderfadeField.setFloat(0.5);
2222
+                opacityField.setFloat(0.75);
2223
+
2224
+                materialtouched = true;
2225
+                applySelf();
2226
+            }
2227
+        });
2228
+        presetpanel.add(borderShader);
2229
+        
21502230         cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
21512231         halo.setToolTipText("Halo");
21522232         halo.addMouseListener(new MouseAdapter()
....@@ -2254,9 +2334,20 @@
22542334 
22552335         cGridBag huepanel = new cGridBag();
22562336             cGridBag huelabel = new cGridBag();
2257
-        skin = GetLabel("icons/hue.png", false);
2258
-        skin.fit = true;
2259
-            huelabel.add(skin);
2337
+        cLabel hue = GetLabel("icons/hue.png", false);
2338
+        hue.fit = true;
2339
+        
2340
+        hue.addMouseListener(new MouseAdapter()
2341
+        {
2342
+            public void mousePressed(MouseEvent e)
2343
+            {
2344
+                int x = e.getX();
2345
+                
2346
+                colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
2347
+            }
2348
+        });
2349
+        
2350
+            huelabel.add(hue);
22602351             huelabel.preferredWidth = 20;
22612352             huepanel.add(new cGridBag()); // Label
22622353             huepanel.add(huelabel); // Field/slider
....@@ -3532,32 +3623,8 @@
35323623 
35333624         if (multiplyToggle != null)
35343625                 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
-        }
3626
+        
3627
+        AllocProjectedVertices(object);
35613628 
35623629         SetMaterial(mat, object.projectedVertices);
35633630     }
....@@ -3867,7 +3934,7 @@
38673934             //System.out.println("ObjEditor " + event);
38683935             applySelf0(true);
38693936             //parent.applySelf();
3870
-            objEditor.refreshContents();
3937
+     // conflicts with requestFocus       objEditor.refreshContents();
38713938         } else if (source == resetButton)
38723939         {
38733940             CameraPane.fullreset = true;
....@@ -4179,8 +4246,6 @@
41794246         return true;
41804247     }
41814248 
4182
-    java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
4183
-    
41844249     void DeleteVersion()
41854250     {
41864251         for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
....@@ -4188,7 +4253,11 @@
41884253             copy.versionlist[i] = copy.versionlist[i+1];
41894254         }
41904255         
4191
-        CopyChanged();
4256
+        if (copy.versionlist[copy.versionindex] == null)
4257
+            copy.versionindex -= 1;
4258
+        
4259
+        if (copy.versionindex != -1)
4260
+            CopyChanged();
41924261         
41934262         SetVersionStates();
41944263     }
....@@ -4301,7 +4370,7 @@
43014370         boolean temp = CameraPane.SWITCH;
43024371         CameraPane.SWITCH = false;
43034372         
4304
-        copy.ExtractBigData(versiontable);
4373
+        copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
43054374         
43064375         copy.clear();
43074376         
....@@ -4313,7 +4382,7 @@
43134382             copy.add(obj.get(i));
43144383         }
43154384         
4316
-        copy.RestoreBigData(versiontable);
4385
+        copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
43174386         
43184387         CameraPane.SWITCH = temp;
43194388         
....@@ -4376,8 +4445,8 @@
43764445         previousVersionButton.setEnabled(copy.versionindex > 0);
43774446         nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
43784447         
4379
-        deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
4380
-                                        copy.versionlist[copy.versionindex + 1] != null);
4448
+        deleteVersionButton.setEnabled(copy.versionindex != -1);
4449
+                                        //copy.versionlist[copy.versionindex + 1] != null);
43814450         
43824451         muteSlider = true;
43834452         versionSlider.setMinimum(0);
....@@ -4442,7 +4511,7 @@
44424511 
44434512     public boolean Replace()
44444513     {
4445
-        System.err.println("Replace");
4514
+        //System.err.println("Replace");
44464515         
44474516         //cRadio tab = GetCurrentTab();
44484517         
....@@ -4780,6 +4849,8 @@
47804849         {
47814850             if (muteSlider)
47824851                 return;
4852
+            
4853
+            Replace();
47834854             
47844855             int version = versionSlider.getInteger();
47854856             
....@@ -5143,6 +5214,8 @@
51435214         
51445215         if (previousVersionButton != null && copy.versionlist != null)
51455216             SetVersionStates();
5217
+        
5218
+        cameraView.requestFocusInWindow();
51465219     }
51475220     
51485221     static TweenManager tweenManager = new TweenManager();
....@@ -5174,7 +5247,7 @@
51745247 //                group = (Composite) group.get(0);
51755248 //            }
51765249 
5177
-        System.out.println("makeSomething of " + thing);
5250
+        //System.out.println("makeSomething of " + thing);
51785251 
51795252         /*
51805253         if (deselect && jList != null)
....@@ -5528,6 +5601,7 @@
55285601 
55295602             copy.versionlist = readobj.versionlist;
55305603             copy.versionindex = readobj.versionindex;
5604
+            copy.versiontable = readobj.versiontable;
55315605             
55325606         if (copy.versionlist == null)
55335607         {
....@@ -5535,7 +5609,7 @@
55355609             copy.versionlist = new Object3D[100];
55365610             copy.versionindex = -1;
55375611             
5538
-            Save(true);
5612
+            //Save(true);
55395613         }
55405614         
55415615             //? SetUndoStates();