blame | history | patch | commit | commitdiff
Normand Briere
2019-06-27 1807e7752960ac229cddd34b100e92cadbac9459 
 ObjEditor.java
....@@ -15,6 +15,9 @@
1515 //import javax.swing.plaf.ColorUIResource;
1616 //import javax.swing.plaf.metal.DefaultMetalTheme;
1717 
18
+import javax.swing.plaf.basic.BasicSplitPaneDivider;
19
+import javax.swing.plaf.basic.BasicSplitPaneUI;
20
+
1821 //import javax.media.opengl.GLCanvas;
1922 
2023 import //weka.core.
....@@ -49,6 +52,19 @@
4952         catch (Exception e)
5053         {
5154             return new cButton(name, border);
55
+        }
56
+    }
57
+
58
+    cToggleButton GetToggleButton(String name, boolean border)
59
+    {
60
+        try
61
+        {
62
+            ImageIcon icon = GetIcon(name);
63
+            return new cToggleButton(icon, border);
64
+        }
65
+        catch (Exception e)
66
+        {
67
+            return new cToggleButton(name, border);
5268         }
5369     }
5470 
....@@ -194,7 +210,7 @@
194210         
195211         objEditor.ctrlPanel.remove(namePanel);
196212         
197
-        if (!GroupEditor.allparams)
213
+        if (!allparams)
198214             return;
199215         
200216 //        objEditor.ctrlPanel.remove(liveCB);
....@@ -324,6 +340,11 @@
324340         return frame.action(event, obj);
325341     }
326342 
343
+    // Cannot work without static
344
+    static boolean allparams = true;
345
+
346
+    static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
347
+
327348     void SetupMenu()
328349     {
329350         frame.setMenuBar(menuBar = new MenuBar());
....@@ -370,6 +391,32 @@
370391         closeItem.addActionListener(this);
371392 
372393         objectPanel = new JTabbedPane();
394
+        
395
+        ChangeListener changeListener = new ChangeListener()
396
+        {
397
+            public void stateChanged(ChangeEvent changeEvent)
398
+            {
399
+//                if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
400
+//                {
401
+//                    if (latestObject != null)
402
+//                    {
403
+//                        refreshContents(true);
404
+//                        SetMaterial(latestObject);
405
+//                    }
406
+//                    
407
+//                    materialFlushed = true;
408
+//                }
409
+//                if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
410
+//                {
411
+//                    if (listUI.size() == 0)
412
+//                        EditSelection(false);
413
+//                }
414
+
415
+                refreshContents(false); // To refresh Info tab
416
+            }
417
+        };
418
+        objectPanel.addChangeListener(changeListener);
419
+    
373420         toolbarPanel = new JPanel();
374421         toolbarPanel.setName("Toolbar");
375422         treePanel = new cGridBag();
....@@ -384,9 +431,12 @@
384431         editPanel.add(editCommandsPanel);
385432         editPanel.add(ctrlPanel);
386433                 
387
-        materialPanel = new cGridBag().setVertical(true);
434
+        toolboxPanel = new cGridBag().setVertical(false);
435
+        toolboxPanel.setName("Toolbox");
388436         
437
+        materialPanel = new cGridBag().setVertical(true);
389438         materialPanel.setName("Material");
439
+        
390440         /*JTextPane*/
391441         infoarea = createTextPane();
392442         doc = infoarea.getStyledDocument();
....@@ -411,7 +461,14 @@
411461         mainPanel.setDividerSize(9);
412462         mainPanel.setDividerLocation(0.5); //1.0);
413463         mainPanel.setResizeWeight(0.5);
414
-
464
+        
465
+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
466
+    BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
467
+    divider.setDividerSize(15);
468
+    divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));    
469
+    
470
+    mainPanel.setUI(new BasicSplitPaneUI());
471
+    
415472         //ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
416473         //mainPanel.setLayout(new GridBagLayout());
417474         toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
....@@ -659,6 +716,8 @@
659716         
660717         boolean maximized;
661718     
719
+        cButton fullscreenLayout;
720
+
662721         void Minimize()
663722         {
664723             frame.setState(Frame.ICONIFIED);
....@@ -684,7 +743,9 @@
684743         
685744         void ToggleFullScreen()
686745         {
687
-                if (CameraPane.FULLSCREEN)
746
+                cameraView.ToggleFullScreen();
747
+                
748
+                if (!CameraPane.FULLSCREEN)
688749                 {
689750                     device.setFullScreenWindow(null);
690751                     //frame.setVisible(false);
....@@ -720,12 +781,10 @@
720781 // X                   frame.getContentPane().add(/*"Center",*/bigThree);
721782                     framePanel.setDividerLocation(0);
722783 
723
-                    radio.layout = twoButton;
784
+                    radio.layout = fullscreenLayout;
724785                     radio.layout.doClick();
725786                     //frame.setVisible(true);
726787                 }
727
-                
728
-                cameraView.ToggleFullScreen();
729788         }
730789 
731790     private JTextPane createTextPane()
....@@ -866,7 +925,12 @@
866925     JCheckBox speedupCB;
867926     JCheckBox rewindCB;
868927     JCheckBox flipVCB;
928
+    
929
+    cCheckBox toggleTextureCB;
930
+    cCheckBox toggleSwitchCB;
931
+        
869932     JComboBox texresMenu;
933
+    
870934     JButton resetButton;
871935     JButton stepButton;
872936     JButton stepAllButton;
....@@ -1058,7 +1122,7 @@
10581122         
10591123         oe.ctrlPanel.Return();
10601124         
1061
-        if (!GroupEditor.allparams)
1125
+        if (!allparams)
10621126             return;
10631127 
10641128             setupPanel = new cGridBag().setVertical(false);
....@@ -1071,7 +1135,7 @@
10711135         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
10721136                 hideCB.setToolTipText("Hide object");
10731137         markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1074
-        markCB.setToolTipText("Set the animation target transform");
1138
+        markCB.setToolTipText("As animation target transform");
10751139         
10761140             setupPanel2 = new cGridBag().setVertical(false);
10771141             
....@@ -1079,7 +1143,7 @@
10791143         rewindCB.setToolTipText("Rewind animation");
10801144         
10811145         randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1082
-        randomCB.setToolTipText("Randomly Rewind or Go back and forth");
1146
+        randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
10831147 
10841148         if (Globals.ADVANCED)
10851149         {
....@@ -1401,6 +1465,7 @@
14011465 //        objectPanel.add(north);
14021466         objectPanel.add(editPanel);
14031467         objectPanel.add(infoPanel);
1468
+        objectPanel.add(toolboxPanel);
14041469 
14051470         /*
14061471         aConstraints.gridx = 0;
....@@ -1409,7 +1474,7 @@
14091474         aConstraints.gridy += 1;
14101475         aConstraints.gridwidth = 1;
14111476         mainPanel.add(objectPanel, aConstraints);
1412
-         */
1477
+        */
14131478 
14141479         scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
14151480                 VERTICAL_SCROLLBAR_AS_NEEDED,
....@@ -1426,9 +1491,7 @@
14261491         JTabbedPane tabbedPane = new JTabbedPane();
14271492         tabbedPane.add(scrollpane);
14281493 
1429
-        tabbedPane.add(FSPane = new cFileSystemPane(this));
1430
-
1431
-        optionsPanel = new cGridBag().setVertical(true);
1494
+        optionsPanel = new cGridBag().setVertical(false);
14321495 
14331496         optionsPanel.setName("Options");
14341497         
....@@ -1436,6 +1499,8 @@
14361499         
14371500         tabbedPane.add(optionsPanel);
14381501         
1502
+        tabbedPane.add(FSPane = new cFileSystemPane(this));
1503
+
14391504         scenePanel.add(tabbedPane);
14401505 
14411506         /*
....@@ -1528,6 +1593,8 @@
15281593 //            aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
15291594 
15301595         frame.setSize(1280, 860);
1596
+        
1597
+        frame.validate();
15311598         frame.setVisible(true);
15321599 
15331600                     cameraView.requestFocusInWindow();
....@@ -2847,6 +2914,8 @@
28472914 
28482915     void SetMaterial(Object3D object)
28492916     {
2917
+        latestObject = object;
2918
+        
28502919         cMaterial mat = object.material;
28512920 
28522921         if (mat == null)
....@@ -2958,12 +3027,17 @@
29583027 //                }
29593028 
29603029         /**/
2961
-        if (deselect)
3030
+        if (deselect || child == null)
29623031         {
29633032             //group.deselectAll();
29643033             //freeze = true;
29653034             GetTree().clearSelection();
29663035             //freeze = false;
3036
+            
3037
+            if (child == null)
3038
+            {
3039
+                return;
3040
+            }
29673041         }
29683042 
29693043         //group.addSelectee(child);
....@@ -3032,7 +3106,7 @@
30323106             cameraView.ToggleDL();
30333107             cameraView.repaint();
30343108             return;
3035
-        } else if (event.getSource() == toggleTextureItem)
3109
+        } else if (event.getSource() == toggleTextureItem || event.getSource() == toggleTextureCB)
30363110         {
30373111             cameraView.ToggleTexture();
30383112             // june 2013           copy.HardTouch();
....@@ -3071,7 +3145,7 @@
30713145             frame.validate();
30723146 
30733147             return;
3074
-        } else if (event.getSource() == toggleSwitchItem)
3148
+        } else if (event.getSource() == toggleSwitchItem || event.getSource() == toggleSwitchCB)
30753149         {
30763150             cameraView.ToggleSwitch();
30773151             cameraView.repaint();
....@@ -3478,6 +3552,8 @@
34783552             tab.graphs[i] = null;
34793553         }
34803554 
3555
+        SetUndoStates();
3556
+        
34813557         // test save
34823558         if (false)
34833559         {
....@@ -3500,6 +3576,8 @@
35003576 
35013577     void CopyChanged(Object3D obj)
35023578     {
3579
+        SetUndoStates();
3580
+        
35033581         boolean temp = CameraPane.SWITCH;
35043582         CameraPane.SWITCH = false;
35053583         
....@@ -3537,6 +3615,17 @@
35373615         }
35383616         
35393617         refreshContents();
3618
+    }
3619
+    
3620
+    cButton undoButton;
3621
+    cButton redoButton;
3622
+        
3623
+    void SetUndoStates()
3624
+    {
3625
+        cRadio tab = GetCurrentTab();
3626
+        
3627
+        undoButton.setEnabled(tab.undoindex > 0);
3628
+        redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
35403629     }
35413630     
35423631     public void Undo()
....@@ -3726,7 +3815,7 @@
37263815         assert false;
37273816     }
37283817 
3729
-    void EditSelection()
3818
+    void EditSelection(boolean newWindow)
37303819     {
37313820     }
37323821 
....@@ -4221,7 +4310,7 @@
42214310 
42224311     void makeSomething(Object3D thing, boolean resetmodel) // deselect)
42234312     {
4224
-        if (Globals.SAVEONMAKE)
4313
+        if (Globals.SAVEONMAKE) // && resetmodel)
42254314             Save();
42264315         //Tween.set(thing, 0).target(1).start(tweenManager);
42274316         //Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
....@@ -4309,6 +4398,12 @@
43094398         {
43104399             ResetModel();
43114400             Select(thing.GetTreePath(), true, false); // unselect... false);
4401
+            
4402
+        if (thing.Size() == 0)
4403
+        {
4404
+            //EditSelection(false);
4405
+        }
4406
+        
43124407             refreshContents();
43134408         }
43144409 
....@@ -4710,6 +4805,8 @@
47104805             String filename = browser.getFile();
47114806             if (filename != null && filename.length() > 0)
47124807             {
4808
+                if (!filename.endsWith(".gfd"))
4809
+                    filename += ".gfd";
47134810                 lastname = browser.getDirectory() + filename;
47144811                 save();
47154812             }
....@@ -4903,18 +5000,31 @@
49035000     CheckboxMenuItem togglePaintItem;
49045001     JSplitPane mainPanel;
49055002     JScrollPane scrollpane;
5003
+    
49065004     JPanel toolbarPanel;
5005
+    
49075006     cGridBag treePanel;
5007
+    
49085008     JPanel radioPanel;
49095009     ButtonGroup buttonGroup;
4910
-    cGridBag ctrlPanel;
5010
+    
5011
+    cGridBag toolboxPanel;
49115012     cGridBag materialPanel;
5013
+    cGridBag ctrlPanel;
5014
+    
49125015     JScrollPane infoPanel;
5016
+    
49135017     cGridBag optionsPanel;
5018
+    
49145019     JTabbedPane objectPanel;
5020
+    boolean materialFlushed;
5021
+    Object3D latestObject;
5022
+    
49155023     cGridBag XYZPanel;
5024
+    
49165025     JSplitPane gridPanel;
49175026     JSplitPane bigPanel;
5027
+    
49185028     cGridBag bigThree;
49195029     cGridBag scenePanel;
49205030     cGridBag centralPanel;
....@@ -5029,7 +5139,7 @@
50295139     cNumberSlider fogField;
50305140     JLabel opacityPowerLabel;
50315141     cNumberSlider opacityPowerField;
5032
-    JTree jTree;
5142
+    cTree jTree;
50335143     //ObjectUI parent;
50345144     
50355145     cNumberSlider normalpushField;