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();
..
..
@@ -75,8 +104,16 @@
75
104
         return new cCheckBox(icon, border);
76
105
     }
77
106
 
107
+    static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
108
+    
78
109
     ImageIcon GetIcon(String name)
79
110
     {
111
+        javax.swing.ImageIcon iconCache = icons.get(name);
112
+        if (iconCache != null)
113
+        {
114
+            return iconCache;
115
+        }
116
+        
80
117
         try
81
118
         {
82
119
             BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
..
..
@@ -94,10 +131,14 @@
94
131
 //            }
95
132
 
96
133
             javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
134
+            
135
+            icons.put(name, icon);
136
+            
97
137
             return icon;
98
138
         }
99
139
         catch (Exception e)
100
140
         {
141
+            //icons.put(name, null);
101
142
             return null;
102
143
         }
103
144
     }
..
..
@@ -347,7 +388,8 @@
347
388
         //parent = p;
348
389
 
349
390
         GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
350
-        System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
391
+        if (Globals.DEBUG)
392
+            System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
351
393
         //gd.setFullScreenWindow(this);
352
394
         //setResizable(false);
353
395
         //if (!isDisplayable())
..
..
@@ -433,7 +475,7 @@
433
475
         
434
476
         ChangeListener changeListener = new ChangeListener()
435
477
         {
436
-            String name;
478
+            //String name;
437
479
             
438
480
             public void stateChanged(ChangeEvent changeEvent)
439
481
             {
..
..
@@ -453,33 +495,34 @@
453
495
 //                        EditSelection(false);
454
496
 //                }
455
497
 
456
-                if (objectPanel.getSelectedIndex() == 4)
457
-                {
458
-                    name = copy.skyboxname;
459
-                    
460
-                    if (name == null)
461
-                    {
462
-                        name = "";
463
-                    }
464
-                    
465
-                    copy.skyboxname = "cubemaps/default-skyboxes/rgb";
466
-                    copy.skyboxext = "jpg";
467
-                }
468
-                else
469
-                {
470
-                    if (name != null)
471
-                    {
472
-                        if (name.equals(""))
473
-                        {
474
-                            copy.skyboxname = null;
475
-                            copy.skyboxext = null;
476
-                        }
477
-                        else
478
-                        {
479
-                            copy.skyboxname = name;
480
-                        }
481
-                    }
482
-                }
498
+//                if (objectPanel.getSelectedIndex() == 4)
499
+//                {
500
+//                    name = copy.skyboxname;
501
+//                    
502
+//                    if (name == null)
503
+//                    {
504
+//                        name = "";
505
+//                    }
506
+//                    
507
+//                    copy.skyboxname = "cubemaps/default-skyboxes/rgb";
508
+//                    copy.skyboxext = "jpg";
509
+//                }
510
+//                else
511
+//                {
512
+//                    if (name != null)
513
+//                    {
514
+//                        if (name.equals(""))
515
+//                        {
516
+//                            copy.skyboxname = null;
517
+//                            copy.skyboxext = null;
518
+//                        }
519
+//                        else
520
+//                        {
521
+//                            copy.skyboxname = name;
522
+//                        }
523
+//                    }
524
+//                }
525
+                cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
483
526
                 
484
527
 //                refreshContents(false); // To refresh Info tab
485
528
                 cameraView.repaint();
..
..
@@ -1281,14 +1324,14 @@
1281
1324
             
1282
1325
         liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1283
1326
                 liveCB.setToolTipText("Animate object");
1327
+        markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
1328
+        markCB.setToolTipText("Set target transform");
1284
1329
         selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1285
1330
                 selectableCB.setToolTipText("Make object selectable");
1286
1331
 //            Return();
1287
1332
                 
1288
1333
         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1289
1334
                 hideCB.setToolTipText("Hide object");
1290
-        markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1291
-        markCB.setToolTipText("As animation target transform");
1292
1335
         
1293
1336
         ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1294
1337
         
..
..
@@ -1490,6 +1533,7 @@
1490
1533
 
1491
1534
         if (cam == null || !(copy.get(0) instanceof cGroup))
1492
1535
         {
1536
+        if (Globals.DEBUG)
1493
1537
             System.out.println("CREATE CAMERAS");
1494
1538
             cams = new cTemplate();
1495
1539
             cams.name = "Cameras";
..
..
@@ -1676,9 +1720,9 @@
1676
1720
         scenePanel.add(tabbedPane);
1677
1721
 
1678
1722
         //if (Globals.ADVANCED)
1679
-            tabbedPane.add(infoPanel);
1680
-        tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1681
-        tabbedPane.setToolTipTextAt(3, "Information");
1723
+//            tabbedPane.add(infoPanel);
1724
+//        tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1725
+//        tabbedPane.setToolTipTextAt(3, "Information");
1682
1726
         
1683
1727
         /*
1684
1728
         cTree jTree = new cTree(null);
..
..
@@ -1776,7 +1820,7 @@
1776
1820
 
1777
1821
         frame.getContentPane().setLayout(new BorderLayout());
1778
1822
         /**/
1779
-        JTabbedPane worldPane = new JTabbedPane();
1823
+        //JTabbedPane worldPane = new JTabbedPane();
1780
1824
         //worldPane.add(bigPanel);
1781
1825
         //worldPane.add(worldPanel);
1782
1826
                 /**/
..
..
@@ -2147,6 +2191,21 @@
2147
2191
         });
2148
2192
         presetpanel.add(bump0);
2149
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
+        
2150
2209
         cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
2151
2210
         halo.setToolTipText("Halo");
2152
2211
         halo.addMouseListener(new MouseAdapter()
..
..
@@ -2254,9 +2313,20 @@
2254
2313
 
2255
2314
         cGridBag huepanel = new cGridBag();
2256
2315
             cGridBag huelabel = new cGridBag();
2257
-        skin = GetLabel("icons/hue.png", false);
2258
-        skin.fit = true;
2259
-            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);
2260
2330
             huelabel.preferredWidth = 20;
2261
2331
             huepanel.add(new cGridBag()); // Label
2262
2332
             huepanel.add(huelabel); // Field/slider
..
..
@@ -3532,32 +3602,8 @@
3532
3602
 
3533
3603
         if (multiplyToggle != null)
3534
3604
                 multiplyToggle.setSelected(mat.multiply);
3535
-
3536
-        assert (object.projectedVertices != null);
3537
-
3538
-        if (object.projectedVertices.length <= 2)
3539
-        {
3540
-            // Side effect...
3541
-            Object3D.cVector2[] keep = object.projectedVertices;
3542
-            object.projectedVertices = new Object3D.cVector2[3];
3543
-            for (int i = 0; i < 3; i++)
3544
-            {
3545
-                if (i < keep.length)
3546
-                {
3547
-                    object.projectedVertices[i] = keep[i];
3548
-                } else
3549
-                {
3550
-                    object.projectedVertices[i] = new Object3D.cVector2();
3551
-                }
3552
-                /*
3553
-                if(keep.length == 0)
3554
-                object.projectedVertices[0] = new Object3D.cVector2();
3555
-                else
3556
-                object.projectedVertices[0] = keep[0];
3557
-                object.projectedVertices[1] = new Object3D.cVector2();
3558
-                 */
3559
-            }
3560
-        }
3605
+        
3606
+        AllocProjectedVertices(object);
3561
3607
 
3562
3608
         SetMaterial(mat, object.projectedVertices);
3563
3609
     }
