blame | history | patch | commit | commitdiff
Normand Briere
2019-06-25 26b24f5b623e709a88e91e9bce0864f9d5e8f084 
 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     
....@@ -323,6 +383,27 @@
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();
....@@ -337,9 +418,12 @@
337418         editPanel.add(editCommandsPanel);
338419         editPanel.add(ctrlPanel);
339420                 
340
-        materialPanel = new cGridBag().setVertical(true);
421
+        toolboxPanel = new cGridBag().setVertical(false);
422
+        toolboxPanel.setName("Toolbox");
341423         
424
+        materialPanel = new cGridBag().setVertical(true);
342425         materialPanel.setName("Material");
426
+        
343427         /*JTextPane*/
344428         infoarea = createTextPane();
345429         doc = infoarea.getStyledDocument();
....@@ -612,6 +696,8 @@
612696         
613697         boolean maximized;
614698     
699
+        cButton fullscreenLayout;
700
+
615701         void Minimize()
616702         {
617703             frame.setState(Frame.ICONIFIED);
....@@ -637,7 +723,9 @@
637723         
638724         void ToggleFullScreen()
639725         {
640
-                if (CameraPane.FULLSCREEN)
726
+                cameraView.ToggleFullScreen();
727
+                
728
+                if (!CameraPane.FULLSCREEN)
641729                 {
642730                     device.setFullScreenWindow(null);
643731                     //frame.setVisible(false);
....@@ -673,12 +761,10 @@
673761 // X                   frame.getContentPane().add(/*"Center",*/bigThree);
674762                     framePanel.setDividerLocation(0);
675763 
676
-                    radio.layout = twoButton;
764
+                    radio.layout = fullscreenLayout;
677765                     radio.layout.doClick();
678766                     //frame.setVisible(true);
679767                 }
680
-                
681
-                cameraView.ToggleFullScreen();
682768         }
683769 
684770     private JTextPane createTextPane()
....@@ -819,7 +905,12 @@
819905     JCheckBox speedupCB;
820906     JCheckBox rewindCB;
821907     JCheckBox flipVCB;
908
+    
909
+    cCheckBox toggleTextureCB;
910
+    cCheckBox toggleSwitchCB;
911
+        
822912     JComboBox texresMenu;
913
+    
823914     JButton resetButton;
824915     JButton stepButton;
825916     JButton stepAllButton;
....@@ -1348,6 +1439,7 @@
13481439         //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
13491440         //tmp.setName("Edit");
13501441         objectPanel.add(materialPanel);
1442
+        objectPanel.add(toolboxPanel);
13511443 //        JPanel north = new JPanel(new BorderLayout());
13521444 //        north.setName("Edit");
13531445 //        north.add(ctrlPanel, BorderLayout.NORTH);
....@@ -1379,9 +1471,7 @@
13791471         JTabbedPane tabbedPane = new JTabbedPane();
13801472         tabbedPane.add(scrollpane);
13811473 
1382
-        tabbedPane.add(FSPane = new cFileSystemPane(this));
1383
-
1384
-        optionsPanel = new cGridBag().setVertical(true);
1474
+        optionsPanel = new cGridBag().setVertical(false);
13851475 
13861476         optionsPanel.setName("Options");
13871477         
....@@ -1389,6 +1479,8 @@
13891479         
13901480         tabbedPane.add(optionsPanel);
13911481         
1482
+        tabbedPane.add(FSPane = new cFileSystemPane(this));
1483
+
13921484         scenePanel.add(tabbedPane);
13931485 
13941486         /*
....@@ -1481,6 +1573,8 @@
14811573 //            aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
14821574 
14831575         frame.setSize(1280, 860);
1576
+        
1577
+        frame.validate();
14841578         frame.setVisible(true);
14851579 
14861580                     cameraView.requestFocusInWindow();
....@@ -2800,6 +2894,8 @@
28002894 
28012895     void SetMaterial(Object3D object)
28022896     {
2897
+        latestObject = object;
2898
+        
28032899         cMaterial mat = object.material;
28042900 
28052901         if (mat == null)
....@@ -2985,7 +3081,7 @@
29853081             cameraView.ToggleDL();
29863082             cameraView.repaint();
29873083             return;
2988
-        } else if (event.getSource() == toggleTextureItem)
3084
+        } else if (event.getSource() == toggleTextureItem || event.getSource() == toggleTextureCB)
29893085         {
29903086             cameraView.ToggleTexture();
29913087             // june 2013           copy.HardTouch();
....@@ -3024,7 +3120,7 @@
30243120             frame.validate();
30253121 
30263122             return;
3027
-        } else if (event.getSource() == toggleSwitchItem)
3123
+        } else if (event.getSource() == toggleSwitchItem || event.getSource() == toggleSwitchCB)
30283124         {
30293125             cameraView.ToggleSwitch();
30303126             cameraView.repaint();
....@@ -3408,6 +3504,8 @@
34083504     
34093505     public void Save()
34103506     {
3507
+        System.err.println("Save");
3508
+        
34113509         cRadio tab = GetCurrentTab();
34123510         
34133511         boolean temp = CameraPane.SWITCH;
....@@ -3492,6 +3590,8 @@
34923590     
34933591     public void Undo()
34943592     {
3593
+        System.err.println("Undo");
3594
+        
34953595         cRadio tab = GetCurrentTab();
34963596         
34973597         if (tab.undoindex == 0)
....@@ -3675,7 +3775,7 @@
36753775         assert false;
36763776     }
36773777 
3678
-    void EditSelection()
3778
+    void EditSelection(boolean newWindow)
36793779     {
36803780     }
36813781 
....@@ -4170,7 +4270,8 @@
41704270 
41714271     void makeSomething(Object3D thing, boolean resetmodel) // deselect)
41724272     {
4173
-        Save();
4273
+        if (Globals.SAVEONMAKE) // && resetmodel)
4274
+            Save();
41744275         //Tween.set(thing, 0).target(1).start(tweenManager);
41754276         //Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
41764277 //            if (thing instanceof GenericJointDemo)
....@@ -4257,6 +4358,12 @@
42574358         {
42584359             ResetModel();
42594360             Select(thing.GetTreePath(), true, false); // unselect... false);
4361
+            
4362
+        if (thing.Size() == 0)
4363
+        {
4364
+            //EditSelection(false);
4365
+        }
4366
+        
42604367             refreshContents();
42614368         }
42624369 
....@@ -4479,6 +4586,7 @@
44794586         
44804587         if (readobj != null)
44814588         {
4589
+        if (Globals.SAVEONMAKE)
44824590             Save();
44834591             try
44844592             {
....@@ -4850,18 +4958,31 @@
48504958     CheckboxMenuItem togglePaintItem;
48514959     JSplitPane mainPanel;
48524960     JScrollPane scrollpane;
4961
+    
48534962     JPanel toolbarPanel;
4963
+    
48544964     cGridBag treePanel;
4965
+    
48554966     JPanel radioPanel;
48564967     ButtonGroup buttonGroup;
4857
-    cGridBag ctrlPanel;
4968
+    
4969
+    cGridBag toolboxPanel;
48584970     cGridBag materialPanel;
4971
+    cGridBag ctrlPanel;
4972
+    
48594973     JScrollPane infoPanel;
4974
+    
48604975     cGridBag optionsPanel;
4976
+    
48614977     JTabbedPane objectPanel;
4978
+    boolean materialFlushed;
4979
+    Object3D latestObject;
4980
+    
48624981     cGridBag XYZPanel;
4982
+    
48634983     JSplitPane gridPanel;
48644984     JSplitPane bigPanel;
4985
+    
48654986     cGridBag bigThree;
48664987     cGridBag scenePanel;
48674988     cGridBag centralPanel;
....@@ -4976,7 +5097,7 @@
49765097     cNumberSlider fogField;
49775098     JLabel opacityPowerLabel;
49785099     cNumberSlider opacityPowerField;
4979
-    JTree jTree;
5100
+    cTree jTree;
49805101     //ObjectUI parent;
49815102     
49825103     cNumberSlider normalpushField;