More tools.

Normand Briere

2019-06-25 d2f456cf5280f59425084532bd2397ec625f7577

 ObjEditor.java
..
..
@@ -4,6 +4,7 @@
4
4
 
5
5
 import java.awt.*;
6
6
 import java.awt.event.*;
7
+import java.awt.image.BufferedImage;
7
8
 import javax.swing.*;
8
9
 import javax.swing.event.*;
9
10
 import javax.swing.text.*;
..
..
@@ -35,6 +36,67 @@
35
36
 
36
37
     GroupEditor callee;
37
38
     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
+    }
38
100
     
39
101
     // SCRIPT
40
102
     
..
..
@@ -169,7 +231,7 @@
169
231
         
170
232
         objEditor.ctrlPanel.remove(setupPanel);
171
233
         objEditor.ctrlPanel.remove(setupPanel2);
172
-        objEditor.ctrlPanel.remove(commandsPanel);
234
+        objEditor.ctrlPanel.remove(objectCommandsPanel);
173
235
         objEditor.ctrlPanel.remove(pushPanel);
174
236
         //objEditor.ctrlPanel.remove(fillPanel);
175
237
         
..
..
@@ -244,6 +306,7 @@
244
306
         //localCopy.parent = null;
245
307
 
246
308
         frame = new JFrame();
309
+                frame.setUndecorated(true);
247
310
         objEditor = this;
248
311
         this.callee = callee;
249
312
 
..
..
@@ -320,14 +383,47 @@
320
383
         closeItem.addActionListener(this);
321
384
 
322
385
         objectPanel = new JTabbedPane();
386
+        
387
+        ChangeListener changeListener = new ChangeListener()
388
+        {
389
+            public void stateChanged(ChangeEvent changeEvent)
390
+            {
391
+//                if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
392
+//                {
393
+//                    if (latestObject != null)
394
+//                    {
395
+//                        refreshContents(true);
396
+//                        SetMaterial(latestObject);
397
+//                    }
398
+//                    
399
+//                    materialFlushed = true;
400
+//                }
401
+
402
+                refreshContents(false); // To refresh Info tab
403
+            }
404
+        };
405
+        objectPanel.addChangeListener(changeListener);
406
+    
323
407
         toolbarPanel = new JPanel();
324
408
         toolbarPanel.setName("Toolbar");
325
409
         treePanel = new cGridBag();
326
410
         treePanel.setName("Tree");
411
+        
412
+        editPanel = new cGridBag().setVertical(true);
413
+        editPanel.setName("Edit");
414
+        
327
415
         ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
328
-        ctrlPanel.setName("Edit");
416
+        
417
+        editCommandsPanel = new cGridBag();
418
+        editPanel.add(editCommandsPanel);
419
+        editPanel.add(ctrlPanel);
420
+                
421
+        toolboxPanel = new cGridBag().setVertical(false);
422
+        toolboxPanel.setName("Toolbox");
423
+        
329
424
         materialPanel = new cGridBag().setVertical(true);
330
425
         materialPanel.setName("Material");
426
+        
331
427
         /*JTextPane*/
332
428
         infoarea = createTextPane();
333
429
         doc = infoarea.getStyledDocument();
..
..
@@ -583,19 +679,91 @@
583
679
         }
584
680
     }
585
681
 
682
+static GraphicsDevice device = GraphicsEnvironment
683
+        .getLocalGraphicsEnvironment().getScreenDevices()[0];
684
+
685
+    Rectangle keeprect;
686
+        cRadio radio;
687
+        
688
+cButton keepButton;
689
+	cButton twoButton; // Full 3D
690
+	cButton sixButton;
691
+	cButton threeButton;
692
+	cButton sevenButton;
693
+	cButton fourButton; // full panel
694
+	cButton oneButton; // full XYZ
695
+        //cButton currentLayout;
696
+        
697
+        boolean maximized;
698
+    
699
+        cButton fullscreenLayout;
700
+
701
+        void Minimize()
702
+        {
703
+            frame.setState(Frame.ICONIFIED);
704
+        }
705
+        
706
+        void Maximize()
707
+        {
708
+            if (maximized)
709
+            {
710
+                frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
711
+            }
712
+            else
713
+            {
714
+                keeprect = frame.getBounds();
715
+                Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
716
+                Dimension rect2 = frame.getToolkit().getScreenSize();
717
+                frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
718
+//                frame.setState(Frame.MAXIMIZED_BOTH);
719
+            }
720
+            
721
+            maximized ^= true;
722
+        }
723
+        
586
724
         void ToggleFullScreen()
