parent: 0216409e | patch | commit
Normand Briere
2019-09-02 21ac57b36a9e3b909853c7d64ac29b7ad72490a3 
Figure panel.
2 files modified
68 ■■■■■ changed files
CameraPane.java 6 ●●●●● patch | view | raw | blame | history
ObjEditor.java 62 ●●●●● patch | view | raw | blame | history 
 CameraPane.java
....@@ -10719,7 +10719,7 @@
1071910719         if (patchMaterial.patchMaterial)
1072010720         {
1072110721             patchMaterial.patchMaterial = false;
10722
-            patchMaterial.objectPanel.setSelectedIndex(1);
10722
+            patchMaterial.objectTabbedPane.setSelectedIndex(1);
1072310723         }
1072410724         
1072510725         if (Grafreed.savesound && Grafreed.hassound)
....@@ -15719,6 +15719,10 @@
1571915719                 break;
1572015720             //case '`' :
1572115721             case ESC:
15722
+                if (FULLSCREEN)
15723
+                    object.editWindow.ToggleFullScreen();
15724
+                break;
15725
+            case 'p':
1572215726                 RENDERPROGRAM += 1;
1572315727                 RENDERPROGRAM %= 3;
1572415728 


 ObjEditor.java
....@@ -504,7 +504,7 @@
504504         //povItem.addActionListener(this);
505505         closeItem.addActionListener(this);
506506 
507
-        objectPanel = new JTabbedPane();
507
+        objectTabbedPane = new JTabbedPane();
508508         
509509         ChangeListener changeListener = new ChangeListener()
510510         {
....@@ -555,13 +555,13 @@
555555 //                        }
556556 //                    }
557557 //                }
558
-                cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
558
+                cameraView.transformMode = objectTabbedPane.getSelectedIndex() == 4;
559559                 
560560 //                refreshContents(false); // To refresh Info tab
561561                 cameraView.repaint();
562562             }
563563         };
564
-        objectPanel.addChangeListener(changeListener);
564
+        objectTabbedPane.addChangeListener(changeListener);
565565     
566566         toolbarPanel = new JPanel();
567567         toolbarPanel.setName("Toolbar");
....@@ -604,7 +604,7 @@
604604         //infoPanel.setLayout(new BorderLayout());
605605         //infoPanel.add(createTextPane());
606606 
607
-        mainPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, treePanel, objectPanel);
607
+        mainPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, treePanel, objectTabbedPane);
608608         mainPanel.setName("Main");
609609         mainPanel.setContinuousLayout(true);
610610         mainPanel.setOneTouchExpandable(true);
....@@ -1589,6 +1589,8 @@
15891589 
15901590         return null;
15911591     }
1592
+    
1593
+    int objectTabCount;
15921594 
15931595     void SetupViews()
15941596     {
....@@ -1761,33 +1763,42 @@
17611763 
17621764         //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
17631765         //tmp.setName("Edit");
1764
-        objectPanel.add(skyboxPanel);
1765
-        objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
1766
-        objectPanel.setToolTipTextAt(0, "Backgrounds");
17671766         
1768
-        objectPanel.add(toolboxPanel);
1769
-        objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1770
-        objectPanel.setToolTipTextAt(1, "Objects & textures");
1767
+        objectTabCount = 0;
1768
+        
1769
+        objectTabbedPane.add(skyboxPanel);
1770
+        objectTabbedPane.setIconAt(objectTabCount, GetIcon("icons/skybox.jpg"));
1771
+        objectTabbedPane.setToolTipTextAt(objectTabCount++, "Backgrounds");
1772
+        
1773
+        objectTabbedPane.add(toolboxPanel);
1774
+        objectTabbedPane.setIconAt(objectTabCount, GetIcon("icons/primitives.png"));
1775
+        objectTabbedPane.setToolTipTextAt(objectTabCount++, "Objects & textures");
17711776 
1772
-        objectPanel.add(materialPanel);
1773
-        objectPanel.setIconAt(2, GetIcon("icons/material.png"));
1774
-        objectPanel.setToolTipTextAt(2, "Material");
1777
+        objectTabbedPane.add(materialPanel);
1778
+        objectTabbedPane.setIconAt(objectTabCount, GetIcon("icons/material.png"));
1779
+        objectTabbedPane.setToolTipTextAt(objectTabCount++, "Material");
17751780     
1781
+        figurePanel = new cGridBag();
1782
+        figurePanel.add(new cButton("FIGURES amd POSES coming soon!"));
1783
+        objectTabbedPane.add(figurePanel);
1784
+        objectTabbedPane.setIconAt(objectTabCount, GetIcon("icons/run.png"));
1785
+        objectTabbedPane.setToolTipTextAt(objectTabCount++, "Figures and poses");
1786
+        
17761787 //        JPanel north = new JPanel(new BorderLayout());
17771788 //        north.setName("Edit");
17781789 //        north.add(ctrlPanel, BorderLayout.NORTH);
17791790 //        objectPanel.add(north);
1780
-        objectPanel.add(editPanel);
1781
-        objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
1782
-        objectPanel.setToolTipTextAt(3, "Edit controls");
1791
+        objectTabbedPane.add(editPanel);
1792
+        objectTabbedPane.setIconAt(objectTabCount, GetIcon("icons/writewhite.png"));
1793
+        objectTabbedPane.setToolTipTextAt(objectTabCount++, "Edit controls");
17831794         
1784
-        objectPanel.add(transformPanel);
1785
-        objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1786
-        objectPanel.setToolTipTextAt(4, "TRS transform");
1795
+        objectTabbedPane.add(transformPanel);
1796
+        objectTabbedPane.setIconAt(objectTabCount, GetIcon("icons/XYZ.png"));
1797
+        objectTabbedPane.setToolTipTextAt(objectTabCount++, "TRS transform");
17871798         
17881799         patchMaterial = true;
17891800         cameraView.patchMaterial = this;
1790
-        objectPanel.setSelectedIndex(2);
1801
+        objectTabbedPane.setSelectedIndex(2);
17911802                 
17921803         /*
17931804         aConstraints.gridx = 0;
....@@ -1808,7 +1819,7 @@
18081819         scrollpane.addMouseWheelListener(this); // Default not fast enough
18091820 
18101821         /*JTabbedPane*/ scenePanel = new cGridBag();
1811
-        scenePanel.preferredWidth = 5;
1822
+        scenePanel.preferredWidth = 6;
18121823         
18131824         JTabbedPane tabbedPane = new JTabbedPane();
18141825         tabbedPane.add(scrollpane);
....@@ -1917,9 +1928,9 @@
19171928         
19181929         if (Globals.SHOWINFO)
19191930         {
1920
-            objectPanel.add(infoPanel);
1921
-            objectPanel.setIconAt(5, GetIcon("icons/info.png"));
1922
-            objectPanel.setToolTipTextAt(4, "Information");
1931
+            objectTabbedPane.add(infoPanel);
1932
+            objectTabbedPane.setIconAt(objectTabCount, GetIcon("icons/info.png"));
1933
+            objectTabbedPane.setToolTipTextAt(objectTabCount++, "Information");
19231934         }
19241935 
19251936         /*
....@@ -6299,12 +6310,13 @@
62996310     cGridBag skyboxPanel;
63006311     cGridBag materialPanel;
63016312     cGridBag ctrlPanel;
6313
+    cGridBag figurePanel;
63026314     
63036315     JScrollPane infoPanel;
63046316     
63056317     cGridBag optionsPanel;
63066318     
6307
-    JTabbedPane objectPanel;
6319
+    JTabbedPane objectTabbedPane;
63086320     boolean materialFlushed;
63096321     Object3D latestObject;
63106322