Fix new + checkbox

Normand Briere

2019-08-18 480ad70047e54b2b92f974e6c2ac5a6c0bdc5a5c

 ObjEditor.java
..
..
@@ -72,6 +72,21 @@
72
72
         }
73
73
     }
74
74
 
75
+    public Composite CreateCameras()
76
+    {
77
+        Composite cams = new cTemplate();
78
+        cams.name = "Cameras";
79
+        copy.insertElementAt(cams, 0);
80
+
81
+        cams.addChild(new Camera());
82
+        cams.addChild(new Camera(1));
83
+        cams.addChild(new Camera(2));
84
+        cams.addChild(new Camera(3));
85
+        cams.addChild(new Camera(4));
86
+        
87
+        return cams;
88
+    }
89
+
75
90
     public cGridBag GetSeparator()
76
91
     {
77
92
         cGridBag separator = new cGridBag();
..
..
@@ -1550,23 +1565,9 @@
1550
1565
 
1551
1566
         if (cam == null || !(copy.get(0) instanceof cGroup))
1552
1567
         {
1553
-        if (Globals.DEBUG)
1554
-            System.out.println("CREATE CAMERAS");
1555
-            cams = new cTemplate();
1556
-            cams.name = "Cameras";
1557
-            copy.insertElementAt(cams, 0);
1558
-            //cams.parent = copy;
1559
-
1560
-            cam = new Camera(); // LA.newVector(3, 2, 1));
1561
-            cams.addChild(cam);
1562
-            cam = new Camera(1);
1563
-            cams.addChild(cam);
1564
-            cam = new Camera(2);
1565
-            cams.addChild(cam);
1566
-            cam = new Camera(3);
1567
-            cams.addChild(cam);
1568
-            cam = new Camera(4); // Light
1569
-            cams.addChild(cam);
1568
+            if (Globals.DEBUG)
1569
+                System.out.println("CREATE CAMERAS");
1570
+            cams = CreateCameras();
1570
1571
         } else
1571
1572
         {
1572
1573
             cams = (cGroup) copy.get(0);
..
..
@@ -1718,24 +1719,24 @@
1718
1719
 
1719
1720
         //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1720
1721
         //tmp.setName("Edit");
1722
+        objectPanel.add(skyboxPanel);
1723
+        objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
1724
+        objectPanel.setToolTipTextAt(0, "Backgrounds");
1725
+        
1721
1726
         objectPanel.add(toolboxPanel);
1722
-        objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
1723
-        objectPanel.setToolTipTextAt(0, "Objects & textures");
1727
+        objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1728
+        objectPanel.setToolTipTextAt(1, "Objects & textures");
1724
1729
 
1725
1730
         objectPanel.add(materialPanel);
1726
-        objectPanel.setIconAt(1, GetIcon("icons/material.png"));
1727
-        objectPanel.setToolTipTextAt(1, "Material");
1731
+        objectPanel.setIconAt(2, GetIcon("icons/material.png"));
1732
+        objectPanel.setToolTipTextAt(2, "Material");
1728
1733
     
1729
-        objectPanel.add(skyboxPanel);
1730
-        objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1731
-        objectPanel.setToolTipTextAt(2, "Backgrounds");
1732
-        
1733
1734
 //        JPanel north = new JPanel(new BorderLayout());
1734
1735
 //        north.setName("Edit");
1735
1736
 //        north.add(ctrlPanel, BorderLayout.NORTH);
1736
1737
 //        objectPanel.add(north);
1737
1738
         objectPanel.add(editPanel);
1738
-        objectPanel.setIconAt(3, GetIcon("icons/write.png"));
1739
+        objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
1739
1740
         objectPanel.setToolTipTextAt(3, "Edit controls");
1740
1741
         
1741
1742
         objectPanel.add(transformPanel);
..
..
@@ -1744,7 +1745,7 @@
1744
1745
         
1745
1746
         patchMaterial = true;
1746
1747
         cameraView.patchMaterial = this;
1747
-        objectPanel.setSelectedIndex(1);
1748
+        objectPanel.setSelectedIndex(2);
1748
1749
                 
1749
1750
         /*
1750
1751
         aConstraints.gridx = 0;
..
..
@@ -4206,8 +4207,12 @@
4206
4207
         
4207
4208
         copy.selection.clear();
4208
4209
         
4210
+        if (copy == Grafreed.grafreed.universe)
4211
+        {
4212
+            CreateCameras();
4213
+            cameraView.SetCamera(GetCamera(copy, 0));
4214
+        }
4209
4215
         ResetModel();
4210
-        SetupViews();
4211
4216
         objEditor.refreshContents();
4212
4217
     }
4213
4218