blame | history | patch | commit | commitdiff
Normand Briere
2019-08-15 33504fc9a180903aace77613264550754fba5706 
 ObjEditor.java
....@@ -34,6 +34,7 @@
3434         iSendInfo
3535 //KeyListener
3636 {
37
+    public cToggleButton pinButton;
3738         boolean timeline;
3839         boolean wasFullScreen;
3940 
....@@ -41,6 +42,35 @@
4142     JFrame frame;
4243     
4344     static ObjEditor theFrame;
45
+
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
+    }
4474 
4575     public cGridBag GetSeparator()
4676     {
....@@ -74,8 +104,16 @@
74104         return new cCheckBox(icon, border);
75105     }
76106 
107
+    static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
108
+    
77109     ImageIcon GetIcon(String name)
78110     {
111
+        javax.swing.ImageIcon iconCache = icons.get(name);
112
+        if (iconCache != null)
113
+        {
114
+            return iconCache;
115
+        }
116
+        
79117         try
80118         {
81119             BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
....@@ -93,10 +131,14 @@
93131 //            }
94132 
95133             javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
134
+            
135
+            icons.put(name, icon);
136
+            
96137             return icon;
97138         }
98139         catch (Exception e)
99140         {
141
+            //icons.put(name, null);
100142             return null;
101143         }
102144     }
....@@ -296,11 +338,13 @@
296338         client = inClient;
297339         copy = client;
298340 
299
-        if (copy.versionlist == null)
300
-        {
301
-            copy.versionlist = new Object3D[100];
302
-            copy.versionindex = -1;
303
-        }
341
+//        if (copy.versionlist == null)
342
+//        {
343
+//            copy.versionlist = new Object3D[100];
344
+//            copy.versionindex = -1;
345
+//            
346
+//            callee.Save(true);
347
+//        }
304348         
305349         // "this" is not called: SetupUI2(objEditor);
306350     }
....@@ -319,6 +363,8 @@
319363         {
320364             copy.versionlist = new Object3D[100];
321365             copy.versionindex = -1;
366
+            
367
+//            Save(true);
322368         }
323369         
324370         SetupUI2(callee.GetEditor());
....@@ -353,11 +399,13 @@
353399         copy = localCopy;
354400         copy.editWindow = this;
355401 
356
-        if (copy.versionlist == null)
357
-        {
358
-//            copy.versions = new byte[100][];
402
+//        if (copy.versionlist == null)
403
+//        {
404
+//            copy.versionlist = new Object3D[100];
359405 //            copy.versionindex = -1;
360
-        }
406
+//            
407
+//            Save(true);
408
+//        }
361409         
362410         SetupMenu();
363411 
....@@ -426,6 +474,8 @@
426474         
427475         ChangeListener changeListener = new ChangeListener()
428476         {
477
+            //String name;
478
+            
429479             public void stateChanged(ChangeEvent changeEvent)
430480             {
431481 //                if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
....@@ -444,7 +494,37 @@
444494 //                        EditSelection(false);
445495 //                }
446496 
447
-                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();
448528             }
449529         };
450530         objectPanel.addChangeListener(changeListener);
....@@ -466,6 +546,8 @@
466546                 
467547         toolboxPanel = new cGridBag().setVertical(true);
468548         //toolboxPanel.setName("Toolbox");
549
+        
550
+        skyboxPanel = new cGridBag().setVertical(true);
469551         
470552         materialPanel = new cGridBag().setVertical(false);
471553         //materialPanel.setName("Material");
....@@ -751,6 +833,7 @@
751833         boolean maximized;
752834     
753835         cButton fullscreenLayout;
836
+        cButton expandedLayout;
754837 
755838         void Minimize()
756839         {
....@@ -790,10 +873,12 @@
790873 	cButton minButton;
791874 	cButton maxButton;
792875 	cButton fullButton;
876
+	cButton collapseButton;
877
+        cButton maximize3DButton;
793878         
794879         void ToggleFullScreen()
795880         {
796
-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
881
+            GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
797882 
798883                 cameraView.ToggleFullScreen();
799884                 
....@@ -814,13 +899,13 @@
814899 // X                   frame.getContentPane().remove(/*"Center",*/bigThree);
815900 // X                   framePanel.add(bigThree);
816901 // X                   frame.getContentPane().add(/*"Center",*/framePanel);
817
-                    framePanel.setDividerLocation(46);
902
+//                    framePanel.setDividerLocation(46); // icons are 24x24
818903                     
819904                     //frame.setVisible(true);
820
-                    radio.layout = keepButton;
905
+//                    radio.layout = keepButton;
821906                     //theFrame = null;
822907                     keepButton = null;
823
-                    radio.layout.doClick();
908
+//                    radio.layout.doClick();
824909                     
825910                 } else
826911                 {
....@@ -841,10 +926,10 @@
841926 // X                   frame.getContentPane().remove(/*"Center",*/framePanel);
842927 // X                   framePanel.remove(bigThree);
843928 // X                   frame.getContentPane().add(/*"Center",*/bigThree);
844
-                    framePanel.setDividerLocation(0);
929
+//                    framePanel.setDividerLocation(0);
845930 
846
-                    radio.layout = fullscreenLayout;
847
-                    radio.layout.doClick();
931
+//                    radio.layout = fullscreenLayout;
932
+//                    radio.layout.doClick();
848933                     //frame.setVisible(true);
849934                 }
850935             frame.validate();
....@@ -852,23 +937,31 @@
852937             cameraView.requestFocusInWindow();
853938         }
854939 
855
-    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)
856949     {
857950         boolean temp = CameraPane.SWITCH;
858951         CameraPane.SWITCH = false;
859952         
860
-        copy.ExtractBigData(versiontable);
953
+        object.ExtractBigData(versiontable);
861954         // if (copy == client)
862955         
863
-        Object3D versions[] = copy.versionlist;
864
-        copy.versionlist = null;
956
+        Object3D versions[] = object.versionlist;
957
+        object.versionlist = null;
865958         
866959         //byte[] compress = Compress(copy);
867
-        Object3D compress = (Object3D)Grafreed.clone(copy);
960
+        Object3D compress = (Object3D)Grafreed.clone(object);
868961         
869
-        copy.versionlist = versions;
962
+        object.versionlist = versions;
870963         
871
-        copy.RestoreBigData(versiontable);
964
+        object.RestoreBigData(versiontable);
872965         
873966         CameraPane.SWITCH = temp;
874967         
....@@ -1205,6 +1298,18 @@
12051298         
12061299             namePanel = new cGridBag();
12071300             
1301
+        //if (copy.pinned)
1302
+        {
1303
+            pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
1304
+            pinButton.setSelected(copy.pinned);
1305
+            cGridBag t = new cGridBag();
1306
+            t.preferredWidth = 2;
1307
+            t.add(pinButton);
1308
+            namePanel.add(t);
1309
+            
1310
+            pinButton.addItemListener(this);
1311
+        }
1312
+        
12081313         nameField = AddText(namePanel, copy.GetName());
12091314         namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
12101315         oe.ctrlPanel.add(namePanel);
....@@ -1558,20 +1663,19 @@
15581663     
15591664         objectPanel.add(toolboxPanel);
15601665         objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1561
-        objectPanel.setToolTipTextAt(1, "Objects & backgrounds");
1666
+        objectPanel.setToolTipTextAt(1, "Objects & textures");
15621667 
1668
+        objectPanel.add(skyboxPanel);
1669
+        objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1670
+        objectPanel.setToolTipTextAt(2, "Backgrounds");
1671
+        
15631672 //        JPanel north = new JPanel(new BorderLayout());
15641673 //        north.setName("Edit");
15651674 //        north.add(ctrlPanel, BorderLayout.NORTH);
15661675 //        objectPanel.add(north);
15671676         objectPanel.add(editPanel);
1568
-        objectPanel.setIconAt(2, GetIcon("icons/write.png"));
1569
-        objectPanel.setToolTipTextAt(2, "Edit controls");
1570
-        
1571
-        //if (Globals.ADVANCED)
1572
-            objectPanel.add(infoPanel);
1573
-        objectPanel.setIconAt(3, GetIcon("icons/info.png"));
1574
-        objectPanel.setToolTipTextAt(3, "Information");
1677
+        objectPanel.setIconAt(3, GetIcon("icons/write.png"));
1678
+        objectPanel.setToolTipTextAt(3, "Edit controls");
15751679         
15761680         objectPanel.add(XYZPanel);
15771681         objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
....@@ -1613,6 +1717,11 @@
16131717 
16141718         scenePanel.add(tabbedPane);
16151719 
1720
+        //if (Globals.ADVANCED)
1721
+//            tabbedPane.add(infoPanel);
1722
+//        tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1723
+//        tabbedPane.setToolTipTextAt(3, "Information");
1724
+        
16161725         /*
16171726         cTree jTree = new cTree(null);
16181727         ToolTipManager.sharedInstance().registerComponent(jTree);
....@@ -1683,6 +1792,23 @@
16831792 //		aConstraints.gridheight = 1;
16841793 
16851794         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
+
16861812         framePanel.setContinuousLayout(false);
16871813         framePanel.setOneTouchExpandable(false);
16881814         //.setDividerLocation(0.8);
....@@ -1692,7 +1818,7 @@
16921818 
16931819         frame.getContentPane().setLayout(new BorderLayout());
16941820         /**/
1695
-        JTabbedPane worldPane = new JTabbedPane();
1821
+        //JTabbedPane worldPane = new JTabbedPane();
16961822         //worldPane.add(bigPanel);
16971823         //worldPane.add(worldPanel);
16981824                 /**/
....@@ -2063,6 +2189,21 @@
20632189         });
20642190         presetpanel.add(bump0);
20652191         
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
+        
20662207         cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
20672208         halo.setToolTipText("Halo");
20682209         halo.addMouseListener(new MouseAdapter()
....@@ -2101,6 +2242,25 @@
21012242             }
21022243         });
21032244         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);
21042264         
21052265         cGridBag panel = new cGridBag().setVertical(true);
21062266         
....@@ -3429,32 +3589,8 @@
34293589 
34303590         if (multiplyToggle != null)
34313591                 multiplyToggle.setSelected(mat.multiply);
3432
-
3433
-        assert (object.projectedVertices != null);
3434
-
3435
-        if (object.projectedVertices.length <= 2)
3436
-        {
3437
-            // Side effect...
3438
-            Object3D.cVector2[] keep = object.projectedVertices;
3439
-            object.projectedVertices = new Object3D.cVector2[3];
3440
-            for (int i = 0; i < 3; i++)
3441
-            {
3442
-                if (i < keep.length)
3443
-                {
3444
-                    object.projectedVertices[i] = keep[i];
3445
-                } else
3446
-                {
3447
-                    object.projectedVertices[i] = new Object3D.cVector2();
3448
-                }
3449
-                /*
3450
-                if(keep.length == 0)
3451
-                object.projectedVertices[0] = new Object3D.cVector2();
3452
-                else
3453
-                object.projectedVertices[0] = keep[0];
3454
-                object.projectedVertices[1] = new Object3D.cVector2();
3455
-                 */
3456
-            }
3457
-        }
3592
+        
3593
+        AllocProjectedVertices(object);
34583594 
34593595         SetMaterial(mat, object.projectedVertices);
34603596     }
....@@ -3574,6 +3710,17 @@
35743710     public void itemStateChanged(ItemEvent event)
35753711     {
35763712         //                   System.out.println("Propagate = " + propagate);
3713
+        if (event.getSource() == pinButton)
3714
+        {
3715
+            copy.pinned ^= true;
3716
+            if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
3717
+            {
3718
+                ((GroupEditor)copy.editWindow).listUI.remove(copy);
3719
+                copy.CloseUI();
3720
+                //copy.editWindow.refreshContents();
3721
+            }
3722
+        }
3723
+        else
35773724         if (event.getSource() == propagateToggle)
35783725         {
35793726             propagate ^= true;
....@@ -4046,7 +4193,7 @@
40464193     {
40474194         //Save(true);
40484195         Replace();
4049
-        SetUndoStates();
4196
+        SetVersionStates();
40504197     }
40514198     
40524199     private boolean Equal(byte[] compress, byte[] name)
....@@ -4076,17 +4223,17 @@
40764223         
40774224         CopyChanged();
40784225         
4079
-        SetUndoStates();
4226
+        SetVersionStates();
40804227     }
40814228     
40824229     public boolean Save(boolean user)
40834230     {
40844231         System.err.println("Save");
4085
-        //Replace();
4232
+        Replace();
40864233         
4087
-        cRadio tab = GetCurrentTab();
4234
+        //cRadio tab = GetCurrentTab();
40884235         
4089
-        Object3D compress = CompressCopy(); // Saved version. No need for "Replace"?
4236
+        Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
40904237         
40914238         boolean thesame = false;
40924239         
....@@ -4122,7 +4269,7 @@
41224269 //            copy.versionlist[i] = null;
41234270 //        }
41244271 
4125
-        SetUndoStates();
4272
+        SetVersionStates();
41264273         
41274274         // test save
41284275         if (false)
....@@ -4180,9 +4327,9 @@
41804327 
41814328     void CopyChanged()
41824329     {
4183
-        Object3D obj = copy.versionlist[copy.versionindex];
4330
+        Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
41844331         
4185
-        SetUndoStates();
4332
+        SetVersionStates();
41864333         
41874334         boolean temp = CameraPane.SWITCH;
41884335         CameraPane.SWITCH = false;
....@@ -4249,12 +4396,15 @@
42494396         return count;
42504397     }
42514398     
4252
-    void SetUndoStates()
4399
+    void SetVersionStates()
42534400     {
4254
-        cRadio tab = GetCurrentTab();
4401
+        //if (true)
4402
+        //    return;
4403
+                    
4404
+        //cRadio tab = GetCurrentTab();
42554405         
4256
-        restoreButton.setEnabled(true); // copy.versionindex != -1);
4257
-        replaceButton.setEnabled(true); // copy.versionindex != -1);
4406
+        restoreButton.setEnabled(copy.versionindex != -1);
4407
+        replaceButton.setEnabled(copy.versionindex != -1);
42584408         
42594409         previousVersionButton.setEnabled(copy.versionindex > 0);
42604410         nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
....@@ -4263,8 +4413,10 @@
42634413                                         copy.versionlist[copy.versionindex + 1] != null);
42644414         
42654415         muteSlider = true;
4416
+        versionSlider.setMinimum(0);
42664417         versionSlider.setMaximum(VersionCount() - 1);
42674418         versionSlider.setInteger(copy.versionindex);
4419
+        versionSlider.setEnabled(copy.versionindex != -1);
42684420         muteSlider = false;
42694421     }
42704422     
....@@ -4275,7 +4427,7 @@
42754427         
42764428         System.err.println("Undo");
42774429         
4278
-        cRadio tab = GetCurrentTab();
4430
+        //cRadio tab = GetCurrentTab();
42794431         
42804432         if (copy.versionindex == 0)
42814433         {
....@@ -4307,7 +4459,7 @@
43074459     {
43084460         System.err.println("Restore");
43094461         
4310
-        cRadio tab = GetCurrentTab();
4462
+        //cRadio tab = GetCurrentTab();
43114463         
43124464         if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
43134465         {
....@@ -4325,7 +4477,7 @@
43254477     {
43264478         System.err.println("Replace");
43274479         
4328
-        cRadio tab = GetCurrentTab();
4480
+        //cRadio tab = GetCurrentTab();
43294481         
43304482         if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
43314483         {
....@@ -4333,7 +4485,7 @@
43334485             return false;
43344486         }
43354487 
4336
-        copy.versionlist[copy.versionindex] = CompressCopy();
4488
+        copy.versionlist[copy.versionindex] = Duplicate(copy);
43374489         
43384490         return true;
43394491     }
....@@ -4343,7 +4495,7 @@
43434495         // Option?
43444496         Replace();
43454497         
4346
-        cRadio tab = GetCurrentTab();
4498
+        //cRadio tab = GetCurrentTab();
43474499         
43484500         if (copy.versionlist[copy.versionindex + 1] == null)
43494501         {
....@@ -4662,9 +4814,11 @@
46624814             if (muteSlider)
46634815                 return;
46644816             
4817
+            Replace();
4818
+            
46654819             int version = versionSlider.getInteger();
46664820             
4667
-            if (copy.versionlist[version] != null)
4821
+            if (version != -1 && copy.versionlist[version] != null)
46684822             {
46694823                 copy.versionindex = version;
46704824                 CopyChanged();
....@@ -4708,7 +4862,7 @@
47084862             //System.out.println("stateChanged = " + this);
47094863             materialtouched = true;
47104864             
4711
-            if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
4865
+            if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
47124866             {
47134867                 saturationField.setFloat(1);
47144868             }
....@@ -5023,7 +5177,7 @@
50235177         }
50245178         
50255179         if (previousVersionButton != null && copy.versionlist != null)
5026
-            SetUndoStates();
5180
+            SetVersionStates();
50275181     }
50285182     
50295183     static TweenManager tweenManager = new TweenManager();
....@@ -5412,8 +5566,11 @@
54125566             
54135567         if (copy.versionlist == null)
54145568         {
5569
+            // Backward compatibility
54155570             copy.versionlist = new Object3D[100];
54165571             copy.versionindex = -1;
5572
+            
5573
+            //Save(true);
54175574         }
54185575         
54195576             //? SetUndoStates();
....@@ -5505,6 +5662,8 @@
55055662 
55065663     void save()
55075664     {
5665
+        Replace();
5666
+        
55085667         if (lastname == null)
55095668         {
55105669             return;
....@@ -5747,6 +5906,7 @@
57475906     ButtonGroup buttonGroup;
57485907     
57495908     cGridBag toolboxPanel;
5909
+    cGridBag skyboxPanel;
57505910     cGridBag materialPanel;
57515911     cGridBag ctrlPanel;
57525912     
....@@ -5851,6 +6011,7 @@
58516011     cNumberSlider anisoField;
58526012     JLabel anisoVLabel;
58536013     cNumberSlider anisoVField;
6014
+    
58546015     JLabel cameraLabel;
58556016     cNumberSlider cameraField;
58566017     JLabel selfshadowLabel;
....@@ -5865,6 +6026,7 @@
58656026     cNumberSlider fakedepthField;
58666027     JLabel shadowbiasLabel;
58676028     cNumberSlider shadowbiasField;
6029
+    
58686030     JLabel bumpLabel;
58696031     cNumberSlider bumpField;
58706032     JLabel noiseLabel;