blame | history | patch | commit | commitdiff
Normand Briere
2019-08-13 c67de8aca04d988179191ccb52461af00125920e 
 ObjEditor.java
....@@ -34,6 +34,7 @@
3434         iSendInfo
3535 //KeyListener
3636 {
37
+    public cToggleButton pinButton;
3738         boolean timeline;
3839         boolean wasFullScreen;
3940 
....@@ -296,11 +297,13 @@
296297         client = inClient;
297298         copy = client;
298299 
299
-        if (copy.versionlist == null)
300
-        {
301
-            copy.versionlist = new Object3D[100];
302
-            copy.versionindex = -1;
303
-        }
300
+//        if (copy.versionlist == null)
301
+//        {
302
+//            copy.versionlist = new Object3D[100];
303
+//            copy.versionindex = -1;
304
+//            
305
+//            callee.Save(true);
306
+//        }
304307         
305308         // "this" is not called: SetupUI2(objEditor);
306309     }
....@@ -319,6 +322,8 @@
319322         {
320323             copy.versionlist = new Object3D[100];
321324             copy.versionindex = -1;
325
+            
326
+//            Save(true);
322327         }
323328         
324329         SetupUI2(callee.GetEditor());
....@@ -353,11 +358,13 @@
353358         copy = localCopy;
354359         copy.editWindow = this;
355360 
356
-        if (copy.versionlist == null)
357
-        {
358
-//            copy.versions = new byte[100][];
361
+//        if (copy.versionlist == null)
362
+//        {
363
+//            copy.versionlist = new Object3D[100];
359364 //            copy.versionindex = -1;
360
-        }
365
+//            
366
+//            Save(true);
367
+//        }
361368         
362369         SetupMenu();
363370 
....@@ -426,6 +433,8 @@
426433         
427434         ChangeListener changeListener = new ChangeListener()
428435         {
436
+            String name;
437
+            
429438             public void stateChanged(ChangeEvent changeEvent)
430439             {
431440 //                if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
....@@ -444,7 +453,36 @@
444453 //                        EditSelection(false);
445454 //                }
446455 
447
-                refreshContents(false); // To refresh Info tab
456
+                if (objectPanel.getSelectedIndex() == 4)
457
+                {
458
+                    name = copy.skyboxname;
459
+                    
460
+                    if (name == null)
461
+                    {
462
+                        name = "";
463
+                    }
464
+                    
465
+                    copy.skyboxname = "cubemaps/default-skyboxes/rgb";
466
+                    copy.skyboxext = "jpg";
467
+                }
468
+                else
469
+                {
470
+                    if (name != null)
471
+                    {
472
+                        if (name.equals(""))
473
+                        {
474
+                            copy.skyboxname = null;
475
+                            copy.skyboxext = null;
476
+                        }
477
+                        else
478
+                        {
479
+                            copy.skyboxname = name;
480
+                        }
481
+                    }
482
+                }
483
+                
484
+//                refreshContents(false); // To refresh Info tab
485
+                cameraView.repaint();
448486             }
449487         };
450488         objectPanel.addChangeListener(changeListener);
....@@ -466,6 +504,8 @@
466504                 
467505         toolboxPanel = new cGridBag().setVertical(true);
468506         //toolboxPanel.setName("Toolbox");
507
+        
508
+        skyboxPanel = new cGridBag().setVertical(true);
469509         
470510         materialPanel = new cGridBag().setVertical(false);
471511         //materialPanel.setName("Material");
....@@ -751,6 +791,7 @@
751791         boolean maximized;
752792     
753793         cButton fullscreenLayout;
794
+        cButton expandedLayout;
754795 
755796         void Minimize()
756797         {
....@@ -790,10 +831,12 @@
790831 	cButton minButton;
791832 	cButton maxButton;
792833 	cButton fullButton;
834
+	cButton collapseButton;
835
+        cButton maximize3DButton;
793836         
794837         void ToggleFullScreen()
795838         {
796
-GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
839
+            GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
797840 
798841                 cameraView.ToggleFullScreen();
799842                 
....@@ -814,13 +857,13 @@
814857 // X                   frame.getContentPane().remove(/*"Center",*/bigThree);
815858 // X                   framePanel.add(bigThree);
816859 // X                   frame.getContentPane().add(/*"Center",*/framePanel);
817
-                    framePanel.setDividerLocation(46);
860
+//                    framePanel.setDividerLocation(46); // icons are 24x24
818861                     
819862                     //frame.setVisible(true);
820
-                    radio.layout = keepButton;
863
+//                    radio.layout = keepButton;
821864                     //theFrame = null;
822865                     keepButton = null;
823
-                    radio.layout.doClick();
866
+//                    radio.layout.doClick();
824867                     
825868                 } else
826869                 {
....@@ -841,10 +884,10 @@
841884 // X                   frame.getContentPane().remove(/*"Center",*/framePanel);
842885 // X                   framePanel.remove(bigThree);
843886 // X                   frame.getContentPane().add(/*"Center",*/bigThree);
844
-                    framePanel.setDividerLocation(0);
887
+//                    framePanel.setDividerLocation(0);
845888 
846
-                    radio.layout = fullscreenLayout;
847
-                    radio.layout.doClick();
889
+//                    radio.layout = fullscreenLayout;
890
+//                    radio.layout.doClick();
848891                     //frame.setVisible(true);
849892                 }
850893             frame.validate();
....@@ -852,23 +895,31 @@
852895             cameraView.requestFocusInWindow();
853896         }
854897 
855
-    private Object3D CompressCopy()
898
+        void CollapseToolbar()
899
+        {
900
+            framePanel.setDividerLocation(0);
901
+            //frame.validate();
902
+            
903
+            cameraView.requestFocusInWindow();
904
+        }
905
+        
906
+    private Object3D Duplicate(Object3D object)
856907     {
857908         boolean temp = CameraPane.SWITCH;
858909         CameraPane.SWITCH = false;
859910         
860
-        copy.ExtractBigData(versiontable);
911
+        object.ExtractBigData(versiontable);
861912         // if (copy == client)
862913         
863
-        Object3D versions[] = copy.versionlist;
864
-        copy.versionlist = null;
914
+        Object3D versions[] = object.versionlist;
915
+        object.versionlist = null;
865916         
866917         //byte[] compress = Compress(copy);
867
-        Object3D compress = (Object3D)Grafreed.clone(copy);
918
+        Object3D compress = (Object3D)Grafreed.clone(object);
868919         
869
-        copy.versionlist = versions;
920
+        object.versionlist = versions;
870921         
871
-        copy.RestoreBigData(versiontable);
922
+        object.RestoreBigData(versiontable);
872923         
873924         CameraPane.SWITCH = temp;
874925         
....@@ -1205,6 +1256,18 @@
12051256         
12061257             namePanel = new cGridBag();
12071258             
1259
+        //if (copy.pinned)
1260
+        {
1261
+            pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
1262
+            pinButton.setSelected(copy.pinned);
1263
+            cGridBag t = new cGridBag();
1264
+            t.preferredWidth = 2;
1265
+            t.add(pinButton);
1266
+            namePanel.add(t);
1267
+            
1268
+            pinButton.addItemListener(this);
1269
+        }
1270
+        
12081271         nameField = AddText(namePanel, copy.GetName());
12091272         namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
12101273         oe.ctrlPanel.add(namePanel);
....@@ -1556,27 +1619,26 @@
15561619         objectPanel.setIconAt(0, GetIcon("icons/material.png"));
15571620         objectPanel.setToolTipTextAt(0, "Material");
15581621     
1622
+        objectPanel.add(toolboxPanel);
1623
+        objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1624
+        objectPanel.setToolTipTextAt(1, "Objects & textures");
1625
+
1626
+        objectPanel.add(skyboxPanel);
1627
+        objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1628
+        objectPanel.setToolTipTextAt(2, "Backgrounds");
1629
+        
15591630 //        JPanel north = new JPanel(new BorderLayout());
15601631 //        north.setName("Edit");
15611632 //        north.add(ctrlPanel, BorderLayout.NORTH);
15621633 //        objectPanel.add(north);
15631634         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");
1635
+        objectPanel.setIconAt(3, GetIcon("icons/write.png"));
1636
+        objectPanel.setToolTipTextAt(3, "Edit controls");
15711637         
15721638         objectPanel.add(XYZPanel);
1573
-        objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
1574
-        objectPanel.setToolTipTextAt(3, "XYZ/RGB transform");
1639
+        objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1640
+        objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
15751641         
1576
-        objectPanel.add(toolboxPanel);
1577
-        objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
1578
-        objectPanel.setToolTipTextAt(4, "Objects & backgrounds");
1579
-
15801642         /*
15811643         aConstraints.gridx = 0;
15821644         aConstraints.gridwidth = 1;
....@@ -1613,6 +1675,11 @@
16131675 
16141676         scenePanel.add(tabbedPane);
16151677 
1678
+        //if (Globals.ADVANCED)
1679
+            tabbedPane.add(infoPanel);
1680
+        tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1681
+        tabbedPane.setToolTipTextAt(3, "Information");
1682
+        
16161683         /*
16171684         cTree jTree = new cTree(null);
16181685         ToolTipManager.sharedInstance().registerComponent(jTree);
....@@ -1683,6 +1750,23 @@
16831750 //		aConstraints.gridheight = 1;
16841751 
16851752         framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1753
+        
1754
+        framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
1755
+                new java.beans.PropertyChangeListener()
1756
+                {
1757
+                    public void propertyChange(java.beans.PropertyChangeEvent pce)
1758
+                    {
1759
+                        if ((Integer)pce.getOldValue() == 1)
1760
+                        {
1761
+                            if (radio.layout != expandedLayout)
1762
+                            {
1763
+                                radio.layout = expandedLayout;
1764
+                                radio.layout.doClick();
1765
+                            }
1766
+                        }
1767
+                    }
1768
+                });
1769
+
16861770         framePanel.setContinuousLayout(false);
16871771         framePanel.setOneTouchExpandable(false);
16881772         //.setDividerLocation(0.8);
....@@ -2101,6 +2185,25 @@
21012185             }
21022186         });
21032187         presetpanel.add(candle);
2188
+        
2189
+        cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
2190
+        shadowShader.setToolTipText("Shadow");
2191
+        shadowShader.addMouseListener(new MouseAdapter()
2192
+        {
2193
+            public void mouseClicked(MouseEvent e)
2194
+            {
2195
+                diffuseField.setFloat(0.001);
2196
+                ambientField.setFloat(0.001);
2197
+                cameraField.setFloat(0.001);
2198
+                specularField.setFloat(0.001);
2199
+                fakedepthField.setFloat(0.001);
2200
+                opacityField.setFloat(0.6);
2201
+
2202
+                materialtouched = true;
2203
+                applySelf();
2204
+            }
2205
+        });
2206
+        presetpanel.add(shadowShader);
21042207         
21052208         cGridBag panel = new cGridBag().setVertical(true);
21062209         
....@@ -3574,6 +3677,17 @@
35743677     public void itemStateChanged(ItemEvent event)
35753678     {
35763679         //                   System.out.println("Propagate = " + propagate);
3680
+        if (event.getSource() == pinButton)
3681
+        {
3682
+            copy.pinned ^= true;
3683
+            if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
3684
+            {
3685
+                ((GroupEditor)copy.editWindow).listUI.remove(copy);
3686
+                copy.CloseUI();
3687
+                //copy.editWindow.refreshContents();
3688
+            }
3689
+        }
3690
+        else
35773691         if (event.getSource() == propagateToggle)
35783692         {
35793693             propagate ^= true;
....@@ -4046,7 +4160,7 @@
40464160     {
40474161         //Save(true);
40484162         Replace();
4049
-        SetUndoStates();
4163
+        SetVersionStates();
40504164     }
40514165     
40524166     private boolean Equal(byte[] compress, byte[] name)
....@@ -4076,17 +4190,17 @@
40764190         
40774191         CopyChanged();
40784192         
4079
-        SetUndoStates();
4193
+        SetVersionStates();
40804194     }
40814195     
40824196     public boolean Save(boolean user)
40834197     {
40844198         System.err.println("Save");
4085
-        //Replace();
4199
+        Replace();
40864200         
4087
-        cRadio tab = GetCurrentTab();
4201
+        //cRadio tab = GetCurrentTab();
40884202         
4089
-        Object3D compress = CompressCopy(); // Saved version. No need for "Replace"?
4203
+        Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
40904204         
40914205         boolean thesame = false;
40924206         
....@@ -4122,7 +4236,7 @@
41224236 //            copy.versionlist[i] = null;
41234237 //        }
41244238 
4125
-        SetUndoStates();
4239
+        SetVersionStates();
41264240         
41274241         // test save
41284242         if (false)
....@@ -4180,9 +4294,9 @@
41804294 
41814295     void CopyChanged()
41824296     {
4183
-        Object3D obj = copy.versionlist[copy.versionindex];
4297
+        Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
41844298         
4185
-        SetUndoStates();
4299
+        SetVersionStates();
41864300         
41874301         boolean temp = CameraPane.SWITCH;
41884302         CameraPane.SWITCH = false;
....@@ -4249,12 +4363,15 @@
42494363         return count;
42504364     }
42514365     
4252
-    void SetUndoStates()
4366
+    void SetVersionStates()
42534367     {
4254
-        cRadio tab = GetCurrentTab();
4368
+        //if (true)
4369
+        //    return;
4370
+                    
4371
+        //cRadio tab = GetCurrentTab();
42554372         
4256
-        restoreButton.setEnabled(true); // copy.versionindex != -1);
4257
-        replaceButton.setEnabled(true); // copy.versionindex != -1);
4373
+        restoreButton.setEnabled(copy.versionindex != -1);
4374
+        replaceButton.setEnabled(copy.versionindex != -1);
42584375         
42594376         previousVersionButton.setEnabled(copy.versionindex > 0);
42604377         nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
....@@ -4263,8 +4380,10 @@
42634380                                         copy.versionlist[copy.versionindex + 1] != null);
42644381         
42654382         muteSlider = true;
4383
+        versionSlider.setMinimum(0);
42664384         versionSlider.setMaximum(VersionCount() - 1);
42674385         versionSlider.setInteger(copy.versionindex);
4386
+        versionSlider.setEnabled(copy.versionindex != -1);
42684387         muteSlider = false;
42694388     }
42704389     
....@@ -4275,7 +4394,7 @@
42754394         
42764395         System.err.println("Undo");
42774396         
4278
-        cRadio tab = GetCurrentTab();
4397
+        //cRadio tab = GetCurrentTab();
42794398         
42804399         if (copy.versionindex == 0)
42814400         {
....@@ -4307,7 +4426,7 @@
43074426     {
43084427         System.err.println("Restore");
43094428         
4310
-        cRadio tab = GetCurrentTab();
4429
+        //cRadio tab = GetCurrentTab();
43114430         
43124431         if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
43134432         {
....@@ -4325,7 +4444,7 @@
43254444     {
43264445         System.err.println("Replace");
43274446         
4328
-        cRadio tab = GetCurrentTab();
4447
+        //cRadio tab = GetCurrentTab();
43294448         
43304449         if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
43314450         {
....@@ -4333,7 +4452,7 @@
43334452             return false;
43344453         }
43354454 
4336
-        copy.versionlist[copy.versionindex] = CompressCopy();
4455
+        copy.versionlist[copy.versionindex] = Duplicate(copy);
43374456         
43384457         return true;
43394458     }
....@@ -4343,7 +4462,7 @@
43434462         // Option?
43444463         Replace();
43454464         
4346
-        cRadio tab = GetCurrentTab();
4465
+        //cRadio tab = GetCurrentTab();
43474466         
43484467         if (copy.versionlist[copy.versionindex + 1] == null)
43494468         {
....@@ -4664,7 +4783,7 @@
46644783             
46654784             int version = versionSlider.getInteger();
46664785             
4667
-            if (copy.versionlist[version] != null)
4786
+            if (version != -1 && copy.versionlist[version] != null)
46684787             {
46694788                 copy.versionindex = version;
46704789                 CopyChanged();
....@@ -4708,7 +4827,7 @@
47084827             //System.out.println("stateChanged = " + this);
47094828             materialtouched = true;
47104829             
4711
-            if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
4830
+            if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
47124831             {
47134832                 saturationField.setFloat(1);
47144833             }
....@@ -5023,7 +5142,7 @@
50235142         }
50245143         
50255144         if (previousVersionButton != null && copy.versionlist != null)
5026
-            SetUndoStates();
5145
+            SetVersionStates();
50275146     }
50285147     
50295148     static TweenManager tweenManager = new TweenManager();
....@@ -5412,8 +5531,11 @@
54125531             
54135532         if (copy.versionlist == null)
54145533         {
5534
+            // Backward compatibility
54155535             copy.versionlist = new Object3D[100];
54165536             copy.versionindex = -1;
5537
+            
5538
+            Save(true);
54175539         }
54185540         
54195541             //? SetUndoStates();
....@@ -5505,6 +5627,8 @@
55055627 
55065628     void save()
55075629     {
5630
+        Replace();
5631
+        
55085632         if (lastname == null)
55095633         {
55105634             return;
....@@ -5747,6 +5871,7 @@
57475871     ButtonGroup buttonGroup;
57485872     
57495873     cGridBag toolboxPanel;
5874
+    cGridBag skyboxPanel;
57505875     cGridBag materialPanel;
57515876     cGridBag ctrlPanel;
57525877     
....@@ -5851,6 +5976,7 @@
58515976     cNumberSlider anisoField;
58525977     JLabel anisoVLabel;
58535978     cNumberSlider anisoVField;
5979
+    
58545980     JLabel cameraLabel;
58555981     cNumberSlider cameraField;
58565982     JLabel selfshadowLabel;
....@@ -5865,6 +5991,7 @@
58655991     cNumberSlider fakedepthField;
58665992     JLabel shadowbiasLabel;
58675993     cNumberSlider shadowbiasField;
5994
+    
58685995     JLabel bumpLabel;
58695996     cNumberSlider bumpField;
58705997     JLabel noiseLabel;