blame | history | patch | commit | commitdiff
Normand Briere
2019-06-25 d2f456cf5280f59425084532bd2397ec625f7577 
 ObjEditor.java
....@@ -52,6 +52,19 @@
5252         }
5353     }
5454 
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
+
5568     cCheckBox GetCheckBox(String name, boolean border)
5669     {
5770         try
....@@ -370,6 +383,27 @@
370383         closeItem.addActionListener(this);
371384 
372385         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
+    
373407         toolbarPanel = new JPanel();
374408         toolbarPanel.setName("Toolbar");
375409         treePanel = new cGridBag();
....@@ -384,9 +418,12 @@
384418         editPanel.add(editCommandsPanel);
385419         editPanel.add(ctrlPanel);
386420                 
387
-        materialPanel = new cGridBag().setVertical(true);
421
+        toolboxPanel = new cGridBag().setVertical(false);
422
+        toolboxPanel.setName("Toolbox");
388423         
424
+        materialPanel = new cGridBag().setVertical(true);
389425         materialPanel.setName("Material");
426
+        
390427         /*JTextPane*/
391428         infoarea = createTextPane();
392429         doc = infoarea.getStyledDocument();
....@@ -659,6 +696,8 @@
659696         
660697         boolean maximized;
661698     
699
+        cButton fullscreenLayout;
700
+
662701         void Minimize()
663702         {
664703             frame.setState(Frame.ICONIFIED);
....@@ -720,7 +759,7 @@
720759 // X                   frame.getContentPane().add(/*"Center",*/bigThree);
721760                     framePanel.setDividerLocation(0);
722761 
723
-                    radio.layout = twoButton;
762
+                    radio.layout = fullscreenLayout;
724763                     radio.layout.doClick();
725764                     //frame.setVisible(true);
726765                 }
....@@ -866,7 +905,12 @@
866905     JCheckBox speedupCB;
867906     JCheckBox rewindCB;
868907     JCheckBox flipVCB;
908
+    
909
+    cCheckBox toggleTextureCB;
910
+    cCheckBox toggleSwitchCB;
911
+        
869912     JComboBox texresMenu;
913
+    
870914     JButton resetButton;
871915     JButton stepButton;
872916     JButton stepAllButton;
....@@ -1395,6 +1439,7 @@
13951439         //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
13961440         //tmp.setName("Edit");
13971441         objectPanel.add(materialPanel);
1442
+        objectPanel.add(toolboxPanel);
13981443 //        JPanel north = new JPanel(new BorderLayout());
13991444 //        north.setName("Edit");
14001445 //        north.add(ctrlPanel, BorderLayout.NORTH);
....@@ -1426,9 +1471,7 @@
14261471         JTabbedPane tabbedPane = new JTabbedPane();
14271472         tabbedPane.add(scrollpane);
14281473 
1429
-        tabbedPane.add(FSPane = new cFileSystemPane(this));
1430
-
1431
-        optionsPanel = new cGridBag().setVertical(true);
1474
+        optionsPanel = new cGridBag().setVertical(false);
14321475 
14331476         optionsPanel.setName("Options");
14341477         
....@@ -1436,6 +1479,8 @@
14361479         
14371480         tabbedPane.add(optionsPanel);
14381481         
1482
+        tabbedPane.add(FSPane = new cFileSystemPane(this));
1483
+
14391484         scenePanel.add(tabbedPane);
14401485 
14411486         /*
....@@ -1528,6 +1573,8 @@
15281573 //            aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
15291574 
15301575         frame.setSize(1280, 860);
1576
+        
1577
+        frame.validate();
15311578         frame.setVisible(true);
15321579 
15331580                     cameraView.requestFocusInWindow();
....@@ -2847,6 +2894,8 @@
28472894 
28482895     void SetMaterial(Object3D object)
28492896     {
2897
+        latestObject = object;
2898
+        
28502899         cMaterial mat = object.material;
28512900 
28522901         if (mat == null)
....@@ -3032,7 +3081,7 @@
30323081             cameraView.ToggleDL();
30333082             cameraView.repaint();
30343083             return;
3035
-        } else if (event.getSource() == toggleTextureItem)
3084
+        } else if (event.getSource() == toggleTextureItem || event.getSource() == toggleTextureCB)
30363085         {
30373086             cameraView.ToggleTexture();
30383087             // june 2013           copy.HardTouch();
....@@ -3071,7 +3120,7 @@
30713120             frame.validate();
30723121 
30733122             return;
3074
-        } else if (event.getSource() == toggleSwitchItem)
3123
+        } else if (event.getSource() == toggleSwitchItem || event.getSource() == toggleSwitchCB)
30753124         {
30763125             cameraView.ToggleSwitch();
30773126             cameraView.repaint();
....@@ -3726,7 +3775,7 @@
37263775         assert false;
37273776     }
37283777 
3729
-    void EditSelection()
3778
+    void EditSelection(boolean newWindow)
37303779     {
37313780     }
37323781 
....@@ -4221,7 +4270,7 @@
42214270 
42224271     void makeSomething(Object3D thing, boolean resetmodel) // deselect)
42234272     {
4224
-        if (Globals.SAVEONMAKE)
4273
+        if (Globals.SAVEONMAKE) // && resetmodel)
42254274             Save();
42264275         //Tween.set(thing, 0).target(1).start(tweenManager);
42274276         //Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
....@@ -4309,6 +4358,12 @@
43094358         {
43104359             ResetModel();
43114360             Select(thing.GetTreePath(), true, false); // unselect... false);
4361
+            
4362
+        if (thing.Size() == 0)
4363
+        {
4364
+            //EditSelection(false);
4365
+        }
4366
+        
43124367             refreshContents();
43134368         }
43144369 
....@@ -4903,18 +4958,31 @@
49034958     CheckboxMenuItem togglePaintItem;
49044959     JSplitPane mainPanel;
49054960     JScrollPane scrollpane;
4961
+    
49064962     JPanel toolbarPanel;
4963
+    
49074964     cGridBag treePanel;
4965
+    
49084966     JPanel radioPanel;
49094967     ButtonGroup buttonGroup;
4910
-    cGridBag ctrlPanel;
4968
+    
4969
+    cGridBag toolboxPanel;
49114970     cGridBag materialPanel;
4971
+    cGridBag ctrlPanel;
4972
+    
49124973     JScrollPane infoPanel;
4974
+    
49134975     cGridBag optionsPanel;
4976
+    
49144977     JTabbedPane objectPanel;
4978
+    boolean materialFlushed;
4979
+    Object3D latestObject;
4980
+    
49154981     cGridBag XYZPanel;
4982
+    
49164983     JSplitPane gridPanel;
49174984     JSplitPane bigPanel;
4985
+    
49184986     cGridBag bigThree;
49194987     cGridBag scenePanel;
49204988     cGridBag centralPanel;
....@@ -5029,7 +5097,7 @@
50295097     cNumberSlider fogField;
50305098     JLabel opacityPowerLabel;
50315099     cNumberSlider opacityPowerField;
5032
-    JTree jTree;
5100
+    cTree jTree;
50335101     //ObjectUI parent;
50345102     
50355103     cNumberSlider normalpushField;