587
725
         {
588
726
                 if (CameraPane.FULLSCREEN)
589
727
                 {
590
-                    frame.getContentPane().remove(/*"Center",*/bigThree);
591
-                    framePanel.add(bigThree);
592
-                    frame.getContentPane().add(/*"Center",*/framePanel);
728
+                    device.setFullScreenWindow(null);
729
+                    //frame.setVisible(false);
730
+//                frame.removeNotify();
731
+//                frame.setUndecorated(false);
732
+//                frame.addNotify();
733
+                //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
734
+                    
735
+// X                   frame.getContentPane().remove(/*"Center",*/bigThree);
736
+// X                   framePanel.add(bigThree);
737
+// X                   frame.getContentPane().add(/*"Center",*/framePanel);
738
+                    framePanel.setDividerLocation(1);
739
+                    
740
+                    //frame.setVisible(true);
741
+                    radio.layout = keepButton;
742
+                    //theFrame = null;
743
+                    keepButton = null;
744
+                    radio.layout.doClick();
745
+                    
593
746
                 } else
594
747
                 {
595
-                    frame.getContentPane().remove(/*"Center",*/framePanel);
596
-                    framePanel.remove(bigThree);
597
-                    frame.getContentPane().add(/*"Center",*/bigThree);
748
+                    keepButton = radio.layout;
749
+                    //keeprect = frame.getBounds();
750
+//                frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
751
+//                        frame.getToolkit().getScreenSize().height);
752
+                    //frame.setVisible(false);
753
+                    device.setFullScreenWindow(frame);
754
+//                frame.removeNotify();
755
+//                frame.setUndecorated(true);
756
+//                frame.addNotify();
757
+// X                   frame.getContentPane().remove(/*"Center",*/framePanel);
758
+// X                   framePanel.remove(bigThree);
759
+// X                   frame.getContentPane().add(/*"Center",*/bigThree);
760
+                    framePanel.setDividerLocation(0);
761
+
762
+                    radio.layout = fullscreenLayout;
763
+                    radio.layout.doClick();
764
+                    //frame.setVisible(true);
598
765
                 }
766
+                
599
767
                 cameraView.ToggleFullScreen();
600
768
         }
601
769
 
..
..
@@ -737,7 +905,12 @@
737
905
     JCheckBox speedupCB;
738
906
     JCheckBox rewindCB;
739
907
     JCheckBox flipVCB;
908
+    
909
+    cCheckBox toggleTextureCB;
910
+    cCheckBox toggleSwitchCB;
911
+        
740
912
     JComboBox texresMenu;
913
+    
741
914
     JButton resetButton;
742
915
     JButton stepButton;
743
916
     JButton stepAllButton;
..
..
@@ -746,10 +919,13 @@
746
919
     JButton fasterButton;
747
920
     JButton remarkButton;
748
921
     
922
+    cGridBag editPanel;
923
+    cGridBag editCommandsPanel;
924
+    
749
925
     cGridBag namePanel;
750
926
     cGridBag setupPanel;
751
927
     cGridBag setupPanel2;
752
-    cGridBag commandsPanel;
928
+    cGridBag objectCommandsPanel;
753
929
     cGridBag pushPanel;
754
930
     cGridBag fillPanel;
755
931
 
..
..
@@ -947,7 +1123,7 @@
947
1123
         rewindCB.setToolTipText("Rewind animation");
948
1124
         
949
1125
         randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
950
-        randomCB.setToolTipText("Rewind or Go back and forth randomly");
1126
+        randomCB.setToolTipText("Randomly Rewind or Go back and forth");
951
1127
 
952
1128
         if (Globals.ADVANCED)
