blame | history | patch | commit | commitdiff
Normand Briere
2019-06-26 89b25e7cc97f6fe221dfd41c4d463500f8a31bc1 
 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.*;
....@@ -35,6 +36,67 @@
3536 
3637     GroupEditor callee;
3738     JFrame frame;
39
+    
40
+    static ObjEditor theFrame;
41
+    
42
+    cButton GetButton(String name, boolean border)
43
+    {
44
+        try
45
+        {
46
+            ImageIcon icon = GetIcon(name);
47
+            return new cButton(icon, border);
48
+        }
49
+        catch (Exception e)
50
+        {
51
+            return new cButton(name, border);
52
+        }
53
+    }
54
+
55
+    cToggleButton GetToggleButton(String name, boolean border)
56
+    {
57
+        try
58
+        {
59
+            ImageIcon icon = GetIcon(name);
60
+            return new cToggleButton(icon, border);
61
+        }
62
+        catch (Exception e)
63
+        {
64
+            return new cToggleButton(name, border);
65
+        }
66
+    }
67
+
68
+    cCheckBox GetCheckBox(String name, boolean border)
69
+    {
70
+        try
71
+        {
72
+            ImageIcon icon = GetIcon(name);
73
+            return new cCheckBox(icon, border);
74
+        }
75
+        catch (Exception e)
76
+        {
77
+            return new cCheckBox(name, border);
78
+        }
79
+    }
80
+
81
+    private ImageIcon GetIcon(String name) throws IOException
82
+    {
83
+        BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
84
+        
85
+        if (image.getWidth() != 24 && image.getHeight() != 24)
86
+        {
87
+            BufferedImage resized = new BufferedImage(24, 24, image.getType());
88
+            Graphics2D g = resized.createGraphics();
89
+            g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
90
+            //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
91
+            g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
92
+            g.dispose();
93
+            
94
+            image = resized;
95
+        }
96
+        
97
+        javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
98
+        return icon;
99
+    }
38100     
39101     // SCRIPT
40102     
....@@ -145,7 +207,7 @@
145207         
146208         objEditor.ctrlPanel.remove(namePanel);
147209         
148
-        if (!GroupEditor.allparams)
210
+        if (!allparams)
149211             return;
150212         
151213 //        objEditor.ctrlPanel.remove(liveCB);
....@@ -169,7 +231,7 @@
169231         
170232         objEditor.ctrlPanel.remove(setupPanel);
171233         objEditor.ctrlPanel.remove(setupPanel2);
172
-        objEditor.ctrlPanel.remove(commandsPanel);
234
+        objEditor.ctrlPanel.remove(objectCommandsPanel);
173235         objEditor.ctrlPanel.remove(pushPanel);
174236         //objEditor.ctrlPanel.remove(fillPanel);
175237         
....@@ -244,6 +306,7 @@
244306         //localCopy.parent = null;
245307 
246308         frame = new JFrame();
309
+                frame.setUndecorated(true);
247310         objEditor = this;
248311         this.callee = callee;
249312 
....@@ -273,6 +336,11 @@
273336     {
274337         return frame.action(event, obj);
275338     }
339
+
340
+    // Cannot work without static
341
+    static boolean allparams = true;
342
+
343
+    static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
276344 
277345     void SetupMenu()
278346     {
....@@ -320,14 +388,52 @@
320388         closeItem.addActionListener(this);
321389 
322390         objectPanel = new JTabbedPane();
391
+        
392
+        ChangeListener changeListener = new ChangeListener()
393
+        {
394
+            public void stateChanged(ChangeEvent changeEvent)
395
+            {
396
+//                if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
397
+//                {
398
+//                    if (latestObject != null)
399
+//                    {
400
+//                        refreshContents(true);
401
+//                        SetMaterial(latestObject);
402
+//                    }
403
+//                    
404
+//                    materialFlushed = true;
405
+//                }
406
+//                if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
407
+//                {
408
+//                    if (listUI.size() == 0)
409
+//                        EditSelection(false);
410
+//                }
411
+
412
+                refreshContents(false); // To refresh Info tab
413
+            }
414
+        };
415
+        objectPanel.addChangeListener(changeListener);
416
+    
323417         toolbarPanel = new JPanel();
324418         toolbarPanel.setName("Toolbar");
325419         treePanel = new cGridBag();
326420         treePanel.setName("Tree");
421
+        
422
+        editPanel = new cGridBag().setVertical(true);
423
+        editPanel.setName("Edit");
424
+        
327425         ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
328
-        ctrlPanel.setName("Edit");
426
+        
427
+        editCommandsPanel = new cGridBag();
428
+        editPanel.add(editCommandsPanel);
429
+        editPanel.add(ctrlPanel);
430
+                
431
+        toolboxPanel = new cGridBag().setVertical(false);
432
+        toolboxPanel.setName("Toolbox");
433
+        
329434         materialPanel = new cGridBag().setVertical(true);
330435         materialPanel.setName("Material");
436
+        
331437         /*JTextPane*/
332438         infoarea = createTextPane();
333439         doc = infoarea.getStyledDocument();
....@@ -583,20 +689,92 @@
583689         }
584690     }
585691 
692
+static GraphicsDevice device = GraphicsEnvironment
693
+        .getLocalGraphicsEnvironment().getScreenDevices()[0];
694
+
695
+    Rectangle keeprect;
696
+        cRadio radio;
697
+        
698
+cButton keepButton;
699
+	cButton twoButton; // Full 3D
700
+	cButton sixButton;
701
+	cButton threeButton;
702
+	cButton sevenButton;
703
+	cButton fourButton; // full panel
704
+	cButton oneButton; // full XYZ
705
+        //cButton currentLayout;
706
+        
707
+        boolean maximized;
708
+    
709
+        cButton fullscreenLayout;
710
+
711
+        void Minimize()
712
+        {
713
+            frame.setState(Frame.ICONIFIED);
714
+        }
715
+        
716
+        void Maximize()
717
+        {
718
+            if (maximized)
719
+            {
720
+                frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
721
+            }
722
+            else
723
+            {
724
+                keeprect = frame.getBounds();
725
+                Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
726
+                Dimension rect2 = frame.getToolkit().getScreenSize();
727
+                frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
728
+//                frame.setState(Frame.MAXIMIZED_BOTH);
729
+            }
730
+            
731
+            maximized ^= true;
732
+        }
733
+        
586734         void ToggleFullScreen()
587735         {
588
-                if (CameraPane.FULLSCREEN)
736
+                cameraView.ToggleFullScreen();
737
+                
738
+                if (!CameraPane.FULLSCREEN)
589739                 {
590
-                    frame.getContentPane().remove(/*"Center",*/bigThree);
591
-                    framePanel.add(bigThree);
592
-                    frame.getContentPane().add(/*"Center",*/framePanel);
740
+                    device.setFullScreenWindow(null);
741
+                    //frame.setVisible(false);
742
+//                frame.removeNotify();
743
+//                frame.setUndecorated(false);
744
+//                frame.addNotify();
745
+                //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
746
+                    
747
+// X                   frame.getContentPane().remove(/*"Center",*/bigThree);
748
+// X                   framePanel.add(bigThree);
749
+// X                   frame.getContentPane().add(/*"Center",*/framePanel);
750
+                    framePanel.setDividerLocation(1);
751
+                    
752
+                    //frame.setVisible(true);
753
+                    radio.layout = keepButton;
754
+                    //theFrame = null;
755
+                    keepButton = null;
756
+                    radio.layout.doClick();
757
+                    
593758                 } else
594759                 {
595
-                    frame.getContentPane().remove(/*"Center",*/framePanel);
596
-                    framePanel.remove(bigThree);
597
-                    frame.getContentPane().add(/*"Center",*/bigThree);
760
+                    keepButton = radio.layout;
761
+                    //keeprect = frame.getBounds();
762
+//                frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
763
+//                        frame.getToolkit().getScreenSize().height);
764
+                    //frame.setVisible(false);
765
+                    device.setFullScreenWindow(frame);
766
+//                frame.removeNotify();
767
+//                frame.setUndecorated(true);
768
+//                frame.addNotify();
769
+// X                   frame.getContentPane().remove(/*"Center",*/framePanel);
770
+// X                   framePanel.remove(bigThree);
771
+// X                   frame.getContentPane().add(/*"Center",*/bigThree);
772
+                    framePanel.setDividerLocation(0);
773
+
774
+                    radio.layout = fullscreenLayout;
775
+                    radio.layout.doClick();
776
+                    //frame.setVisible(true);
598777                 }
599
-                cameraView.ToggleFullScreen();
600778         }
601779 
602780     private JTextPane createTextPane()
....@@ -737,7 +915,12 @@
737915     JCheckBox speedupCB;
738916     JCheckBox rewindCB;
739917     JCheckBox flipVCB;
918
+    
919
+    cCheckBox toggleTextureCB;
920
+    cCheckBox toggleSwitchCB;
921
+        
740922     JComboBox texresMenu;
923
+    
741924     JButton resetButton;
742925     JButton stepButton;
743926     JButton stepAllButton;
....@@ -746,10 +929,13 @@
746929     JButton fasterButton;
747930     JButton remarkButton;
748931     
932
+    cGridBag editPanel;
933
+    cGridBag editCommandsPanel;
934
+    
749935     cGridBag namePanel;
750936     cGridBag setupPanel;
751937     cGridBag setupPanel2;
752
-    cGridBag commandsPanel;
938
+    cGridBag objectCommandsPanel;
753939     cGridBag pushPanel;
754940     cGridBag fillPanel;
755941 
....@@ -926,7 +1112,7 @@
9261112         
9271113         oe.ctrlPanel.Return();
9281114         
929
-        if (!GroupEditor.allparams)
1115
+        if (!allparams)
9301116             return;
9311117 
9321118             setupPanel = new cGridBag().setVertical(false);
....@@ -947,7 +1133,7 @@
9471133         rewindCB.setToolTipText("Rewind animation");
9481134         
9491135         randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
950
-        randomCB.setToolTipText("Rewind or Go back and forth randomly");
1136
+        randomCB.setToolTipText("Randomly Rewind or Go back and forth");
9511137 
9521138         if (Globals.ADVANCED)
9531139         {
....@@ -962,23 +1148,23 @@
9621148         oe.ctrlPanel.add(setupPanel2);
9631149         oe.ctrlPanel.Return();
9641150         
965
-            commandsPanel = new cGridBag().setVertical(false);
1151
+            objectCommandsPanel = new cGridBag().setVertical(false);
9661152         
967
-        resetButton = AddButton(commandsPanel, "Reset");
1153
+        resetButton = AddButton(objectCommandsPanel, "Reset");
9681154         resetButton.setToolTipText("Jump to frame zero");
969
-        stepButton = AddButton(commandsPanel, "Step");
1155
+        stepButton = AddButton(objectCommandsPanel, "Step");
9701156         stepButton.setToolTipText("Step one frame");
9711157 //            resetAllButton = AddButton(oe, "Reset All");
9721158 //            stepAllButton = AddButton(oe, "Step All");
9731159 //            Return();
974
-        slowerButton = AddButton(commandsPanel, "Slow");
1160
+        slowerButton = AddButton(objectCommandsPanel, "Slow");
9751161         slowerButton.setToolTipText("Decrease animation speed");
976
-        fasterButton = AddButton(commandsPanel, "Fast");
1162
+        fasterButton = AddButton(objectCommandsPanel, "Fast");
9771163         fasterButton.setToolTipText("Increase animation speed");
978
-        remarkButton = AddButton(commandsPanel, "Remark");
1164
+        remarkButton = AddButton(objectCommandsPanel, "Remark");
9791165         remarkButton.setToolTipText("Set the current transform as the target");
9801166 
981
-        oe.ctrlPanel.add(commandsPanel);
1167
+        oe.ctrlPanel.add(objectCommandsPanel);
9821168         oe.ctrlPanel.Return();
9831169 
9841170     pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
....@@ -1184,8 +1370,11 @@
11841370         //worldPanel.setName("World");
11851371 	centralPanel = new cGridBag();
11861372         centralPanel.preferredWidth = 20;
1187
-	timelinePanel = new JPanel(new BorderLayout());
1188
-        timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1373
+        
1374
+        if (Globals.ADVANCED)
1375
+        {
1376
+            timelinePanel = new JPanel(new BorderLayout());
1377
+            timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
11891378 
11901379         cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
11911380         cameraPanel.setContinuousLayout(true);
....@@ -1194,7 +1383,10 @@
11941383 //        cameraPanel.setDividerSize(9);
11951384         cameraPanel.setResizeWeight(1.0);
11961385         
1386
+        }
1387
+        
11971388         centralPanel.add(cameraView);
1389
+        centralPanel.setFocusable(true);
11981390         //frame.setJMenuBar(timelineMenubar);
11991391         //centralPanel.add(timelinePanel);
12001392         
....@@ -1261,8 +1453,9 @@
12611453 //        north.setName("Edit");
12621454 //        north.add(ctrlPanel, BorderLayout.NORTH);
12631455 //        objectPanel.add(north);
1264
-        objectPanel.add(ctrlPanel);
1456
+        objectPanel.add(editPanel);
12651457         objectPanel.add(infoPanel);
1458
+        objectPanel.add(toolboxPanel);
12661459 
12671460         /*
12681461         aConstraints.gridx = 0;
....@@ -1271,7 +1464,7 @@
12711464         aConstraints.gridy += 1;
12721465         aConstraints.gridwidth = 1;
12731466         mainPanel.add(objectPanel, aConstraints);
1274
-         */
1467
+        */
12751468 
12761469         scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
12771470                 VERTICAL_SCROLLBAR_AS_NEEDED,
....@@ -1288,9 +1481,7 @@
12881481         JTabbedPane tabbedPane = new JTabbedPane();
12891482         tabbedPane.add(scrollpane);
12901483 
1291
-        tabbedPane.add(FSPane = new cFileSystemPane(this));
1292
-
1293
-        optionsPanel = new cGridBag().setVertical(true);
1484
+        optionsPanel = new cGridBag().setVertical(false);
12941485 
12951486         optionsPanel.setName("Options");
12961487         
....@@ -1298,6 +1489,8 @@
12981489         
12991490         tabbedPane.add(optionsPanel);
13001491         
1492
+        tabbedPane.add(FSPane = new cFileSystemPane(this));
1493
+
13011494         scenePanel.add(tabbedPane);
13021495 
13031496         /*
....@@ -1390,8 +1583,12 @@
13901583 //            aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
13911584 
13921585         frame.setSize(1280, 860);
1586
+        
1587
+        frame.validate();
13931588         frame.setVisible(true);
13941589 
1590
+                    cameraView.requestFocusInWindow();
1591
+                    
13951592         gridPanel.setDividerLocation(1.0);
13961593 
13971594         frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
....@@ -2707,6 +2904,8 @@
27072904 
27082905     void SetMaterial(Object3D object)
27092906     {
2907
+        latestObject = object;
2908
+        
27102909         cMaterial mat = object.material;
27112910 
27122911         if (mat == null)
....@@ -2892,7 +3091,7 @@
28923091             cameraView.ToggleDL();
28933092             cameraView.repaint();
28943093             return;
2895
-        } else if (event.getSource() == toggleTextureItem)
3094
+        } else if (event.getSource() == toggleTextureItem || event.getSource() == toggleTextureCB)
28963095         {
28973096             cameraView.ToggleTexture();
28983097             // june 2013           copy.HardTouch();
....@@ -2931,7 +3130,7 @@
29313130             frame.validate();
29323131 
29333132             return;
2934
-        } else if (event.getSource() == toggleSwitchItem)
3133
+        } else if (event.getSource() == toggleSwitchItem || event.getSource() == toggleSwitchCB)
29353134         {
29363135             cameraView.ToggleSwitch();
29373136             cameraView.repaint();
....@@ -3315,6 +3514,8 @@
33153514     
33163515     public void Save()
33173516     {
3517
+        System.err.println("Save");
3518
+        
33183519         cRadio tab = GetCurrentTab();
33193520         
33203521         boolean temp = CameraPane.SWITCH;
....@@ -3336,6 +3537,8 @@
33363537             tab.graphs[i] = null;
33373538         }
33383539 
3540
+        SetUndoStates();
3541
+        
33393542         // test save
33403543         if (false)
33413544         {
....@@ -3358,6 +3561,8 @@
33583561 
33593562     void CopyChanged(Object3D obj)
33603563     {
3564
+        SetUndoStates();
3565
+        
33613566         boolean temp = CameraPane.SWITCH;
33623567         CameraPane.SWITCH = false;
33633568         
....@@ -3397,8 +3602,21 @@
33973602         refreshContents();
33983603     }
33993604     
3605
+    cButton undoButton;
3606
+    cButton redoButton;
3607
+        
3608
+    void SetUndoStates()
3609
+    {
3610
+        cRadio tab = GetCurrentTab();
3611
+        
3612
+        undoButton.setEnabled(tab.undoindex > 0);
3613
+        redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
3614
+    }
3615
+    
34003616     public void Undo()
34013617     {
3618
+        System.err.println("Undo");
3619
+        
34023620         cRadio tab = GetCurrentTab();
34033621         
34043622         if (tab.undoindex == 0)
....@@ -3582,7 +3800,7 @@
35823800         assert false;
35833801     }
35843802 
3585
-    void EditSelection()
3803
+    void EditSelection(boolean newWindow)
35863804     {
35873805     }
35883806 
....@@ -4077,7 +4295,8 @@
40774295 
40784296     void makeSomething(Object3D thing, boolean resetmodel) // deselect)
40794297     {
4080
-        Save();
4298
+        if (Globals.SAVEONMAKE) // && resetmodel)
4299
+            Save();
40814300         //Tween.set(thing, 0).target(1).start(tweenManager);
40824301         //Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
40834302 //            if (thing instanceof GenericJointDemo)
....@@ -4164,6 +4383,12 @@
41644383         {
41654384             ResetModel();
41664385             Select(thing.GetTreePath(), true, false); // unselect... false);
4386
+            
4387
+        if (thing.Size() == 0)
4388
+        {
4389
+            //EditSelection(false);
4390
+        }
4391
+        
41674392             refreshContents();
41684393         }
41694394 
....@@ -4386,6 +4611,7 @@
43864611         
43874612         if (readobj != null)
43884613         {
4614
+        if (Globals.SAVEONMAKE)
43894615             Save();
43904616             try
43914617             {
....@@ -4564,6 +4790,8 @@
45644790             String filename = browser.getFile();
45654791             if (filename != null && filename.length() > 0)
45664792             {
4793
+                if (!filename.endsWith(".gfd"))
4794
+                    filename += ".gfd";
45674795                 lastname = browser.getDirectory() + filename;
45684796                 save();
45694797             }
....@@ -4757,18 +4985,31 @@
47574985     CheckboxMenuItem togglePaintItem;
47584986     JSplitPane mainPanel;
47594987     JScrollPane scrollpane;
4988
+    
47604989     JPanel toolbarPanel;
4990
+    
47614991     cGridBag treePanel;
4992
+    
47624993     JPanel radioPanel;
47634994     ButtonGroup buttonGroup;
4764
-    cGridBag ctrlPanel;
4995
+    
4996
+    cGridBag toolboxPanel;
47654997     cGridBag materialPanel;
4998
+    cGridBag ctrlPanel;
4999
+    
47665000     JScrollPane infoPanel;
5001
+    
47675002     cGridBag optionsPanel;
5003
+    
47685004     JTabbedPane objectPanel;
5005
+    boolean materialFlushed;
5006
+    Object3D latestObject;
5007
+    
47695008     cGridBag XYZPanel;
5009
+    
47705010     JSplitPane gridPanel;
47715011     JSplitPane bigPanel;
5012
+    
47725013     cGridBag bigThree;
47735014     cGridBag scenePanel;
47745015     cGridBag centralPanel;
....@@ -4883,7 +5124,7 @@
48835124     cNumberSlider fogField;
48845125     JLabel opacityPowerLabel;
48855126     cNumberSlider opacityPowerField;
4886
-    JTree jTree;
5127
+    cTree jTree;
48875128     //ObjectUI parent;
48885129     
48895130     cNumberSlider normalpushField;