blame | history | patch | commit | commitdiff
Normand Briere
2019-06-27 f78dd18c66d607b693c0bf5937fc59181bf5a26b 
 ObjEditor.java
....@@ -4,6 +4,7 @@
44 
55 import java.awt.*;
66 import java.awt.event.*;
7
+import java.awt.image.BufferedImage;
78 import javax.swing.*;
89 import javax.swing.event.*;
910 import javax.swing.text.*;
....@@ -13,6 +14,9 @@
1314 import javax.swing.plaf.metal.MetalLookAndFeel;
1415 //import javax.swing.plaf.ColorUIResource;
1516 //import javax.swing.plaf.metal.DefaultMetalTheme;
17
+
18
+import javax.swing.plaf.basic.BasicSplitPaneDivider;
19
+import javax.swing.plaf.basic.BasicSplitPaneUI;
1620 
1721 //import javax.media.opengl.GLCanvas;
1822 
....@@ -37,6 +41,65 @@
3741     JFrame frame;
3842     
3943     static ObjEditor theFrame;
44
+    
45
+    cButton GetButton(String name, boolean border)
46
+    {
47
+        try
48
+        {
49
+            ImageIcon icon = GetIcon(name);
50
+            return new cButton(icon, border);
51
+        }
52
+        catch (Exception e)
53
+        {
54
+            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);
68
+        }
69
+    }
70
+
71
+    cCheckBox GetCheckBox(String name, boolean border)
72
+    {
73
+        try
74
+        {
75
+            ImageIcon icon = GetIcon(name);
76
+            return new cCheckBox(icon, border);
77
+        }
78
+        catch (Exception e)
79
+        {
80
+            return new cCheckBox(name, border);
81
+        }
82
+    }
83
+
84
+    private ImageIcon GetIcon(String name) throws IOException
85
+    {
86
+        BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
87
+        
88
+        if (image.getWidth() != 24 && image.getHeight() != 24)
89
+        {
90
+            BufferedImage resized = new BufferedImage(24, 24, image.getType());
91
+            Graphics2D g = resized.createGraphics();
92
+            g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
93
+            //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
94
+            g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
95
+            g.dispose();
96
+            
97
+            image = resized;
98
+        }
99
+        
100
+        javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
101
+        return icon;
102
+    }
40103     
41104     // SCRIPT
42105     
....@@ -147,7 +210,7 @@
147210         
148211         objEditor.ctrlPanel.remove(namePanel);
149212         
150
-        if (!GroupEditor.allparams)
213
+        if (!allparams)
151214             return;
152215         
153216 //        objEditor.ctrlPanel.remove(liveCB);
....@@ -171,7 +234,7 @@
171234         
172235         objEditor.ctrlPanel.remove(setupPanel);
173236         objEditor.ctrlPanel.remove(setupPanel2);
174
-        objEditor.ctrlPanel.remove(commandsPanel);
237
+        objEditor.ctrlPanel.remove(objectCommandsPanel);
175238         objEditor.ctrlPanel.remove(pushPanel);
176239         //objEditor.ctrlPanel.remove(fillPanel);
177240         
....@@ -277,6 +340,11 @@
277340         return frame.action(event, obj);
278341     }
279342 
343
+    // Cannot work without static
344
+    static boolean allparams = true;
345
+
346
+    static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
347
+
280348     void SetupMenu()
281349     {
282350         frame.setMenuBar(menuBar = new MenuBar());
....@@ -323,14 +391,52 @@
323391         closeItem.addActionListener(this);
324392 
325393         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
+    
326420         toolbarPanel = new JPanel();
327421         toolbarPanel.setName("Toolbar");
328422         treePanel = new cGridBag();
329423         treePanel.setName("Tree");
424
+        
425
+        editPanel = new cGridBag().setVertical(true);
426
+        editPanel.setName("Edit");
427
+        
330428         ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
331
-        ctrlPanel.setName("Edit");
429
+        
430
+        editCommandsPanel = new cGridBag();
431
+        editPanel.add(editCommandsPanel);
432
+        editPanel.add(ctrlPanel);
433
+                
434
+        toolboxPanel = new cGridBag().setVertical(false);
435
+        toolboxPanel.setName("Toolbox");
436
+        
332437         materialPanel = new cGridBag().setVertical(true);
333438         materialPanel.setName("Material");
439
+        
334440         /*JTextPane*/
335441         infoarea = createTextPane();
336442         doc = infoarea.getStyledDocument();
....@@ -355,7 +461,13 @@
355461         mainPanel.setDividerSize(9);
356462         mainPanel.setDividerLocation(0.5); //1.0);
357463         mainPanel.setResizeWeight(0.5);
358
-
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
+    
359471         //ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
360472         //mainPanel.setLayout(new GridBagLayout());
361473         toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
....@@ -603,6 +715,8 @@
603715         
604716         boolean maximized;
605717     
718
+        cButton fullscreenLayout;
719
+
606720         void Minimize()
607721         {
608722             frame.setState(Frame.ICONIFIED);
....@@ -628,7 +742,9 @@
628742         
629743         void ToggleFullScreen()
630744         {
631
-                if (CameraPane.FULLSCREEN)
745
+                cameraView.ToggleFullScreen();
746
+                
747
+                if (!CameraPane.FULLSCREEN)
632748                 {
633749                     device.setFullScreenWindow(null);
634750                     //frame.setVisible(false);
....@@ -664,12 +780,10 @@
664780 // X                   frame.getContentPane().add(/*"Center",*/bigThree);
665781                     framePanel.setDividerLocation(0);
666782 
667
-                    radio.layout = twoButton;
783
+                    radio.layout = fullscreenLayout;
668784                     radio.layout.doClick();
669785                     //frame.setVisible(true);
670786                 }
671
-                
672
-                cameraView.ToggleFullScreen();
673787         }
674788 
675789     private JTextPane createTextPane()
....@@ -810,7 +924,12 @@
810924     JCheckBox speedupCB;
811925     JCheckBox rewindCB;
812926     JCheckBox flipVCB;
927
+    
928
+    cCheckBox toggleTextureCB;
929
+    cCheckBox toggleSwitchCB;
930
+        
813931     JComboBox texresMenu;
932
+    
814933     JButton resetButton;
815934     JButton stepButton;
816935     JButton stepAllButton;
....@@ -819,10 +938,13 @@
819938     JButton fasterButton;
820939     JButton remarkButton;
821940     
941
+    cGridBag editPanel;
942
+    cGridBag editCommandsPanel;
943
+    
822944     cGridBag namePanel;
823945     cGridBag setupPanel;
824946     cGridBag setupPanel2;
825
-    cGridBag commandsPanel;
947
+    cGridBag objectCommandsPanel;
826948     cGridBag pushPanel;
827949     cGridBag fillPanel;
828950 
....@@ -999,7 +1121,7 @@
9991121         
10001122         oe.ctrlPanel.Return();
10011123         
1002
-        if (!GroupEditor.allparams)
1124
+        if (!allparams)
10031125             return;
10041126 
10051127             setupPanel = new cGridBag().setVertical(false);
....@@ -1012,7 +1134,7 @@
10121134         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
10131135                 hideCB.setToolTipText("Hide object");
10141136         markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1015
-        markCB.setToolTipText("Set the animation target transform");
1137
+        markCB.setToolTipText("As animation target transform");
10161138         
10171139             setupPanel2 = new cGridBag().setVertical(false);
10181140             
....@@ -1020,7 +1142,7 @@
10201142         rewindCB.setToolTipText("Rewind animation");
10211143         
10221144         randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1023
-        randomCB.setToolTipText("Randomly Rewind or Go back and forth");
1145
+        randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
10241146 
10251147         if (Globals.ADVANCED)
10261148         {
....@@ -1035,23 +1157,23 @@
10351157         oe.ctrlPanel.add(setupPanel2);
10361158         oe.ctrlPanel.Return();
10371159         
1038
-            commandsPanel = new cGridBag().setVertical(false);
1160
+            objectCommandsPanel = new cGridBag().setVertical(false);
10391161         
1040
-        resetButton = AddButton(commandsPanel, "Reset");
1162
+        resetButton = AddButton(objectCommandsPanel, "Reset");
10411163         resetButton.setToolTipText("Jump to frame zero");
1042
-        stepButton = AddButton(commandsPanel, "Step");
1164
+        stepButton = AddButton(objectCommandsPanel, "Step");
10431165         stepButton.setToolTipText("Step one frame");
10441166 //            resetAllButton = AddButton(oe, "Reset All");
10451167 //            stepAllButton = AddButton(oe, "Step All");
10461168 //            Return();
1047
-        slowerButton = AddButton(commandsPanel, "Slow");
1169
+        slowerButton = AddButton(objectCommandsPanel, "Slow");
10481170         slowerButton.setToolTipText("Decrease animation speed");
1049
-        fasterButton = AddButton(commandsPanel, "Fast");
1171
+        fasterButton = AddButton(objectCommandsPanel, "Fast");
10501172         fasterButton.setToolTipText("Increase animation speed");
1051
-        remarkButton = AddButton(commandsPanel, "Remark");
1173
+        remarkButton = AddButton(objectCommandsPanel, "Remark");
10521174         remarkButton.setToolTipText("Set the current transform as the target");
10531175 
1054
-        oe.ctrlPanel.add(commandsPanel);
1176
+        oe.ctrlPanel.add(objectCommandsPanel);
10551177         oe.ctrlPanel.Return();
10561178 
10571179     pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
....@@ -1340,8 +1462,9 @@
13401462 //        north.setName("Edit");
13411463 //        north.add(ctrlPanel, BorderLayout.NORTH);
13421464 //        objectPanel.add(north);
1343
-        objectPanel.add(ctrlPanel);
1465
+        objectPanel.add(editPanel);
13441466         objectPanel.add(infoPanel);
1467
+        objectPanel.add(toolboxPanel);
13451468 
13461469         /*
13471470         aConstraints.gridx = 0;
....@@ -1350,7 +1473,7 @@
13501473         aConstraints.gridy += 1;
13511474         aConstraints.gridwidth = 1;
13521475         mainPanel.add(objectPanel, aConstraints);
1353
-         */
1476
+        */
13541477 
13551478         scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
13561479                 VERTICAL_SCROLLBAR_AS_NEEDED,
....@@ -1367,9 +1490,7 @@
13671490         JTabbedPane tabbedPane = new JTabbedPane();
13681491         tabbedPane.add(scrollpane);
13691492 
1370
-        tabbedPane.add(FSPane = new cFileSystemPane(this));
1371
-
1372
-        optionsPanel = new cGridBag().setVertical(true);
1493
+        optionsPanel = new cGridBag().setVertical(false);
13731494 
13741495         optionsPanel.setName("Options");
13751496         
....@@ -1377,6 +1498,8 @@
13771498         
13781499         tabbedPane.add(optionsPanel);
13791500         
1501
+        tabbedPane.add(FSPane = new cFileSystemPane(this));
1502
+
13801503         scenePanel.add(tabbedPane);
13811504 
13821505         /*
....@@ -1469,6 +1592,8 @@
14691592 //            aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
14701593 
14711594         frame.setSize(1280, 860);
1595
+        
1596
+        frame.validate();
14721597         frame.setVisible(true);
14731598 
14741599                     cameraView.requestFocusInWindow();
....@@ -2788,6 +2913,8 @@
27882913 
27892914     void SetMaterial(Object3D object)
27902915     {
2916
+        latestObject = object;
2917
+        
27912918         cMaterial mat = object.material;
27922919 
27932920         if (mat == null)
....@@ -2899,12 +3026,17 @@
28993026 //                }
29003027 
29013028         /**/
2902
-        if (deselect)
3029
+        if (deselect || child == null)
29033030         {
29043031             //group.deselectAll();
29053032             //freeze = true;
29063033             GetTree().clearSelection();
29073034             //freeze = false;
3035
+            
3036
+            if (child == null)
3037
+            {
3038
+                return;
3039
+            }
29083040         }
29093041 
29103042         //group.addSelectee(child);
....@@ -2973,7 +3105,7 @@
29733105             cameraView.ToggleDL();
29743106             cameraView.repaint();
29753107             return;
2976
-        } else if (event.getSource() == toggleTextureItem)
3108
+        } else if (event.getSource() == toggleTextureItem || event.getSource() == toggleTextureCB)
29773109         {
29783110             cameraView.ToggleTexture();
29793111             // june 2013           copy.HardTouch();
....@@ -3012,7 +3144,7 @@
30123144             frame.validate();
30133145 
30143146             return;
3015
-        } else if (event.getSource() == toggleSwitchItem)
3147
+        } else if (event.getSource() == toggleSwitchItem || event.getSource() == toggleSwitchCB)
30163148         {
30173149             cameraView.ToggleSwitch();
30183150             cameraView.repaint();
....@@ -3396,6 +3528,8 @@
33963528     
33973529     public void Save()
33983530     {
3531
+        System.err.println("Save");
3532
+        
33993533         cRadio tab = GetCurrentTab();
34003534         
34013535         boolean temp = CameraPane.SWITCH;
....@@ -3417,6 +3551,8 @@
34173551             tab.graphs[i] = null;
34183552         }
34193553 
3554
+        SetUndoStates();
3555
+        
34203556         // test save
34213557         if (false)
34223558         {
....@@ -3439,6 +3575,8 @@
34393575 
34403576     void CopyChanged(Object3D obj)
34413577     {
3578
+        SetUndoStates();
3579
+        
34423580         boolean temp = CameraPane.SWITCH;
34433581         CameraPane.SWITCH = false;
34443582         
....@@ -3478,8 +3616,21 @@
34783616         refreshContents();
34793617     }
34803618     
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);
3628
+    }
3629
+    
34813630     public void Undo()
34823631     {
3632
+        System.err.println("Undo");
3633
+        
34833634         cRadio tab = GetCurrentTab();
34843635         
34853636         if (tab.undoindex == 0)
....@@ -3663,7 +3814,7 @@
36633814         assert false;
36643815     }
36653816 
3666
-    void EditSelection()
3817
+    void EditSelection(boolean newWindow)
36673818     {
36683819     }
36693820 
....@@ -4158,7 +4309,8 @@
41584309 
41594310     void makeSomething(Object3D thing, boolean resetmodel) // deselect)
41604311     {
4161
-        Save();
4312
+        if (Globals.SAVEONMAKE) // && resetmodel)
4313
+            Save();
41624314         //Tween.set(thing, 0).target(1).start(tweenManager);
41634315         //Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
41644316 //            if (thing instanceof GenericJointDemo)
....@@ -4245,6 +4397,12 @@
42454397         {
42464398             ResetModel();
42474399             Select(thing.GetTreePath(), true, false); // unselect... false);
4400
+            
4401
+        if (thing.Size() == 0)
4402
+        {
4403
+            //EditSelection(false);
4404
+        }
4405
+        
42484406             refreshContents();
42494407         }
42504408 
....@@ -4467,6 +4625,7 @@
44674625         
44684626         if (readobj != null)
44694627         {
4628
+        if (Globals.SAVEONMAKE)
44704629             Save();
44714630             try
44724631             {
....@@ -4645,6 +4804,8 @@
46454804             String filename = browser.getFile();
46464805             if (filename != null && filename.length() > 0)
46474806             {
4807
+                if (!filename.endsWith(".gfd"))
4808
+                    filename += ".gfd";
46484809                 lastname = browser.getDirectory() + filename;
46494810                 save();
46504811             }
....@@ -4838,18 +4999,31 @@
48384999     CheckboxMenuItem togglePaintItem;
48395000     JSplitPane mainPanel;
48405001     JScrollPane scrollpane;
5002
+    
48415003     JPanel toolbarPanel;
5004
+    
48425005     cGridBag treePanel;
5006
+    
48435007     JPanel radioPanel;
48445008     ButtonGroup buttonGroup;
4845
-    cGridBag ctrlPanel;
5009
+    
5010
+    cGridBag toolboxPanel;
48465011     cGridBag materialPanel;
5012
+    cGridBag ctrlPanel;
5013
+    
48475014     JScrollPane infoPanel;
5015
+    
48485016     cGridBag optionsPanel;
5017
+    
48495018     JTabbedPane objectPanel;
5019
+    boolean materialFlushed;
5020
+    Object3D latestObject;
5021
+    
48505022     cGridBag XYZPanel;
5023
+    
48515024     JSplitPane gridPanel;
48525025     JSplitPane bigPanel;
5026
+    
48535027     cGridBag bigThree;
48545028     cGridBag scenePanel;
48555029     cGridBag centralPanel;
....@@ -4964,7 +5138,7 @@
49645138     cNumberSlider fogField;
49655139     JLabel opacityPowerLabel;
49665140     cNumberSlider opacityPowerField;
4967
-    JTree jTree;
5141
+    cTree jTree;
49685142     //ObjectUI parent;
49695143     
49705144     cNumberSlider normalpushField;