blame | history | patch | commit | commitdiff
Normand Briere
2019-08-15 33504fc9a180903aace77613264550754fba5706 
 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     }
....@@ -297,11 +338,13 @@
297338         client = inClient;
298339         copy = client;
299340 
300
-        if (copy.versionlist == null)
301
-        {
302
-            copy.versionlist = new Object3D[100];
303
-            copy.versionindex = -1;
304
-        }
341
+//        if (copy.versionlist == null)
342
+//        {
343
+//            copy.versionlist = new Object3D[100];
344
+//            copy.versionindex = -1;
345
+//            
346
+//            callee.Save(true);
347
+//        }
305348         
306349         // "this" is not called: SetupUI2(objEditor);
307350     }
....@@ -320,6 +363,8 @@
320363         {
321364             copy.versionlist = new Object3D[100];
322365             copy.versionindex = -1;
366
+            
367
+//            Save(true);
323368         }
324369         
325370         SetupUI2(callee.GetEditor());
....@@ -354,11 +399,13 @@
354399         copy = localCopy;
355400         copy.editWindow = this;
356401 
357
-        if (copy.versionlist == null)
358
-        {
359
-//            copy.versions = new byte[100][];
402
+//        if (copy.versionlist == null)
403
+//        {
404
+//            copy.versionlist = new Object3D[100];
360405 //            copy.versionindex = -1;
361
-        }
406
+//            
407
+//            Save(true);
408
+//        }
362409         
363410         SetupMenu();
364411 
....@@ -427,6 +474,8 @@
427474         
428475         ChangeListener changeListener = new ChangeListener()
429476         {
477
+            //String name;
478
+            
430479             public void stateChanged(ChangeEvent changeEvent)
431480             {
432481 //                if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
....@@ -445,7 +494,37 @@
445494 //                        EditSelection(false);
446495 //                }
447496 
448
-                refreshContents(false); // To refresh Info tab
497
+//                if (objectPanel.getSelectedIndex() == 4)
498
+//                {
499
+//                    name = copy.skyboxname;
500
+//                    
501
+//                    if (name == null)
502
+//                    {
503
+//                        name = "";
504
+//                    }
505
+//                    
506
+//                    copy.skyboxname = "cubemaps/default-skyboxes/rgb";
507
+//                    copy.skyboxext = "jpg";
508
+//                }
509
+//                else
510
+//                {
511
+//                    if (name != null)
512
+//                    {
513
+//                        if (name.equals(""))
514
+//                        {
515
+//                            copy.skyboxname = null;
516
+//                            copy.skyboxext = null;
517
+//                        }
518
+//                        else
519
+//                        {
520
+//                            copy.skyboxname = name;
521
+//                        }
522
+//                    }
523
+//                }
524
+                cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
525
+                
526
+//                refreshContents(false); // To refresh Info tab
527
+                cameraView.repaint();
449528             }
450529         };
451530         objectPanel.addChangeListener(changeListener);
....@@ -754,6 +833,7 @@
754833         boolean maximized;
755834     
756835         cButton fullscreenLayout;
836
+        cButton expandedLayout;
757837 
758838         void Minimize()
759839         {
....@@ -793,10 +873,12 @@
793873 	cButton minButton;
794874 	cButton maxButton;
795875 	cButton fullButton;
876
+	cButton collapseButton;
877
+        cButton maximize3DButton;
796878         
797879         void ToggleFullScreen()
798880         {
799
-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
881
+            GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
800882 
801883                 cameraView.ToggleFullScreen();
802884                 
....@@ -817,13 +899,13 @@
817899 // X                   frame.getContentPane().remove(/*"Center",*/bigThree);
818900 // X                   framePanel.add(bigThree);
819901 // X                   frame.getContentPane().add(/*"Center",*/framePanel);
820
-                    framePanel.setDividerLocation(46);
902
+//                    framePanel.setDividerLocation(46); // icons are 24x24
821903                     
822904                     //frame.setVisible(true);
823
-                    radio.layout = keepButton;
905
+//                    radio.layout = keepButton;
824906                     //theFrame = null;
825907                     keepButton = null;
826
-                    radio.layout.doClick();
908
+//                    radio.layout.doClick();
827909                     
828910                 } else
829911                 {
....@@ -844,10 +926,10 @@
844926 // X                   frame.getContentPane().remove(/*"Center",*/framePanel);
845927 // X                   framePanel.remove(bigThree);
846928 // X                   frame.getContentPane().add(/*"Center",*/bigThree);
847
-                    framePanel.setDividerLocation(0);
929
+//                    framePanel.setDividerLocation(0);
848930 
849
-                    radio.layout = fullscreenLayout;
850
-                    radio.layout.doClick();
931
+//                    radio.layout = fullscreenLayout;
932
+//                    radio.layout.doClick();
851933                     //frame.setVisible(true);
852934                 }
853935             frame.validate();
....@@ -855,23 +937,31 @@
855937             cameraView.requestFocusInWindow();
856938         }
857939 
858
-    private Object3D CompressCopy()
940
+        void CollapseToolbar()
941
+        {
942
+            framePanel.setDividerLocation(0);
943
+            //frame.validate();
944
+            
945
+            cameraView.requestFocusInWindow();
946
+        }
947
+        
948
+    private Object3D Duplicate(Object3D object)
859949     {
860950         boolean temp = CameraPane.SWITCH;
861951         CameraPane.SWITCH = false;
862952         
863
-        copy.ExtractBigData(versiontable);
953
+        object.ExtractBigData(versiontable);
864954         // if (copy == client)
865955         
866
-        Object3D versions[] = copy.versionlist;
867
-        copy.versionlist = null;
956
+        Object3D versions[] = object.versionlist;
957
+        object.versionlist = null;
868958         
869959         //byte[] compress = Compress(copy);
870
-        Object3D compress = (Object3D)Grafreed.clone(copy);
960
+        Object3D compress = (Object3D)Grafreed.clone(object);
871961         
872
-        copy.versionlist = versions;
962
+        object.versionlist = versions;
873963         
874
-        copy.RestoreBigData(versiontable);
964
+        object.RestoreBigData(versiontable);
875965         
876966         CameraPane.SWITCH = temp;
877967         
....@@ -1628,9 +1718,9 @@
16281718         scenePanel.add(tabbedPane);
16291719 
16301720         //if (Globals.ADVANCED)
1631
-            tabbedPane.add(infoPanel);
1632
-        tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1633
-        tabbedPane.setToolTipTextAt(3, "Information");
1721
+//            tabbedPane.add(infoPanel);
1722
+//        tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1723
+//        tabbedPane.setToolTipTextAt(3, "Information");
16341724         
16351725         /*
16361726         cTree jTree = new cTree(null);
....@@ -1702,6 +1792,23 @@
17021792 //		aConstraints.gridheight = 1;
17031793 
17041794         framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1795
+        
1796
+        framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
1797
+                new java.beans.PropertyChangeListener()
1798
+                {
1799
+                    public void propertyChange(java.beans.PropertyChangeEvent pce)
1800
+                    {
1801
+                        if ((Integer)pce.getOldValue() == 1)
1802
+                        {
1803
+                            if (radio.layout != expandedLayout)
1804
+                            {
1805
+                                radio.layout = expandedLayout;
1806
+                                radio.layout.doClick();
1807
+                            }
1808
+                        }
1809
+                    }
1810
+                });
1811
+
17051812         framePanel.setContinuousLayout(false);
17061813         framePanel.setOneTouchExpandable(false);
17071814         //.setDividerLocation(0.8);
....@@ -1711,7 +1818,7 @@
17111818 
17121819         frame.getContentPane().setLayout(new BorderLayout());
17131820         /**/
1714
-        JTabbedPane worldPane = new JTabbedPane();
1821
+        //JTabbedPane worldPane = new JTabbedPane();
17151822         //worldPane.add(bigPanel);
17161823         //worldPane.add(worldPanel);
17171824                 /**/
....@@ -2082,6 +2189,21 @@
20822189         });
20832190         presetpanel.add(bump0);
20842191         
2192
+        cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
2193
+        borderShader.setToolTipText("Border fade");
2194
+        borderShader.addMouseListener(new MouseAdapter()
2195
+        {
2196
+            public void mouseClicked(MouseEvent e)
2197
+            {
2198
+                borderfadeField.setFloat(0.5);
2199
+                opacityField.setFloat(0.6);
2200
+
2201
+                materialtouched = true;
2202
+                applySelf();
2203
+            }
2204
+        });
2205
+        presetpanel.add(borderShader);
2206
+        
20852207         cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
20862208         halo.setToolTipText("Halo");
20872209         halo.addMouseListener(new MouseAdapter()
....@@ -2120,6 +2242,25 @@
21202242             }
21212243         });
21222244         presetpanel.add(candle);
2245
+        
2246
+        cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
2247
+        shadowShader.setToolTipText("Shadow");
2248
+        shadowShader.addMouseListener(new MouseAdapter()
2249
+        {
2250
+            public void mouseClicked(MouseEvent e)
2251
+            {
2252
+                diffuseField.setFloat(0.001);
2253
+                ambientField.setFloat(0.001);
2254
+                cameraField.setFloat(0.001);
2255
+                specularField.setFloat(0.001);
2256
+                fakedepthField.setFloat(0.001);
2257
+                opacityField.setFloat(0.6);
2258
+
2259
+                materialtouched = true;
2260
+                applySelf();
2261
+            }
2262
+        });
2263
+        presetpanel.add(shadowShader);
21232264         
21242265         cGridBag panel = new cGridBag().setVertical(true);
21252266         
....@@ -3448,32 +3589,8 @@
34483589 
34493590         if (multiplyToggle != null)
34503591                 multiplyToggle.setSelected(mat.multiply);
3451
-
3452
-        assert (object.projectedVertices != null);
3453
-
3454
-        if (object.projectedVertices.length <= 2)
3455
-        {
3456
-            // Side effect...
3457
-            Object3D.cVector2[] keep = object.projectedVertices;
3458
-            object.projectedVertices = new Object3D.cVector2[3];
3459
-            for (int i = 0; i < 3; i++)
3460
-            {
3461
-                if (i < keep.length)
3462
-                {
3463
-                    object.projectedVertices[i] = keep[i];
3464
-                } else
3465
-                {
3466
-                    object.projectedVertices[i] = new Object3D.cVector2();
3467
-                }
3468
-                /*
3469
-                if(keep.length == 0)
3470
-                object.projectedVertices[0] = new Object3D.cVector2();
3471
-                else
3472
-                object.projectedVertices[0] = keep[0];
3473
-                object.projectedVertices[1] = new Object3D.cVector2();
3474
-                 */
3475
-            }
3476
-        }
3592
+        
3593
+        AllocProjectedVertices(object);
34773594 
34783595         SetMaterial(mat, object.projectedVertices);
34793596     }
....@@ -4076,7 +4193,7 @@
40764193     {
40774194         //Save(true);
40784195         Replace();
4079
-        SetUndoStates();
4196
+        SetVersionStates();
40804197     }
40814198     
40824199     private boolean Equal(byte[] compress, byte[] name)
....@@ -4106,17 +4223,17 @@
41064223         
41074224         CopyChanged();
41084225         
4109
-        SetUndoStates();
4226
+        SetVersionStates();
41104227     }
41114228     
41124229     public boolean Save(boolean user)
41134230     {
41144231         System.err.println("Save");
4115
-        //Replace();
4232
+        Replace();
41164233         
4117
-        cRadio tab = GetCurrentTab();
4234
+        //cRadio tab = GetCurrentTab();
41184235         
4119
-        Object3D compress = CompressCopy(); // Saved version. No need for "Replace"?
4236
+        Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
41204237         
41214238         boolean thesame = false;
41224239         
....@@ -4152,7 +4269,7 @@
41524269 //            copy.versionlist[i] = null;
41534270 //        }
41544271 
4155
-        SetUndoStates();
4272
+        SetVersionStates();
41564273         
41574274         // test save
41584275         if (false)
....@@ -4210,9 +4327,9 @@
42104327 
42114328     void CopyChanged()
42124329     {
4213
-        Object3D obj = copy.versionlist[copy.versionindex];
4330
+        Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
42144331         
4215
-        SetUndoStates();
4332
+        SetVersionStates();
42164333         
42174334         boolean temp = CameraPane.SWITCH;
42184335         CameraPane.SWITCH = false;
....@@ -4279,12 +4396,15 @@
42794396         return count;
42804397     }
42814398     
4282
-    void SetUndoStates()
4399
+    void SetVersionStates()
42834400     {
4284
-        cRadio tab = GetCurrentTab();
4401
+        //if (true)
4402
+        //    return;
4403
+                    
4404
+        //cRadio tab = GetCurrentTab();
42854405         
4286
-        restoreButton.setEnabled(true); // copy.versionindex != -1);
4287
-        replaceButton.setEnabled(true); // copy.versionindex != -1);
4406
+        restoreButton.setEnabled(copy.versionindex != -1);
4407
+        replaceButton.setEnabled(copy.versionindex != -1);
42884408         
42894409         previousVersionButton.setEnabled(copy.versionindex > 0);
42904410         nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
....@@ -4293,8 +4413,10 @@
42934413                                         copy.versionlist[copy.versionindex + 1] != null);
42944414         
42954415         muteSlider = true;
4416
+        versionSlider.setMinimum(0);
42964417         versionSlider.setMaximum(VersionCount() - 1);
42974418         versionSlider.setInteger(copy.versionindex);
4419
+        versionSlider.setEnabled(copy.versionindex != -1);
42984420         muteSlider = false;
42994421     }
43004422     
....@@ -4305,7 +4427,7 @@
43054427         
43064428         System.err.println("Undo");
43074429         
4308
-        cRadio tab = GetCurrentTab();
4430
+        //cRadio tab = GetCurrentTab();
43094431         
43104432         if (copy.versionindex == 0)
43114433         {
....@@ -4337,7 +4459,7 @@
43374459     {
43384460         System.err.println("Restore");
43394461         
4340
-        cRadio tab = GetCurrentTab();
4462
+        //cRadio tab = GetCurrentTab();
43414463         
43424464         if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
43434465         {
....@@ -4355,7 +4477,7 @@
43554477     {
43564478         System.err.println("Replace");
43574479         
4358
-        cRadio tab = GetCurrentTab();
4480
+        //cRadio tab = GetCurrentTab();
43594481         
43604482         if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
43614483         {
....@@ -4363,7 +4485,7 @@
43634485             return false;
43644486         }
43654487 
4366
-        copy.versionlist[copy.versionindex] = CompressCopy();
4488
+        copy.versionlist[copy.versionindex] = Duplicate(copy);
43674489         
43684490         return true;
43694491     }
....@@ -4373,7 +4495,7 @@
43734495         // Option?
43744496         Replace();
43754497         
4376
-        cRadio tab = GetCurrentTab();
4498
+        //cRadio tab = GetCurrentTab();
43774499         
43784500         if (copy.versionlist[copy.versionindex + 1] == null)
43794501         {
....@@ -4692,9 +4814,11 @@
46924814             if (muteSlider)
46934815                 return;
46944816             
4817
+            Replace();
4818
+            
46954819             int version = versionSlider.getInteger();
46964820             
4697
-            if (copy.versionlist[version] != null)
4821
+            if (version != -1 && copy.versionlist[version] != null)
46984822             {
46994823                 copy.versionindex = version;
47004824                 CopyChanged();
....@@ -4738,7 +4862,7 @@
47384862             //System.out.println("stateChanged = " + this);
47394863             materialtouched = true;
47404864             
4741
-            if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
4865
+            if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
47424866             {
47434867                 saturationField.setFloat(1);
47444868             }
....@@ -5053,7 +5177,7 @@
50535177         }
50545178         
50555179         if (previousVersionButton != null && copy.versionlist != null)
5056
-            SetUndoStates();
5180
+            SetVersionStates();
50575181     }
50585182     
50595183     static TweenManager tweenManager = new TweenManager();
....@@ -5442,8 +5566,11 @@
54425566             
54435567         if (copy.versionlist == null)
54445568         {
5569
+            // Backward compatibility
54455570             copy.versionlist = new Object3D[100];
54465571             copy.versionindex = -1;
5572
+            
5573
+            //Save(true);
54475574         }
54485575         
54495576             //? SetUndoStates();
....@@ -5535,6 +5662,8 @@
55355662 
55365663     void save()
55375664     {
5665
+        Replace();
5666
+        
55385667         if (lastname == null)
55395668         {
55405669             return;
....@@ -5882,6 +6011,7 @@
58826011     cNumberSlider anisoField;
58836012     JLabel anisoVLabel;
58846013     cNumberSlider anisoVField;
6014
+    
58856015     JLabel cameraLabel;
58866016     cNumberSlider cameraField;
58876017     JLabel selfshadowLabel;
....@@ -5896,6 +6026,7 @@
58966026     cNumberSlider fakedepthField;
58976027     JLabel shadowbiasLabel;
58986028     cNumberSlider shadowbiasField;
6029
+    
58996030     JLabel bumpLabel;
59006031     cNumberSlider bumpField;
59016032     JLabel noiseLabel;