blame | history | patch | commit | commitdiff
Normand Briere
2019-08-15 7f97054d681518416a4ee1c1548ad42cfb489a8f 
 ObjEditor.java
....@@ -75,8 +75,16 @@
7575         return new cCheckBox(icon, border);
7676     }
7777 
78
+    static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
79
+    
7880     ImageIcon GetIcon(String name)
7981     {
82
+        javax.swing.ImageIcon iconCache = icons.get(name);
83
+        if (iconCache != null)
84
+        {
85
+            return iconCache;
86
+        }
87
+        
8088         try
8189         {
8290             BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
....@@ -94,10 +102,14 @@
94102 //            }
95103 
96104             javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
105
+            
106
+            icons.put(name, icon);
107
+            
97108             return icon;
98109         }
99110         catch (Exception e)
100111         {
112
+            //icons.put(name, null);
101113             return null;
102114         }
103115     }
....@@ -297,11 +309,13 @@
297309         client = inClient;
298310         copy = client;
299311 
300
-        if (copy.versionlist == null)
301
-        {
302
-            copy.versionlist = new Object3D[100];
303
-            copy.versionindex = -1;
304
-        }
312
+//        if (copy.versionlist == null)
313
+//        {
314
+//            copy.versionlist = new Object3D[100];
315
+//            copy.versionindex = -1;
316
+//            
317
+//            callee.Save(true);
318
+//        }
305319         
306320         // "this" is not called: SetupUI2(objEditor);
307321     }
....@@ -320,6 +334,8 @@
320334         {
321335             copy.versionlist = new Object3D[100];
322336             copy.versionindex = -1;
337
+            
338
+//            Save(true);
323339         }
324340         
325341         SetupUI2(callee.GetEditor());
....@@ -354,11 +370,13 @@
354370         copy = localCopy;
355371         copy.editWindow = this;
356372 
357
-        if (copy.versionlist == null)
358
-        {
359
-//            copy.versions = new byte[100][];
373
+//        if (copy.versionlist == null)
374
+//        {
375
+//            copy.versionlist = new Object3D[100];
360376 //            copy.versionindex = -1;
361
-        }
377
+//            
378
+//            Save(true);
379
+//        }
362380         
363381         SetupMenu();
364382 
....@@ -427,6 +445,8 @@
427445         
428446         ChangeListener changeListener = new ChangeListener()
429447         {
448
+            //String name;
449
+            
430450             public void stateChanged(ChangeEvent changeEvent)
431451             {
432452 //                if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
....@@ -445,7 +465,37 @@
445465 //                        EditSelection(false);
446466 //                }
447467 
448
-                refreshContents(false); // To refresh Info tab
468
+//                if (objectPanel.getSelectedIndex() == 4)
469
+//                {
470
+//                    name = copy.skyboxname;
471
+//                    
472
+//                    if (name == null)
473
+//                    {
474
+//                        name = "";
475
+//                    }
476
+//                    
477
+//                    copy.skyboxname = "cubemaps/default-skyboxes/rgb";
478
+//                    copy.skyboxext = "jpg";
479
+//                }
480
+//                else
481
+//                {
482
+//                    if (name != null)
483
+//                    {
484
+//                        if (name.equals(""))
485
+//                        {
486
+//                            copy.skyboxname = null;
487
+//                            copy.skyboxext = null;
488
+//                        }
489
+//                        else
490
+//                        {
491
+//                            copy.skyboxname = name;
492
+//                        }
493
+//                    }
494
+//                }
495
+                cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
496
+                
497
+//                refreshContents(false); // To refresh Info tab
498
+                cameraView.repaint();
449499             }
450500         };
451501         objectPanel.addChangeListener(changeListener);
....@@ -754,6 +804,7 @@
754804         boolean maximized;
755805     
756806         cButton fullscreenLayout;
807
+        cButton expandedLayout;
757808 
758809         void Minimize()
759810         {
....@@ -793,10 +844,12 @@
793844 	cButton minButton;
794845 	cButton maxButton;
795846 	cButton fullButton;
847
+	cButton collapseButton;
848
+        cButton maximize3DButton;
796849         
797850         void ToggleFullScreen()
798851         {
799
-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
852
+            GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
800853 
801854                 cameraView.ToggleFullScreen();
802855                 
....@@ -817,13 +870,13 @@
817870 // X                   frame.getContentPane().remove(/*"Center",*/bigThree);
818871 // X                   framePanel.add(bigThree);
819872 // X                   frame.getContentPane().add(/*"Center",*/framePanel);
820
-                    framePanel.setDividerLocation(46);
873
+//                    framePanel.setDividerLocation(46); // icons are 24x24
821874                     
822875                     //frame.setVisible(true);
823
-                    radio.layout = keepButton;
876
+//                    radio.layout = keepButton;
824877                     //theFrame = null;
825878                     keepButton = null;
826
-                    radio.layout.doClick();
879
+//                    radio.layout.doClick();
827880                     
828881                 } else
829882                 {
....@@ -844,10 +897,10 @@
844897 // X                   frame.getContentPane().remove(/*"Center",*/framePanel);
845898 // X                   framePanel.remove(bigThree);
846899 // X                   frame.getContentPane().add(/*"Center",*/bigThree);
847
-                    framePanel.setDividerLocation(0);
900
+//                    framePanel.setDividerLocation(0);
848901 
849
-                    radio.layout = fullscreenLayout;
850
-                    radio.layout.doClick();
902
+//                    radio.layout = fullscreenLayout;
903
+//                    radio.layout.doClick();
851904                     //frame.setVisible(true);
852905                 }
853906             frame.validate();
....@@ -855,23 +908,31 @@
855908             cameraView.requestFocusInWindow();
856909         }
857910 
858
-    private Object3D CompressCopy()
911
+        void CollapseToolbar()
912
+        {
913
+            framePanel.setDividerLocation(0);
914
+            //frame.validate();
915
+            
916
+            cameraView.requestFocusInWindow();
917
+        }
918
+        
919
+    private Object3D Duplicate(Object3D object)
859920     {
860921         boolean temp = CameraPane.SWITCH;
861922         CameraPane.SWITCH = false;
862923         
863
-        copy.ExtractBigData(versiontable);
924
+        object.ExtractBigData(versiontable);
864925         // if (copy == client)
865926         
866
-        Object3D versions[] = copy.versionlist;
867
-        copy.versionlist = null;
927
+        Object3D versions[] = object.versionlist;
928
+        object.versionlist = null;
868929         
869930         //byte[] compress = Compress(copy);
870
-        Object3D compress = (Object3D)Grafreed.clone(copy);
931
+        Object3D compress = (Object3D)Grafreed.clone(object);
871932         
872
-        copy.versionlist = versions;
933
+        object.versionlist = versions;
873934         
874
-        copy.RestoreBigData(versiontable);
935
+        object.RestoreBigData(versiontable);
875936         
876937         CameraPane.SWITCH = temp;
877938         
....@@ -1628,9 +1689,9 @@
16281689         scenePanel.add(tabbedPane);
16291690 
16301691         //if (Globals.ADVANCED)
1631
-            tabbedPane.add(infoPanel);
1632
-        tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1633
-        tabbedPane.setToolTipTextAt(3, "Information");
1692
+//            tabbedPane.add(infoPanel);
1693
+//        tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1694
+//        tabbedPane.setToolTipTextAt(3, "Information");
16341695         
16351696         /*
16361697         cTree jTree = new cTree(null);
....@@ -1702,6 +1763,23 @@
17021763 //		aConstraints.gridheight = 1;
17031764 
17041765         framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1766
+        
1767
+        framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
1768
+                new java.beans.PropertyChangeListener()
1769
+                {
1770
+                    public void propertyChange(java.beans.PropertyChangeEvent pce)
1771
+                    {
1772
+                        if ((Integer)pce.getOldValue() == 1)
1773
+                        {
1774
+                            if (radio.layout != expandedLayout)
1775
+                            {
1776
+                                radio.layout = expandedLayout;
1777
+                                radio.layout.doClick();
1778
+                            }
1779
+                        }
1780
+                    }
1781
+                });
1782
+
17051783         framePanel.setContinuousLayout(false);
17061784         framePanel.setOneTouchExpandable(false);
17071785         //.setDividerLocation(0.8);
....@@ -2120,6 +2198,25 @@
21202198             }
21212199         });
21222200         presetpanel.add(candle);
2201
+        
2202
+        cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
2203
+        shadowShader.setToolTipText("Shadow");
2204
+        shadowShader.addMouseListener(new MouseAdapter()
2205
+        {
2206
+            public void mouseClicked(MouseEvent e)
2207
+            {
2208
+                diffuseField.setFloat(0.001);
2209
+                ambientField.setFloat(0.001);
2210
+                cameraField.setFloat(0.001);
2211
+                specularField.setFloat(0.001);
2212
+                fakedepthField.setFloat(0.001);
2213
+                opacityField.setFloat(0.6);
2214
+
2215
+                materialtouched = true;
2216
+                applySelf();
2217
+            }
2218
+        });
2219
+        presetpanel.add(shadowShader);
21232220         
21242221         cGridBag panel = new cGridBag().setVertical(true);
21252222         
....@@ -4076,7 +4173,7 @@
40764173     {
40774174         //Save(true);
40784175         Replace();
4079
-        SetUndoStates();
4176
+        SetVersionStates();
40804177     }
40814178     
40824179     private boolean Equal(byte[] compress, byte[] name)
....@@ -4106,17 +4203,17 @@
41064203         
41074204         CopyChanged();
41084205         
4109
-        SetUndoStates();
4206
+        SetVersionStates();
41104207     }
41114208     
41124209     public boolean Save(boolean user)
41134210     {
41144211         System.err.println("Save");
4115
-        //Replace();
4212
+        Replace();
41164213         
4117
-        cRadio tab = GetCurrentTab();
4214
+        //cRadio tab = GetCurrentTab();
41184215         
4119
-        Object3D compress = CompressCopy(); // Saved version. No need for "Replace"?
4216
+        Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
41204217         
41214218         boolean thesame = false;
41224219         
....@@ -4152,7 +4249,7 @@
41524249 //            copy.versionlist[i] = null;
41534250 //        }
41544251 
4155
-        SetUndoStates();
4252
+        SetVersionStates();
41564253         
41574254         // test save
41584255         if (false)
....@@ -4210,9 +4307,9 @@
42104307 
42114308     void CopyChanged()
42124309     {
4213
-        Object3D obj = copy.versionlist[copy.versionindex];
4310
+        Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
42144311         
4215
-        SetUndoStates();
4312
+        SetVersionStates();
42164313         
42174314         boolean temp = CameraPane.SWITCH;
42184315         CameraPane.SWITCH = false;
....@@ -4279,12 +4376,15 @@
42794376         return count;
42804377     }
42814378     
4282
-    void SetUndoStates()
4379
+    void SetVersionStates()
42834380     {
4284
-        cRadio tab = GetCurrentTab();
4381
+        //if (true)
4382
+        //    return;
4383
+                    
4384
+        //cRadio tab = GetCurrentTab();
42854385         
4286
-        restoreButton.setEnabled(true); // copy.versionindex != -1);
4287
-        replaceButton.setEnabled(true); // copy.versionindex != -1);
4386
+        restoreButton.setEnabled(copy.versionindex != -1);
4387
+        replaceButton.setEnabled(copy.versionindex != -1);
42884388         
42894389         previousVersionButton.setEnabled(copy.versionindex > 0);
42904390         nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
....@@ -4293,8 +4393,10 @@
42934393                                         copy.versionlist[copy.versionindex + 1] != null);
42944394         
42954395         muteSlider = true;
4396
+        versionSlider.setMinimum(0);
42964397         versionSlider.setMaximum(VersionCount() - 1);
42974398         versionSlider.setInteger(copy.versionindex);
4399
+        versionSlider.setEnabled(copy.versionindex != -1);
42984400         muteSlider = false;
42994401     }
43004402     
....@@ -4305,7 +4407,7 @@
43054407         
43064408         System.err.println("Undo");
43074409         
4308
-        cRadio tab = GetCurrentTab();
4410
+        //cRadio tab = GetCurrentTab();
43094411         
43104412         if (copy.versionindex == 0)
43114413         {
....@@ -4337,7 +4439,7 @@
43374439     {
43384440         System.err.println("Restore");
43394441         
4340
-        cRadio tab = GetCurrentTab();
4442
+        //cRadio tab = GetCurrentTab();
43414443         
43424444         if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
43434445         {
....@@ -4355,7 +4457,7 @@
43554457     {
43564458         System.err.println("Replace");
43574459         
4358
-        cRadio tab = GetCurrentTab();
4460
+        //cRadio tab = GetCurrentTab();
43594461         
43604462         if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
43614463         {
....@@ -4363,7 +4465,7 @@
43634465             return false;
43644466         }
43654467 
4366
-        copy.versionlist[copy.versionindex] = CompressCopy();
4468
+        copy.versionlist[copy.versionindex] = Duplicate(copy);
43674469         
43684470         return true;
43694471     }
....@@ -4373,7 +4475,7 @@
43734475         // Option?
43744476         Replace();
43754477         
4376
-        cRadio tab = GetCurrentTab();
4478
+        //cRadio tab = GetCurrentTab();
43774479         
43784480         if (copy.versionlist[copy.versionindex + 1] == null)
43794481         {
....@@ -4692,9 +4794,11 @@
46924794             if (muteSlider)
46934795                 return;
46944796             
4797
+            Replace();
4798
+            
46954799             int version = versionSlider.getInteger();
46964800             
4697
-            if (copy.versionlist[version] != null)
4801
+            if (version != -1 && copy.versionlist[version] != null)
46984802             {
46994803                 copy.versionindex = version;
47004804                 CopyChanged();
....@@ -4738,7 +4842,7 @@
47384842             //System.out.println("stateChanged = " + this);
47394843             materialtouched = true;
47404844             
4741
-            if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
4845
+            if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
47424846             {
47434847                 saturationField.setFloat(1);
47444848             }
....@@ -5053,7 +5157,7 @@
50535157         }
50545158         
50555159         if (previousVersionButton != null && copy.versionlist != null)
5056
-            SetUndoStates();
5160
+            SetVersionStates();
50575161     }
50585162     
50595163     static TweenManager tweenManager = new TweenManager();
....@@ -5442,8 +5546,11 @@
54425546             
54435547         if (copy.versionlist == null)
54445548         {
5549
+            // Backward compatibility
54455550             copy.versionlist = new Object3D[100];
54465551             copy.versionindex = -1;
5552
+            
5553
+            Save(true);
54475554         }
54485555         
54495556             //? SetUndoStates();
....@@ -5535,6 +5642,8 @@
55355642 
55365643     void save()
55375644     {
5645
+        Replace();
5646
+        
55385647         if (lastname == null)
55395648         {
55405649             return;
....@@ -5882,6 +5991,7 @@
58825991     cNumberSlider anisoField;
58835992     JLabel anisoVLabel;
58845993     cNumberSlider anisoVField;
5994
+    
58855995     JLabel cameraLabel;
58865996     cNumberSlider cameraField;
58875997     JLabel selfshadowLabel;
....@@ -5896,6 +6006,7 @@
58966006     cNumberSlider fakedepthField;
58976007     JLabel shadowbiasLabel;
58986008     cNumberSlider shadowbiasField;
6009
+    
58996010     JLabel bumpLabel;
59006011     cNumberSlider bumpField;
59016012     JLabel noiseLabel;