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 
....@@ -35,6 +39,67 @@
3539 
3640     GroupEditor callee;
3741     JFrame frame;
42
+    
43
+    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
+    }
38103     
39104     // SCRIPT
40105     
....@@ -145,7 +210,7 @@
145210         
146211         objEditor.ctrlPanel.remove(namePanel);
147212         
148
-        if (!GroupEditor.allparams)
213
+        if (!allparams)
149214             return;
150215         
151216 //        objEditor.ctrlPanel.remove(liveCB);
....@@ -169,7 +234,7 @@
169234         
170235         objEditor.ctrlPanel.remove(setupPanel);
171236         objEditor.ctrlPanel.remove(setupPanel2);
172
-        objEditor.ctrlPanel.remove(commandsPanel);
237
+        objEditor.ctrlPanel.remove(objectCommandsPanel);
173238         objEditor.ctrlPanel.remove(pushPanel);
174239         //objEditor.ctrlPanel.remove(fillPanel);
175240         
....@@ -244,6 +309,7 @@
244309         //localCopy.parent = null;
245310 
246311         frame = new JFrame();
312
+                frame.setUndecorated(true);
247313         objEditor = this;
248314         this.callee = callee;
249315 
....@@ -273,6 +339,11 @@
273339     {
274340         return frame.action(event, obj);
275341     }
342
+
343
+    // Cannot work without static
344
+    static boolean allparams = true;
345
+
346
+    static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
276347 
277348     void SetupMenu()
278349     {
....@@ -320,14 +391,52 @@
320391         closeItem.addActionListener(this);
321392 
322393         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
+    
323420         toolbarPanel = new JPanel();
324421         toolbarPanel.setName("Toolbar");
325422         treePanel = new cGridBag();
326423         treePanel.setName("Tree");
424
+        
425
+        editPanel = new cGridBag().setVertical(true);
426
+        editPanel.setName("Edit");
427
+        
327428         ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
328
-        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
+        
329437         materialPanel = new cGridBag().setVertical(true);
330438         materialPanel.setName("Material");
439
+        
331440         /*JTextPane*/
332441         infoarea = createTextPane();
333442         doc = infoarea.getStyledDocument();
....@@ -352,7 +461,13 @@
352461         mainPanel.setDividerSize(9);
353462         mainPanel.setDividerLocation(0.5); //1.0);
354463         mainPanel.setResizeWeight(0.5);
355
-
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
+    
356471         //ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
357472         //mainPanel.setLayout(new GridBagLayout());
358473         toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
....@@ -583,20 +698,92 @@
583698         }
584699     }
585700 
701
+static GraphicsDevice device = GraphicsEnvironment
702
+        .getLocalGraphicsEnvironment().getScreenDevices()[0];
703
+
704
+    Rectangle keeprect;
705
+        cRadio radio;
706
+        
707
+cButton keepButton;
708
+	cButton twoButton; // Full 3D
709
+	cButton sixButton;
710
+	cButton threeButton;
711
+	cButton sevenButton;
712
+	cButton fourButton; // full panel
713
+	cButton oneButton; // full XYZ
714
+        //cButton currentLayout;
715
+        
716
+        boolean maximized;
717
+    
718
+        cButton fullscreenLayout;
719
+
720
+        void Minimize()
721
+        {
722
+            frame.setState(Frame.ICONIFIED);
723
+        }
724
+        
725
+        void Maximize()
726
+        {
727
+            if (maximized)
728
+            {
729
+                frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
730
+            }
731
+            else
732
+            {
733
+                keeprect = frame.getBounds();
734
+                Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
735
+                Dimension rect2 = frame.getToolkit().getScreenSize();
736
+                frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
737
+//                frame.setState(Frame.MAXIMIZED_BOTH);
738
+            }
739
+            
740
+            maximized ^= true;
741
+        }
742
+        
586743         void ToggleFullScreen()
587744         {
588
-                if (CameraPane.FULLSCREEN)
745
+                cameraView.ToggleFullScreen();
746
+                
747
+                if (!CameraPane.FULLSCREEN)
589748                 {
590
-                    frame.getContentPane().remove(/*"Center",*/bigThree);
591
-                    framePanel.add(bigThree);
592
-                    frame.getContentPane().add(/*"Center",*/framePanel);
749
+                    device.setFullScreenWindow(null);
750
+                    //frame.setVisible(false);
751
+//                frame.removeNotify();
752
+//                frame.setUndecorated(false);
753
+//                frame.addNotify();
754
+                //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
755
+                    
756
+// X                   frame.getContentPane().remove(/*"Center",*/bigThree);
757
+// X                   framePanel.add(bigThree);
758
+// X                   frame.getContentPane().add(/*"Center",*/framePanel);
759
+                    framePanel.setDividerLocation(1);
760
+                    
761
+                    //frame.setVisible(true);
762
+                    radio.layout = keepButton;
763
+                    //theFrame = null;
764
+                    keepButton = null;
765
+                    radio.layout.doClick();
766
+                    
593767                 } else
594768                 {
595
-                    frame.getContentPane().remove(/*"Center",*/framePanel);
596
-                    framePanel.remove(bigThree);
597
-                    frame.getContentPane().add(/*"Center",*/bigThree);
769
+                    keepButton = radio.layout;
770
+                    //keeprect = frame.getBounds();
771
+//                frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
772
+//                        frame.getToolkit().getScreenSize().height);
773
+                    //frame.setVisible(false);
774
+                    device.setFullScreenWindow(frame);
775
+//                frame.removeNotify();
776
+//                frame.setUndecorated(true);
777
+//                frame.addNotify();
778
+// X                   frame.getContentPane().remove(/*"Center",*/framePanel);
779
+// X                   framePanel.remove(bigThree);
780
+// X                   frame.getContentPane().add(/*"Center",*/bigThree);
781
+                    framePanel.setDividerLocation(0);
782
+
783
+                    radio.layout = fullscreenLayout;
784
+                    radio.layout.doClick();
785
+                    //frame.setVisible(true);
598786                 }
599
-                cameraView.ToggleFullScreen();
600787         }
601788 
602789     private JTextPane createTextPane()
....@@ -737,7 +924,12 @@
737924     JCheckBox speedupCB;
738925     JCheckBox rewindCB;
739926     JCheckBox flipVCB;
927
+    
928
+    cCheckBox toggleTextureCB;
929
+    cCheckBox toggleSwitchCB;
930
+        
740931     JComboBox texresMenu;
932
+    
741933     JButton resetButton;
742934     JButton stepButton;
743935     JButton stepAllButton;
....@@ -746,10 +938,13 @@
746938     JButton fasterButton;
747939     JButton remarkButton;
748940     
941
+    cGridBag editPanel;
942
+    cGridBag editCommandsPanel;
943
+    
749944     cGridBag namePanel;
750945     cGridBag setupPanel;
751946     cGridBag setupPanel2;
752
-    cGridBag commandsPanel;
947
+    cGridBag objectCommandsPanel;
753948     cGridBag pushPanel;
754949     cGridBag fillPanel;
755950 
....@@ -926,7 +1121,7 @@
9261121         
9271122         oe.ctrlPanel.Return();
9281123         
929
-        if (!GroupEditor.allparams)
1124
+        if (!allparams)
9301125             return;
9311126 
9321127             setupPanel = new cGridBag().setVertical(false);
....@@ -939,7 +1134,7 @@
9391134         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
9401135                 hideCB.setToolTipText("Hide object");
9411136         markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
942
-        markCB.setToolTipText("Set the animation target transform");
1137
+        markCB.setToolTipText("As animation target transform");
9431138         
9441139             setupPanel2 = new cGridBag().setVertical(false);
9451140             
....@@ -947,7 +1142,7 @@
9471142         rewindCB.setToolTipText("Rewind animation");
9481143         
9491144         randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
950
-        randomCB.setToolTipText("Rewind or Go back and forth randomly");
1145
+        randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
9511146 
9521147         if (Globals.ADVANCED)
9531148         {
....@@ -962,23 +1157,23 @@
9621157         oe.ctrlPanel.add(setupPanel2);
9631158         oe.ctrlPanel.Return();
9641159         
965
-            commandsPanel = new cGridBag().setVertical(false);
1160
+            objectCommandsPanel = new cGridBag().setVertical(false);
9661161         
967
-        resetButton = AddButton(commandsPanel, "Reset");
1162
+        resetButton = AddButton(objectCommandsPanel, "Reset");
9681163         resetButton.setToolTipText("Jump to frame zero");
969
-        stepButton = AddButton(commandsPanel, "Step");
1164
+        stepButton = AddButton(objectCommandsPanel, "Step");
9701165         stepButton.setToolTipText("Step one frame");
9711166 //            resetAllButton = AddButton(oe, "Reset All");
9721167 //            stepAllButton = AddButton(oe, "Step All");
9731168 //            Return();
974
-        slowerButton = AddButton(commandsPanel, "Slow");
1169
+        slowerButton = AddButton(objectCommandsPanel, "Slow");
9751170         slowerButton.setToolTipText("Decrease animation speed");
976
-        fasterButton = AddButton(commandsPanel, "Fast");
1171
+        fasterButton = AddButton(objectCommandsPanel, "Fast");
9771172         fasterButton.setToolTipText("Increase animation speed");
978
-        remarkButton = AddButton(commandsPanel, "Remark");
1173
+        remarkButton = AddButton(objectCommandsPanel, "Remark");
9791174         remarkButton.setToolTipText("Set the current transform as the target");
9801175 
981
-        oe.ctrlPanel.add(commandsPanel);
1176
+        oe.ctrlPanel.add(objectCommandsPanel);
9821177         oe.ctrlPanel.Return();
9831178 
9841179     pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
....@@ -1184,8 +1379,11 @@
11841379         //worldPanel.setName("World");
11851380 	centralPanel = new cGridBag();
11861381         centralPanel.preferredWidth = 20;
1187
-	timelinePanel = new JPanel(new BorderLayout());
1188
-        timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1382
+        
1383
+        if (Globals.ADVANCED)
1384
+        {
1385
+            timelinePanel = new JPanel(new BorderLayout());
1386
+            timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
11891387 
11901388         cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
11911389         cameraPanel.setContinuousLayout(true);
....@@ -1194,7 +1392,10 @@
11941392 //        cameraPanel.setDividerSize(9);
11951393         cameraPanel.setResizeWeight(1.0);
11961394         
1395
+        }
1396
+        
11971397         centralPanel.add(cameraView);
1398
+        centralPanel.setFocusable(true);
11981399         //frame.setJMenuBar(timelineMenubar);
11991400         //centralPanel.add(timelinePanel);
12001401         
....@@ -1261,8 +1462,9 @@
12611462 //        north.setName("Edit");
12621463 //        north.add(ctrlPanel, BorderLayout.NORTH);
12631464 //        objectPanel.add(north);
1264
-        objectPanel.add(ctrlPanel);
1465
+        objectPanel.add(editPanel);
12651466         objectPanel.add(infoPanel);
1467
+        objectPanel.add(toolboxPanel);
12661468 
12671469         /*
12681470         aConstraints.gridx = 0;
....@@ -1271,7 +1473,7 @@
12711473         aConstraints.gridy += 1;
12721474         aConstraints.gridwidth = 1;
12731475         mainPanel.add(objectPanel, aConstraints);
1274
-         */
1476
+        */
12751477 
12761478         scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
12771479                 VERTICAL_SCROLLBAR_AS_NEEDED,
....@@ -1288,9 +1490,7 @@
12881490         JTabbedPane tabbedPane = new JTabbedPane();
12891491         tabbedPane.add(scrollpane);
12901492 
1291
-        tabbedPane.add(FSPane = new cFileSystemPane(this));
1292
-
1293
-        optionsPanel = new cGridBag().setVertical(true);
1493
+        optionsPanel = new cGridBag().setVertical(false);
12941494 
12951495         optionsPanel.setName("Options");
12961496         
....@@ -1298,6 +1498,8 @@
12981498         
12991499         tabbedPane.add(optionsPanel);
13001500         
1501
+        tabbedPane.add(FSPane = new cFileSystemPane(this));
1502
+
13011503         scenePanel.add(tabbedPane);
13021504 
13031505         /*
....@@ -1390,8 +1592,12 @@
13901592 //            aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
13911593 
13921594         frame.setSize(1280, 860);
1595
+        
1596
+        frame.validate();
13931597         frame.setVisible(true);
13941598 
1599
+                    cameraView.requestFocusInWindow();
1600
+                    
13951601         gridPanel.setDividerLocation(1.0);
13961602 
13971603         frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
....@@ -2707,6 +2913,8 @@
27072913 
27082914     void SetMaterial(Object3D object)
27092915     {
2916
+        latestObject = object;
2917
+        
27102918         cMaterial mat = object.material;
27112919 
27122920         if (mat == null)
....@@ -2818,12 +3026,17 @@
28183026 //                }
28193027 
28203028         /**/
2821
-        if (deselect)
3029
+        if (deselect || child == null)
28223030         {
28233031             //group.deselectAll();
28243032             //freeze = true;
28253033             GetTree().clearSelection();
28263034             //freeze = false;
3035
+            
3036
+            if (child == null)
3037
+            {
3038
+                return;
3039
+            }
28273040         }
28283041 
28293042         //group.addSelectee(child);
....@@ -2892,7 +3105,7 @@
28923105             cameraView.ToggleDL();
28933106             cameraView.repaint();
28943107             return;
2895
-        } else if (event.getSource() == toggleTextureItem)
3108
+        } else if (event.getSource() == toggleTextureItem || event.getSource() == toggleTextureCB)
28963109         {
28973110             cameraView.ToggleTexture();
28983111             // june 2013           copy.HardTouch();
....@@ -2931,7 +3144,7 @@
29313144             frame.validate();
29323145 
29333146             return;
2934
-        } else if (event.getSource() == toggleSwitchItem)
3147
+        } else if (event.getSource() == toggleSwitchItem || event.getSource() == toggleSwitchCB)
29353148         {
29363149             cameraView.ToggleSwitch();
29373150             cameraView.repaint();
....@@ -3315,6 +3528,8 @@
33153528     
33163529     public void Save()
33173530     {
3531
+        System.err.println("Save");
3532
+        
33183533         cRadio tab = GetCurrentTab();
33193534         
33203535         boolean temp = CameraPane.SWITCH;
....@@ -3336,6 +3551,8 @@
33363551             tab.graphs[i] = null;
33373552         }
33383553 
3554
+        SetUndoStates();
3555
+        
33393556         // test save
33403557         if (false)
33413558         {
....@@ -3358,6 +3575,8 @@
33583575 
33593576     void CopyChanged(Object3D obj)
33603577     {
3578
+        SetUndoStates();
3579
+        
33613580         boolean temp = CameraPane.SWITCH;
33623581         CameraPane.SWITCH = false;
33633582         
....@@ -3397,8 +3616,21 @@
33973616         refreshContents();
33983617     }
33993618     
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
+    
34003630     public void Undo()
34013631     {
3632
+        System.err.println("Undo");
3633
+        
34023634         cRadio tab = GetCurrentTab();
34033635         
34043636         if (tab.undoindex == 0)
....@@ -3582,7 +3814,7 @@
35823814         assert false;
35833815     }
35843816 
3585
-    void EditSelection()
3817
+    void EditSelection(boolean newWindow)
35863818     {
35873819     }
35883820 
....@@ -4077,7 +4309,8 @@
40774309 
40784310     void makeSomething(Object3D thing, boolean resetmodel) // deselect)
40794311     {
4080
-        Save();
4312
+        if (Globals.SAVEONMAKE) // && resetmodel)
4313
+            Save();
40814314         //Tween.set(thing, 0).target(1).start(tweenManager);
40824315         //Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
40834316 //            if (thing instanceof GenericJointDemo)
....@@ -4164,6 +4397,12 @@
41644397         {
41654398             ResetModel();
41664399             Select(thing.GetTreePath(), true, false); // unselect... false);
4400
+            
4401
+        if (thing.Size() == 0)
4402
+        {
4403
+            //EditSelection(false);
4404
+        }
4405
+        
41674406             refreshContents();
41684407         }
41694408 
....@@ -4386,6 +4625,7 @@
43864625         
43874626         if (readobj != null)
43884627         {
4628
+        if (Globals.SAVEONMAKE)
43894629             Save();
43904630             try
43914631             {
....@@ -4564,6 +4804,8 @@
45644804             String filename = browser.getFile();
45654805             if (filename != null && filename.length() > 0)
45664806             {
4807
+                if (!filename.endsWith(".gfd"))
4808
+                    filename += ".gfd";
45674809                 lastname = browser.getDirectory() + filename;
45684810                 save();
45694811             }
....@@ -4757,18 +4999,31 @@
47574999     CheckboxMenuItem togglePaintItem;
47585000     JSplitPane mainPanel;
47595001     JScrollPane scrollpane;
5002
+    
47605003     JPanel toolbarPanel;
5004
+    
47615005     cGridBag treePanel;
5006
+    
47625007     JPanel radioPanel;
47635008     ButtonGroup buttonGroup;
4764
-    cGridBag ctrlPanel;
5009
+    
5010
+    cGridBag toolboxPanel;
47655011     cGridBag materialPanel;
5012
+    cGridBag ctrlPanel;
5013
+    
47665014     JScrollPane infoPanel;
5015
+    
47675016     cGridBag optionsPanel;
5017
+    
47685018     JTabbedPane objectPanel;
5019
+    boolean materialFlushed;
5020
+    Object3D latestObject;
5021
+    
47695022     cGridBag XYZPanel;
5023
+    
47705024     JSplitPane gridPanel;
47715025     JSplitPane bigPanel;
5026
+    
47725027     cGridBag bigThree;
47735028     cGridBag scenePanel;
47745029     cGridBag centralPanel;
....@@ -4883,7 +5138,7 @@
48835138     cNumberSlider fogField;
48845139     JLabel opacityPowerLabel;
48855140     cNumberSlider opacityPowerField;
4886
-    JTree jTree;
5141
+    cTree jTree;
48875142     //ObjectUI parent;
48885143     
48895144     cNumberSlider normalpushField;