Fix box and VR keys.

Normand Briere

2019-08-16 64e20f390e4b8e58bd0006dde8fa10fba1dac1d5

 ObjEditor.java
..
..
@@ -43,6 +43,35 @@
43
43
     
44
44
     static ObjEditor theFrame;
45
45
 
46
+    public void AllocProjectedVertices(Object3D object)
47
+    {
48
+        assert (object.projectedVertices != null);
49
+
50
+        if (object.projectedVertices.length <= 2)
51
+        {
52
+            // Side effect...
53
+            Object3D.cVector2[] keep = object.projectedVertices;
54
+            object.projectedVertices = new Object3D.cVector2[3];
55
+            for (int i = 0; i < 3; i++)
56
+            {
57
+                if (i < keep.length)
58
+                {
59
+                    object.projectedVertices[i] = keep[i];
60
+                } else
61
+                {
62
+                    object.projectedVertices[i] = new Object3D.cVector2();
63
+                }
64
+                /*
65
+                if(keep.length == 0)
66
+                object.projectedVertices[0] = new Object3D.cVector2();
67
+                else
68
+                object.projectedVertices[0] = keep[0];
69
+                object.projectedVertices[1] = new Object3D.cVector2();
70
+                 */
71
+            }
72
+        }
73
+    }
74
+
46
75
     public cGridBag GetSeparator()
47
76
     {
48
77
         cGridBag separator = new cGridBag();
..
..
@@ -359,7 +388,8 @@
359
388
         //parent = p;
360
389
 
361
390
         GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
362
-        System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
391
+        if (Globals.DEBUG)
392
+            System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
363
393
         //gd.setFullScreenWindow(this);
364
394
         //setResizable(false);
365
395
         //if (!isDisplayable())
..
..
@@ -1294,14 +1324,14 @@
1294
1324
             
1295
1325
         liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1296
1326
                 liveCB.setToolTipText("Animate object");
1327
+        markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
1328
+        markCB.setToolTipText("Set target transform");
1297
1329
         selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1298
1330
                 selectableCB.setToolTipText("Make object selectable");
1299
1331
 //            Return();
1300
1332
                 
1301
1333
         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1302
1334
                 hideCB.setToolTipText("Hide object");
1303
-        markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1304
-        markCB.setToolTipText("As animation target transform");
1305
1335
         
1306
1336
         ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1307
1337
         
..
..
@@ -1503,6 +1533,7 @@
1503
1533
 
1504
1534
         if (cam == null || !(copy.get(0) instanceof cGroup))
1505
1535
         {
1536
+        if (Globals.DEBUG)
1506
1537
             System.out.println("CREATE CAMERAS");
1507
1538
             cams = new cTemplate();
1508
1539
             cams.name = "Cameras";
..
..
@@ -1789,7 +1820,7 @@
1789
1820
 
1790
1821
         frame.getContentPane().setLayout(new BorderLayout());
1791
1822
         /**/
1792
-        JTabbedPane worldPane = new JTabbedPane();
1823
+        //JTabbedPane worldPane = new JTabbedPane();
1793
1824
         //worldPane.add(bigPanel);
1794
1825
         //worldPane.add(worldPanel);
1795
1826
                 /**/
..
..
@@ -2160,6 +2191,21 @@
2160
2191
         });
2161
2192
         presetpanel.add(bump0);
2162
2193
         
2194
+        cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
2195
+        borderShader.setToolTipText("Border fade");
2196
+        borderShader.addMouseListener(new MouseAdapter()
2197
+        {
2198
+            public void mouseClicked(MouseEvent e)
2199
+            {
2200
+                borderfadeField.setFloat(0.5);
2201
+                opacityField.setFloat(0.75);
2202
+
2203
+                materialtouched = true;
2204
+                applySelf();
2205
+            }
2206
+        });
2207
+        presetpanel.add(borderShader);
2208
+        
2163
2209
         cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
2164
2210
         halo.setToolTipText("Halo");
2165
2211
         halo.addMouseListener(new MouseAdapter()
..
..
@@ -2267,9 +2313,20 @@
2267
2313
 
2268
2314
         cGridBag huepanel = new cGridBag();
2269
2315
             cGridBag huelabel = new cGridBag();
2270
-        skin = GetLabel("icons/hue.png", false);
2271
-        skin.fit = true;
2272
-            huelabel.add(skin);
2316
+        cLabel hue = GetLabel("icons/hue.png", false);
2317
+        hue.fit = true;
2318
+        
2319
+        hue.addMouseListener(new MouseAdapter()
2320
+        {
2321
+            public void mousePressed(MouseEvent e)
2322
+            {
2323
+                int x = e.getX();
2324
+                
2325
+                colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
2326
+            }
2327
+        });
2328
+        
2329
+            huelabel.add(hue);
2273
2330
             huelabel.preferredWidth = 20;
2274
2331
             huepanel.add(new cGridBag()); // Label
2275
2332
             huepanel.add(huelabel); // Field/slider
..
..
@@ -3545,32 +3602,8 @@
3545
3602
 
3546
3603
         if (multiplyToggle != null)
3547
3604
                 multiplyToggle.setSelected(mat.multiply);
3548
-
3549
-        assert (object.projectedVertices != null);
3550
-
3551
-        if (object.projectedVertices.length <= 2)
3552
-        {
3553
-            // Side effect...
3554
-            Object3D.cVector2[] keep = object.projectedVertices;
3555
-            object.projectedVertices = new Object3D.cVector2[3];
3556
-            for (int i = 0; i < 3; i++)
3557
-            {
3558
-                if (i < keep.length)
3559
-                {
3560
-                    object.projectedVertices[i] = keep[i];
3561
-                } else
3562
-                {
3563
-                    object.projectedVertices[i] = new Object3D.cVector2();
3564
-                }
3565
-                /*
3566
-                if(keep.length == 0)
3567
-                object.projectedVertices[0] = new Object3D.cVector2();
3568
-                else
3569
-                object.projectedVertices[0] = keep[0];
3570
-                object.projectedVertices[1] = new Object3D.cVector2();
3571
-                 */
3572
-            }
3573
-        }
3605
+        
3606
+        AllocProjectedVertices(object);
3574
3607
 
3575
3608
         SetMaterial(mat, object.projectedVertices);
3576
3609
     }
..
..
@@ -5158,6 +5191,8 @@
5158
5191
         
5159
5192
         if (previousVersionButton != null && copy.versionlist != null)
5160
5193
             SetVersionStates();
5194
+        
5195
+        cameraView.requestFocusInWindow();
5161
5196
     }
5162
5197
     
5163
5198
     static TweenManager tweenManager = new TweenManager();
..
..
@@ -5189,7 +5224,7 @@
5189
5224
 //                group = (Composite) group.get(0);
5190
5225
 //            }
5191
5226
 
5192
-        System.out.println("makeSomething of " + thing);
5227
+        //System.out.println("makeSomething of " + thing);
5193
5228
 
5194
5229
         /*
5195
5230
         if (deselect && jList != null)
..
..
@@ -5550,7 +5585,7 @@
5550
5585
             copy.versionlist = new Object3D[100];
5551
5586
             copy.versionindex = -1;
5552
5587
             
5553
-            Save(true);
5588
+            //Save(true);
5554
5589
         }
5555
5590
         
5556
5591
             //? SetUndoStates();