blame | history | patch | commit | commitdiff
Normand Briere
2019-06-27 f78dd18c66d607b693c0bf5937fc59181bf5a26b 
 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,13 @@
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
+    
415471         //ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
416472         //mainPanel.setLayout(new GridBagLayout());
417473         toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
....@@ -659,6 +715,8 @@
659715         
660716         boolean maximized;
661717     
718
+        cButton fullscreenLayout;
719
+
662720         void Minimize()
663721         {
664722             frame.setState(Frame.ICONIFIED);
....@@ -684,7 +742,9 @@
684742         
685743         void ToggleFullScreen()
686744         {
687
-                if (CameraPane.FULLSCREEN)
745
+                cameraView.ToggleFullScreen();
746
+                
747
+                if (!CameraPane.FULLSCREEN)
688748                 {
689749                     device.setFullScreenWindow(null);
690750                     //frame.setVisible(false);
....@@ -720,12 +780,10 @@
720780 // X                   frame.getContentPane().add(/*"Center",*/bigThree);
721781                     framePanel.setDividerLocation(0);
722782 
723
-                    radio.layout = twoButton;
783
+                    radio.layout = fullscreenLayout;
724784                     radio.layout.doClick();
725785                     //frame.setVisible(true);
726786                 }
727
-                
728
-                cameraView.ToggleFullScreen();
729787         }
730788 
731789     private JTextPane createTextPane()
....@@ -866,7 +924,12 @@
866924     JCheckBox speedupCB;
867925     JCheckBox rewindCB;
868926     JCheckBox flipVCB;
927
+    
928
+    cCheckBox toggleTextureCB;
929
+    cCheckBox toggleSwitchCB;
930
+        
869931     JComboBox texresMenu;
932
+    
870933     JButton resetButton;
871934     JButton stepButton;
872935     JButton stepAllButton;
....@@ -1058,7 +1121,7 @@
10581121         
10591122         oe.ctrlPanel.Return();
10601123         
1061
-        if (!GroupEditor.allparams)
1124
+        if (!allparams)
10621125             return;
10631126 
10641127             setupPanel = new cGridBag().setVertical(false);
....@@ -1071,7 +1134,7 @@
10711134         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
10721135                 hideCB.setToolTipText("Hide object");
10731136         markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1074
-        markCB.setToolTipText("Set the animation target transform");
1137
+        markCB.setToolTipText("As animation target transform");
10751138         
10761139             setupPanel2 = new cGridBag().setVertical(false);
10771140             
....@@ -1079,7 +1142,7 @@
10791142         rewindCB.setToolTipText("Rewind animation");
10801143         
10811144         randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1082
-        randomCB.setToolTipText("Randomly Rewind or Go back and forth");
1145
+        randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
10831146 
10841147         if (Globals.ADVANCED)
10851148         {
....@@ -1401,6 +1464,7 @@
14011464 //        objectPanel.add(north);
14021465         objectPanel.add(editPanel);
14031466         objectPanel.add(infoPanel);
1467
+        objectPanel.add(toolboxPanel);
14041468 
14051469         /*
14061470         aConstraints.gridx = 0;
....@@ -1409,7 +1473,7 @@
14091473         aConstraints.gridy += 1;
14101474         aConstraints.gridwidth = 1;
14111475         mainPanel.add(objectPanel, aConstraints);
1412
-         */
1476
+        */
14131477 
14141478         scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
14151479                 VERTICAL_SCROLLBAR_AS_NEEDED,
....@@ -1426,9 +1490,7 @@
14261490         JTabbedPane tabbedPane = new JTabbedPane();
14271491         tabbedPane.add(scrollpane);
14281492 
1429
-        tabbedPane.add(FSPane = new cFileSystemPane(this));
1430
-
1431
-        optionsPanel = new cGridBag().setVertical(true);
1493
+        optionsPanel = new cGridBag().setVertical(false);
14321494 
14331495         optionsPanel.setName("Options");
14341496         
....@@ -1436,6 +1498,8 @@
14361498         
14371499         tabbedPane.add(optionsPanel);
14381500         
1501
+        tabbedPane.add(FSPane = new cFileSystemPane(this));
1502
+
14391503         scenePanel.add(tabbedPane);
14401504 
14411505         /*
....@@ -1528,6 +1592,8 @@
15281592 //            aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
15291593 
15301594         frame.setSize(1280, 860);
1595
+        
1596
+        frame.validate();
15311597         frame.setVisible(true);
15321598 
15331599                     cameraView.requestFocusInWindow();
....@@ -2847,6 +2913,8 @@
28472913 
28482914     void SetMaterial(Object3D object)
28492915     {
2916
+        latestObject = object;
2917
+        
28502918         cMaterial mat = object.material;
28512919 
28522920         if (mat == null)
....@@ -2958,12 +3026,17 @@
29583026 //                }
29593027 
29603028         /**/
2961
-        if (deselect)
3029
+        if (deselect || child == null)
29623030         {
29633031             //group.deselectAll();
29643032             //freeze = true;
29653033             GetTree().clearSelection();
29663034             //freeze = false;
3035
+            
3036
+            if (child == null)
3037
+            {
3038
+                return;
3039
+            }
29673040         }
29683041 
29693042         //group.addSelectee(child);
....@@ -3032,7 +3105,7 @@
30323105             cameraView.ToggleDL();
30333106             cameraView.repaint();
30343107             return;
3035
-        } else if (event.getSource() == toggleTextureItem)
3108
+        } else if (event.getSource() == toggleTextureItem || event.getSource() == toggleTextureCB)
30363109         {
30373110             cameraView.ToggleTexture();
30383111             // june 2013           copy.HardTouch();
....@@ -3071,7 +3144,7 @@
30713144             frame.validate();
30723145 
30733146             return;
3074
-        } else if (event.getSource() == toggleSwitchItem)
3147
+        } else if (event.getSource() == toggleSwitchItem || event.getSource() == toggleSwitchCB)
30753148         {
30763149             cameraView.ToggleSwitch();
30773150             cameraView.repaint();
....@@ -3478,6 +3551,8 @@
34783551             tab.graphs[i] = null;
34793552         }
34803553 
3554
+        SetUndoStates();
3555
+        
34813556         // test save
34823557         if (false)
34833558         {
....@@ -3500,6 +3575,8 @@
35003575 
35013576     void CopyChanged(Object3D obj)
35023577     {
3578
+        SetUndoStates();
3579
+        
35033580         boolean temp = CameraPane.SWITCH;
35043581         CameraPane.SWITCH = false;
35053582         
....@@ -3537,6 +3614,17 @@
35373614         }
35383615         
35393616         refreshContents();
3617
+    }
3618
+    
3619
+    cButton undoButton;
3620
+    cButton redoButton;
3621
+        
3622
+    void SetUndoStates()
3623
+    {
3624
+        cRadio tab = GetCurrentTab();
3625
+        
3626
+        undoButton.setEnabled(tab.undoindex > 0);
3627
+        redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
35403628     }
35413629     
35423630     public void Undo()
....@@ -3726,7 +3814,7 @@
37263814         assert false;
37273815     }
37283816 
3729
-    void EditSelection()
3817
+    void EditSelection(boolean newWindow)
37303818     {
37313819     }
37323820 
....@@ -4221,7 +4309,7 @@
42214309 
42224310     void makeSomething(Object3D thing, boolean resetmodel) // deselect)
42234311     {
4224
-        if (Globals.SAVEONMAKE)
4312
+        if (Globals.SAVEONMAKE) // && resetmodel)
42254313             Save();
42264314         //Tween.set(thing, 0).target(1).start(tweenManager);
42274315         //Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
....@@ -4309,6 +4397,12 @@
43094397         {
43104398             ResetModel();
43114399             Select(thing.GetTreePath(), true, false); // unselect... false);
4400
+            
4401
+        if (thing.Size() == 0)
4402
+        {
4403
+            //EditSelection(false);
4404
+        }
4405
+        
43124406             refreshContents();
43134407         }
43144408 
....@@ -4710,6 +4804,8 @@
47104804             String filename = browser.getFile();
47114805             if (filename != null && filename.length() > 0)
47124806             {
4807
+                if (!filename.endsWith(".gfd"))
4808
+                    filename += ".gfd";
47134809                 lastname = browser.getDirectory() + filename;
47144810                 save();
47154811             }
....@@ -4903,18 +4999,31 @@
49034999     CheckboxMenuItem togglePaintItem;
49045000     JSplitPane mainPanel;
49055001     JScrollPane scrollpane;
5002
+    
49065003     JPanel toolbarPanel;
5004
+    
49075005     cGridBag treePanel;
5006
+    
49085007     JPanel radioPanel;
49095008     ButtonGroup buttonGroup;
4910
-    cGridBag ctrlPanel;
5009
+    
5010
+    cGridBag toolboxPanel;
49115011     cGridBag materialPanel;
5012
+    cGridBag ctrlPanel;
5013
+    
49125014     JScrollPane infoPanel;
5015
+    
49135016     cGridBag optionsPanel;
5017
+    
49145018     JTabbedPane objectPanel;
5019
+    boolean materialFlushed;
5020
+    Object3D latestObject;
5021
+    
49155022     cGridBag XYZPanel;
5023
+    
49165024     JSplitPane gridPanel;
49175025     JSplitPane bigPanel;
5026
+    
49185027     cGridBag bigThree;
49195028     cGridBag scenePanel;
49205029     cGridBag centralPanel;
....@@ -5029,7 +5138,7 @@
50295138     cNumberSlider fogField;
50305139     JLabel opacityPowerLabel;
50315140     cNumberSlider opacityPowerField;
5032
-    JTree jTree;
5141
+    cTree jTree;
50335142     //ObjectUI parent;
50345143     
50355144     cNumberSlider normalpushField;