..
..
@@ -4781,6 +4827,8 @@
4781
4827
             if (muteSlider)
4782
4828
                 return;
4783
4829
             
4830
+            Replace();
4831
+            
4784
4832
             int version = versionSlider.getInteger();
4785
4833
             
4786
4834
             if (version != -1 && copy.versionlist[version] != null)
..
..
@@ -5143,6 +5191,8 @@
5143
5191
         
5144
5192
         if (previousVersionButton != null && copy.versionlist != null)
5145
5193
             SetVersionStates();
5194
+        
5195
+        cameraView.requestFocusInWindow();
5146
5196
     }
5147
5197
     
5148
5198
     static TweenManager tweenManager = new TweenManager();
..
..
@@ -5174,7 +5224,7 @@
5174
5224
 //                group = (Composite) group.get(0);
5175
5225
 //            }
5176
5226
 
5177
-        System.out.println("makeSomething of " + thing);
5227
+        //System.out.println("makeSomething of " + thing);
5178
5228
 
5179
5229
         /*
5180
5230
         if (deselect && jList != null)
..
..
@@ -5535,7 +5585,7 @@
5535
5585
             copy.versionlist = new Object3D[100];
5536
5586
             copy.versionindex = -1;
5537
5587
             
5538
-            Save(true);
5588
+            //Save(true);
5539
5589
         }
5540
5590
         
5541
5591
             //? SetUndoStates();