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();
....@@ -75,11 +104,19 @@
75104         return new cCheckBox(icon, border);
76105     }
77106 
78
-    ImageIcon GetIcon(String name)
107
+    static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
108
+    
109
+    static 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         {
82
-            BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
119
+            BufferedImage image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
83120 
84121 //            if (image.getWidth() > 48 && image.getHeight() > 48)
85122 //            {
....@@ -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,6 +478,8 @@
433478         
434479         ChangeListener changeListener = new ChangeListener()
435480         {
481
+            //String name;
482
+            
436483             public void stateChanged(ChangeEvent changeEvent)
437484             {
438485 //                if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
....@@ -451,7 +498,37 @@
451498 //                        EditSelection(false);
452499 //                }
453500 
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;
529
+                
454530 //                refreshContents(false); // To refresh Info tab
531
+                cameraView.repaint();
455532             }
456533         };
457534         objectPanel.addChangeListener(changeListener);
....@@ -877,18 +954,24 @@
877954         boolean temp = CameraPane.SWITCH;
878955         CameraPane.SWITCH = false;
879956         
880
-        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);
881961         // if (copy == client)
882962         
883963         Object3D versions[] = object.versionlist;
964
+        java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
884965         object.versionlist = null;
966
+        object.versiontable = null;
885967         
886968         //byte[] compress = Compress(copy);
887969         Object3D compress = (Object3D)Grafreed.clone(object);
888970         
889971         object.versionlist = versions;
972
+        object.versiontable = versiontable; // if Grafreed.grafreed.universe
890973         
891
-        object.RestoreBigData(versiontable);
974
+        object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
892975         
893976         CameraPane.SWITCH = temp;
894977         
....@@ -1250,14 +1333,14 @@
12501333             
12511334         liveCB = AddCheckBox(setupPanel, "Live", copy.live);
12521335                 liveCB.setToolTipText("Animate object");
1336
+        markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
1337
+        markCB.setToolTipText("Set target transform");
12531338         selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
12541339                 selectableCB.setToolTipText("Make object selectable");
12551340 //            Return();
12561341                 
12571342         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
12581343                 hideCB.setToolTipText("Hide object");
1259
-        markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1260
-        markCB.setToolTipText("As animation target transform");
12611344         
12621345         ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
12631346         
....@@ -1459,6 +1542,7 @@
14591542 
14601543         if (cam == null || !(copy.get(0) instanceof cGroup))
14611544         {
1545
+        if (Globals.DEBUG)
14621546             System.out.println("CREATE CAMERAS");
14631547             cams = new cTemplate();
14641548             cams.name = "Cameras";
....@@ -1584,14 +1668,14 @@
15841668 
15851669         //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
15861670         //tmp.setName("Edit");
1587
-        objectPanel.add(materialPanel);
1588
-        objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1589
-        objectPanel.setToolTipTextAt(0, "Material");
1590
-    
15911671         objectPanel.add(toolboxPanel);
1592
-        objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1593
-        objectPanel.setToolTipTextAt(1, "Objects & textures");
1672
+        objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
1673
+        objectPanel.setToolTipTextAt(0, "Objects & textures");
15941674 
1675
+        objectPanel.add(materialPanel);
1676
+        objectPanel.setIconAt(1, GetIcon("icons/material.png"));
1677
+        objectPanel.setToolTipTextAt(1, "Material");
1678
+    
15951679         objectPanel.add(skyboxPanel);
15961680         objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
15971681         objectPanel.setToolTipTextAt(2, "Backgrounds");
....@@ -1608,6 +1692,10 @@
16081692         objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
16091693         objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
16101694         
1695
+        patchMaterial = true;
1696
+        cameraView.patchMaterial = this;
1697
+        objectPanel.setSelectedIndex(1);
1698
+                
16111699         /*
16121700         aConstraints.gridx = 0;
16131701         aConstraints.gridwidth = 1;
....@@ -1627,7 +1715,7 @@
16271715         scrollpane.addMouseWheelListener(this); // Default not fast enough
16281716 
16291717         /*JTabbedPane*/ scenePanel = new cGridBag();
1630
-        scenePanel.preferredWidth = 5;
1718
+        scenePanel.preferredWidth = 6;
16311719         
16321720         JTabbedPane tabbedPane = new JTabbedPane();
16331721         tabbedPane.add(scrollpane);
....@@ -1645,9 +1733,9 @@
16451733         scenePanel.add(tabbedPane);
16461734 
16471735         //if (Globals.ADVANCED)
1648
-            tabbedPane.add(infoPanel);
1649
-        tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1650
-        tabbedPane.setToolTipTextAt(3, "Information");
1736
+//            tabbedPane.add(infoPanel);
1737
+//        tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1738
+//        tabbedPane.setToolTipTextAt(3, "Information");
16511739         
16521740         /*
16531741         cTree jTree = new cTree(null);
....@@ -1745,7 +1833,7 @@
17451833 
17461834         frame.getContentPane().setLayout(new BorderLayout());
17471835         /**/
1748
-        JTabbedPane worldPane = new JTabbedPane();
1836
+        //JTabbedPane worldPane = new JTabbedPane();
17491837         //worldPane.add(bigPanel);
17501838         //worldPane.add(worldPanel);
17511839                 /**/
....@@ -1805,7 +1893,15 @@
18051893                 
18061894                 // Skin
18071895                 colorField.setFloat(material.color);
1808
-                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
+                
18091905                 subsurfaceField.setFloat(material.subsurface);
18101906                 selfshadowField.setFloat(material.diffuseness);
18111907                 diffusenessField.setFloat(material.factor);
....@@ -2116,6 +2212,21 @@
21162212         });
21172213         presetpanel.add(bump0);
21182214         
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
+        
21192230         cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
21202231         halo.setToolTipText("Halo");
21212232         halo.addMouseListener(new MouseAdapter()
....@@ -2223,9 +2334,20 @@
22232334 
22242335         cGridBag huepanel = new cGridBag();
22252336             cGridBag huelabel = new cGridBag();
2226
-        skin = GetLabel("icons/hue.png", false);
2227
-        skin.fit = true;
2228
-            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);
22292351             huelabel.preferredWidth = 20;
22302352             huepanel.add(new cGridBag()); // Label
22312353             huepanel.add(huelabel); // Field/slider
....@@ -3501,32 +3623,8 @@
35013623 
35023624         if (multiplyToggle != null)
35033625                 multiplyToggle.setSelected(mat.multiply);
3504
-
3505
-        assert (object.projectedVertices != null);
3506
-
3507
-        if (object.projectedVertices.length <= 2)
3508
-        {
3509
-            // Side effect...
3510
-            Object3D.cVector2[] keep = object.projectedVertices;
3511
-            object.projectedVertices = new Object3D.cVector2[3];
3512
-            for (int i = 0; i < 3; i++)
3513
-            {
3514
-                if (i < keep.length)
3515
-                {
3516
-                    object.projectedVertices[i] = keep[i];
3517
-                } else
3518
-                {
3519
-                    object.projectedVertices[i] = new Object3D.cVector2();
3520
-                }
3521
-                /*
3522
-                if(keep.length == 0)
3523
-                object.projectedVertices[0] = new Object3D.cVector2();
3524
-                else
3525
-                object.projectedVertices[0] = keep[0];
3526
-                object.projectedVertices[1] = new Object3D.cVector2();
3527
-                 */
3528
-            }
3529
-        }
3626
+        
3627
+        AllocProjectedVertices(object);
35303628 
35313629         SetMaterial(mat, object.projectedVertices);
35323630     }
....@@ -3836,7 +3934,7 @@
38363934             //System.out.println("ObjEditor " + event);
38373935             applySelf0(true);
38383936             //parent.applySelf();
3839
-            objEditor.refreshContents();
3937
+     // conflicts with requestFocus       objEditor.refreshContents();
38403938         } else if (source == resetButton)
38413939         {
38423940             CameraPane.fullreset = true;
....@@ -4148,8 +4246,6 @@
41484246         return true;
41494247     }
41504248 
4151
-    java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
4152
-    
41534249     void DeleteVersion()
41544250     {
41554251         for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
....@@ -4157,7 +4253,11 @@
41574253             copy.versionlist[i] = copy.versionlist[i+1];
41584254         }
41594255         
4160
-        CopyChanged();
4256
+        if (copy.versionlist[copy.versionindex] == null)
4257
+            copy.versionindex -= 1;
4258
+        
4259
+        if (copy.versionindex != -1)
4260
+            CopyChanged();
41614261         
41624262         SetVersionStates();
41634263     }
....@@ -4270,7 +4370,7 @@
42704370         boolean temp = CameraPane.SWITCH;
42714371         CameraPane.SWITCH = false;
42724372         
4273
-        copy.ExtractBigData(versiontable);
4373
+        copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
42744374         
42754375         copy.clear();
42764376         
....@@ -4282,7 +4382,7 @@
42824382             copy.add(obj.get(i));
42834383         }
42844384         
4285
-        copy.RestoreBigData(versiontable);
4385
+        copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
42864386         
42874387         CameraPane.SWITCH = temp;
42884388         
....@@ -4345,8 +4445,8 @@
43454445         previousVersionButton.setEnabled(copy.versionindex > 0);
43464446         nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
43474447         
4348
-        deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
4349
-                                        copy.versionlist[copy.versionindex + 1] != null);
4448
+        deleteVersionButton.setEnabled(copy.versionindex != -1);
4449
+                                        //copy.versionlist[copy.versionindex + 1] != null);
43504450         
43514451         muteSlider = true;
43524452         versionSlider.setMinimum(0);
....@@ -4411,7 +4511,7 @@
44114511 
44124512     public boolean Replace()
44134513     {
4414
-        System.err.println("Replace");
4514
+        //System.err.println("Replace");
44154515         
44164516         //cRadio tab = GetCurrentTab();
44174517         
....@@ -4638,6 +4738,12 @@
46384738 //            else
46394739 //		applySelf(true);
46404740 //	}
4741
+    
4742
+    boolean Equal(double a, double b)
4743
+    {
4744
+        return Math.abs(a - b) < 0.001;
4745
+    }
4746
+    
46414747     void applySelf0(boolean name)
46424748     {
46434749         if (name)
....@@ -4687,29 +4793,52 @@
46874793                 {
46884794                     cMaterial mat = copy.material;
46894795                             
4690
-                    colorField.SetToolTipValue((mat.color));
4691
-                    saturationField.SetToolTipValue((mat.modulation));
4692
-                    metalnessField.SetToolTipValue((mat.metalness));
4693
-                    diffuseField.SetToolTipValue((mat.diffuse));
4694
-                    specularField.SetToolTipValue((mat.specular));
4695
-                    shininessField.SetToolTipValue((mat.shininess));
4696
-                    shiftField.SetToolTipValue((mat.shift));
4697
-                    ambientField.SetToolTipValue((mat.ambient));
4698
-                    lightareaField.SetToolTipValue((mat.lightarea));
4699
-                    diffusenessField.SetToolTipValue((mat.factor));
4700
-                    velvetField.SetToolTipValue((mat.velvet));
4701
-                    sheenField.SetToolTipValue((mat.sheen));
4702
-                    subsurfaceField.SetToolTipValue((mat.subsurface));
4703
-                    backlitField.SetToolTipValue((mat.bump));
4704
-                    anisoField.SetToolTipValue((mat.aniso));
4705
-                    anisoVField.SetToolTipValue((mat.anisoV));
4706
-                    cameraField.SetToolTipValue((mat.cameralight));
4707
-                    selfshadowField.SetToolTipValue((mat.diffuseness));
4708
-                    shadowField.SetToolTipValue((mat.shadow));
4709
-                    textureField.SetToolTipValue((mat.texture));
4710
-                    opacityField.SetToolTipValue((mat.opacity));
4711
-                    fakedepthField.SetToolTipValue((mat.fakedepth));
4712
-                    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));
47134842                 }
47144843                 
47154844                 if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
....@@ -4749,6 +4878,8 @@
47494878         {
47504879             if (muteSlider)
47514880                 return;
4881
+            
4882
+            Replace();
47524883             
47534884             int version = versionSlider.getInteger();
47544885             
....@@ -5112,6 +5243,8 @@
51125243         
51135244         if (previousVersionButton != null && copy.versionlist != null)
51145245             SetVersionStates();
5246
+        
5247
+        cameraView.requestFocusInWindow();
51155248     }
51165249     
51175250     static TweenManager tweenManager = new TweenManager();
....@@ -5143,7 +5276,7 @@
51435276 //                group = (Composite) group.get(0);
51445277 //            }
51455278 
5146
-        System.out.println("makeSomething of " + thing);
5279
+        //System.out.println("makeSomething of " + thing);
51475280 
51485281         /*
51495282         if (deselect && jList != null)
....@@ -5497,6 +5630,7 @@
54975630 
54985631             copy.versionlist = readobj.versionlist;
54995632             copy.versionindex = readobj.versionindex;
5633
+            copy.versiontable = readobj.versiontable;
55005634             
55015635         if (copy.versionlist == null)
55025636         {
....@@ -5504,7 +5638,7 @@
55045638             copy.versionlist = new Object3D[100];
55055639             copy.versionindex = -1;
55065640             
5507
-            Save(true);
5641
+            //Save(true);
55085642         }
55095643         
55105644             //? SetUndoStates();