blame | history | patch | commit | commitdiff
Normand Briere
2019-08-16 64e20f390e4b8e58bd0006dde8fa10fba1dac1d5 
 ObjEditor.java
....@@ -43,6 +43,35 @@
4343     
4444     static ObjEditor theFrame;
4545 
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
+
4675     public cGridBag GetSeparator()
4776     {
4877         cGridBag separator = new cGridBag();
....@@ -75,8 +104,16 @@
75104         return new cCheckBox(icon, border);
76105     }
77106 
107
+    static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
108
+    
78109     ImageIcon GetIcon(String name)
79110     {
111
+        javax.swing.ImageIcon iconCache = icons.get(name);
112
+        if (iconCache != null)
113
+        {
114
+            return iconCache;
115
+        }
116
+        
80117         try
81118         {
82119             BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
....@@ -94,10 +131,14 @@
94131 //            }
95132 
96133             javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
134
+            
135
+            icons.put(name, icon);
136
+            
97137             return icon;
98138         }
99139         catch (Exception e)
100140         {
141
+            //icons.put(name, null);
101142             return null;
102143         }
103144     }
....@@ -297,11 +338,13 @@
297338         client = inClient;
298339         copy = client;
299340 
300
-        if (copy.versionlist == null)
301
-        {
302
-            copy.versionlist = new Object3D[100];
303
-            copy.versionindex = -1;
304
-        }
341
+//        if (copy.versionlist == null)
342
+//        {
343
+//            copy.versionlist = new Object3D[100];
344
+//            copy.versionindex = -1;
345
+//            
346
+//            callee.Save(true);
347
+//        }
305348         
306349         // "this" is not called: SetupUI2(objEditor);
307350     }
....@@ -320,6 +363,8 @@
320363         {
321364             copy.versionlist = new Object3D[100];
322365             copy.versionindex = -1;
366
+            
367
+//            Save(true);
323368         }
324369         
325370         SetupUI2(callee.GetEditor());
....@@ -343,7 +388,8 @@
343388         //parent = p;
344389 
345390         GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
346
-        System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
391
+        if (Globals.DEBUG)
392
+            System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
347393         //gd.setFullScreenWindow(this);
348394         //setResizable(false);
349395         //if (!isDisplayable())
....@@ -354,11 +400,13 @@
354400         copy = localCopy;
355401         copy.editWindow = this;
356402 
357
-        if (copy.versionlist == null)
358
-        {
359
-//            copy.versions = new byte[100][];
403
+//        if (copy.versionlist == null)
404
+//        {
405
+//            copy.versionlist = new Object3D[100];
360406 //            copy.versionindex = -1;
361
-        }
407
+//            
408
+//            Save(true);
409
+//        }
362410         
363411         SetupMenu();
364412 
....@@ -427,6 +475,8 @@
427475         
428476         ChangeListener changeListener = new ChangeListener()
429477         {
478
+            //String name;
479
+            
430480             public void stateChanged(ChangeEvent changeEvent)
431481             {
432482 //                if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
....@@ -445,7 +495,37 @@
445495 //                        EditSelection(false);
446496 //                }
447497 
448
-                refreshContents(false); // To refresh Info tab
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;
526
+                
527
+//                refreshContents(false); // To refresh Info tab
528
+                cameraView.repaint();
449529             }
450530         };
451531         objectPanel.addChangeListener(changeListener);
....@@ -1244,14 +1324,14 @@
12441324             
12451325         liveCB = AddCheckBox(setupPanel, "Live", copy.live);
12461326                 liveCB.setToolTipText("Animate object");
1327
+        markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
1328
+        markCB.setToolTipText("Set target transform");
12471329         selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
12481330                 selectableCB.setToolTipText("Make object selectable");
12491331 //            Return();
12501332                 
12511333         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
12521334                 hideCB.setToolTipText("Hide object");
1253
-        markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1254
-        markCB.setToolTipText("As animation target transform");
12551335         
12561336         ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
12571337         
....@@ -1453,6 +1533,7 @@
14531533 
14541534         if (cam == null || !(copy.get(0) instanceof cGroup))
14551535         {
1536
+        if (Globals.DEBUG)
14561537             System.out.println("CREATE CAMERAS");
14571538             cams = new cTemplate();
14581539             cams.name = "Cameras";
....@@ -1639,9 +1720,9 @@
16391720         scenePanel.add(tabbedPane);
16401721 
16411722         //if (Globals.ADVANCED)
1642
-            tabbedPane.add(infoPanel);
1643
-        tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1644
-        tabbedPane.setToolTipTextAt(3, "Information");
1723
+//            tabbedPane.add(infoPanel);
1724
+//        tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1725
+//        tabbedPane.setToolTipTextAt(3, "Information");
16451726         
16461727         /*
16471728         cTree jTree = new cTree(null);
....@@ -1739,7 +1820,7 @@
17391820 
17401821         frame.getContentPane().setLayout(new BorderLayout());
17411822         /**/
1742
-        JTabbedPane worldPane = new JTabbedPane();
1823
+        //JTabbedPane worldPane = new JTabbedPane();
17431824         //worldPane.add(bigPanel);
17441825         //worldPane.add(worldPanel);
17451826                 /**/
....@@ -2110,6 +2191,21 @@
21102191         });
21112192         presetpanel.add(bump0);
21122193         
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
+        
21132209         cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
21142210         halo.setToolTipText("Halo");
21152211         halo.addMouseListener(new MouseAdapter()
....@@ -2217,9 +2313,20 @@
22172313 
22182314         cGridBag huepanel = new cGridBag();
22192315             cGridBag huelabel = new cGridBag();
2220
-        skin = GetLabel("icons/hue.png", false);
2221
-        skin.fit = true;
2222
-            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);
22232330             huelabel.preferredWidth = 20;
22242331             huepanel.add(new cGridBag()); // Label
22252332             huepanel.add(huelabel); // Field/slider
....@@ -3495,32 +3602,8 @@
34953602 
34963603         if (multiplyToggle != null)
34973604                 multiplyToggle.setSelected(mat.multiply);
3498
-
3499
-        assert (object.projectedVertices != null);
3500
-
3501
-        if (object.projectedVertices.length <= 2)
3502
-        {
3503
-            // Side effect...
3504
-            Object3D.cVector2[] keep = object.projectedVertices;
3505
-            object.projectedVertices = new Object3D.cVector2[3];
3506
-            for (int i = 0; i < 3; i++)
3507
-            {
3508
-                if (i < keep.length)
3509
-                {
3510
-                    object.projectedVertices[i] = keep[i];
3511
-                } else
3512
-                {
3513
-                    object.projectedVertices[i] = new Object3D.cVector2();
3514
-                }
3515
-                /*
3516
-                if(keep.length == 0)
3517
-                object.projectedVertices[0] = new Object3D.cVector2();
3518
-                else
3519
-                object.projectedVertices[0] = keep[0];
3520
-                object.projectedVertices[1] = new Object3D.cVector2();
3521
-                 */
3522
-            }
3523
-        }
3605
+        
3606
+        AllocProjectedVertices(object);
35243607 
35253608         SetMaterial(mat, object.projectedVertices);
35263609     }
....@@ -4123,7 +4206,7 @@
41234206     {
41244207         //Save(true);
41254208         Replace();
4126
-        SetUndoStates();
4209
+        SetVersionStates();
41274210     }
41284211     
41294212     private boolean Equal(byte[] compress, byte[] name)
....@@ -4153,7 +4236,7 @@
41534236         
41544237         CopyChanged();
41554238         
4156
-        SetUndoStates();
4239
+        SetVersionStates();
41574240     }
41584241     
41594242     public boolean Save(boolean user)
....@@ -4161,7 +4244,7 @@
41614244         System.err.println("Save");
41624245         Replace();
41634246         
4164
-        cRadio tab = GetCurrentTab();
4247
+        //cRadio tab = GetCurrentTab();
41654248         
41664249         Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
41674250         
....@@ -4199,7 +4282,7 @@
41994282 //            copy.versionlist[i] = null;
42004283 //        }
42014284 
4202
-        SetUndoStates();
4285
+        SetVersionStates();
42034286         
42044287         // test save
42054288         if (false)
....@@ -4259,7 +4342,7 @@
42594342     {
42604343         Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
42614344         
4262
-        SetUndoStates();
4345
+        SetVersionStates();
42634346         
42644347         boolean temp = CameraPane.SWITCH;
42654348         CameraPane.SWITCH = false;
....@@ -4326,12 +4409,15 @@
43264409         return count;
43274410     }
43284411     
4329
-    void SetUndoStates()
4412
+    void SetVersionStates()
43304413     {
4331
-        cRadio tab = GetCurrentTab();
4414
+        //if (true)
4415
+        //    return;
4416
+                    
4417
+        //cRadio tab = GetCurrentTab();
43324418         
4333
-        restoreButton.setEnabled(true); // copy.versionindex != -1);
4334
-        replaceButton.setEnabled(true); // copy.versionindex != -1);
4419
+        restoreButton.setEnabled(copy.versionindex != -1);
4420
+        replaceButton.setEnabled(copy.versionindex != -1);
43354421         
43364422         previousVersionButton.setEnabled(copy.versionindex > 0);
43374423         nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
....@@ -4340,8 +4426,10 @@
43404426                                         copy.versionlist[copy.versionindex + 1] != null);
43414427         
43424428         muteSlider = true;
4429
+        versionSlider.setMinimum(0);
43434430         versionSlider.setMaximum(VersionCount() - 1);
43444431         versionSlider.setInteger(copy.versionindex);
4432
+        versionSlider.setEnabled(copy.versionindex != -1);
43454433         muteSlider = false;
43464434     }
43474435     
....@@ -4352,7 +4440,7 @@
43524440         
43534441         System.err.println("Undo");
43544442         
4355
-        cRadio tab = GetCurrentTab();
4443
+        //cRadio tab = GetCurrentTab();
43564444         
43574445         if (copy.versionindex == 0)
43584446         {
....@@ -4384,7 +4472,7 @@
43844472     {
43854473         System.err.println("Restore");
43864474         
4387
-        cRadio tab = GetCurrentTab();
4475
+        //cRadio tab = GetCurrentTab();
43884476         
43894477         if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
43904478         {
....@@ -4402,7 +4490,7 @@
44024490     {
44034491         System.err.println("Replace");
44044492         
4405
-        cRadio tab = GetCurrentTab();
4493
+        //cRadio tab = GetCurrentTab();
44064494         
44074495         if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
44084496         {
....@@ -4420,7 +4508,7 @@
44204508         // Option?
44214509         Replace();
44224510         
4423
-        cRadio tab = GetCurrentTab();
4511
+        //cRadio tab = GetCurrentTab();
44244512         
44254513         if (copy.versionlist[copy.versionindex + 1] == null)
44264514         {
....@@ -4739,9 +4827,11 @@
47394827             if (muteSlider)
47404828                 return;
47414829             
4830
+            Replace();
4831
+            
47424832             int version = versionSlider.getInteger();
47434833             
4744
-            if (copy.versionlist[version] != null)
4834
+            if (version != -1 && copy.versionlist[version] != null)
47454835             {
47464836                 copy.versionindex = version;
47474837                 CopyChanged();
....@@ -5100,7 +5190,9 @@
51005190         }
51015191         
51025192         if (previousVersionButton != null && copy.versionlist != null)
5103
-            SetUndoStates();
5193
+            SetVersionStates();
5194
+        
5195
+        cameraView.requestFocusInWindow();
51045196     }
51055197     
51065198     static TweenManager tweenManager = new TweenManager();
....@@ -5132,7 +5224,7 @@
51325224 //                group = (Composite) group.get(0);
51335225 //            }
51345226 
5135
-        System.out.println("makeSomething of " + thing);
5227
+        //System.out.println("makeSomething of " + thing);
51365228 
51375229         /*
51385230         if (deselect && jList != null)
....@@ -5489,8 +5581,11 @@
54895581             
54905582         if (copy.versionlist == null)
54915583         {
5584
+            // Backward compatibility
54925585             copy.versionlist = new Object3D[100];
54935586             copy.versionindex = -1;
5587
+            
5588
+            //Save(true);
54945589         }
54955590         
54965591             //? SetUndoStates();
....@@ -5582,6 +5677,8 @@
55825677 
55835678     void save()
55845679     {
5680
+        Replace();
5681
+        
55855682         if (lastname == null)
55865683         {
55875684             return;