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     }
....@@ -347,7 +388,8 @@
347388         //parent = p;
348389 
349390         GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
350
-        System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
391
+        if (Globals.DEBUG)
392
+            System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
351393         //gd.setFullScreenWindow(this);
352394         //setResizable(false);
353395         //if (!isDisplayable())
....@@ -433,6 +475,8 @@
433475         
434476         ChangeListener changeListener = new ChangeListener()
435477         {
478
+            //String name;
479
+            
436480             public void stateChanged(ChangeEvent changeEvent)
437481             {
438482 //                if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
....@@ -451,7 +495,37 @@
451495 //                        EditSelection(false);
452496 //                }
453497 
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
+                
454527 //                refreshContents(false); // To refresh Info tab
528
+                cameraView.repaint();
455529             }
456530         };
457531         objectPanel.addChangeListener(changeListener);
....@@ -1250,14 +1324,14 @@
12501324             
12511325         liveCB = AddCheckBox(setupPanel, "Live", copy.live);
12521326                 liveCB.setToolTipText("Animate object");
1327
+        markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
1328
+        markCB.setToolTipText("Set target transform");
12531329         selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
12541330                 selectableCB.setToolTipText("Make object selectable");
12551331 //            Return();
12561332                 
12571333         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
12581334                 hideCB.setToolTipText("Hide object");
1259
-        markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1260
-        markCB.setToolTipText("As animation target transform");
12611335         
12621336         ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
12631337         
....@@ -1459,6 +1533,7 @@
14591533 
14601534         if (cam == null || !(copy.get(0) instanceof cGroup))
14611535         {
1536
+        if (Globals.DEBUG)
14621537             System.out.println("CREATE CAMERAS");
14631538             cams = new cTemplate();
14641539             cams.name = "Cameras";
....@@ -1645,9 +1720,9 @@
16451720         scenePanel.add(tabbedPane);
16461721 
16471722         //if (Globals.ADVANCED)
1648
-            tabbedPane.add(infoPanel);
1649
-        tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1650
-        tabbedPane.setToolTipTextAt(3, "Information");
1723
+//            tabbedPane.add(infoPanel);
1724
+//        tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1725
+//        tabbedPane.setToolTipTextAt(3, "Information");
16511726         
16521727         /*
16531728         cTree jTree = new cTree(null);
....@@ -1745,7 +1820,7 @@
17451820 
17461821         frame.getContentPane().setLayout(new BorderLayout());
17471822         /**/
1748
-        JTabbedPane worldPane = new JTabbedPane();
1823
+        //JTabbedPane worldPane = new JTabbedPane();
17491824         //worldPane.add(bigPanel);
17501825         //worldPane.add(worldPanel);
17511826                 /**/
....@@ -2116,6 +2191,21 @@
21162191         });
21172192         presetpanel.add(bump0);
21182193         
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
+        
21192209         cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
21202210         halo.setToolTipText("Halo");
21212211         halo.addMouseListener(new MouseAdapter()
....@@ -2223,9 +2313,20 @@
22232313 
22242314         cGridBag huepanel = new cGridBag();
22252315             cGridBag huelabel = new cGridBag();
2226
-        skin = GetLabel("icons/hue.png", false);
2227
-        skin.fit = true;
2228
-            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);
22292330             huelabel.preferredWidth = 20;
22302331             huepanel.add(new cGridBag()); // Label
22312332             huepanel.add(huelabel); // Field/slider
....@@ -3501,32 +3602,8 @@
35013602 
35023603         if (multiplyToggle != null)
35033604                 multiplyToggle.setSelected(mat.multiply);
3504
-
3505
-        assert (object.projectedVertices != null);
3506
-
3507
-        if (object.projectedVertices.length <= 2)
3508
-        {
3509
-            // Side effect...
3510
-            Object3D.cVector2[] keep = object.projectedVertices;
3511
-            object.projectedVertices = new Object3D.cVector2[3];
3512
-            for (int i = 0; i < 3; i++)
3513
-            {
3514
-                if (i < keep.length)
3515
-                {
3516
-                    object.projectedVertices[i] = keep[i];
3517
-                } else
3518
-                {
3519
-                    object.projectedVertices[i] = new Object3D.cVector2();
3520
-                }
3521
-                /*
3522
-                if(keep.length == 0)
3523
-                object.projectedVertices[0] = new Object3D.cVector2();
3524
-                else
3525
-                object.projectedVertices[0] = keep[0];
3526
-                object.projectedVertices[1] = new Object3D.cVector2();
3527
-                 */
3528
-            }
3529
-        }
3605
+        
3606
+        AllocProjectedVertices(object);
35303607 
35313608         SetMaterial(mat, object.projectedVertices);
35323609     }
....@@ -4129,7 +4206,7 @@
41294206     {
41304207         //Save(true);
41314208         Replace();
4132
-        SetUndoStates();
4209
+        SetVersionStates();
41334210     }
41344211     
41354212     private boolean Equal(byte[] compress, byte[] name)
....@@ -4159,7 +4236,7 @@
41594236         
41604237         CopyChanged();
41614238         
4162
-        SetUndoStates();
4239
+        SetVersionStates();
41634240     }
41644241     
41654242     public boolean Save(boolean user)
....@@ -4205,7 +4282,7 @@
42054282 //            copy.versionlist[i] = null;
42064283 //        }
42074284 
4208
-        SetUndoStates();
4285
+        SetVersionStates();
42094286         
42104287         // test save
42114288         if (false)
....@@ -4265,7 +4342,7 @@
42654342     {
42664343         Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
42674344         
4268
-        SetUndoStates();
4345
+        SetVersionStates();
42694346         
42704347         boolean temp = CameraPane.SWITCH;
42714348         CameraPane.SWITCH = false;
....@@ -4332,7 +4409,7 @@
43324409         return count;
43334410     }
43344411     
4335
-    void SetUndoStates()
4412
+    void SetVersionStates()
43364413     {
43374414         //if (true)
43384415         //    return;
....@@ -4750,6 +4827,8 @@
47504827             if (muteSlider)
47514828                 return;
47524829             
4830
+            Replace();
4831
+            
47534832             int version = versionSlider.getInteger();
47544833             
47554834             if (version != -1 && copy.versionlist[version] != null)
....@@ -5111,7 +5190,9 @@
51115190         }
51125191         
51135192         if (previousVersionButton != null && copy.versionlist != null)
5114
-            SetUndoStates();
5193
+            SetVersionStates();
5194
+        
5195
+        cameraView.requestFocusInWindow();
51155196     }
51165197     
51175198     static TweenManager tweenManager = new TweenManager();
....@@ -5143,7 +5224,7 @@
51435224 //                group = (Composite) group.get(0);
51445225 //            }
51455226 
5146
-        System.out.println("makeSomething of " + thing);
5227
+        //System.out.println("makeSomething of " + thing);
51475228 
51485229         /*
51495230         if (deselect && jList != null)
....@@ -5504,7 +5585,7 @@
55045585             copy.versionlist = new Object3D[100];
55055586             copy.versionindex = -1;
55065587             
5507
-            Save(true);
5588
+            //Save(true);
55085589         }
55095590         
55105591             //? SetUndoStates();
....@@ -5596,6 +5677,8 @@
55965677 
55975678     void save()
55985679     {
5680
+        Replace();
5681
+        
55995682         if (lastname == null)
56005683         {
56015684             return;