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.
....@@ -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,13 @@
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
+    
431471         //ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
432472         //mainPanel.setLayout(new GridBagLayout());
433473         toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
....@@ -702,7 +742,9 @@
702742         
703743         void ToggleFullScreen()
704744         {
705
-                if (CameraPane.FULLSCREEN)
745
+                cameraView.ToggleFullScreen();
746
+                
747
+                if (!CameraPane.FULLSCREEN)
706748                 {
707749                     device.setFullScreenWindow(null);
708750                     //frame.setVisible(false);
....@@ -742,8 +784,6 @@
742784                     radio.layout.doClick();
743785                     //frame.setVisible(true);
744786                 }
745
-                
746
-                cameraView.ToggleFullScreen();
747787         }
748788 
749789     private JTextPane createTextPane()
....@@ -884,7 +924,12 @@
884924     JCheckBox speedupCB;
885925     JCheckBox rewindCB;
886926     JCheckBox flipVCB;
927
+    
928
+    cCheckBox toggleTextureCB;
929
+    cCheckBox toggleSwitchCB;
930
+        
887931     JComboBox texresMenu;
932
+    
888933     JButton resetButton;
889934     JButton stepButton;
890935     JButton stepAllButton;
....@@ -1076,7 +1121,7 @@
10761121         
10771122         oe.ctrlPanel.Return();
10781123         
1079
-        if (!GroupEditor.allparams)
1124
+        if (!allparams)
10801125             return;
10811126 
10821127             setupPanel = new cGridBag().setVertical(false);
....@@ -1089,7 +1134,7 @@
10891134         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
10901135                 hideCB.setToolTipText("Hide object");
10911136         markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1092
-        markCB.setToolTipText("Set the animation target transform");
1137
+        markCB.setToolTipText("As animation target transform");
10931138         
10941139             setupPanel2 = new cGridBag().setVertical(false);
10951140             
....@@ -1097,7 +1142,7 @@
10971142         rewindCB.setToolTipText("Rewind animation");
10981143         
10991144         randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1100
-        randomCB.setToolTipText("Randomly Rewind or Go back and forth");
1145
+        randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
11011146 
11021147         if (Globals.ADVANCED)
11031148         {
....@@ -1412,7 +1457,6 @@
14121457 
14131458         //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
14141459         //tmp.setName("Edit");
1415
-        objectPanel.add(toolboxPanel);
14161460         objectPanel.add(materialPanel);
14171461 //        JPanel north = new JPanel(new BorderLayout());
14181462 //        north.setName("Edit");
....@@ -1420,6 +1464,7 @@
14201464 //        objectPanel.add(north);
14211465         objectPanel.add(editPanel);
14221466         objectPanel.add(infoPanel);
1467
+        objectPanel.add(toolboxPanel);
14231468 
14241469         /*
14251470         aConstraints.gridx = 0;
....@@ -1428,7 +1473,7 @@
14281473         aConstraints.gridy += 1;
14291474         aConstraints.gridwidth = 1;
14301475         mainPanel.add(objectPanel, aConstraints);
1431
-         */
1476
+        */
14321477 
14331478         scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
14341479                 VERTICAL_SCROLLBAR_AS_NEEDED,
....@@ -1445,9 +1490,7 @@
14451490         JTabbedPane tabbedPane = new JTabbedPane();
14461491         tabbedPane.add(scrollpane);
14471492 
1448
-        tabbedPane.add(FSPane = new cFileSystemPane(this));
1449
-
1450
-        optionsPanel = new cGridBag().setVertical(true);
1493
+        optionsPanel = new cGridBag().setVertical(false);
14511494 
14521495         optionsPanel.setName("Options");
14531496         
....@@ -1455,6 +1498,8 @@
14551498         
14561499         tabbedPane.add(optionsPanel);
14571500         
1501
+        tabbedPane.add(FSPane = new cFileSystemPane(this));
1502
+
14581503         scenePanel.add(tabbedPane);
14591504 
14601505         /*
....@@ -1547,6 +1592,8 @@
15471592 //            aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
15481593 
15491594         frame.setSize(1280, 860);
1595
+        
1596
+        frame.validate();
15501597         frame.setVisible(true);
15511598 
15521599                     cameraView.requestFocusInWindow();
....@@ -2866,6 +2913,8 @@
28662913 
28672914     void SetMaterial(Object3D object)
28682915     {
2916
+        latestObject = object;
2917
+        
28692918         cMaterial mat = object.material;
28702919 
28712920         if (mat == null)
....@@ -2977,12 +3026,17 @@
29773026 //                }
29783027 
29793028         /**/
2980
-        if (deselect)
3029
+        if (deselect || child == null)
29813030         {
29823031             //group.deselectAll();
29833032             //freeze = true;
29843033             GetTree().clearSelection();
29853034             //freeze = false;
3035
+            
3036
+            if (child == null)
3037
+            {
3038
+                return;
3039
+            }
29863040         }
29873041 
29883042         //group.addSelectee(child);
....@@ -3051,7 +3105,7 @@
30513105             cameraView.ToggleDL();
30523106             cameraView.repaint();
30533107             return;
3054
-        } else if (event.getSource() == toggleTextureItem)
3108
+        } else if (event.getSource() == toggleTextureItem || event.getSource() == toggleTextureCB)
30553109         {
30563110             cameraView.ToggleTexture();
30573111             // june 2013           copy.HardTouch();
....@@ -3090,7 +3144,7 @@
30903144             frame.validate();
30913145 
30923146             return;
3093
-        } else if (event.getSource() == toggleSwitchItem)
3147
+        } else if (event.getSource() == toggleSwitchItem || event.getSource() == toggleSwitchCB)
30943148         {
30953149             cameraView.ToggleSwitch();
30963150             cameraView.repaint();
....@@ -3497,6 +3551,8 @@
34973551             tab.graphs[i] = null;
34983552         }
34993553 
3554
+        SetUndoStates();
3555
+        
35003556         // test save
35013557         if (false)
35023558         {
....@@ -3519,6 +3575,8 @@
35193575 
35203576     void CopyChanged(Object3D obj)
35213577     {
3578
+        SetUndoStates();
3579
+        
35223580         boolean temp = CameraPane.SWITCH;
35233581         CameraPane.SWITCH = false;
35243582         
....@@ -3556,6 +3614,17 @@
35563614         }
35573615         
35583616         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);
35593628     }
35603629     
35613630     public void Undo()
....@@ -4735,6 +4804,8 @@
47354804             String filename = browser.getFile();
47364805             if (filename != null && filename.length() > 0)
47374806             {
4807
+                if (!filename.endsWith(".gfd"))
4808
+                    filename += ".gfd";
47384809                 lastname = browser.getDirectory() + filename;
47394810                 save();
47404811             }
....@@ -4945,6 +5016,8 @@
49455016     cGridBag optionsPanel;
49465017     
49475018     JTabbedPane objectPanel;
5019
+    boolean materialFlushed;
5020
+    Object3D latestObject;
49485021     
49495022     cGridBag XYZPanel;
49505023