blame | history | patch | commit | commitdiff
Normand Briere
2019-08-13 0cdf3fb57ddea3226f094ba45c836c7e9b123e3a 
 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 
....@@ -445,7 +451,7 @@
445451 //                        EditSelection(false);
446452 //                }
447453 
448
-                refreshContents(false); // To refresh Info tab
454
+//                refreshContents(false); // To refresh Info tab
449455             }
450456         };
451457         objectPanel.addChangeListener(changeListener);
....@@ -754,6 +760,7 @@
754760         boolean maximized;
755761     
756762         cButton fullscreenLayout;
763
+        cButton expandedLayout;
757764 
758765         void Minimize()
759766         {
....@@ -793,10 +800,12 @@
793800 	cButton minButton;
794801 	cButton maxButton;
795802 	cButton fullButton;
803
+	cButton collapseButton;
804
+        cButton maximize3DButton;
796805         
797806         void ToggleFullScreen()
798807         {
799
-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
808
+            GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
800809 
801810                 cameraView.ToggleFullScreen();
802811                 
....@@ -817,13 +826,13 @@
817826 // X                   frame.getContentPane().remove(/*"Center",*/bigThree);
818827 // X                   framePanel.add(bigThree);
819828 // X                   frame.getContentPane().add(/*"Center",*/framePanel);
820
-                    framePanel.setDividerLocation(46);
829
+//                    framePanel.setDividerLocation(46); // icons are 24x24
821830                     
822831                     //frame.setVisible(true);
823
-                    radio.layout = keepButton;
832
+//                    radio.layout = keepButton;
824833                     //theFrame = null;
825834                     keepButton = null;
826
-                    radio.layout.doClick();
835
+//                    radio.layout.doClick();
827836                     
828837                 } else
829838                 {
....@@ -844,10 +853,10 @@
844853 // X                   frame.getContentPane().remove(/*"Center",*/framePanel);
845854 // X                   framePanel.remove(bigThree);
846855 // X                   frame.getContentPane().add(/*"Center",*/bigThree);
847
-                    framePanel.setDividerLocation(0);
856
+//                    framePanel.setDividerLocation(0);
848857 
849
-                    radio.layout = fullscreenLayout;
850
-                    radio.layout.doClick();
858
+//                    radio.layout = fullscreenLayout;
859
+//                    radio.layout.doClick();
851860                     //frame.setVisible(true);
852861                 }
853862             frame.validate();
....@@ -855,23 +864,31 @@
855864             cameraView.requestFocusInWindow();
856865         }
857866 
858
-    private Object3D CompressCopy()
867
+        void CollapseToolbar()
868
+        {
869
+            framePanel.setDividerLocation(0);
870
+            //frame.validate();
871
+            
872
+            cameraView.requestFocusInWindow();
873
+        }
874
+        
875
+    private Object3D Duplicate(Object3D object)
859876     {
860877         boolean temp = CameraPane.SWITCH;
861878         CameraPane.SWITCH = false;
862879         
863
-        copy.ExtractBigData(versiontable);
880
+        object.ExtractBigData(versiontable);
864881         // if (copy == client)
865882         
866
-        Object3D versions[] = copy.versionlist;
867
-        copy.versionlist = null;
883
+        Object3D versions[] = object.versionlist;
884
+        object.versionlist = null;
868885         
869886         //byte[] compress = Compress(copy);
870
-        Object3D compress = (Object3D)Grafreed.clone(copy);
887
+        Object3D compress = (Object3D)Grafreed.clone(object);
871888         
872
-        copy.versionlist = versions;
889
+        object.versionlist = versions;
873890         
874
-        copy.RestoreBigData(versiontable);
891
+        object.RestoreBigData(versiontable);
875892         
876893         CameraPane.SWITCH = temp;
877894         
....@@ -1702,6 +1719,23 @@
17021719 //		aConstraints.gridheight = 1;
17031720 
17041721         framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1722
+        
1723
+        framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
1724
+                new java.beans.PropertyChangeListener()
1725
+                {
1726
+                    public void propertyChange(java.beans.PropertyChangeEvent pce)
1727
+                    {
1728
+                        if ((Integer)pce.getOldValue() == 1)
1729
+                        {
1730
+                            if (radio.layout != expandedLayout)
1731
+                            {
1732
+                                radio.layout = expandedLayout;
1733
+                                radio.layout.doClick();
1734
+                            }
1735
+                        }
1736
+                    }
1737
+                });
1738
+
17051739         framePanel.setContinuousLayout(false);
17061740         framePanel.setOneTouchExpandable(false);
17071741         //.setDividerLocation(0.8);
....@@ -2120,6 +2154,25 @@
21202154             }
21212155         });
21222156         presetpanel.add(candle);
2157
+        
2158
+        cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
2159
+        shadowShader.setToolTipText("Shadow");
2160
+        shadowShader.addMouseListener(new MouseAdapter()
2161
+        {
2162
+            public void mouseClicked(MouseEvent e)
2163
+            {
2164
+                diffuseField.setFloat(0.001);
2165
+                ambientField.setFloat(0.001);
2166
+                cameraField.setFloat(0.001);
2167
+                specularField.setFloat(0.001);
2168
+                fakedepthField.setFloat(0.001);
2169
+                opacityField.setFloat(0.6);
2170
+
2171
+                materialtouched = true;
2172
+                applySelf();
2173
+            }
2174
+        });
2175
+        presetpanel.add(shadowShader);
21232176         
21242177         cGridBag panel = new cGridBag().setVertical(true);
21252178         
....@@ -4076,7 +4129,7 @@
40764129     {
40774130         //Save(true);
40784131         Replace();
4079
-        SetUndoStates();
4132
+        SetVersionStates();
40804133     }
40814134     
40824135     private boolean Equal(byte[] compress, byte[] name)
....@@ -4106,17 +4159,17 @@
41064159         
41074160         CopyChanged();
41084161         
4109
-        SetUndoStates();
4162
+        SetVersionStates();
41104163     }
41114164     
41124165     public boolean Save(boolean user)
41134166     {
41144167         System.err.println("Save");
4115
-        //Replace();
4168
+        Replace();
41164169         
4117
-        cRadio tab = GetCurrentTab();
4170
+        //cRadio tab = GetCurrentTab();
41184171         
4119
-        Object3D compress = CompressCopy(); // Saved version. No need for "Replace"?
4172
+        Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
41204173         
41214174         boolean thesame = false;
41224175         
....@@ -4152,7 +4205,7 @@
41524205 //            copy.versionlist[i] = null;
41534206 //        }
41544207 
4155
-        SetUndoStates();
4208
+        SetVersionStates();
41564209         
41574210         // test save
41584211         if (false)
....@@ -4210,9 +4263,9 @@
42104263 
42114264     void CopyChanged()
42124265     {
4213
-        Object3D obj = copy.versionlist[copy.versionindex];
4266
+        Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
42144267         
4215
-        SetUndoStates();
4268
+        SetVersionStates();
42164269         
42174270         boolean temp = CameraPane.SWITCH;
42184271         CameraPane.SWITCH = false;
....@@ -4279,12 +4332,15 @@
42794332         return count;
42804333     }
42814334     
4282
-    void SetUndoStates()
4335
+    void SetVersionStates()
42834336     {
4284
-        cRadio tab = GetCurrentTab();
4337
+        //if (true)
4338
+        //    return;
4339
+                    
4340
+        //cRadio tab = GetCurrentTab();
42854341         
4286
-        restoreButton.setEnabled(true); // copy.versionindex != -1);
4287
-        replaceButton.setEnabled(true); // copy.versionindex != -1);
4342
+        restoreButton.setEnabled(copy.versionindex != -1);
4343
+        replaceButton.setEnabled(copy.versionindex != -1);
42884344         
42894345         previousVersionButton.setEnabled(copy.versionindex > 0);
42904346         nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
....@@ -4293,8 +4349,10 @@
42934349                                         copy.versionlist[copy.versionindex + 1] != null);
42944350         
42954351         muteSlider = true;
4352
+        versionSlider.setMinimum(0);
42964353         versionSlider.setMaximum(VersionCount() - 1);
42974354         versionSlider.setInteger(copy.versionindex);
4355
+        versionSlider.setEnabled(copy.versionindex != -1);
42984356         muteSlider = false;
42994357     }
43004358     
....@@ -4305,7 +4363,7 @@
43054363         
43064364         System.err.println("Undo");
43074365         
4308
-        cRadio tab = GetCurrentTab();
4366
+        //cRadio tab = GetCurrentTab();
43094367         
43104368         if (copy.versionindex == 0)
43114369         {
....@@ -4337,7 +4395,7 @@
43374395     {
43384396         System.err.println("Restore");
43394397         
4340
-        cRadio tab = GetCurrentTab();
4398
+        //cRadio tab = GetCurrentTab();
43414399         
43424400         if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
43434401         {
....@@ -4355,7 +4413,7 @@
43554413     {
43564414         System.err.println("Replace");
43574415         
4358
-        cRadio tab = GetCurrentTab();
4416
+        //cRadio tab = GetCurrentTab();
43594417         
43604418         if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
43614419         {
....@@ -4363,7 +4421,7 @@
43634421             return false;
43644422         }
43654423 
4366
-        copy.versionlist[copy.versionindex] = CompressCopy();
4424
+        copy.versionlist[copy.versionindex] = Duplicate(copy);
43674425         
43684426         return true;
43694427     }
....@@ -4373,7 +4431,7 @@
43734431         // Option?
43744432         Replace();
43754433         
4376
-        cRadio tab = GetCurrentTab();
4434
+        //cRadio tab = GetCurrentTab();
43774435         
43784436         if (copy.versionlist[copy.versionindex + 1] == null)
43794437         {
....@@ -4694,7 +4752,7 @@
46944752             
46954753             int version = versionSlider.getInteger();
46964754             
4697
-            if (copy.versionlist[version] != null)
4755
+            if (version != -1 && copy.versionlist[version] != null)
46984756             {
46994757                 copy.versionindex = version;
47004758                 CopyChanged();
....@@ -4738,7 +4796,7 @@
47384796             //System.out.println("stateChanged = " + this);
47394797             materialtouched = true;
47404798             
4741
-            if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
4799
+            if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
47424800             {
47434801                 saturationField.setFloat(1);
47444802             }
....@@ -5053,7 +5111,7 @@
50535111         }
50545112         
50555113         if (previousVersionButton != null && copy.versionlist != null)
5056
-            SetUndoStates();
5114
+            SetVersionStates();
50575115     }
50585116     
50595117     static TweenManager tweenManager = new TweenManager();
....@@ -5442,8 +5500,11 @@
54425500             
54435501         if (copy.versionlist == null)
54445502         {
5503
+            // Backward compatibility
54455504             copy.versionlist = new Object3D[100];
54465505             copy.versionindex = -1;
5506
+            
5507
+            Save(true);
54475508         }
54485509         
54495510             //? SetUndoStates();
....@@ -5535,6 +5596,8 @@
55355596 
55365597     void save()
55375598     {
5599
+        Replace();
5600
+        
55385601         if (lastname == null)
55395602         {
55405603             return;
....@@ -5882,6 +5945,7 @@
58825945     cNumberSlider anisoField;
58835946     JLabel anisoVLabel;
58845947     cNumberSlider anisoVField;
5948
+    
58855949     JLabel cameraLabel;
58865950     cNumberSlider cameraField;
58875951     JLabel selfshadowLabel;
....@@ -5896,6 +5960,7 @@
58965960     cNumberSlider fakedepthField;
58975961     JLabel shadowbiasLabel;
58985962     cNumberSlider shadowbiasField;
5963
+    
58995964     JLabel bumpLabel;
59005965     cNumberSlider bumpField;
59015966     JLabel noiseLabel;