blame | history | patch | commit | commitdiff
Normand Briere
2019-08-17 5892f05411c3d4dce2d8a59e0966dc2e1843a971 
 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();
....@@ -77,7 +106,7 @@
77106 
78107     static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
79108     
80
-    ImageIcon GetIcon(String name)
109
+    static ImageIcon GetIcon(String name)
81110     {
82111         javax.swing.ImageIcon iconCache = icons.get(name);
83112         if (iconCache != null)
....@@ -87,7 +116,7 @@
87116         
88117         try
89118         {
90
-            BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
119
+            BufferedImage image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
91120 
92121 //            if (image.getWidth() > 48 && image.getHeight() > 48)
93122 //            {
....@@ -359,7 +388,8 @@
359388         //parent = p;
360389 
361390         GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
362
-        System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
391
+        if (Globals.DEBUG)
392
+            System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
363393         //gd.setFullScreenWindow(this);
364394         //setResizable(false);
365395         //if (!isDisplayable())
....@@ -396,6 +426,9 @@
396426 
397427     static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
398428 
429
+    // This is to refresh the UI of the material panel.
430
+    boolean patchMaterial;
431
+    
399432     void SetupMenu()
400433     {
401434         frame.setMenuBar(menuBar = new MenuBar());
....@@ -921,18 +954,24 @@
921954         boolean temp = CameraPane.SWITCH;
922955         CameraPane.SWITCH = false;
923956         
924
-        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);
925961         // if (copy == client)
926962         
927963         Object3D versions[] = object.versionlist;
964
+        java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
928965         object.versionlist = null;
966
+        object.versiontable = null;
929967         
930968         //byte[] compress = Compress(copy);
931969         Object3D compress = (Object3D)Grafreed.clone(object);
932970         
933971         object.versionlist = versions;
972
+        object.versiontable = versiontable; // if Grafreed.grafreed.universe
934973         
935
-        object.RestoreBigData(versiontable);
974
+        object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
936975         
937976         CameraPane.SWITCH = temp;
938977         
....@@ -1294,14 +1333,14 @@
12941333             
12951334         liveCB = AddCheckBox(setupPanel, "Live", copy.live);
12961335                 liveCB.setToolTipText("Animate object");
1336
+        markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
1337
+        markCB.setToolTipText("Set target transform");
12971338         selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
12981339                 selectableCB.setToolTipText("Make object selectable");
12991340 //            Return();
13001341                 
13011342         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
13021343                 hideCB.setToolTipText("Hide object");
1303
-        markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1304
-        markCB.setToolTipText("As animation target transform");
13051344         
13061345         ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
13071346         
....@@ -1503,6 +1542,7 @@
15031542 
15041543         if (cam == null || !(copy.get(0) instanceof cGroup))
15051544         {
1545
+        if (Globals.DEBUG)
15061546             System.out.println("CREATE CAMERAS");
15071547             cams = new cTemplate();
15081548             cams.name = "Cameras";
....@@ -1628,14 +1668,14 @@
16281668 
16291669         //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
16301670         //tmp.setName("Edit");
1631
-        objectPanel.add(materialPanel);
1632
-        objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1633
-        objectPanel.setToolTipTextAt(0, "Material");
1634
-    
16351671         objectPanel.add(toolboxPanel);
1636
-        objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1637
-        objectPanel.setToolTipTextAt(1, "Objects & textures");
1672
+        objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
1673
+        objectPanel.setToolTipTextAt(0, "Objects & textures");
16381674 
1675
+        objectPanel.add(materialPanel);
1676
+        objectPanel.setIconAt(1, GetIcon("icons/material.png"));
1677
+        objectPanel.setToolTipTextAt(1, "Material");
1678
+    
16391679         objectPanel.add(skyboxPanel);
16401680         objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
16411681         objectPanel.setToolTipTextAt(2, "Backgrounds");
....@@ -1652,6 +1692,10 @@
16521692         objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
16531693         objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
16541694         
1695
+        patchMaterial = true;
1696
+        cameraView.patchMaterial = this;
1697
+        objectPanel.setSelectedIndex(1);
1698
+                
16551699         /*
16561700         aConstraints.gridx = 0;
16571701         aConstraints.gridwidth = 1;
....@@ -1671,7 +1715,7 @@
16711715         scrollpane.addMouseWheelListener(this); // Default not fast enough
16721716 
16731717         /*JTabbedPane*/ scenePanel = new cGridBag();
1674
-        scenePanel.preferredWidth = 5;
1718
+        scenePanel.preferredWidth = 6;
16751719         
16761720         JTabbedPane tabbedPane = new JTabbedPane();
16771721         tabbedPane.add(scrollpane);
....@@ -1789,7 +1833,7 @@
17891833 
17901834         frame.getContentPane().setLayout(new BorderLayout());
17911835         /**/
1792
-        JTabbedPane worldPane = new JTabbedPane();
1836
+        //JTabbedPane worldPane = new JTabbedPane();
17931837         //worldPane.add(bigPanel);
17941838         //worldPane.add(worldPanel);
17951839                 /**/
....@@ -1849,7 +1893,15 @@
18491893                 
18501894                 // Skin
18511895                 colorField.setFloat(material.color);
1852
-                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
+                
18531905                 subsurfaceField.setFloat(material.subsurface);
18541906                 selfshadowField.setFloat(material.diffuseness);
18551907                 diffusenessField.setFloat(material.factor);
....@@ -2160,6 +2212,21 @@
21602212         });
21612213         presetpanel.add(bump0);
21622214         
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
+        
21632230         cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
21642231         halo.setToolTipText("Halo");
21652232         halo.addMouseListener(new MouseAdapter()
....@@ -2267,9 +2334,20 @@
22672334 
22682335         cGridBag huepanel = new cGridBag();
22692336             cGridBag huelabel = new cGridBag();
2270
-        skin = GetLabel("icons/hue.png", false);
2271
-        skin.fit = true;
2272
-            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);
22732351             huelabel.preferredWidth = 20;
22742352             huepanel.add(new cGridBag()); // Label
22752353             huepanel.add(huelabel); // Field/slider
....@@ -3545,32 +3623,8 @@
35453623 
35463624         if (multiplyToggle != null)
35473625                 multiplyToggle.setSelected(mat.multiply);
3548
-
3549
-        assert (object.projectedVertices != null);
3550
-
3551
-        if (object.projectedVertices.length <= 2)
3552
-        {
3553
-            // Side effect...
3554
-            Object3D.cVector2[] keep = object.projectedVertices;
3555
-            object.projectedVertices = new Object3D.cVector2[3];
3556
-            for (int i = 0; i < 3; i++)
3557
-            {
3558
-                if (i < keep.length)
3559
-                {
3560
-                    object.projectedVertices[i] = keep[i];
3561
-                } else
3562
-                {
3563
-                    object.projectedVertices[i] = new Object3D.cVector2();
3564
-                }
3565
-                /*
3566
-                if(keep.length == 0)
3567
-                object.projectedVertices[0] = new Object3D.cVector2();
3568
-                else
3569
-                object.projectedVertices[0] = keep[0];
3570
-                object.projectedVertices[1] = new Object3D.cVector2();
3571
-                 */
3572
-            }
3573
-        }
3626
+        
3627
+        AllocProjectedVertices(object);
35743628 
35753629         SetMaterial(mat, object.projectedVertices);
35763630     }
....@@ -3880,7 +3934,7 @@
38803934             //System.out.println("ObjEditor " + event);
38813935             applySelf0(true);
38823936             //parent.applySelf();
3883
-            objEditor.refreshContents();
3937
+     // conflicts with requestFocus       objEditor.refreshContents();
38843938         } else if (source == resetButton)
38853939         {
38863940             CameraPane.fullreset = true;
....@@ -4192,8 +4246,6 @@
41924246         return true;
41934247     }
41944248 
4195
-    java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
4196
-    
41974249     void DeleteVersion()
41984250     {
41994251         for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
....@@ -4201,7 +4253,11 @@
42014253             copy.versionlist[i] = copy.versionlist[i+1];
42024254         }
42034255         
4204
-        CopyChanged();
4256
+        if (copy.versionlist[copy.versionindex] == null)
4257
+            copy.versionindex -= 1;
4258
+        
4259
+        if (copy.versionindex != -1)
4260
+            CopyChanged();
42054261         
42064262         SetVersionStates();
42074263     }
....@@ -4314,7 +4370,7 @@
43144370         boolean temp = CameraPane.SWITCH;
43154371         CameraPane.SWITCH = false;
43164372         
4317
-        copy.ExtractBigData(versiontable);
4373
+        copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
43184374         
43194375         copy.clear();
43204376         
....@@ -4326,7 +4382,7 @@
43264382             copy.add(obj.get(i));
43274383         }
43284384         
4329
-        copy.RestoreBigData(versiontable);
4385
+        copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
43304386         
43314387         CameraPane.SWITCH = temp;
43324388         
....@@ -4389,8 +4445,8 @@
43894445         previousVersionButton.setEnabled(copy.versionindex > 0);
43904446         nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
43914447         
4392
-        deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
4393
-                                        copy.versionlist[copy.versionindex + 1] != null);
4448
+        deleteVersionButton.setEnabled(copy.versionindex != -1);
4449
+                                        //copy.versionlist[copy.versionindex + 1] != null);
43944450         
43954451         muteSlider = true;
43964452         versionSlider.setMinimum(0);
....@@ -4455,7 +4511,7 @@
44554511 
44564512     public boolean Replace()
44574513     {
4458
-        System.err.println("Replace");
4514
+        //System.err.println("Replace");
44594515         
44604516         //cRadio tab = GetCurrentTab();
44614517         
....@@ -4682,6 +4738,12 @@
46824738 //            else
46834739 //		applySelf(true);
46844740 //	}
4741
+    
4742
+    boolean Equal(double a, double b)
4743
+    {
4744
+        return Math.abs(a - b) < 0.001;
4745
+    }
4746
+    
46854747     void applySelf0(boolean name)
46864748     {
46874749         if (name)
....@@ -4731,29 +4793,52 @@
47314793                 {
47324794                     cMaterial mat = copy.material;
47334795                             
4734
-                    colorField.SetToolTipValue((mat.color));
4735
-                    saturationField.SetToolTipValue((mat.modulation));
4736
-                    metalnessField.SetToolTipValue((mat.metalness));
4737
-                    diffuseField.SetToolTipValue((mat.diffuse));
4738
-                    specularField.SetToolTipValue((mat.specular));
4739
-                    shininessField.SetToolTipValue((mat.shininess));
4740
-                    shiftField.SetToolTipValue((mat.shift));
4741
-                    ambientField.SetToolTipValue((mat.ambient));
4742
-                    lightareaField.SetToolTipValue((mat.lightarea));
4743
-                    diffusenessField.SetToolTipValue((mat.factor));
4744
-                    velvetField.SetToolTipValue((mat.velvet));
4745
-                    sheenField.SetToolTipValue((mat.sheen));
4746
-                    subsurfaceField.SetToolTipValue((mat.subsurface));
4747
-                    backlitField.SetToolTipValue((mat.bump));
4748
-                    anisoField.SetToolTipValue((mat.aniso));
4749
-                    anisoVField.SetToolTipValue((mat.anisoV));
4750
-                    cameraField.SetToolTipValue((mat.cameralight));
4751
-                    selfshadowField.SetToolTipValue((mat.diffuseness));
4752
-                    shadowField.SetToolTipValue((mat.shadow));
4753
-                    textureField.SetToolTipValue((mat.texture));
4754
-                    opacityField.SetToolTipValue((mat.opacity));
4755
-                    fakedepthField.SetToolTipValue((mat.fakedepth));
4756
-                    shadowbiasField.SetToolTipValue((mat.shadowbias));
4796
+                    if (!Equal(colorField.getFloat(), mat.color))
4797
+                        colorField.SetToolTipValue((mat.color));
4798
+                    if (!Equal(saturationField.getFloat(), mat.modulation))
4799
+                        saturationField.SetToolTipValue((mat.modulation));
4800
+                    if (!Equal(metalnessField.getFloat(), mat.metalness))
4801
+                        metalnessField.SetToolTipValue((mat.metalness));
4802
+                    if (!Equal(diffuseField.getFloat(), mat.diffuse))
4803
+                        diffuseField.SetToolTipValue((mat.diffuse));
4804
+                    if (!Equal(specularField.getFloat(), mat.specular))
4805
+                        specularField.SetToolTipValue((mat.specular));
4806
+                    if (!Equal(shininessField.getFloat(), mat.shininess))
4807
+                        shininessField.SetToolTipValue((mat.shininess));
4808
+                    if (!Equal(shiftField.getFloat(), mat.shift))
4809
+                        shiftField.SetToolTipValue((mat.shift));
4810
+                    if (!Equal(ambientField.getFloat(), mat.ambient))
4811
+                        ambientField.SetToolTipValue((mat.ambient));
4812
+                    if (!Equal(lightareaField.getFloat(), mat.lightarea))
4813
+                        lightareaField.SetToolTipValue((mat.lightarea));
4814
+                    if (!Equal(diffusenessField.getFloat(), mat.factor))
4815
+                        diffusenessField.SetToolTipValue((mat.factor));
4816
+                    if (!Equal(velvetField.getFloat(), mat.velvet))
4817
+                        velvetField.SetToolTipValue((mat.velvet));
4818
+                    if (!Equal(sheenField.getFloat(), mat.sheen))
4819
+                        sheenField.SetToolTipValue((mat.sheen));
4820
+                    if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
4821
+                        subsurfaceField.SetToolTipValue((mat.subsurface));
4822
+                    if (!Equal(backlitField.getFloat(), mat.bump))
4823
+                        backlitField.SetToolTipValue((mat.bump));
4824
+                    if (!Equal(anisoField.getFloat(), mat.aniso))
4825
+                        anisoField.SetToolTipValue((mat.aniso));
4826
+                    if (!Equal(anisoVField.getFloat(), mat.anisoV))
4827
+                        anisoVField.SetToolTipValue((mat.anisoV));
4828
+                    if (!Equal(cameraField.getFloat(), mat.cameralight))
4829
+                        cameraField.SetToolTipValue((mat.cameralight));
4830
+                    if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
4831
+                        selfshadowField.SetToolTipValue((mat.diffuseness));
4832
+                    if (!Equal(shadowField.getFloat(), mat.shadow))
4833
+                        shadowField.SetToolTipValue((mat.shadow));
4834
+                    if (!Equal(textureField.getFloat(), mat.texture))
4835
+                        textureField.SetToolTipValue((mat.texture));
4836
+                    if (!Equal(opacityField.getFloat(), mat.opacity))
4837
+                        opacityField.SetToolTipValue((mat.opacity));
4838
+                    if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
4839
+                        fakedepthField.SetToolTipValue((mat.fakedepth));
4840
+                    if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
4841
+                        shadowbiasField.SetToolTipValue((mat.shadowbias));
47574842                 }
47584843                 
47594844                 if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
....@@ -5158,6 +5243,8 @@
51585243         
51595244         if (previousVersionButton != null && copy.versionlist != null)
51605245             SetVersionStates();
5246
+        
5247
+        cameraView.requestFocusInWindow();
51615248     }
51625249     
51635250     static TweenManager tweenManager = new TweenManager();
....@@ -5189,7 +5276,7 @@
51895276 //                group = (Composite) group.get(0);
51905277 //            }
51915278 
5192
-        System.out.println("makeSomething of " + thing);
5279
+        //System.out.println("makeSomething of " + thing);
51935280 
51945281         /*
51955282         if (deselect && jList != null)
....@@ -5543,6 +5630,7 @@
55435630 
55445631             copy.versionlist = readobj.versionlist;
55455632             copy.versionindex = readobj.versionindex;
5633
+            copy.versiontable = readobj.versiontable;
55465634             
55475635         if (copy.versionlist == null)
55485636         {
....@@ -5550,7 +5638,7 @@
55505638             copy.versionlist = new Object3D[100];
55515639             copy.versionindex = -1;
55525640             
5553
-            Save(true);
5641
+            //Save(true);
55545642         }
55555643         
55565644             //? SetUndoStates();