blame | history | patch | commit | commitdiff
Normand Briere
2019-06-25 d2f456cf5280f59425084532bd2397ec625f7577 
 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     
....@@ -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         
....@@ -323,14 +383,47 @@
323383         closeItem.addActionListener(this);
324384 
325385         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
+    
326407         toolbarPanel = new JPanel();
327408         toolbarPanel.setName("Toolbar");
328409         treePanel = new cGridBag();
329410         treePanel.setName("Tree");
411
+        
412
+        editPanel = new cGridBag().setVertical(true);
413
+        editPanel.setName("Edit");
414
+        
330415         ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
331
-        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
+        
332424         materialPanel = new cGridBag().setVertical(true);
333425         materialPanel.setName("Material");
426
+        
334427         /*JTextPane*/
335428         infoarea = createTextPane();
336429         doc = infoarea.getStyledDocument();
....@@ -603,6 +696,8 @@
603696         
604697         boolean maximized;
605698     
699
+        cButton fullscreenLayout;
700
+
606701         void Minimize()
607702         {
608703             frame.setState(Frame.ICONIFIED);
....@@ -664,7 +759,7 @@
664759 // X                   frame.getContentPane().add(/*"Center",*/bigThree);
665760                     framePanel.setDividerLocation(0);
666761 
667
-                    radio.layout = twoButton;
762
+                    radio.layout = fullscreenLayout;
668763                     radio.layout.doClick();
669764                     //frame.setVisible(true);
670765                 }
....@@ -810,7 +905,12 @@
810905     JCheckBox speedupCB;
811906     JCheckBox rewindCB;
812907     JCheckBox flipVCB;
908
+    
909
+    cCheckBox toggleTextureCB;
910
+    cCheckBox toggleSwitchCB;
911
+        
813912     JComboBox texresMenu;
913
+    
814914     JButton resetButton;
815915     JButton stepButton;
816916     JButton stepAllButton;
....@@ -819,10 +919,13 @@
819919     JButton fasterButton;
820920     JButton remarkButton;
821921     
922
+    cGridBag editPanel;
923
+    cGridBag editCommandsPanel;
924
+    
822925     cGridBag namePanel;
823926     cGridBag setupPanel;
824927     cGridBag setupPanel2;
825
-    cGridBag commandsPanel;
928
+    cGridBag objectCommandsPanel;
826929     cGridBag pushPanel;
827930     cGridBag fillPanel;
828931 
....@@ -1035,23 +1138,23 @@
10351138         oe.ctrlPanel.add(setupPanel2);
10361139         oe.ctrlPanel.Return();
10371140         
1038
-            commandsPanel = new cGridBag().setVertical(false);
1141
+            objectCommandsPanel = new cGridBag().setVertical(false);
10391142         
1040
-        resetButton = AddButton(commandsPanel, "Reset");
1143
+        resetButton = AddButton(objectCommandsPanel, "Reset");
10411144         resetButton.setToolTipText("Jump to frame zero");
1042
-        stepButton = AddButton(commandsPanel, "Step");
1145
+        stepButton = AddButton(objectCommandsPanel, "Step");
10431146         stepButton.setToolTipText("Step one frame");
10441147 //            resetAllButton = AddButton(oe, "Reset All");
10451148 //            stepAllButton = AddButton(oe, "Step All");
10461149 //            Return();
1047
-        slowerButton = AddButton(commandsPanel, "Slow");
1150
+        slowerButton = AddButton(objectCommandsPanel, "Slow");
10481151         slowerButton.setToolTipText("Decrease animation speed");
1049
-        fasterButton = AddButton(commandsPanel, "Fast");
1152
+        fasterButton = AddButton(objectCommandsPanel, "Fast");
10501153         fasterButton.setToolTipText("Increase animation speed");
1051
-        remarkButton = AddButton(commandsPanel, "Remark");
1154
+        remarkButton = AddButton(objectCommandsPanel, "Remark");
10521155         remarkButton.setToolTipText("Set the current transform as the target");
10531156 
1054
-        oe.ctrlPanel.add(commandsPanel);
1157
+        oe.ctrlPanel.add(objectCommandsPanel);
10551158         oe.ctrlPanel.Return();
10561159 
10571160     pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
....@@ -1336,11 +1439,12 @@
13361439         //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
13371440         //tmp.setName("Edit");
13381441         objectPanel.add(materialPanel);
1442
+        objectPanel.add(toolboxPanel);
13391443 //        JPanel north = new JPanel(new BorderLayout());
13401444 //        north.setName("Edit");
13411445 //        north.add(ctrlPanel, BorderLayout.NORTH);
13421446 //        objectPanel.add(north);
1343
-        objectPanel.add(ctrlPanel);
1447
+        objectPanel.add(editPanel);
13441448         objectPanel.add(infoPanel);
13451449 
13461450         /*
....@@ -1367,9 +1471,7 @@
13671471         JTabbedPane tabbedPane = new JTabbedPane();
13681472         tabbedPane.add(scrollpane);
13691473 
1370
-        tabbedPane.add(FSPane = new cFileSystemPane(this));
1371
-
1372
-        optionsPanel = new cGridBag().setVertical(true);
1474
+        optionsPanel = new cGridBag().setVertical(false);
13731475 
13741476         optionsPanel.setName("Options");
13751477         
....@@ -1377,6 +1479,8 @@
13771479         
13781480         tabbedPane.add(optionsPanel);
13791481         
1482
+        tabbedPane.add(FSPane = new cFileSystemPane(this));
1483
+
13801484         scenePanel.add(tabbedPane);
13811485 
13821486         /*
....@@ -1469,6 +1573,8 @@
14691573 //            aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
14701574 
14711575         frame.setSize(1280, 860);
1576
+        
1577
+        frame.validate();
14721578         frame.setVisible(true);
14731579 
14741580                     cameraView.requestFocusInWindow();
....@@ -2788,6 +2894,8 @@
27882894 
27892895     void SetMaterial(Object3D object)
27902896     {
2897
+        latestObject = object;
2898
+        
27912899         cMaterial mat = object.material;
27922900 
27932901         if (mat == null)
....@@ -2973,7 +3081,7 @@
29733081             cameraView.ToggleDL();
29743082             cameraView.repaint();
29753083             return;
2976
-        } else if (event.getSource() == toggleTextureItem)
3084
+        } else if (event.getSource() == toggleTextureItem || event.getSource() == toggleTextureCB)
29773085         {
29783086             cameraView.ToggleTexture();
29793087             // june 2013           copy.HardTouch();
....@@ -3012,7 +3120,7 @@
30123120             frame.validate();
30133121 
30143122             return;
3015
-        } else if (event.getSource() == toggleSwitchItem)
3123
+        } else if (event.getSource() == toggleSwitchItem || event.getSource() == toggleSwitchCB)
30163124         {
30173125             cameraView.ToggleSwitch();
30183126             cameraView.repaint();
....@@ -3396,6 +3504,8 @@
33963504     
33973505     public void Save()
33983506     {
3507
+        System.err.println("Save");
3508
+        
33993509         cRadio tab = GetCurrentTab();
34003510         
34013511         boolean temp = CameraPane.SWITCH;
....@@ -3480,6 +3590,8 @@
34803590     
34813591     public void Undo()
34823592     {
3593
+        System.err.println("Undo");
3594
+        
34833595         cRadio tab = GetCurrentTab();
34843596         
34853597         if (tab.undoindex == 0)
....@@ -3663,7 +3775,7 @@
36633775         assert false;
36643776     }
36653777 
3666
-    void EditSelection()
3778
+    void EditSelection(boolean newWindow)
36673779     {
36683780     }
36693781 
....@@ -4158,7 +4270,8 @@
41584270 
41594271     void makeSomething(Object3D thing, boolean resetmodel) // deselect)
41604272     {
4161
-        Save();
4273
+        if (Globals.SAVEONMAKE) // && resetmodel)
4274
+            Save();
41624275         //Tween.set(thing, 0).target(1).start(tweenManager);
41634276         //Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
41644277 //            if (thing instanceof GenericJointDemo)
....@@ -4245,6 +4358,12 @@
42454358         {
42464359             ResetModel();
42474360             Select(thing.GetTreePath(), true, false); // unselect... false);
4361
+            
4362
+        if (thing.Size() == 0)
4363
+        {
4364
+            //EditSelection(false);
4365
+        }
4366
+        
42484367             refreshContents();
42494368         }
42504369 
....@@ -4467,6 +4586,7 @@
44674586         
44684587         if (readobj != null)
44694588         {
4589
+        if (Globals.SAVEONMAKE)
44704590             Save();
44714591             try
44724592             {
....@@ -4838,18 +4958,31 @@
48384958     CheckboxMenuItem togglePaintItem;
48394959     JSplitPane mainPanel;
48404960     JScrollPane scrollpane;
4961
+    
48414962     JPanel toolbarPanel;
4963
+    
48424964     cGridBag treePanel;
4965
+    
48434966     JPanel radioPanel;
48444967     ButtonGroup buttonGroup;
4845
-    cGridBag ctrlPanel;
4968
+    
4969
+    cGridBag toolboxPanel;
48464970     cGridBag materialPanel;
4971
+    cGridBag ctrlPanel;
4972
+    
48474973     JScrollPane infoPanel;
4974
+    
48484975     cGridBag optionsPanel;
4976
+    
48494977     JTabbedPane objectPanel;
4978
+    boolean materialFlushed;
4979
+    Object3D latestObject;
4980
+    
48504981     cGridBag XYZPanel;
4982
+    
48514983     JSplitPane gridPanel;
48524984     JSplitPane bigPanel;
4985
+    
48534986     cGridBag bigThree;
48544987     cGridBag scenePanel;
48554988     cGridBag centralPanel;
....@@ -4964,7 +5097,7 @@
49645097     cNumberSlider fogField;
49655098     JLabel opacityPowerLabel;
49665099     cNumberSlider opacityPowerField;
4967
-    JTree jTree;
5100
+    cTree jTree;
49685101     //ObjectUI parent;
49695102     
49705103     cNumberSlider normalpushField;