blame | history | patch | commit | commitdiff
Normand Briere
2019-08-14 0c1f740dd6ddd6432dc29266e42ef851e26027bb 
 ObjEditor.java
....@@ -34,6 +34,7 @@
3434         iSendInfo
3535 //KeyListener
3636 {
37
+    public cToggleButton pinButton;
3738         boolean timeline;
3839         boolean wasFullScreen;
3940 
....@@ -74,8 +75,16 @@
7475         return new cCheckBox(icon, border);
7576     }
7677 
78
+    static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
79
+    
7780     ImageIcon GetIcon(String name)
7881     {
82
+        javax.swing.ImageIcon iconCache = icons.get(name);
83
+        if (iconCache != null)
84
+        {
85
+            return iconCache;
86
+        }
87
+        
7988         try
8089         {
8190             BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
....@@ -93,10 +102,14 @@
93102 //            }
94103 
95104             javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
105
+            
106
+            icons.put(name, icon);
107
+            
96108             return icon;
97109         }
98110         catch (Exception e)
99111         {
112
+            //icons.put(name, null);
100113             return null;
101114         }
102115     }
....@@ -296,11 +309,13 @@
296309         client = inClient;
297310         copy = client;
298311 
299
-        if (copy.versionlist == null)
300
-        {
301
-            copy.versionlist = new Object3D[100];
302
-            copy.versionindex = -1;
303
-        }
312
+//        if (copy.versionlist == null)
313
+//        {
314
+//            copy.versionlist = new Object3D[100];
315
+//            copy.versionindex = -1;
316
+//            
317
+//            callee.Save(true);
318
+//        }
304319         
305320         // "this" is not called: SetupUI2(objEditor);
306321     }
....@@ -319,6 +334,8 @@
319334         {
320335             copy.versionlist = new Object3D[100];
321336             copy.versionindex = -1;
337
+            
338
+//            Save(true);
322339         }
323340         
324341         SetupUI2(callee.GetEditor());
....@@ -353,11 +370,13 @@
353370         copy = localCopy;
354371         copy.editWindow = this;
355372 
356
-        if (copy.versionlist == null)
357
-        {
358
-//            copy.versions = new byte[100][];
373
+//        if (copy.versionlist == null)
374
+//        {
375
+//            copy.versionlist = new Object3D[100];
359376 //            copy.versionindex = -1;
360
-        }
377
+//            
378
+//            Save(true);
379
+//        }
361380         
362381         SetupMenu();
363382 
....@@ -426,6 +445,8 @@
426445         
427446         ChangeListener changeListener = new ChangeListener()
428447         {
448
+            //String name;
449
+            
429450             public void stateChanged(ChangeEvent changeEvent)
430451             {
431452 //                if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
....@@ -444,7 +465,37 @@
444465 //                        EditSelection(false);
445466 //                }
446467 
447
-                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();
448499             }
449500         };
450501         objectPanel.addChangeListener(changeListener);
....@@ -466,6 +517,8 @@
466517                 
467518         toolboxPanel = new cGridBag().setVertical(true);
468519         //toolboxPanel.setName("Toolbox");
520
+        
521
+        skyboxPanel = new cGridBag().setVertical(true);
469522         
470523         materialPanel = new cGridBag().setVertical(false);
471524         //materialPanel.setName("Material");
....@@ -751,6 +804,7 @@
751804         boolean maximized;
752805     
753806         cButton fullscreenLayout;
807
+        cButton expandedLayout;
754808 
755809         void Minimize()
756810         {
....@@ -790,10 +844,12 @@
790844 	cButton minButton;
791845 	cButton maxButton;
792846 	cButton fullButton;
847
+	cButton collapseButton;
848
+        cButton maximize3DButton;
793849         
794850         void ToggleFullScreen()
795851         {
796
-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
852
+            GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
797853 
798854                 cameraView.ToggleFullScreen();
799855                 
....@@ -814,13 +870,13 @@
814870 // X                   frame.getContentPane().remove(/*"Center",*/bigThree);
815871 // X                   framePanel.add(bigThree);
816872 // X                   frame.getContentPane().add(/*"Center",*/framePanel);
817
-                    framePanel.setDividerLocation(46);
873
+//                    framePanel.setDividerLocation(46); // icons are 24x24
818874                     
819875                     //frame.setVisible(true);
820
-                    radio.layout = keepButton;
876
+//                    radio.layout = keepButton;
821877                     //theFrame = null;
822878                     keepButton = null;
823
-                    radio.layout.doClick();
879
+//                    radio.layout.doClick();
824880                     
825881                 } else
826882                 {
....@@ -841,10 +897,10 @@
841897 // X                   frame.getContentPane().remove(/*"Center",*/framePanel);
842898 // X                   framePanel.remove(bigThree);
843899 // X                   frame.getContentPane().add(/*"Center",*/bigThree);
844
-                    framePanel.setDividerLocation(0);
900
+//                    framePanel.setDividerLocation(0);
845901 
846
-                    radio.layout = fullscreenLayout;
847
-                    radio.layout.doClick();
902
+//                    radio.layout = fullscreenLayout;
903
+//                    radio.layout.doClick();
848904                     //frame.setVisible(true);
849905                 }
850906             frame.validate();
....@@ -852,23 +908,31 @@
852908             cameraView.requestFocusInWindow();
853909         }
854910 
855
-    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)
856920     {
857921         boolean temp = CameraPane.SWITCH;
858922         CameraPane.SWITCH = false;
859923         
860
-        copy.ExtractBigData(versiontable);
924
+        object.ExtractBigData(versiontable);
861925         // if (copy == client)
862926         
863
-        Object3D versions[] = copy.versionlist;
864
-        copy.versionlist = null;
927
+        Object3D versions[] = object.versionlist;
928
+        object.versionlist = null;
865929         
866930         //byte[] compress = Compress(copy);
867
-        Object3D compress = (Object3D)Grafreed.clone(copy);
931
+        Object3D compress = (Object3D)Grafreed.clone(object);
868932         
869
-        copy.versionlist = versions;
933
+        object.versionlist = versions;
870934         
871
-        copy.RestoreBigData(versiontable);
935
+        object.RestoreBigData(versiontable);
872936         
873937         CameraPane.SWITCH = temp;
874938         
....@@ -1205,6 +1269,18 @@
12051269         
12061270             namePanel = new cGridBag();
12071271             
1272
+        //if (copy.pinned)
1273
+        {
1274
+            pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
1275
+            pinButton.setSelected(copy.pinned);
1276
+            cGridBag t = new cGridBag();
1277
+            t.preferredWidth = 2;
1278
+            t.add(pinButton);
1279
+            namePanel.add(t);
1280
+            
1281
+            pinButton.addItemListener(this);
1282
+        }
1283
+        
12081284         nameField = AddText(namePanel, copy.GetName());
12091285         namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
12101286         oe.ctrlPanel.add(namePanel);
....@@ -1556,27 +1632,26 @@
15561632         objectPanel.setIconAt(0, GetIcon("icons/material.png"));
15571633         objectPanel.setToolTipTextAt(0, "Material");
15581634     
1635
+        objectPanel.add(toolboxPanel);
1636
+        objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1637
+        objectPanel.setToolTipTextAt(1, "Objects & textures");
1638
+
1639
+        objectPanel.add(skyboxPanel);
1640
+        objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1641
+        objectPanel.setToolTipTextAt(2, "Backgrounds");
1642
+        
15591643 //        JPanel north = new JPanel(new BorderLayout());
15601644 //        north.setName("Edit");
15611645 //        north.add(ctrlPanel, BorderLayout.NORTH);
15621646 //        objectPanel.add(north);
15631647         objectPanel.add(editPanel);
1564
-        objectPanel.setIconAt(1, GetIcon("icons/write.png"));
1565
-        objectPanel.setToolTipTextAt(1, "Edit controls");
1566
-        
1567
-        //if (Globals.ADVANCED)
1568
-            objectPanel.add(infoPanel);
1569
-        objectPanel.setIconAt(2, GetIcon("icons/info.png"));
1570
-        objectPanel.setToolTipTextAt(2, "Information");
1648
+        objectPanel.setIconAt(3, GetIcon("icons/write.png"));
1649
+        objectPanel.setToolTipTextAt(3, "Edit controls");
15711650         
15721651         objectPanel.add(XYZPanel);
1573
-        objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
1574
-        objectPanel.setToolTipTextAt(3, "XYZ/RGB transform");
1652
+        objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1653
+        objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
15751654         
1576
-        objectPanel.add(toolboxPanel);
1577
-        objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
1578
-        objectPanel.setToolTipTextAt(4, "Objects & backgrounds");
1579
-
15801655         /*
15811656         aConstraints.gridx = 0;
15821657         aConstraints.gridwidth = 1;
....@@ -1613,6 +1688,11 @@
16131688 
16141689         scenePanel.add(tabbedPane);
16151690 
1691
+        //if (Globals.ADVANCED)
1692
+//            tabbedPane.add(infoPanel);
1693
+//        tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1694
+//        tabbedPane.setToolTipTextAt(3, "Information");
1695
+        
16161696         /*
16171697         cTree jTree = new cTree(null);
16181698         ToolTipManager.sharedInstance().registerComponent(jTree);
....@@ -1683,6 +1763,23 @@
16831763 //		aConstraints.gridheight = 1;
16841764 
16851765         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
+
16861783         framePanel.setContinuousLayout(false);
16871784         framePanel.setOneTouchExpandable(false);
16881785         //.setDividerLocation(0.8);
....@@ -2101,6 +2198,25 @@
21012198             }
21022199         });
21032200         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);
21042220         
21052221         cGridBag panel = new cGridBag().setVertical(true);
21062222         
....@@ -3574,6 +3690,17 @@
35743690     public void itemStateChanged(ItemEvent event)
35753691     {
35763692         //                   System.out.println("Propagate = " + propagate);
3693
+        if (event.getSource() == pinButton)
3694
+        {
3695
+            copy.pinned ^= true;
3696
+            if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
3697
+            {
3698
+                ((GroupEditor)copy.editWindow).listUI.remove(copy);
3699
+                copy.CloseUI();
3700
+                //copy.editWindow.refreshContents();
3701
+            }
3702
+        }
3703
+        else
35773704         if (event.getSource() == propagateToggle)
35783705         {
35793706             propagate ^= true;
....@@ -4046,7 +4173,7 @@
40464173     {
40474174         //Save(true);
40484175         Replace();
4049
-        SetUndoStates();
4176
+        SetVersionStates();
40504177     }
40514178     
40524179     private boolean Equal(byte[] compress, byte[] name)
....@@ -4076,17 +4203,17 @@
40764203         
40774204         CopyChanged();
40784205         
4079
-        SetUndoStates();
4206
+        SetVersionStates();
40804207     }
40814208     
40824209     public boolean Save(boolean user)
40834210     {
40844211         System.err.println("Save");
4085
-        //Replace();
4212
+        Replace();
40864213         
4087
-        cRadio tab = GetCurrentTab();
4214
+        //cRadio tab = GetCurrentTab();
40884215         
4089
-        Object3D compress = CompressCopy(); // Saved version. No need for "Replace"?
4216
+        Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
40904217         
40914218         boolean thesame = false;
40924219         
....@@ -4122,7 +4249,7 @@
41224249 //            copy.versionlist[i] = null;
41234250 //        }
41244251 
4125
-        SetUndoStates();
4252
+        SetVersionStates();
41264253         
41274254         // test save
41284255         if (false)
....@@ -4180,9 +4307,9 @@
41804307 
41814308     void CopyChanged()
41824309     {
4183
-        Object3D obj = copy.versionlist[copy.versionindex];
4310
+        Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
41844311         
4185
-        SetUndoStates();
4312
+        SetVersionStates();
41864313         
41874314         boolean temp = CameraPane.SWITCH;
41884315         CameraPane.SWITCH = false;
....@@ -4249,12 +4376,15 @@
42494376         return count;
42504377     }
42514378     
4252
-    void SetUndoStates()
4379
+    void SetVersionStates()
42534380     {
4254
-        cRadio tab = GetCurrentTab();
4381
+        //if (true)
4382
+        //    return;
4383
+                    
4384
+        //cRadio tab = GetCurrentTab();
42554385         
4256
-        restoreButton.setEnabled(true); // copy.versionindex != -1);
4257
-        replaceButton.setEnabled(true); // copy.versionindex != -1);
4386
+        restoreButton.setEnabled(copy.versionindex != -1);
4387
+        replaceButton.setEnabled(copy.versionindex != -1);
42584388         
42594389         previousVersionButton.setEnabled(copy.versionindex > 0);
42604390         nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
....@@ -4263,8 +4393,10 @@
42634393                                         copy.versionlist[copy.versionindex + 1] != null);
42644394         
42654395         muteSlider = true;
4396
+        versionSlider.setMinimum(0);
42664397         versionSlider.setMaximum(VersionCount() - 1);
42674398         versionSlider.setInteger(copy.versionindex);
4399
+        versionSlider.setEnabled(copy.versionindex != -1);
42684400         muteSlider = false;
42694401     }
42704402     
....@@ -4275,7 +4407,7 @@
42754407         
42764408         System.err.println("Undo");
42774409         
4278
-        cRadio tab = GetCurrentTab();
4410
+        //cRadio tab = GetCurrentTab();
42794411         
42804412         if (copy.versionindex == 0)
42814413         {
....@@ -4307,7 +4439,7 @@
43074439     {
43084440         System.err.println("Restore");
43094441         
4310
-        cRadio tab = GetCurrentTab();
4442
+        //cRadio tab = GetCurrentTab();
43114443         
43124444         if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
43134445         {
....@@ -4325,7 +4457,7 @@
43254457     {
43264458         System.err.println("Replace");
43274459         
4328
-        cRadio tab = GetCurrentTab();
4460
+        //cRadio tab = GetCurrentTab();
43294461         
43304462         if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
43314463         {
....@@ -4333,7 +4465,7 @@
43334465             return false;
43344466         }
43354467 
4336
-        copy.versionlist[copy.versionindex] = CompressCopy();
4468
+        copy.versionlist[copy.versionindex] = Duplicate(copy);
43374469         
43384470         return true;
43394471     }
....@@ -4343,7 +4475,7 @@
43434475         // Option?
43444476         Replace();
43454477         
4346
-        cRadio tab = GetCurrentTab();
4478
+        //cRadio tab = GetCurrentTab();
43474479         
43484480         if (copy.versionlist[copy.versionindex + 1] == null)
43494481         {
....@@ -4662,9 +4794,11 @@
46624794             if (muteSlider)
46634795                 return;
46644796             
4797
+            Replace();
4798
+            
46654799             int version = versionSlider.getInteger();
46664800             
4667
-            if (copy.versionlist[version] != null)
4801
+            if (version != -1 && copy.versionlist[version] != null)
46684802             {
46694803                 copy.versionindex = version;
46704804                 CopyChanged();
....@@ -4708,7 +4842,7 @@
47084842             //System.out.println("stateChanged = " + this);
47094843             materialtouched = true;
47104844             
4711
-            if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
4845
+            if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
47124846             {
47134847                 saturationField.setFloat(1);
47144848             }
....@@ -5023,7 +5157,7 @@
50235157         }
50245158         
50255159         if (previousVersionButton != null && copy.versionlist != null)
5026
-            SetUndoStates();
5160
+            SetVersionStates();
50275161     }
50285162     
50295163     static TweenManager tweenManager = new TweenManager();
....@@ -5412,8 +5546,11 @@
54125546             
54135547         if (copy.versionlist == null)
54145548         {
5549
+            // Backward compatibility
54155550             copy.versionlist = new Object3D[100];
54165551             copy.versionindex = -1;
5552
+            
5553
+            Save(true);
54175554         }
54185555         
54195556             //? SetUndoStates();
....@@ -5505,6 +5642,8 @@
55055642 
55065643     void save()
55075644     {
5645
+        Replace();
5646
+        
55085647         if (lastname == null)
55095648         {
55105649             return;
....@@ -5747,6 +5886,7 @@
57475886     ButtonGroup buttonGroup;
57485887     
57495888     cGridBag toolboxPanel;
5889
+    cGridBag skyboxPanel;
57505890     cGridBag materialPanel;
57515891     cGridBag ctrlPanel;
57525892     
....@@ -5851,6 +5991,7 @@
58515991     cNumberSlider anisoField;
58525992     JLabel anisoVLabel;
58535993     cNumberSlider anisoVField;
5994
+    
58545995     JLabel cameraLabel;
58555996     cNumberSlider cameraField;
58565997     JLabel selfshadowLabel;
....@@ -5865,6 +6006,7 @@
58656006     cNumberSlider fakedepthField;
58666007     JLabel shadowbiasLabel;
58676008     cNumberSlider shadowbiasField;
6009
+    
58686010     JLabel bumpLabel;
58696011     cNumberSlider bumpField;
58706012     JLabel noiseLabel;