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);
....@@ -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,6 +391,32 @@
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();
....@@ -337,9 +431,12 @@
337431         editPanel.add(editCommandsPanel);
338432         editPanel.add(ctrlPanel);
339433                 
340
-        materialPanel = new cGridBag().setVertical(true);
434
+        toolboxPanel = new cGridBag().setVertical(false);
435
+        toolboxPanel.setName("Toolbox");
341436         
437
+        materialPanel = new cGridBag().setVertical(true);
342438         materialPanel.setName("Material");
439
+        
343440         /*JTextPane*/
344441         infoarea = createTextPane();
345442         doc = infoarea.getStyledDocument();
....@@ -364,7 +461,13 @@
364461         mainPanel.setDividerSize(9);
365462         mainPanel.setDividerLocation(0.5); //1.0);
366463         mainPanel.setResizeWeight(0.5);
367
-
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
+    
368471         //ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
369472         //mainPanel.setLayout(new GridBagLayout());
370473         toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
....@@ -612,6 +715,8 @@
612715         
613716         boolean maximized;
614717     
718
+        cButton fullscreenLayout;
719
+
615720         void Minimize()
616721         {
617722             frame.setState(Frame.ICONIFIED);
....@@ -637,7 +742,9 @@
637742         
638743         void ToggleFullScreen()
639744         {
640
-                if (CameraPane.FULLSCREEN)
745
+                cameraView.ToggleFullScreen();
746
+                
747
+                if (!CameraPane.FULLSCREEN)
641748                 {
642749                     device.setFullScreenWindow(null);
643750                     //frame.setVisible(false);
....@@ -673,12 +780,10 @@
673780 // X                   frame.getContentPane().add(/*"Center",*/bigThree);
674781                     framePanel.setDividerLocation(0);
675782 
676
-                    radio.layout = twoButton;
783
+                    radio.layout = fullscreenLayout;
677784                     radio.layout.doClick();
678785                     //frame.setVisible(true);
679786                 }
680
-                
681
-                cameraView.ToggleFullScreen();
682787         }
683788 
684789     private JTextPane createTextPane()
....@@ -819,7 +924,12 @@
819924     JCheckBox speedupCB;
820925     JCheckBox rewindCB;
821926     JCheckBox flipVCB;
927
+    
928
+    cCheckBox toggleTextureCB;
929
+    cCheckBox toggleSwitchCB;
930
+        
822931     JComboBox texresMenu;
932
+    
823933     JButton resetButton;
824934     JButton stepButton;
825935     JButton stepAllButton;
....@@ -1011,7 +1121,7 @@
10111121         
10121122         oe.ctrlPanel.Return();
10131123         
1014
-        if (!GroupEditor.allparams)
1124
+        if (!allparams)
10151125             return;
10161126 
10171127             setupPanel = new cGridBag().setVertical(false);
....@@ -1024,7 +1134,7 @@
10241134         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
10251135                 hideCB.setToolTipText("Hide object");
10261136         markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1027
-        markCB.setToolTipText("Set the animation target transform");
1137
+        markCB.setToolTipText("As animation target transform");
10281138         
10291139             setupPanel2 = new cGridBag().setVertical(false);
10301140             
....@@ -1032,7 +1142,7 @@
10321142         rewindCB.setToolTipText("Rewind animation");
10331143         
10341144         randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1035
-        randomCB.setToolTipText("Randomly Rewind or Go back and forth");
1145
+        randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
10361146 
10371147         if (Globals.ADVANCED)
10381148         {
....@@ -1354,6 +1464,7 @@
13541464 //        objectPanel.add(north);
13551465         objectPanel.add(editPanel);
13561466         objectPanel.add(infoPanel);
1467
+        objectPanel.add(toolboxPanel);
13571468 
13581469         /*
13591470         aConstraints.gridx = 0;
....@@ -1362,7 +1473,7 @@
13621473         aConstraints.gridy += 1;
13631474         aConstraints.gridwidth = 1;
13641475         mainPanel.add(objectPanel, aConstraints);
1365
-         */
1476
+        */
13661477 
13671478         scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
13681479                 VERTICAL_SCROLLBAR_AS_NEEDED,
....@@ -1379,9 +1490,7 @@
13791490         JTabbedPane tabbedPane = new JTabbedPane();
13801491         tabbedPane.add(scrollpane);
13811492 
1382
-        tabbedPane.add(FSPane = new cFileSystemPane(this));
1383
-
1384
-        optionsPanel = new cGridBag().setVertical(true);
1493
+        optionsPanel = new cGridBag().setVertical(false);
13851494 
13861495         optionsPanel.setName("Options");
13871496         
....@@ -1389,6 +1498,8 @@
13891498         
13901499         tabbedPane.add(optionsPanel);
13911500         
1501
+        tabbedPane.add(FSPane = new cFileSystemPane(this));
1502
+
13921503         scenePanel.add(tabbedPane);
13931504 
13941505         /*
....@@ -1481,6 +1592,8 @@
14811592 //            aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
14821593 
14831594         frame.setSize(1280, 860);
1595
+        
1596
+        frame.validate();
14841597         frame.setVisible(true);
14851598 
14861599                     cameraView.requestFocusInWindow();
....@@ -2800,6 +2913,8 @@
28002913 
28012914     void SetMaterial(Object3D object)
28022915     {
2916
+        latestObject = object;
2917
+        
28032918         cMaterial mat = object.material;
28042919 
28052920         if (mat == null)
....@@ -2911,12 +3026,17 @@
29113026 //                }
29123027 
29133028         /**/
2914
-        if (deselect)
3029
+        if (deselect || child == null)
29153030         {
29163031             //group.deselectAll();
29173032             //freeze = true;
29183033             GetTree().clearSelection();
29193034             //freeze = false;
3035
+            
3036
+            if (child == null)
3037
+            {
3038
+                return;
3039
+            }
29203040         }
29213041 
29223042         //group.addSelectee(child);
....@@ -2985,7 +3105,7 @@
29853105             cameraView.ToggleDL();
29863106             cameraView.repaint();
29873107             return;
2988
-        } else if (event.getSource() == toggleTextureItem)
3108
+        } else if (event.getSource() == toggleTextureItem || event.getSource() == toggleTextureCB)
29893109         {
29903110             cameraView.ToggleTexture();
29913111             // june 2013           copy.HardTouch();
....@@ -3024,7 +3144,7 @@
30243144             frame.validate();
30253145 
30263146             return;
3027
-        } else if (event.getSource() == toggleSwitchItem)
3147
+        } else if (event.getSource() == toggleSwitchItem || event.getSource() == toggleSwitchCB)
30283148         {
30293149             cameraView.ToggleSwitch();
30303150             cameraView.repaint();
....@@ -3408,6 +3528,8 @@
34083528     
34093529     public void Save()
34103530     {
3531
+        System.err.println("Save");
3532
+        
34113533         cRadio tab = GetCurrentTab();
34123534         
34133535         boolean temp = CameraPane.SWITCH;
....@@ -3429,6 +3551,8 @@
34293551             tab.graphs[i] = null;
34303552         }
34313553 
3554
+        SetUndoStates();
3555
+        
34323556         // test save
34333557         if (false)
34343558         {
....@@ -3451,6 +3575,8 @@
34513575 
34523576     void CopyChanged(Object3D obj)
34533577     {
3578
+        SetUndoStates();
3579
+        
34543580         boolean temp = CameraPane.SWITCH;
34553581         CameraPane.SWITCH = false;
34563582         
....@@ -3490,8 +3616,21 @@
34903616         refreshContents();
34913617     }
34923618     
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
+    
34933630     public void Undo()
34943631     {
3632
+        System.err.println("Undo");
3633
+        
34953634         cRadio tab = GetCurrentTab();
34963635         
34973636         if (tab.undoindex == 0)
....@@ -3675,7 +3814,7 @@
36753814         assert false;
36763815     }
36773816 
3678
-    void EditSelection()
3817
+    void EditSelection(boolean newWindow)
36793818     {
36803819     }
36813820 
....@@ -4170,7 +4309,8 @@
41704309 
41714310     void makeSomething(Object3D thing, boolean resetmodel) // deselect)
41724311     {
4173
-        Save();
4312
+        if (Globals.SAVEONMAKE) // && resetmodel)
4313
+            Save();
41744314         //Tween.set(thing, 0).target(1).start(tweenManager);
41754315         //Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
41764316 //            if (thing instanceof GenericJointDemo)
....@@ -4257,6 +4397,12 @@
42574397         {
42584398             ResetModel();
42594399             Select(thing.GetTreePath(), true, false); // unselect... false);
4400
+            
4401
+        if (thing.Size() == 0)
4402
+        {
4403
+            //EditSelection(false);
4404
+        }
4405
+        
42604406             refreshContents();
42614407         }
42624408 
....@@ -4479,6 +4625,7 @@
44794625         
44804626         if (readobj != null)
44814627         {
4628
+        if (Globals.SAVEONMAKE)
44824629             Save();
44834630             try
44844631             {
....@@ -4657,6 +4804,8 @@
46574804             String filename = browser.getFile();
46584805             if (filename != null && filename.length() > 0)
46594806             {
4807
+                if (!filename.endsWith(".gfd"))
4808
+                    filename += ".gfd";
46604809                 lastname = browser.getDirectory() + filename;
46614810                 save();
46624811             }
....@@ -4850,18 +4999,31 @@
48504999     CheckboxMenuItem togglePaintItem;
48515000     JSplitPane mainPanel;
48525001     JScrollPane scrollpane;
5002
+    
48535003     JPanel toolbarPanel;
5004
+    
48545005     cGridBag treePanel;
5006
+    
48555007     JPanel radioPanel;
48565008     ButtonGroup buttonGroup;
4857
-    cGridBag ctrlPanel;
5009
+    
5010
+    cGridBag toolboxPanel;
48585011     cGridBag materialPanel;
5012
+    cGridBag ctrlPanel;
5013
+    
48595014     JScrollPane infoPanel;
5015
+    
48605016     cGridBag optionsPanel;
5017
+    
48615018     JTabbedPane objectPanel;
5019
+    boolean materialFlushed;
5020
+    Object3D latestObject;
5021
+    
48625022     cGridBag XYZPanel;
5023
+    
48635024     JSplitPane gridPanel;
48645025     JSplitPane bigPanel;
5026
+    
48655027     cGridBag bigThree;
48665028     cGridBag scenePanel;
48675029     cGridBag centralPanel;
....@@ -4976,7 +5138,7 @@
49765138     cNumberSlider fogField;
49775139     JLabel opacityPowerLabel;
49785140     cNumberSlider opacityPowerField;
4979
-    JTree jTree;
5141
+    cTree jTree;
49805142     //ObjectUI parent;
49815143     
49825144     cNumberSlider normalpushField;