blame | history | patch | commit | commitdiff
Normand Briere
2019-08-16 64e20f390e4b8e58bd0006dde8fa10fba1dac1d5 
 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());
....@@ -343,7 +388,8 @@
343388         //parent = p;
344389 
345390         GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
346
-        System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
391
+        if (Globals.DEBUG)
392
+            System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
347393         //gd.setFullScreenWindow(this);
348394         //setResizable(false);
349395         //if (!isDisplayable())
....@@ -354,11 +400,13 @@
354400         copy = localCopy;
355401         copy.editWindow = this;
356402 
357
-        if (copy.versionlist == null)
358
-        {
359
-//            copy.versions = new byte[100][];
403
+//        if (copy.versionlist == null)
404
+//        {
405
+//            copy.versionlist = new Object3D[100];
360406 //            copy.versionindex = -1;
361
-        }
407
+//            
408
+//            Save(true);
409
+//        }
362410         
363411         SetupMenu();
364412 
....@@ -427,6 +475,8 @@
427475         
428476         ChangeListener changeListener = new ChangeListener()
429477         {
478
+            //String name;
479
+            
430480             public void stateChanged(ChangeEvent changeEvent)
431481             {
432482 //                if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
....@@ -445,7 +495,37 @@
445495 //                        EditSelection(false);
446496 //                }
447497 
448
-                refreshContents(false); // To refresh Info tab
498
+//                if (objectPanel.getSelectedIndex() == 4)
499
+//                {
500
+//                    name = copy.skyboxname;
501
+//                    
502
+//                    if (name == null)
503
+//                    {
504
+//                        name = "";
505
+//                    }
506
+//                    
507
+//                    copy.skyboxname = "cubemaps/default-skyboxes/rgb";
508
+//                    copy.skyboxext = "jpg";
509
+//                }
510
+//                else
511
+//                {
512
+//                    if (name != null)
513
+//                    {
514
+//                        if (name.equals(""))
515
+//                        {
516
+//                            copy.skyboxname = null;
517
+//                            copy.skyboxext = null;
518
+//                        }
519
+//                        else
520
+//                        {
521
+//                            copy.skyboxname = name;
522
+//                        }
523
+//                    }
524
+//                }
525
+                cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
526
+                
527
+//                refreshContents(false); // To refresh Info tab
528
+                cameraView.repaint();
449529             }
450530         };
451531         objectPanel.addChangeListener(changeListener);
....@@ -754,6 +834,7 @@
754834         boolean maximized;
755835     
756836         cButton fullscreenLayout;
837
+        cButton expandedLayout;
757838 
758839         void Minimize()
759840         {
....@@ -793,10 +874,12 @@
793874 	cButton minButton;
794875 	cButton maxButton;
795876 	cButton fullButton;
877
+	cButton collapseButton;
878
+        cButton maximize3DButton;
796879         
797880         void ToggleFullScreen()
798881         {
799
-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
882
+            GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
800883 
801884                 cameraView.ToggleFullScreen();
802885                 
....@@ -817,13 +900,13 @@
817900 // X                   frame.getContentPane().remove(/*"Center",*/bigThree);
818901 // X                   framePanel.add(bigThree);
819902 // X                   frame.getContentPane().add(/*"Center",*/framePanel);
820
-                    framePanel.setDividerLocation(46);
903
+//                    framePanel.setDividerLocation(46); // icons are 24x24
821904                     
822905                     //frame.setVisible(true);
823
-                    radio.layout = keepButton;
906
+//                    radio.layout = keepButton;
824907                     //theFrame = null;
825908                     keepButton = null;
826
-                    radio.layout.doClick();
909
+//                    radio.layout.doClick();
827910                     
828911                 } else
829912                 {
....@@ -844,10 +927,10 @@
844927 // X                   frame.getContentPane().remove(/*"Center",*/framePanel);
845928 // X                   framePanel.remove(bigThree);
846929 // X                   frame.getContentPane().add(/*"Center",*/bigThree);
847
-                    framePanel.setDividerLocation(0);
930
+//                    framePanel.setDividerLocation(0);
848931 
849
-                    radio.layout = fullscreenLayout;
850
-                    radio.layout.doClick();
932
+//                    radio.layout = fullscreenLayout;
933
+//                    radio.layout.doClick();
851934                     //frame.setVisible(true);
852935                 }
853936             frame.validate();
....@@ -855,23 +938,31 @@
855938             cameraView.requestFocusInWindow();
856939         }
857940 
858
-    private Object3D CompressCopy()
941
+        void CollapseToolbar()
942
+        {
943
+            framePanel.setDividerLocation(0);
944
+            //frame.validate();
945
+            
946
+            cameraView.requestFocusInWindow();
947
+        }
948
+        
949
+    private Object3D Duplicate(Object3D object)
859950     {
860951         boolean temp = CameraPane.SWITCH;
861952         CameraPane.SWITCH = false;
862953         
863
-        copy.ExtractBigData(versiontable);
954
+        object.ExtractBigData(versiontable);
864955         // if (copy == client)
865956         
866
-        Object3D versions[] = copy.versionlist;
867
-        copy.versionlist = null;
957
+        Object3D versions[] = object.versionlist;
958
+        object.versionlist = null;
868959         
869960         //byte[] compress = Compress(copy);
870
-        Object3D compress = (Object3D)Grafreed.clone(copy);
961
+        Object3D compress = (Object3D)Grafreed.clone(object);
871962         
872
-        copy.versionlist = versions;
963
+        object.versionlist = versions;
873964         
874
-        copy.RestoreBigData(versiontable);
965
+        object.RestoreBigData(versiontable);
875966         
876967         CameraPane.SWITCH = temp;
877968         
....@@ -1233,14 +1324,14 @@
12331324             
12341325         liveCB = AddCheckBox(setupPanel, "Live", copy.live);
12351326                 liveCB.setToolTipText("Animate object");
1327
+        markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
1328
+        markCB.setToolTipText("Set target transform");
12361329         selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
12371330                 selectableCB.setToolTipText("Make object selectable");
12381331 //            Return();
12391332                 
12401333         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
12411334                 hideCB.setToolTipText("Hide object");
1242
-        markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1243
-        markCB.setToolTipText("As animation target transform");
12441335         
12451336         ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
12461337         
....@@ -1442,6 +1533,7 @@
14421533 
14431534         if (cam == null || !(copy.get(0) instanceof cGroup))
14441535         {
1536
+        if (Globals.DEBUG)
14451537             System.out.println("CREATE CAMERAS");
14461538             cams = new cTemplate();
14471539             cams.name = "Cameras";
....@@ -1628,9 +1720,9 @@
16281720         scenePanel.add(tabbedPane);
16291721 
16301722         //if (Globals.ADVANCED)
1631
-            tabbedPane.add(infoPanel);
1632
-        tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1633
-        tabbedPane.setToolTipTextAt(3, "Information");
1723
+//            tabbedPane.add(infoPanel);
1724
+//        tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1725
+//        tabbedPane.setToolTipTextAt(3, "Information");
16341726         
16351727         /*
16361728         cTree jTree = new cTree(null);
....@@ -1702,6 +1794,23 @@
17021794 //		aConstraints.gridheight = 1;
17031795 
17041796         framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1797
+        
1798
+        framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
1799
+                new java.beans.PropertyChangeListener()
1800
+                {
1801
+                    public void propertyChange(java.beans.PropertyChangeEvent pce)
1802
+                    {
1803
+                        if ((Integer)pce.getOldValue() == 1)
1804
+                        {
1805
+                            if (radio.layout != expandedLayout)
1806
+                            {
1807
+                                radio.layout = expandedLayout;
1808
+                                radio.layout.doClick();
1809
+                            }
1810
+                        }
1811
+                    }
1812
+                });
1813
+
17051814         framePanel.setContinuousLayout(false);
17061815         framePanel.setOneTouchExpandable(false);
17071816         //.setDividerLocation(0.8);
....@@ -1711,7 +1820,7 @@
17111820 
17121821         frame.getContentPane().setLayout(new BorderLayout());
17131822         /**/
1714
-        JTabbedPane worldPane = new JTabbedPane();
1823
+        //JTabbedPane worldPane = new JTabbedPane();
17151824         //worldPane.add(bigPanel);
17161825         //worldPane.add(worldPanel);
17171826                 /**/
....@@ -2082,6 +2191,21 @@
20822191         });
20832192         presetpanel.add(bump0);
20842193         
2194
+        cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
2195
+        borderShader.setToolTipText("Border fade");
2196
+        borderShader.addMouseListener(new MouseAdapter()
2197
+        {
2198
+            public void mouseClicked(MouseEvent e)
2199
+            {
2200
+                borderfadeField.setFloat(0.5);
2201
+                opacityField.setFloat(0.75);
2202
+
2203
+                materialtouched = true;
2204
+                applySelf();
2205
+            }
2206
+        });
2207
+        presetpanel.add(borderShader);
2208
+        
20852209         cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
20862210         halo.setToolTipText("Halo");
20872211         halo.addMouseListener(new MouseAdapter()
....@@ -2120,6 +2244,25 @@
21202244             }
21212245         });
21222246         presetpanel.add(candle);
2247
+        
2248
+        cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
2249
+        shadowShader.setToolTipText("Shadow");
2250
+        shadowShader.addMouseListener(new MouseAdapter()
2251
+        {
2252
+            public void mouseClicked(MouseEvent e)
2253
+            {
2254
+                diffuseField.setFloat(0.001);
2255
+                ambientField.setFloat(0.001);
2256
+                cameraField.setFloat(0.001);
2257
+                specularField.setFloat(0.001);
2258
+                fakedepthField.setFloat(0.001);
2259
+                opacityField.setFloat(0.6);
2260
+
2261
+                materialtouched = true;
2262
+                applySelf();
2263
+            }
2264
+        });
2265
+        presetpanel.add(shadowShader);
21232266         
21242267         cGridBag panel = new cGridBag().setVertical(true);
21252268         
....@@ -2170,9 +2313,20 @@
21702313 
21712314         cGridBag huepanel = new cGridBag();
21722315             cGridBag huelabel = new cGridBag();
2173
-        skin = GetLabel("icons/hue.png", false);
2174
-        skin.fit = true;
2175
-            huelabel.add(skin);
2316
+        cLabel hue = GetLabel("icons/hue.png", false);
2317
+        hue.fit = true;
2318
+        
2319
+        hue.addMouseListener(new MouseAdapter()
2320
+        {
2321
+            public void mousePressed(MouseEvent e)
2322
+            {
2323
+                int x = e.getX();
2324
+                
2325
+                colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
2326
+            }
2327
+        });
2328
+        
2329
+            huelabel.add(hue);
21762330             huelabel.preferredWidth = 20;
21772331             huepanel.add(new cGridBag()); // Label
21782332             huepanel.add(huelabel); // Field/slider
....@@ -3448,32 +3602,8 @@
34483602 
34493603         if (multiplyToggle != null)
34503604                 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
-        }
3605
+        
3606
+        AllocProjectedVertices(object);
34773607 
34783608         SetMaterial(mat, object.projectedVertices);
34793609     }
....@@ -4076,7 +4206,7 @@
40764206     {
40774207         //Save(true);
40784208         Replace();
4079
-        SetUndoStates();
4209
+        SetVersionStates();
40804210     }
40814211     
40824212     private boolean Equal(byte[] compress, byte[] name)
....@@ -4106,17 +4236,17 @@
41064236         
41074237         CopyChanged();
41084238         
4109
-        SetUndoStates();
4239
+        SetVersionStates();
41104240     }
41114241     
41124242     public boolean Save(boolean user)
41134243     {
41144244         System.err.println("Save");
4115
-        //Replace();
4245
+        Replace();
41164246         
4117
-        cRadio tab = GetCurrentTab();
4247
+        //cRadio tab = GetCurrentTab();
41184248         
4119
-        Object3D compress = CompressCopy(); // Saved version. No need for "Replace"?
4249
+        Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
41204250         
41214251         boolean thesame = false;
41224252         
....@@ -4152,7 +4282,7 @@
41524282 //            copy.versionlist[i] = null;
41534283 //        }
41544284 
4155
-        SetUndoStates();
4285
+        SetVersionStates();
41564286         
41574287         // test save
41584288         if (false)
....@@ -4210,9 +4340,9 @@
42104340 
42114341     void CopyChanged()
42124342     {
4213
-        Object3D obj = copy.versionlist[copy.versionindex];
4343
+        Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
42144344         
4215
-        SetUndoStates();
4345
+        SetVersionStates();
42164346         
42174347         boolean temp = CameraPane.SWITCH;
42184348         CameraPane.SWITCH = false;
....@@ -4279,12 +4409,15 @@
42794409         return count;
42804410     }
42814411     
4282
-    void SetUndoStates()
4412
+    void SetVersionStates()
42834413     {
4284
-        cRadio tab = GetCurrentTab();
4414
+        //if (true)
4415
+        //    return;
4416
+                    
4417
+        //cRadio tab = GetCurrentTab();
42854418         
4286
-        restoreButton.setEnabled(true); // copy.versionindex != -1);
4287
-        replaceButton.setEnabled(true); // copy.versionindex != -1);
4419
+        restoreButton.setEnabled(copy.versionindex != -1);
4420
+        replaceButton.setEnabled(copy.versionindex != -1);
42884421         
42894422         previousVersionButton.setEnabled(copy.versionindex > 0);
42904423         nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
....@@ -4293,8 +4426,10 @@
42934426                                         copy.versionlist[copy.versionindex + 1] != null);
42944427         
42954428         muteSlider = true;
4429
+        versionSlider.setMinimum(0);
42964430         versionSlider.setMaximum(VersionCount() - 1);
42974431         versionSlider.setInteger(copy.versionindex);
4432
+        versionSlider.setEnabled(copy.versionindex != -1);
42984433         muteSlider = false;
42994434     }
43004435     
....@@ -4305,7 +4440,7 @@
43054440         
43064441         System.err.println("Undo");
43074442         
4308
-        cRadio tab = GetCurrentTab();
4443
+        //cRadio tab = GetCurrentTab();
43094444         
43104445         if (copy.versionindex == 0)
43114446         {
....@@ -4337,7 +4472,7 @@
43374472     {
43384473         System.err.println("Restore");
43394474         
4340
-        cRadio tab = GetCurrentTab();
4475
+        //cRadio tab = GetCurrentTab();
43414476         
43424477         if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
43434478         {
....@@ -4355,7 +4490,7 @@
43554490     {
43564491         System.err.println("Replace");
43574492         
4358
-        cRadio tab = GetCurrentTab();
4493
+        //cRadio tab = GetCurrentTab();
43594494         
43604495         if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
43614496         {
....@@ -4363,7 +4498,7 @@
43634498             return false;
43644499         }
43654500 
4366
-        copy.versionlist[copy.versionindex] = CompressCopy();
4501
+        copy.versionlist[copy.versionindex] = Duplicate(copy);
43674502         
43684503         return true;
43694504     }
....@@ -4373,7 +4508,7 @@
43734508         // Option?
43744509         Replace();
43754510         
4376
-        cRadio tab = GetCurrentTab();
4511
+        //cRadio tab = GetCurrentTab();
43774512         
43784513         if (copy.versionlist[copy.versionindex + 1] == null)
43794514         {
....@@ -4692,9 +4827,11 @@
46924827             if (muteSlider)
46934828                 return;
46944829             
4830
+            Replace();
4831
+            
46954832             int version = versionSlider.getInteger();
46964833             
4697
-            if (copy.versionlist[version] != null)
4834
+            if (version != -1 && copy.versionlist[version] != null)
46984835             {
46994836                 copy.versionindex = version;
47004837                 CopyChanged();
....@@ -4738,7 +4875,7 @@
47384875             //System.out.println("stateChanged = " + this);
47394876             materialtouched = true;
47404877             
4741
-            if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
4878
+            if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
47424879             {
47434880                 saturationField.setFloat(1);
47444881             }
....@@ -5053,7 +5190,9 @@
50535190         }
50545191         
50555192         if (previousVersionButton != null && copy.versionlist != null)
5056
-            SetUndoStates();
5193
+            SetVersionStates();
5194
+        
5195
+        cameraView.requestFocusInWindow();
50575196     }
50585197     
50595198     static TweenManager tweenManager = new TweenManager();
....@@ -5085,7 +5224,7 @@
50855224 //                group = (Composite) group.get(0);
50865225 //            }
50875226 
5088
-        System.out.println("makeSomething of " + thing);
5227
+        //System.out.println("makeSomething of " + thing);
50895228 
50905229         /*
50915230         if (deselect && jList != null)
....@@ -5442,8 +5581,11 @@
54425581             
54435582         if (copy.versionlist == null)
54445583         {
5584
+            // Backward compatibility
54455585             copy.versionlist = new Object3D[100];
54465586             copy.versionindex = -1;
5587
+            
5588
+            //Save(true);
54475589         }
54485590         
54495591             //? SetUndoStates();
....@@ -5535,6 +5677,8 @@
55355677 
55365678     void save()
55375679     {
5680
+        Replace();
5681
+        
55385682         if (lastname == null)
55395683         {
55405684             return;
....@@ -5882,6 +6026,7 @@
58826026     cNumberSlider anisoField;
58836027     JLabel anisoVLabel;
58846028     cNumberSlider anisoVField;
6029
+    
58856030     JLabel cameraLabel;
58866031     cNumberSlider cameraField;
58876032     JLabel selfshadowLabel;
....@@ -5896,6 +6041,7 @@
58966041     cNumberSlider fakedepthField;
58976042     JLabel shadowbiasLabel;
58986043     cNumberSlider shadowbiasField;
6044
+    
58996045     JLabel bumpLabel;
59006046     cNumberSlider bumpField;
59016047     JLabel noiseLabel;