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.*;
....@@ -37,6 +38,65 @@
3738     JFrame frame;
3839     
3940     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
+    }
40100     
41101     // SCRIPT
42102     
....@@ -147,7 +207,7 @@
147207         
148208         objEditor.ctrlPanel.remove(namePanel);
149209         
150
-        if (!GroupEditor.allparams)
210
+        if (!allparams)
151211             return;
152212         
153213 //        objEditor.ctrlPanel.remove(liveCB);
....@@ -171,7 +231,7 @@
171231         
172232         objEditor.ctrlPanel.remove(setupPanel);
173233         objEditor.ctrlPanel.remove(setupPanel2);
174
-        objEditor.ctrlPanel.remove(commandsPanel);
234
+        objEditor.ctrlPanel.remove(objectCommandsPanel);
175235         objEditor.ctrlPanel.remove(pushPanel);
176236         //objEditor.ctrlPanel.remove(fillPanel);
177237         
....@@ -277,6 +337,11 @@
277337         return frame.action(event, obj);
278338     }
279339 
340
+    // Cannot work without static
341
+    static boolean allparams = true;
342
+
343
+    static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
344
+
280345     void SetupMenu()
281346     {
282347         frame.setMenuBar(menuBar = new MenuBar());
....@@ -323,14 +388,52 @@
323388         closeItem.addActionListener(this);
324389 
325390         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
+    
326417         toolbarPanel = new JPanel();
327418         toolbarPanel.setName("Toolbar");
328419         treePanel = new cGridBag();
329420         treePanel.setName("Tree");
421
+        
422
+        editPanel = new cGridBag().setVertical(true);
423
+        editPanel.setName("Edit");
424
+        
330425         ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
331
-        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
+        
332434         materialPanel = new cGridBag().setVertical(true);
333435         materialPanel.setName("Material");
436
+        
334437         /*JTextPane*/
335438         infoarea = createTextPane();
336439         doc = infoarea.getStyledDocument();
....@@ -603,6 +706,8 @@
603706         
604707         boolean maximized;
605708     
709
+        cButton fullscreenLayout;
710
+
606711         void Minimize()
607712         {
608713             frame.setState(Frame.ICONIFIED);
....@@ -628,7 +733,9 @@
628733         
629734         void ToggleFullScreen()
630735         {
631
-                if (CameraPane.FULLSCREEN)
736
+                cameraView.ToggleFullScreen();
737
+                
738
+                if (!CameraPane.FULLSCREEN)
632739                 {
633740                     device.setFullScreenWindow(null);
634741                     //frame.setVisible(false);
....@@ -664,12 +771,10 @@
664771 // X                   frame.getContentPane().add(/*"Center",*/bigThree);
665772                     framePanel.setDividerLocation(0);
666773 
667
-                    radio.layout = twoButton;
774
+                    radio.layout = fullscreenLayout;
668775                     radio.layout.doClick();
669776                     //frame.setVisible(true);
670777                 }
671
-                
672
-                cameraView.ToggleFullScreen();
673778         }
674779 
675780     private JTextPane createTextPane()
....@@ -810,7 +915,12 @@
810915     JCheckBox speedupCB;
811916     JCheckBox rewindCB;
812917     JCheckBox flipVCB;
918
+    
919
+    cCheckBox toggleTextureCB;
920
+    cCheckBox toggleSwitchCB;
921
+        
813922     JComboBox texresMenu;
923
+    
814924     JButton resetButton;
815925     JButton stepButton;
816926     JButton stepAllButton;
....@@ -819,10 +929,13 @@
819929     JButton fasterButton;
820930     JButton remarkButton;
821931     
932
+    cGridBag editPanel;
933
+    cGridBag editCommandsPanel;
934
+    
822935     cGridBag namePanel;
823936     cGridBag setupPanel;
824937     cGridBag setupPanel2;
825
-    cGridBag commandsPanel;
938
+    cGridBag objectCommandsPanel;
826939     cGridBag pushPanel;
827940     cGridBag fillPanel;
828941 
....@@ -999,7 +1112,7 @@
9991112         
10001113         oe.ctrlPanel.Return();
10011114         
1002
-        if (!GroupEditor.allparams)
1115
+        if (!allparams)
10031116             return;
10041117 
10051118             setupPanel = new cGridBag().setVertical(false);
....@@ -1035,23 +1148,23 @@
10351148         oe.ctrlPanel.add(setupPanel2);
10361149         oe.ctrlPanel.Return();
10371150         
1038
-            commandsPanel = new cGridBag().setVertical(false);
1151
+            objectCommandsPanel = new cGridBag().setVertical(false);
10391152         
1040
-        resetButton = AddButton(commandsPanel, "Reset");
1153
+        resetButton = AddButton(objectCommandsPanel, "Reset");
10411154         resetButton.setToolTipText("Jump to frame zero");
1042
-        stepButton = AddButton(commandsPanel, "Step");
1155
+        stepButton = AddButton(objectCommandsPanel, "Step");
10431156         stepButton.setToolTipText("Step one frame");
10441157 //            resetAllButton = AddButton(oe, "Reset All");
10451158 //            stepAllButton = AddButton(oe, "Step All");
10461159 //            Return();
1047
-        slowerButton = AddButton(commandsPanel, "Slow");
1160
+        slowerButton = AddButton(objectCommandsPanel, "Slow");
10481161         slowerButton.setToolTipText("Decrease animation speed");
1049
-        fasterButton = AddButton(commandsPanel, "Fast");
1162
+        fasterButton = AddButton(objectCommandsPanel, "Fast");
10501163         fasterButton.setToolTipText("Increase animation speed");
1051
-        remarkButton = AddButton(commandsPanel, "Remark");
1164
+        remarkButton = AddButton(objectCommandsPanel, "Remark");
10521165         remarkButton.setToolTipText("Set the current transform as the target");
10531166 
1054
-        oe.ctrlPanel.add(commandsPanel);
1167
+        oe.ctrlPanel.add(objectCommandsPanel);
10551168         oe.ctrlPanel.Return();
10561169 
10571170     pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
....@@ -1340,8 +1453,9 @@
13401453 //        north.setName("Edit");
13411454 //        north.add(ctrlPanel, BorderLayout.NORTH);
13421455 //        objectPanel.add(north);
1343
-        objectPanel.add(ctrlPanel);
1456
+        objectPanel.add(editPanel);
13441457         objectPanel.add(infoPanel);
1458
+        objectPanel.add(toolboxPanel);
13451459 
13461460         /*
13471461         aConstraints.gridx = 0;
....@@ -1350,7 +1464,7 @@
13501464         aConstraints.gridy += 1;
13511465         aConstraints.gridwidth = 1;
13521466         mainPanel.add(objectPanel, aConstraints);
1353
-         */
1467
+        */
13541468 
13551469         scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
13561470                 VERTICAL_SCROLLBAR_AS_NEEDED,
....@@ -1367,9 +1481,7 @@
13671481         JTabbedPane tabbedPane = new JTabbedPane();
13681482         tabbedPane.add(scrollpane);
13691483 
1370
-        tabbedPane.add(FSPane = new cFileSystemPane(this));
1371
-
1372
-        optionsPanel = new cGridBag().setVertical(true);
1484
+        optionsPanel = new cGridBag().setVertical(false);
13731485 
13741486         optionsPanel.setName("Options");
13751487         
....@@ -1377,6 +1489,8 @@
13771489         
13781490         tabbedPane.add(optionsPanel);
13791491         
1492
+        tabbedPane.add(FSPane = new cFileSystemPane(this));
1493
+
13801494         scenePanel.add(tabbedPane);
13811495 
13821496         /*
....@@ -1469,6 +1583,8 @@
14691583 //            aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
14701584 
14711585         frame.setSize(1280, 860);
1586
+        
1587
+        frame.validate();
14721588         frame.setVisible(true);
14731589 
14741590                     cameraView.requestFocusInWindow();
....@@ -2788,6 +2904,8 @@
27882904 
27892905     void SetMaterial(Object3D object)
27902906     {
2907
+        latestObject = object;
2908
+        
27912909         cMaterial mat = object.material;
27922910 
27932911         if (mat == null)
....@@ -2973,7 +3091,7 @@
29733091             cameraView.ToggleDL();
29743092             cameraView.repaint();
29753093             return;
2976
-        } else if (event.getSource() == toggleTextureItem)
3094
+        } else if (event.getSource() == toggleTextureItem || event.getSource() == toggleTextureCB)
29773095         {
29783096             cameraView.ToggleTexture();
29793097             // june 2013           copy.HardTouch();
....@@ -3012,7 +3130,7 @@
30123130             frame.validate();
30133131 
30143132             return;
3015
-        } else if (event.getSource() == toggleSwitchItem)
3133
+        } else if (event.getSource() == toggleSwitchItem || event.getSource() == toggleSwitchCB)
30163134         {
30173135             cameraView.ToggleSwitch();
30183136             cameraView.repaint();
....@@ -3396,6 +3514,8 @@
33963514     
33973515     public void Save()
33983516     {
3517
+        System.err.println("Save");
3518
+        
33993519         cRadio tab = GetCurrentTab();
34003520         
34013521         boolean temp = CameraPane.SWITCH;
....@@ -3417,6 +3537,8 @@
34173537             tab.graphs[i] = null;
34183538         }
34193539 
3540
+        SetUndoStates();
3541
+        
34203542         // test save
34213543         if (false)
34223544         {
....@@ -3439,6 +3561,8 @@
34393561 
34403562     void CopyChanged(Object3D obj)
34413563     {
3564
+        SetUndoStates();
3565
+        
34423566         boolean temp = CameraPane.SWITCH;
34433567         CameraPane.SWITCH = false;
34443568         
....@@ -3478,8 +3602,21 @@
34783602         refreshContents();
34793603     }
34803604     
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
+    
34813616     public void Undo()
34823617     {
3618
+        System.err.println("Undo");
3619
+        
34833620         cRadio tab = GetCurrentTab();
34843621         
34853622         if (tab.undoindex == 0)
....@@ -3663,7 +3800,7 @@
36633800         assert false;
36643801     }
36653802 
3666
-    void EditSelection()
3803
+    void EditSelection(boolean newWindow)
36673804     {
36683805     }
36693806 
....@@ -4158,7 +4295,8 @@
41584295 
41594296     void makeSomething(Object3D thing, boolean resetmodel) // deselect)
41604297     {
4161
-        Save();
4298
+        if (Globals.SAVEONMAKE) // && resetmodel)
4299
+            Save();
41624300         //Tween.set(thing, 0).target(1).start(tweenManager);
41634301         //Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
41644302 //            if (thing instanceof GenericJointDemo)
....@@ -4245,6 +4383,12 @@
42454383         {
42464384             ResetModel();
42474385             Select(thing.GetTreePath(), true, false); // unselect... false);
4386
+            
4387
+        if (thing.Size() == 0)
4388
+        {
4389
+            //EditSelection(false);
4390
+        }
4391
+        
42484392             refreshContents();
42494393         }
42504394 
....@@ -4467,6 +4611,7 @@
44674611         
44684612         if (readobj != null)
44694613         {
4614
+        if (Globals.SAVEONMAKE)
44704615             Save();
44714616             try
44724617             {
....@@ -4645,6 +4790,8 @@
46454790             String filename = browser.getFile();
46464791             if (filename != null && filename.length() > 0)
46474792             {
4793
+                if (!filename.endsWith(".gfd"))
4794
+                    filename += ".gfd";
46484795                 lastname = browser.getDirectory() + filename;
46494796                 save();
46504797             }
....@@ -4838,18 +4985,31 @@
48384985     CheckboxMenuItem togglePaintItem;
48394986     JSplitPane mainPanel;
48404987     JScrollPane scrollpane;
4988
+    
48414989     JPanel toolbarPanel;
4990
+    
48424991     cGridBag treePanel;
4992
+    
48434993     JPanel radioPanel;
48444994     ButtonGroup buttonGroup;
4845
-    cGridBag ctrlPanel;
4995
+    
4996
+    cGridBag toolboxPanel;
48464997     cGridBag materialPanel;
4998
+    cGridBag ctrlPanel;
4999
+    
48475000     JScrollPane infoPanel;
5001
+    
48485002     cGridBag optionsPanel;
5003
+    
48495004     JTabbedPane objectPanel;
5005
+    boolean materialFlushed;
5006
+    Object3D latestObject;
5007
+    
48505008     cGridBag XYZPanel;
5009
+    
48515010     JSplitPane gridPanel;
48525011     JSplitPane bigPanel;
5012
+    
48535013     cGridBag bigThree;
48545014     cGridBag scenePanel;
48555015     cGridBag centralPanel;
....@@ -4964,7 +5124,7 @@
49645124     cNumberSlider fogField;
49655125     JLabel opacityPowerLabel;
49665126     cNumberSlider opacityPowerField;
4967
-    JTree jTree;
5127
+    cTree jTree;
49685128     //ObjectUI parent;
49695129     
49705130     cNumberSlider normalpushField;