blame | history | patch | commit | commitdiff
Normand Briere
2019-08-13 c67de8aca04d988179191ccb52461af00125920e 
 ObjEditor.java
....@@ -297,11 +297,13 @@
297297         client = inClient;
298298         copy = client;
299299 
300
-        if (copy.versionlist == null)
301
-        {
302
-            copy.versionlist = new Object3D[100];
303
-            copy.versionindex = -1;
304
-        }
300
+//        if (copy.versionlist == null)
301
+//        {
302
+//            copy.versionlist = new Object3D[100];
303
+//            copy.versionindex = -1;
304
+//            
305
+//            callee.Save(true);
306
+//        }
305307         
306308         // "this" is not called: SetupUI2(objEditor);
307309     }
....@@ -320,6 +322,8 @@
320322         {
321323             copy.versionlist = new Object3D[100];
322324             copy.versionindex = -1;
325
+            
326
+//            Save(true);
323327         }
324328         
325329         SetupUI2(callee.GetEditor());
....@@ -354,11 +358,13 @@
354358         copy = localCopy;
355359         copy.editWindow = this;
356360 
357
-        if (copy.versionlist == null)
358
-        {
359
-//            copy.versions = new byte[100][];
361
+//        if (copy.versionlist == null)
362
+//        {
363
+//            copy.versionlist = new Object3D[100];
360364 //            copy.versionindex = -1;
361
-        }
365
+//            
366
+//            Save(true);
367
+//        }
362368         
363369         SetupMenu();
364370 
....@@ -427,6 +433,8 @@
427433         
428434         ChangeListener changeListener = new ChangeListener()
429435         {
436
+            String name;
437
+            
430438             public void stateChanged(ChangeEvent changeEvent)
431439             {
432440 //                if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
....@@ -445,7 +453,36 @@
445453 //                        EditSelection(false);
446454 //                }
447455 
448
-                refreshContents(false); // To refresh Info tab
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
+                }
483
+                
484
+//                refreshContents(false); // To refresh Info tab
485
+                cameraView.repaint();
449486             }
450487         };
451488         objectPanel.addChangeListener(changeListener);
....@@ -754,6 +791,7 @@
754791         boolean maximized;
755792     
756793         cButton fullscreenLayout;
794
+        cButton expandedLayout;
757795 
758796         void Minimize()
759797         {
....@@ -793,10 +831,12 @@
793831 	cButton minButton;
794832 	cButton maxButton;
795833 	cButton fullButton;
834
+	cButton collapseButton;
835
+        cButton maximize3DButton;
796836         
797837         void ToggleFullScreen()
798838         {
799
-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
839
+            GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
800840 
801841                 cameraView.ToggleFullScreen();
802842                 
....@@ -817,13 +857,13 @@
817857 // X                   frame.getContentPane().remove(/*"Center",*/bigThree);
818858 // X                   framePanel.add(bigThree);
819859 // X                   frame.getContentPane().add(/*"Center",*/framePanel);
820
-                    framePanel.setDividerLocation(46);
860
+//                    framePanel.setDividerLocation(46); // icons are 24x24
821861                     
822862                     //frame.setVisible(true);
823
-                    radio.layout = keepButton;
863
+//                    radio.layout = keepButton;
824864                     //theFrame = null;
825865                     keepButton = null;
826
-                    radio.layout.doClick();
866
+//                    radio.layout.doClick();
827867                     
828868                 } else
829869                 {
....@@ -844,10 +884,10 @@
844884 // X                   frame.getContentPane().remove(/*"Center",*/framePanel);
845885 // X                   framePanel.remove(bigThree);
846886 // X                   frame.getContentPane().add(/*"Center",*/bigThree);
847
-                    framePanel.setDividerLocation(0);
887
+//                    framePanel.setDividerLocation(0);
848888 
849
-                    radio.layout = fullscreenLayout;
850
-                    radio.layout.doClick();
889
+//                    radio.layout = fullscreenLayout;
890
+//                    radio.layout.doClick();
851891                     //frame.setVisible(true);
852892                 }
853893             frame.validate();
....@@ -855,23 +895,31 @@
855895             cameraView.requestFocusInWindow();
856896         }
857897 
858
-    private Object3D CompressCopy()
898
+        void CollapseToolbar()
899
+        {
900
+            framePanel.setDividerLocation(0);
901
+            //frame.validate();
902
+            
903
+            cameraView.requestFocusInWindow();
904
+        }
905
+        
906
+    private Object3D Duplicate(Object3D object)
859907     {
860908         boolean temp = CameraPane.SWITCH;
861909         CameraPane.SWITCH = false;
862910         
863
-        copy.ExtractBigData(versiontable);
911
+        object.ExtractBigData(versiontable);
864912         // if (copy == client)
865913         
866
-        Object3D versions[] = copy.versionlist;
867
-        copy.versionlist = null;
914
+        Object3D versions[] = object.versionlist;
915
+        object.versionlist = null;
868916         
869917         //byte[] compress = Compress(copy);
870
-        Object3D compress = (Object3D)Grafreed.clone(copy);
918
+        Object3D compress = (Object3D)Grafreed.clone(object);
871919         
872
-        copy.versionlist = versions;
920
+        object.versionlist = versions;
873921         
874
-        copy.RestoreBigData(versiontable);
922
+        object.RestoreBigData(versiontable);
875923         
876924         CameraPane.SWITCH = temp;
877925         
....@@ -1702,6 +1750,23 @@
17021750 //		aConstraints.gridheight = 1;
17031751 
17041752         framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1753
+        
1754
+        framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
1755
+                new java.beans.PropertyChangeListener()
1756
+                {
1757
+                    public void propertyChange(java.beans.PropertyChangeEvent pce)
1758
+                    {
1759
+                        if ((Integer)pce.getOldValue() == 1)
1760
+                        {
1761
+                            if (radio.layout != expandedLayout)
1762
+                            {
1763
+                                radio.layout = expandedLayout;
1764
+                                radio.layout.doClick();
1765
+                            }
1766
+                        }
1767
+                    }
1768
+                });
1769
+
17051770         framePanel.setContinuousLayout(false);
17061771         framePanel.setOneTouchExpandable(false);
17071772         //.setDividerLocation(0.8);
....@@ -2120,6 +2185,25 @@
21202185             }
21212186         });
21222187         presetpanel.add(candle);
2188
+        
2189
+        cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
2190
+        shadowShader.setToolTipText("Shadow");
2191
+        shadowShader.addMouseListener(new MouseAdapter()
2192
+        {
2193
+            public void mouseClicked(MouseEvent e)
2194
+            {
2195
+                diffuseField.setFloat(0.001);
2196
+                ambientField.setFloat(0.001);
2197
+                cameraField.setFloat(0.001);
2198
+                specularField.setFloat(0.001);
2199
+                fakedepthField.setFloat(0.001);
2200
+                opacityField.setFloat(0.6);
2201
+
2202
+                materialtouched = true;
2203
+                applySelf();
2204
+            }
2205
+        });
2206
+        presetpanel.add(shadowShader);
21232207         
21242208         cGridBag panel = new cGridBag().setVertical(true);
21252209         
....@@ -4076,7 +4160,7 @@
40764160     {
40774161         //Save(true);
40784162         Replace();
4079
-        SetUndoStates();
4163
+        SetVersionStates();
40804164     }
40814165     
40824166     private boolean Equal(byte[] compress, byte[] name)
....@@ -4106,17 +4190,17 @@
41064190         
41074191         CopyChanged();
41084192         
4109
-        SetUndoStates();
4193
+        SetVersionStates();
41104194     }
41114195     
41124196     public boolean Save(boolean user)
41134197     {
41144198         System.err.println("Save");
4115
-        //Replace();
4199
+        Replace();
41164200         
4117
-        cRadio tab = GetCurrentTab();
4201
+        //cRadio tab = GetCurrentTab();
41184202         
4119
-        Object3D compress = CompressCopy(); // Saved version. No need for "Replace"?
4203
+        Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
41204204         
41214205         boolean thesame = false;
41224206         
....@@ -4152,7 +4236,7 @@
41524236 //            copy.versionlist[i] = null;
41534237 //        }
41544238 
4155
-        SetUndoStates();
4239
+        SetVersionStates();
41564240         
41574241         // test save
41584242         if (false)
....@@ -4210,9 +4294,9 @@
42104294 
42114295     void CopyChanged()
42124296     {
4213
-        Object3D obj = copy.versionlist[copy.versionindex];
4297
+        Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
42144298         
4215
-        SetUndoStates();
4299
+        SetVersionStates();
42164300         
42174301         boolean temp = CameraPane.SWITCH;
42184302         CameraPane.SWITCH = false;
....@@ -4279,12 +4363,15 @@
42794363         return count;
42804364     }
42814365     
4282
-    void SetUndoStates()
4366
+    void SetVersionStates()
42834367     {
4284
-        cRadio tab = GetCurrentTab();
4368
+        //if (true)
4369
+        //    return;
4370
+                    
4371
+        //cRadio tab = GetCurrentTab();
42854372         
4286
-        restoreButton.setEnabled(true); // copy.versionindex != -1);
4287
-        replaceButton.setEnabled(true); // copy.versionindex != -1);
4373
+        restoreButton.setEnabled(copy.versionindex != -1);
4374
+        replaceButton.setEnabled(copy.versionindex != -1);
42884375         
42894376         previousVersionButton.setEnabled(copy.versionindex > 0);
42904377         nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
....@@ -4293,8 +4380,10 @@
42934380                                         copy.versionlist[copy.versionindex + 1] != null);
42944381         
42954382         muteSlider = true;
4383
+        versionSlider.setMinimum(0);
42964384         versionSlider.setMaximum(VersionCount() - 1);
42974385         versionSlider.setInteger(copy.versionindex);
4386
+        versionSlider.setEnabled(copy.versionindex != -1);
42984387         muteSlider = false;
42994388     }
43004389     
....@@ -4305,7 +4394,7 @@
43054394         
43064395         System.err.println("Undo");
43074396         
4308
-        cRadio tab = GetCurrentTab();
4397
+        //cRadio tab = GetCurrentTab();
43094398         
43104399         if (copy.versionindex == 0)
43114400         {
....@@ -4337,7 +4426,7 @@
43374426     {
43384427         System.err.println("Restore");
43394428         
4340
-        cRadio tab = GetCurrentTab();
4429
+        //cRadio tab = GetCurrentTab();
43414430         
43424431         if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
43434432         {
....@@ -4355,7 +4444,7 @@
43554444     {
43564445         System.err.println("Replace");
43574446         
4358
-        cRadio tab = GetCurrentTab();
4447
+        //cRadio tab = GetCurrentTab();
43594448         
43604449         if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
43614450         {
....@@ -4363,7 +4452,7 @@
43634452             return false;
43644453         }
43654454 
4366
-        copy.versionlist[copy.versionindex] = CompressCopy();
4455
+        copy.versionlist[copy.versionindex] = Duplicate(copy);
43674456         
43684457         return true;
43694458     }
....@@ -4373,7 +4462,7 @@
43734462         // Option?
43744463         Replace();
43754464         
4376
-        cRadio tab = GetCurrentTab();
4465
+        //cRadio tab = GetCurrentTab();
43774466         
43784467         if (copy.versionlist[copy.versionindex + 1] == null)
43794468         {
....@@ -4694,7 +4783,7 @@
46944783             
46954784             int version = versionSlider.getInteger();
46964785             
4697
-            if (copy.versionlist[version] != null)
4786
+            if (version != -1 && copy.versionlist[version] != null)
46984787             {
46994788                 copy.versionindex = version;
47004789                 CopyChanged();
....@@ -4738,7 +4827,7 @@
47384827             //System.out.println("stateChanged = " + this);
47394828             materialtouched = true;
47404829             
4741
-            if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
4830
+            if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
47424831             {
47434832                 saturationField.setFloat(1);
47444833             }
....@@ -5053,7 +5142,7 @@
50535142         }
50545143         
50555144         if (previousVersionButton != null && copy.versionlist != null)
5056
-            SetUndoStates();
5145
+            SetVersionStates();
50575146     }
50585147     
50595148     static TweenManager tweenManager = new TweenManager();
....@@ -5442,8 +5531,11 @@
54425531             
54435532         if (copy.versionlist == null)
54445533         {
5534
+            // Backward compatibility
54455535             copy.versionlist = new Object3D[100];
54465536             copy.versionindex = -1;
5537
+            
5538
+            Save(true);
54475539         }
54485540         
54495541             //? SetUndoStates();
....@@ -5535,6 +5627,8 @@
55355627 
55365628     void save()
55375629     {
5630
+        Replace();
5631
+        
55385632         if (lastname == null)
55395633         {
55405634             return;
....@@ -5882,6 +5976,7 @@
58825976     cNumberSlider anisoField;
58835977     JLabel anisoVLabel;
58845978     cNumberSlider anisoVField;
5979
+    
58855980     JLabel cameraLabel;
58865981     cNumberSlider cameraField;
58875982     JLabel selfshadowLabel;
....@@ -5896,6 +5991,7 @@
58965991     cNumberSlider fakedepthField;
58975992     JLabel shadowbiasLabel;
58985993     cNumberSlider shadowbiasField;
5994
+    
58995995     JLabel bumpLabel;
59005996     cNumberSlider bumpField;
59015997     JLabel noiseLabel;