blame | history | patch | commit | commitdiff
Normand Briere
2019-08-17 5892f05411c3d4dce2d8a59e0966dc2e1843a971 
 ObjEditor.java
....@@ -106,7 +106,7 @@
106106 
107107     static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
108108     
109
-    ImageIcon GetIcon(String name)
109
+    static ImageIcon GetIcon(String name)
110110     {
111111         javax.swing.ImageIcon iconCache = icons.get(name);
112112         if (iconCache != null)
....@@ -116,7 +116,7 @@
116116         
117117         try
118118         {
119
-            BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
119
+            BufferedImage image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
120120 
121121 //            if (image.getWidth() > 48 && image.getHeight() > 48)
122122 //            {
....@@ -426,6 +426,9 @@
426426 
427427     static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
428428 
429
+    // This is to refresh the UI of the material panel.
430
+    boolean patchMaterial;
431
+    
429432     void SetupMenu()
430433     {
431434         frame.setMenuBar(menuBar = new MenuBar());
....@@ -951,18 +954,24 @@
951954         boolean temp = CameraPane.SWITCH;
952955         CameraPane.SWITCH = false;
953956         
954
-        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);
955961         // if (copy == client)
956962         
957963         Object3D versions[] = object.versionlist;
964
+        java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
958965         object.versionlist = null;
966
+        object.versiontable = null;
959967         
960968         //byte[] compress = Compress(copy);
961969         Object3D compress = (Object3D)Grafreed.clone(object);
962970         
963971         object.versionlist = versions;
972
+        object.versiontable = versiontable; // if Grafreed.grafreed.universe
964973         
965
-        object.RestoreBigData(versiontable);
974
+        object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
966975         
967976         CameraPane.SWITCH = temp;
968977         
....@@ -1659,14 +1668,14 @@
16591668 
16601669         //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
16611670         //tmp.setName("Edit");
1662
-        objectPanel.add(materialPanel);
1663
-        objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1664
-        objectPanel.setToolTipTextAt(0, "Material");
1665
-    
16661671         objectPanel.add(toolboxPanel);
1667
-        objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1668
-        objectPanel.setToolTipTextAt(1, "Objects & textures");
1672
+        objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
1673
+        objectPanel.setToolTipTextAt(0, "Objects & textures");
16691674 
1675
+        objectPanel.add(materialPanel);
1676
+        objectPanel.setIconAt(1, GetIcon("icons/material.png"));
1677
+        objectPanel.setToolTipTextAt(1, "Material");
1678
+    
16701679         objectPanel.add(skyboxPanel);
16711680         objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
16721681         objectPanel.setToolTipTextAt(2, "Backgrounds");
....@@ -1683,6 +1692,10 @@
16831692         objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
16841693         objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
16851694         
1695
+        patchMaterial = true;
1696
+        cameraView.patchMaterial = this;
1697
+        objectPanel.setSelectedIndex(1);
1698
+                
16861699         /*
16871700         aConstraints.gridx = 0;
16881701         aConstraints.gridwidth = 1;
....@@ -1702,7 +1715,7 @@
17021715         scrollpane.addMouseWheelListener(this); // Default not fast enough
17031716 
17041717         /*JTabbedPane*/ scenePanel = new cGridBag();
1705
-        scenePanel.preferredWidth = 5;
1718
+        scenePanel.preferredWidth = 6;
17061719         
17071720         JTabbedPane tabbedPane = new JTabbedPane();
17081721         tabbedPane.add(scrollpane);
....@@ -1880,7 +1893,15 @@
18801893                 
18811894                 // Skin
18821895                 colorField.setFloat(material.color);
1883
-                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
+                
18841905                 subsurfaceField.setFloat(material.subsurface);
18851906                 selfshadowField.setFloat(material.diffuseness);
18861907                 diffusenessField.setFloat(material.factor);
....@@ -3913,7 +3934,7 @@
39133934             //System.out.println("ObjEditor " + event);
39143935             applySelf0(true);
39153936             //parent.applySelf();
3916
-            objEditor.refreshContents();
3937
+     // conflicts with requestFocus       objEditor.refreshContents();
39173938         } else if (source == resetButton)
39183939         {
39193940             CameraPane.fullreset = true;
....@@ -4225,8 +4246,6 @@
42254246         return true;
42264247     }
42274248 
4228
-    java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
4229
-    
42304249     void DeleteVersion()
42314250     {
42324251         for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
....@@ -4234,7 +4253,11 @@
42344253             copy.versionlist[i] = copy.versionlist[i+1];
42354254         }
42364255         
4237
-        CopyChanged();
4256
+        if (copy.versionlist[copy.versionindex] == null)
4257
+            copy.versionindex -= 1;
4258
+        
4259
+        if (copy.versionindex != -1)
4260
+            CopyChanged();
42384261         
42394262         SetVersionStates();
42404263     }
....@@ -4347,7 +4370,7 @@
43474370         boolean temp = CameraPane.SWITCH;
43484371         CameraPane.SWITCH = false;
43494372         
4350
-        copy.ExtractBigData(versiontable);
4373
+        copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
43514374         
43524375         copy.clear();
43534376         
....@@ -4359,7 +4382,7 @@
43594382             copy.add(obj.get(i));
43604383         }
43614384         
4362
-        copy.RestoreBigData(versiontable);
4385
+        copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
43634386         
43644387         CameraPane.SWITCH = temp;
43654388         
....@@ -4422,8 +4445,8 @@
44224445         previousVersionButton.setEnabled(copy.versionindex > 0);
44234446         nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
44244447         
4425
-        deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
4426
-                                        copy.versionlist[copy.versionindex + 1] != null);
4448
+        deleteVersionButton.setEnabled(copy.versionindex != -1);
4449
+                                        //copy.versionlist[copy.versionindex + 1] != null);
44274450         
44284451         muteSlider = true;
44294452         versionSlider.setMinimum(0);
....@@ -4488,7 +4511,7 @@
44884511 
44894512     public boolean Replace()
44904513     {
4491
-        System.err.println("Replace");
4514
+        //System.err.println("Replace");
44924515         
44934516         //cRadio tab = GetCurrentTab();
44944517         
....@@ -4715,6 +4738,12 @@
47154738 //            else
47164739 //		applySelf(true);
47174740 //	}
4741
+    
4742
+    boolean Equal(double a, double b)
4743
+    {
4744
+        return Math.abs(a - b) < 0.001;
4745
+    }
4746
+    
47184747     void applySelf0(boolean name)
47194748     {
47204749         if (name)
....@@ -4764,29 +4793,52 @@
47644793                 {
47654794                     cMaterial mat = copy.material;
47664795                             
4767
-                    colorField.SetToolTipValue((mat.color));
4768
-                    saturationField.SetToolTipValue((mat.modulation));
4769
-                    metalnessField.SetToolTipValue((mat.metalness));
4770
-                    diffuseField.SetToolTipValue((mat.diffuse));
4771
-                    specularField.SetToolTipValue((mat.specular));
4772
-                    shininessField.SetToolTipValue((mat.shininess));
4773
-                    shiftField.SetToolTipValue((mat.shift));
4774
-                    ambientField.SetToolTipValue((mat.ambient));
4775
-                    lightareaField.SetToolTipValue((mat.lightarea));
4776
-                    diffusenessField.SetToolTipValue((mat.factor));
4777
-                    velvetField.SetToolTipValue((mat.velvet));
4778
-                    sheenField.SetToolTipValue((mat.sheen));
4779
-                    subsurfaceField.SetToolTipValue((mat.subsurface));
4780
-                    backlitField.SetToolTipValue((mat.bump));
4781
-                    anisoField.SetToolTipValue((mat.aniso));
4782
-                    anisoVField.SetToolTipValue((mat.anisoV));
4783
-                    cameraField.SetToolTipValue((mat.cameralight));
4784
-                    selfshadowField.SetToolTipValue((mat.diffuseness));
4785
-                    shadowField.SetToolTipValue((mat.shadow));
4786
-                    textureField.SetToolTipValue((mat.texture));
4787
-                    opacityField.SetToolTipValue((mat.opacity));
4788
-                    fakedepthField.SetToolTipValue((mat.fakedepth));
4789
-                    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));
47904842                 }
47914843                 
47924844                 if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
....@@ -5578,6 +5630,7 @@
55785630 
55795631             copy.versionlist = readobj.versionlist;
55805632             copy.versionindex = readobj.versionindex;
5633
+            copy.versiontable = readobj.versiontable;
55815634             
55825635         if (copy.versionlist == null)
55835636         {