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.
....@@ -207,7 +210,7 @@
207210         
208211         objEditor.ctrlPanel.remove(namePanel);
209212         
210
-        if (!GroupEditor.allparams)
213
+        if (!allparams)
211214             return;
212215         
213216 //        objEditor.ctrlPanel.remove(liveCB);
....@@ -337,6 +340,11 @@
337340         return frame.action(event, obj);
338341     }
339342 
343
+    // Cannot work without static
344
+    static boolean allparams = true;
345
+
346
+    static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
347
+
340348     void SetupMenu()
341349     {
342350         frame.setMenuBar(menuBar = new MenuBar());
....@@ -383,6 +391,32 @@
383391         closeItem.addActionListener(this);
384392 
385393         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
+    
386420         toolbarPanel = new JPanel();
387421         toolbarPanel.setName("Toolbar");
388422         treePanel = new cGridBag();
....@@ -427,7 +461,14 @@
427461         mainPanel.setDividerSize(9);
428462         mainPanel.setDividerLocation(0.5); //1.0);
429463         mainPanel.setResizeWeight(0.5);
430
-
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
+    
431472         //ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
432473         //mainPanel.setLayout(new GridBagLayout());
433474         toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
....@@ -702,7 +743,9 @@
702743         
703744         void ToggleFullScreen()
704745         {
705
-                if (CameraPane.FULLSCREEN)
746
+                cameraView.ToggleFullScreen();
747
+                
748
+                if (!CameraPane.FULLSCREEN)
706749                 {
707750                     device.setFullScreenWindow(null);
708751                     //frame.setVisible(false);
....@@ -742,8 +785,6 @@
742785                     radio.layout.doClick();
743786                     //frame.setVisible(true);
744787                 }
745
-                
746
-                cameraView.ToggleFullScreen();
747788         }
748789 
749790     private JTextPane createTextPane()
....@@ -884,7 +925,12 @@
884925     JCheckBox speedupCB;
885926     JCheckBox rewindCB;
886927     JCheckBox flipVCB;
928
+    
929
+    cCheckBox toggleTextureCB;
930
+    cCheckBox toggleSwitchCB;
931
+        
887932     JComboBox texresMenu;
933
+    
888934     JButton resetButton;
889935     JButton stepButton;
890936     JButton stepAllButton;
....@@ -1076,7 +1122,7 @@
10761122         
10771123         oe.ctrlPanel.Return();
10781124         
1079
-        if (!GroupEditor.allparams)
1125
+        if (!allparams)
10801126             return;
10811127 
10821128             setupPanel = new cGridBag().setVertical(false);
....@@ -1089,7 +1135,7 @@
10891135         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
10901136                 hideCB.setToolTipText("Hide object");
10911137         markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1092
-        markCB.setToolTipText("Set the animation target transform");
1138
+        markCB.setToolTipText("As animation target transform");
10931139         
10941140             setupPanel2 = new cGridBag().setVertical(false);
10951141             
....@@ -1097,7 +1143,7 @@
10971143         rewindCB.setToolTipText("Rewind animation");
10981144         
10991145         randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1100
-        randomCB.setToolTipText("Randomly Rewind or Go back and forth");
1146
+        randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
11011147 
11021148         if (Globals.ADVANCED)
11031149         {
....@@ -1412,7 +1458,6 @@
14121458 
14131459         //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
14141460         //tmp.setName("Edit");
1415
-        objectPanel.add(toolboxPanel);
14161461         objectPanel.add(materialPanel);
14171462 //        JPanel north = new JPanel(new BorderLayout());
14181463 //        north.setName("Edit");
....@@ -1420,6 +1465,7 @@
14201465 //        objectPanel.add(north);
14211466         objectPanel.add(editPanel);
14221467         objectPanel.add(infoPanel);
1468
+        objectPanel.add(toolboxPanel);
14231469 
14241470         /*
14251471         aConstraints.gridx = 0;
....@@ -1428,7 +1474,7 @@
14281474         aConstraints.gridy += 1;
14291475         aConstraints.gridwidth = 1;
14301476         mainPanel.add(objectPanel, aConstraints);
1431
-         */
1477
+        */
14321478 
14331479         scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
14341480                 VERTICAL_SCROLLBAR_AS_NEEDED,
....@@ -1445,9 +1491,7 @@
14451491         JTabbedPane tabbedPane = new JTabbedPane();
14461492         tabbedPane.add(scrollpane);
14471493 
1448
-        tabbedPane.add(FSPane = new cFileSystemPane(this));
1449
-
1450
-        optionsPanel = new cGridBag().setVertical(true);
1494
+        optionsPanel = new cGridBag().setVertical(false);
14511495 
14521496         optionsPanel.setName("Options");
14531497         
....@@ -1455,6 +1499,8 @@
14551499         
14561500         tabbedPane.add(optionsPanel);
14571501         
1502
+        tabbedPane.add(FSPane = new cFileSystemPane(this));
1503
+
14581504         scenePanel.add(tabbedPane);
14591505 
14601506         /*
....@@ -1547,6 +1593,8 @@
15471593 //            aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
15481594 
15491595         frame.setSize(1280, 860);
1596
+        
1597
+        frame.validate();
15501598         frame.setVisible(true);
15511599 
15521600                     cameraView.requestFocusInWindow();
....@@ -2866,6 +2914,8 @@
28662914 
28672915     void SetMaterial(Object3D object)
28682916     {
2917
+        latestObject = object;
2918
+        
28692919         cMaterial mat = object.material;
28702920 
28712921         if (mat == null)
....@@ -2977,12 +3027,17 @@
29773027 //                }
29783028 
29793029         /**/
2980
-        if (deselect)
3030
+        if (deselect || child == null)
29813031         {
29823032             //group.deselectAll();
29833033             //freeze = true;
29843034             GetTree().clearSelection();
29853035             //freeze = false;
3036
+            
3037
+            if (child == null)
3038
+            {
3039
+                return;
3040
+            }
29863041         }
29873042 
29883043         //group.addSelectee(child);
....@@ -3051,7 +3106,7 @@
30513106             cameraView.ToggleDL();
30523107             cameraView.repaint();
30533108             return;
3054
-        } else if (event.getSource() == toggleTextureItem)
3109
+        } else if (event.getSource() == toggleTextureItem || event.getSource() == toggleTextureCB)
30553110         {
30563111             cameraView.ToggleTexture();
30573112             // june 2013           copy.HardTouch();
....@@ -3090,7 +3145,7 @@
30903145             frame.validate();
30913146 
30923147             return;
3093
-        } else if (event.getSource() == toggleSwitchItem)
3148
+        } else if (event.getSource() == toggleSwitchItem || event.getSource() == toggleSwitchCB)
30943149         {
30953150             cameraView.ToggleSwitch();
30963151             cameraView.repaint();
....@@ -3497,6 +3552,8 @@
34973552             tab.graphs[i] = null;
34983553         }
34993554 
3555
+        SetUndoStates();
3556
+        
35003557         // test save
35013558         if (false)
35023559         {
....@@ -3519,6 +3576,8 @@
35193576 
35203577     void CopyChanged(Object3D obj)
35213578     {
3579
+        SetUndoStates();
3580
+        
35223581         boolean temp = CameraPane.SWITCH;
35233582         CameraPane.SWITCH = false;
35243583         
....@@ -3556,6 +3615,17 @@
35563615         }
35573616         
35583617         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);
35593629     }
35603630     
35613631     public void Undo()
....@@ -4735,6 +4805,8 @@
47354805             String filename = browser.getFile();
47364806             if (filename != null && filename.length() > 0)
47374807             {
4808
+                if (!filename.endsWith(".gfd"))
4809
+                    filename += ".gfd";
47384810                 lastname = browser.getDirectory() + filename;
47394811                 save();
47404812             }
....@@ -4945,6 +5017,8 @@
49455017     cGridBag optionsPanel;
49465018     
49475019     JTabbedPane objectPanel;
5020
+    boolean materialFlushed;
5021
+    Object3D latestObject;
49485022     
49495023     cGridBag XYZPanel;
49505024