blame | history | patch | commit | commitdiff
Normand Briere
2019-08-15 33504fc9a180903aace77613264550754fba5706 
 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());
....@@ -354,11 +399,13 @@
354399         copy = localCopy;
355400         copy.editWindow = this;
356401 
357
-        if (copy.versionlist == null)
358
-        {
359
-//            copy.versions = new byte[100][];
402
+//        if (copy.versionlist == null)
403
+//        {
404
+//            copy.versionlist = new Object3D[100];
360405 //            copy.versionindex = -1;
361
-        }
406
+//            
407
+//            Save(true);
408
+//        }
362409         
363410         SetupMenu();
364411 
....@@ -427,6 +474,8 @@
427474         
428475         ChangeListener changeListener = new ChangeListener()
429476         {
477
+            //String name;
478
+            
430479             public void stateChanged(ChangeEvent changeEvent)
431480             {
432481 //                if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
....@@ -445,7 +494,37 @@
445494 //                        EditSelection(false);
446495 //                }
447496 
448
-                refreshContents(false); // To refresh Info tab
497
+//                if (objectPanel.getSelectedIndex() == 4)
498
+//                {
499
+//                    name = copy.skyboxname;
500
+//                    
501
+//                    if (name == null)
502
+//                    {
503
+//                        name = "";
504
+//                    }
505
+//                    
506
+//                    copy.skyboxname = "cubemaps/default-skyboxes/rgb";
507
+//                    copy.skyboxext = "jpg";
508
+//                }
509
+//                else
510
+//                {
511
+//                    if (name != null)
512
+//                    {
513
+//                        if (name.equals(""))
514
+//                        {
515
+//                            copy.skyboxname = null;
516
+//                            copy.skyboxext = null;
517
+//                        }
518
+//                        else
519
+//                        {
520
+//                            copy.skyboxname = name;
521
+//                        }
522
+//                    }
523
+//                }
524
+                cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
525
+                
526
+//                refreshContents(false); // To refresh Info tab
527
+                cameraView.repaint();
449528             }
450529         };
451530         objectPanel.addChangeListener(changeListener);
....@@ -1639,9 +1718,9 @@
16391718         scenePanel.add(tabbedPane);
16401719 
16411720         //if (Globals.ADVANCED)
1642
-            tabbedPane.add(infoPanel);
1643
-        tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1644
-        tabbedPane.setToolTipTextAt(3, "Information");
1721
+//            tabbedPane.add(infoPanel);
1722
+//        tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1723
+//        tabbedPane.setToolTipTextAt(3, "Information");
16451724         
16461725         /*
16471726         cTree jTree = new cTree(null);
....@@ -1739,7 +1818,7 @@
17391818 
17401819         frame.getContentPane().setLayout(new BorderLayout());
17411820         /**/
1742
-        JTabbedPane worldPane = new JTabbedPane();
1821
+        //JTabbedPane worldPane = new JTabbedPane();
17431822         //worldPane.add(bigPanel);
17441823         //worldPane.add(worldPanel);
17451824                 /**/
....@@ -2109,6 +2188,21 @@
21092188             }
21102189         });
21112190         presetpanel.add(bump0);
2191
+        
2192
+        cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
2193
+        borderShader.setToolTipText("Border fade");
2194
+        borderShader.addMouseListener(new MouseAdapter()
2195
+        {
2196
+            public void mouseClicked(MouseEvent e)
2197
+            {
2198
+                borderfadeField.setFloat(0.5);
2199
+                opacityField.setFloat(0.6);
2200
+
2201
+                materialtouched = true;
2202
+                applySelf();
2203
+            }
2204
+        });
2205
+        presetpanel.add(borderShader);
21122206         
21132207         cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
21142208         halo.setToolTipText("Halo");
....@@ -3495,32 +3589,8 @@
34953589 
34963590         if (multiplyToggle != null)
34973591                 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
-        }
3592
+        
3593
+        AllocProjectedVertices(object);
35243594 
35253595         SetMaterial(mat, object.projectedVertices);
35263596     }
....@@ -4123,7 +4193,7 @@
41234193     {
41244194         //Save(true);
41254195         Replace();
4126
-        SetUndoStates();
4196
+        SetVersionStates();
41274197     }
41284198     
41294199     private boolean Equal(byte[] compress, byte[] name)
....@@ -4153,7 +4223,7 @@
41534223         
41544224         CopyChanged();
41554225         
4156
-        SetUndoStates();
4226
+        SetVersionStates();
41574227     }
41584228     
41594229     public boolean Save(boolean user)
....@@ -4161,7 +4231,7 @@
41614231         System.err.println("Save");
41624232         Replace();
41634233         
4164
-        cRadio tab = GetCurrentTab();
4234
+        //cRadio tab = GetCurrentTab();
41654235         
41664236         Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
41674237         
....@@ -4199,7 +4269,7 @@
41994269 //            copy.versionlist[i] = null;
42004270 //        }
42014271 
4202
-        SetUndoStates();
4272
+        SetVersionStates();
42034273         
42044274         // test save
42054275         if (false)
....@@ -4259,7 +4329,7 @@
42594329     {
42604330         Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
42614331         
4262
-        SetUndoStates();
4332
+        SetVersionStates();
42634333         
42644334         boolean temp = CameraPane.SWITCH;
42654335         CameraPane.SWITCH = false;
....@@ -4326,12 +4396,15 @@
43264396         return count;
43274397     }
43284398     
4329
-    void SetUndoStates()
4399
+    void SetVersionStates()
43304400     {
4331
-        cRadio tab = GetCurrentTab();
4401
+        //if (true)
4402
+        //    return;
4403
+                    
4404
+        //cRadio tab = GetCurrentTab();
43324405         
4333
-        restoreButton.setEnabled(true); // copy.versionindex != -1);
4334
-        replaceButton.setEnabled(true); // copy.versionindex != -1);
4406
+        restoreButton.setEnabled(copy.versionindex != -1);
4407
+        replaceButton.setEnabled(copy.versionindex != -1);
43354408         
43364409         previousVersionButton.setEnabled(copy.versionindex > 0);
43374410         nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
....@@ -4340,8 +4413,10 @@
43404413                                         copy.versionlist[copy.versionindex + 1] != null);
43414414         
43424415         muteSlider = true;
4416
+        versionSlider.setMinimum(0);
43434417         versionSlider.setMaximum(VersionCount() - 1);
43444418         versionSlider.setInteger(copy.versionindex);
4419
+        versionSlider.setEnabled(copy.versionindex != -1);
43454420         muteSlider = false;
43464421     }
43474422     
....@@ -4352,7 +4427,7 @@
43524427         
43534428         System.err.println("Undo");
43544429         
4355
-        cRadio tab = GetCurrentTab();
4430
+        //cRadio tab = GetCurrentTab();
43564431         
43574432         if (copy.versionindex == 0)
43584433         {
....@@ -4384,7 +4459,7 @@
43844459     {
43854460         System.err.println("Restore");
43864461         
4387
-        cRadio tab = GetCurrentTab();
4462
+        //cRadio tab = GetCurrentTab();
43884463         
43894464         if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
43904465         {
....@@ -4402,7 +4477,7 @@
44024477     {
44034478         System.err.println("Replace");
44044479         
4405
-        cRadio tab = GetCurrentTab();
4480
+        //cRadio tab = GetCurrentTab();
44064481         
44074482         if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
44084483         {
....@@ -4420,7 +4495,7 @@
44204495         // Option?
44214496         Replace();
44224497         
4423
-        cRadio tab = GetCurrentTab();
4498
+        //cRadio tab = GetCurrentTab();
44244499         
44254500         if (copy.versionlist[copy.versionindex + 1] == null)
44264501         {
....@@ -4739,9 +4814,11 @@
47394814             if (muteSlider)
47404815                 return;
47414816             
4817
+            Replace();
4818
+            
47424819             int version = versionSlider.getInteger();
47434820             
4744
-            if (copy.versionlist[version] != null)
4821
+            if (version != -1 && copy.versionlist[version] != null)
47454822             {
47464823                 copy.versionindex = version;
47474824                 CopyChanged();
....@@ -5100,7 +5177,7 @@
51005177         }
51015178         
51025179         if (previousVersionButton != null && copy.versionlist != null)
5103
-            SetUndoStates();
5180
+            SetVersionStates();
51045181     }
51055182     
51065183     static TweenManager tweenManager = new TweenManager();
....@@ -5489,8 +5566,11 @@
54895566             
54905567         if (copy.versionlist == null)
54915568         {
5569
+            // Backward compatibility
54925570             copy.versionlist = new Object3D[100];
54935571             copy.versionindex = -1;
5572
+            
5573
+            //Save(true);
54945574         }
54955575         
54965576             //? SetUndoStates();
....@@ -5582,6 +5662,8 @@
55825662 
55835663     void save()
55845664     {
5665
+        Replace();
5666
+        
55855667         if (lastname == null)
55865668         {
55875669             return;