953
1129
         {
..
..
@@ -962,23 +1138,23 @@
962
1138
         oe.ctrlPanel.add(setupPanel2);
963
1139
         oe.ctrlPanel.Return();
964
1140
         
965
-            commandsPanel = new cGridBag().setVertical(false);
1141
+            objectCommandsPanel = new cGridBag().setVertical(false);
966
1142
         
967
-        resetButton = AddButton(commandsPanel, "Reset");
1143
+        resetButton = AddButton(objectCommandsPanel, "Reset");
968
1144
         resetButton.setToolTipText("Jump to frame zero");
969
-        stepButton = AddButton(commandsPanel, "Step");
1145
+        stepButton = AddButton(objectCommandsPanel, "Step");
970
1146
         stepButton.setToolTipText("Step one frame");
971
1147
 //            resetAllButton = AddButton(oe, "Reset All");
972
1148
 //            stepAllButton = AddButton(oe, "Step All");
973
1149
 //            Return();
974
-        slowerButton = AddButton(commandsPanel, "Slow");
1150
+        slowerButton = AddButton(objectCommandsPanel, "Slow");
975
1151
         slowerButton.setToolTipText("Decrease animation speed");
976
-        fasterButton = AddButton(commandsPanel, "Fast");
1152
+        fasterButton = AddButton(objectCommandsPanel, "Fast");
977
1153
         fasterButton.setToolTipText("Increase animation speed");
978
-        remarkButton = AddButton(commandsPanel, "Remark");
1154
+        remarkButton = AddButton(objectCommandsPanel, "Remark");
979
1155
         remarkButton.setToolTipText("Set the current transform as the target");
980
1156
 
981
-        oe.ctrlPanel.add(commandsPanel);
1157
+        oe.ctrlPanel.add(objectCommandsPanel);
982
1158
         oe.ctrlPanel.Return();
983
1159
 
984
1160
     pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
..
..
@@ -1184,8 +1360,11 @@
1184
1360
         //worldPanel.setName("World");
1185
1361
 	centralPanel = new cGridBag();
1186
1362
         centralPanel.preferredWidth = 20;
1187
-	timelinePanel = new JPanel(new BorderLayout());
1188
-        timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1363
+        
1364
+        if (Globals.ADVANCED)
1365
+        {
1366
+            timelinePanel = new JPanel(new BorderLayout());
1367
+            timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1189
1368
 
1190
1369
         cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1191
1370
         cameraPanel.setContinuousLayout(true);
..
..
@@ -1194,7 +1373,10 @@
1194
1373
 //        cameraPanel.setDividerSize(9);
1195
1374
         cameraPanel.setResizeWeight(1.0);
1196
1375
         
1376
+        }
1377
+        
1197
1378
         centralPanel.add(cameraView);
1379
+        centralPanel.setFocusable(true);
1198
1380
         //frame.setJMenuBar(timelineMenubar);
1199
1381
         //centralPanel.add(timelinePanel);
1200
1382
         
..
..
@@ -1257,11 +1439,12 @@
1257
1439
         //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1258
1440
         //tmp.setName("Edit");
1259
1441
         objectPanel.add(materialPanel);
1442
+        objectPanel.add(toolboxPanel);
1260
1443
 //        JPanel north = new JPanel(new BorderLayout());
1261
1444
 //        north.setName("Edit");
1262
1445
 //        north.add(ctrlPanel, BorderLayout.NORTH);
1263
1446
 //        objectPanel.add(north);
1264
-        objectPanel.add(ctrlPanel);
1447
+        objectPanel.add(editPanel);
1265
1448
         objectPanel.add(infoPanel);
1266
1449
 
1267
1450
         /*
..
..
@@ -1288,9 +1471,7 @@
1288
1471
         JTabbedPane tabbedPane = new JTabbedPane();
1289
1472
         tabbedPane.add(scrollpane);
1290
1473
 
1291
-        tabbedPane.add(FSPane = new cFileSystemPane(this));
1292
-
1293
-        optionsPanel = new cGridBag().setVertical(true);
1474
+        optionsPanel = new cGridBag().setVertical(false);
1294
1475
 
1295
1476
         optionsPanel.setName("Options");
1296
1477
         
..
..
@@ -1298,6 +1479,8 @@
1298
1479
         
1299
1480
         tabbedPane.add(optionsPanel);
1300
1481
         
1482
+        tabbedPane.add(FSPane = new cFileSystemPane(this));
1483
+
1301
1484
         scenePanel.add(tabbedPane);
1302
1485
 
1303
1486
         /*
..
..
@@ -1390,8 +1573,12 @@
1390
1573
 //            aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1391
1574
 
1392
1575
         frame.setSize(1280, 860);
1576
+        
1577
+        frame.validate();
1393
1578
         frame.setVisible(true);
1394
1579
 
1580
+                    cameraView.requestFocusInWindow();
1581
+                    
1395
1582
         gridPanel.setDividerLocation(1.0);
1396
1583
 
1397
1584
         frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
..
..
@@ -2707,6 +2894,8 @@
2707
2894
 
2708
2895
     void SetMaterial(Object3D object)
2709
2896
     {
2897
+        latestObject = object;
2898
+        
2710
2899
         cMaterial mat = object.material;
2711
2900
 
2712
2901
         if (mat == null)
..
..
@@ -2892,7 +3081,7 @@
2892
3081
             cameraView.ToggleDL();
2893
3082
             cameraView.repaint();
2894
3083
             return;
2895
-        } else if (event.getSource() == toggleTextureItem)
3084
+        } else if (event.getSource() == toggleTextureItem || event.getSource() == toggleTextureCB)
2896
3085
         {
2897
3086
             cameraView.ToggleTexture();
2898
3087
             // june 2013           copy.HardTouch();
..
..
@@ -2931,7 +3120,7 @@
2931
3120
             frame.validate();
2932
3121
 
2933
3122
             return;
2934
-        } else if (event.getSource() == toggleSwitchItem)
3123
+        } else if (event.getSource() == toggleSwitchItem || event.getSource() == toggleSwitchCB)
2935
3124
         {
2936
3125
             cameraView.ToggleSwitch();
2937
3126
             cameraView.repaint();
..
..
@@ -3315,6 +3504,8 @@
3315
3504
     
3316
3505
     public void Save()
3317
3506
     {
3507
+        System.err.println("Save");
3508
+        
3318
3509
         cRadio tab = GetCurrentTab();
3319
3510
         
3320
3511
         boolean temp = CameraPane.SWITCH;
..
..
@@ -3399,6 +3590,8 @@
3399
3590
     
3400
3591
     public void Undo()
3401
3592
     {
3593
+        System.err.println("Undo");
3594
+        
3402
3595
         cRadio tab = GetCurrentTab();
3403
3596
         
3404
3597
         if (tab.undoindex == 0)
..
..
@@ -3582,7 +3775,7 @@
3582
3775
         assert false;
3583
3776
     }
3584
3777
 
3585
-    void EditSelection()
3778
+    void EditSelection(boolean newWindow)
3586
3779
     {
3587
3780
     }
3588
3781
 
..
..
@@ -4077,7 +4270,8 @@
4077
4270
 
4078
4271
     void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4079
4272
     {
4080
-        Save();
4273
+        if (Globals.SAVEONMAKE) // && resetmodel)
4274
+            Save();
4081
4275
         //Tween.set(thing, 0).target(1).start(tweenManager);
4082
4276
         //Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
4083
4277
 //            if (thing instanceof GenericJointDemo)
..
..
@@ -4164,6 +4358,12 @@
4164
4358
         {
4165
4359
             ResetModel();
4166
4360
             Select(thing.GetTreePath(), true, false); // unselect... false);
4361
+            
4362
+        if (thing.Size() == 0)
4363
+        {
4364
+            //EditSelection(false);
4365
+        }
4366
+        
4167
4367
             refreshContents();
4168
4368
         }
4169
4369
 
..
..
@@ -4386,6 +4586,7 @@
4386
4586
         
4387
4587
         if (readobj != null)
4388
4588
         {
4589
+        if (Globals.SAVEONMAKE)
4389
4590
             Save();
4390
4591
             try
4391
4592
             {
..
..
@@ -4757,18 +4958,31 @@
4757
4958
     CheckboxMenuItem togglePaintItem;
4758
4959
     JSplitPane mainPanel;
4759
4960
     JScrollPane scrollpane;
4961
+    
4760
4962
     JPanel toolbarPanel;
4963
+    
4761
4964
     cGridBag treePanel;
4965
+    
4762
4966
     JPanel radioPanel;
4763
4967
     ButtonGroup buttonGroup;
4764
-    cGridBag ctrlPanel;
4968
+    
4969
+    cGridBag toolboxPanel;
4765
4970
     cGridBag materialPanel;
4971
+    cGridBag ctrlPanel;
4972
+    
4766
4973
     JScrollPane infoPanel;
4974
+    
4767
4975
     cGridBag optionsPanel;
4976
+    
4768
4977
     JTabbedPane objectPanel;
4978
+    boolean materialFlushed;
4979
+    Object3D latestObject;
4980
+    
4769
4981
     cGridBag XYZPanel;
4982
+    
4770
4983
     JSplitPane gridPanel;
4771
4984
     JSplitPane bigPanel;
4985
+    
4772
4986
     cGridBag bigThree;
4773
4987
     cGridBag scenePanel;
4774
4988
     cGridBag centralPanel;
..
..
@@ -4883,7 +5097,7 @@
4883
5097
     cNumberSlider fogField;
4884
5098
     JLabel opacityPowerLabel;
4885
5099
     cNumberSlider opacityPowerField;
4886
-    JTree jTree;
5100
+    cTree jTree;
4887
5101
     //ObjectUI parent;
4888
5102
     
4889
5103
     cNumberSlider normalpushField;