blame | history | patch | commit | commitdiff
Normand Briere
2019-08-17 07c0c67b88160b51e61c5c1d2b9b602daafa44a9 
 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 
....@@ -378,6 +426,9 @@
378426 
379427     static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
380428 
429
+    // This is to refresh the UI of the material panel.
430
+    boolean patchMaterial;
431
+    
381432     void SetupMenu()
382433     {
383434         frame.setMenuBar(menuBar = new MenuBar());
....@@ -427,6 +478,8 @@
427478         
428479         ChangeListener changeListener = new ChangeListener()
429480         {
481
+            //String name;
482
+            
430483             public void stateChanged(ChangeEvent changeEvent)
431484             {
432485 //                if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
....@@ -445,7 +498,37 @@
445498 //                        EditSelection(false);
446499 //                }
447500 
448
-                refreshContents(false); // To refresh Info tab
501
+//                if (objectPanel.getSelectedIndex() == 4)
502
+//                {
503
+//                    name = copy.skyboxname;
504
+//                    
505
+//                    if (name == null)
506
+//                    {
507
+//                        name = "";
508
+//                    }
509
+//                    
510
+//                    copy.skyboxname = "cubemaps/default-skyboxes/rgb";
511
+//                    copy.skyboxext = "jpg";
512
+//                }
513
+//                else
514
+//                {
515
+//                    if (name != null)
516
+//                    {
517
+//                        if (name.equals(""))
518
+//                        {
519
+//                            copy.skyboxname = null;
520
+//                            copy.skyboxext = null;
521
+//                        }
522
+//                        else
523
+//                        {
524
+//                            copy.skyboxname = name;
525
+//                        }
526
+//                    }
527
+//                }
528
+                cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
529
+                
530
+//                refreshContents(false); // To refresh Info tab
531
+                cameraView.repaint();
449532             }
450533         };
451534         objectPanel.addChangeListener(changeListener);
....@@ -871,18 +954,24 @@
871954         boolean temp = CameraPane.SWITCH;
872955         CameraPane.SWITCH = false;
873956         
874
-        object.ExtractBigData(versiontable);
957
+        if (Grafreed.grafreed.universe.versiontable == null)
958
+            Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
959
+         
960
+        object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
875961         // if (copy == client)
876962         
877963         Object3D versions[] = object.versionlist;
964
+        java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
878965         object.versionlist = null;
966
+        object.versiontable = null;
879967         
880968         //byte[] compress = Compress(copy);
881969         Object3D compress = (Object3D)Grafreed.clone(object);
882970         
883971         object.versionlist = versions;
972
+        object.versiontable = versiontable; // if Grafreed.grafreed.universe
884973         
885
-        object.RestoreBigData(versiontable);
974
+        object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
886975         
887976         CameraPane.SWITCH = temp;
888977         
....@@ -1244,14 +1333,14 @@
12441333             
12451334         liveCB = AddCheckBox(setupPanel, "Live", copy.live);
12461335                 liveCB.setToolTipText("Animate object");
1336
+        markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
1337
+        markCB.setToolTipText("Set target transform");
12471338         selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
12481339                 selectableCB.setToolTipText("Make object selectable");
12491340 //            Return();
12501341                 
12511342         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
12521343                 hideCB.setToolTipText("Hide object");
1253
-        markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1254
-        markCB.setToolTipText("As animation target transform");
12551344         
12561345         ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
12571346         
....@@ -1453,6 +1542,7 @@
14531542 
14541543         if (cam == null || !(copy.get(0) instanceof cGroup))
14551544         {
1545
+        if (Globals.DEBUG)
14561546             System.out.println("CREATE CAMERAS");
14571547             cams = new cTemplate();
14581548             cams.name = "Cameras";
....@@ -1578,14 +1668,14 @@
15781668 
15791669         //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
15801670         //tmp.setName("Edit");
1581
-        objectPanel.add(materialPanel);
1582
-        objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1583
-        objectPanel.setToolTipTextAt(0, "Material");
1584
-    
15851671         objectPanel.add(toolboxPanel);
1586
-        objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1587
-        objectPanel.setToolTipTextAt(1, "Objects & textures");
1672
+        objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
1673
+        objectPanel.setToolTipTextAt(0, "Objects & textures");
15881674 
1675
+        objectPanel.add(materialPanel);
1676
+        objectPanel.setIconAt(1, GetIcon("icons/material.png"));
1677
+        objectPanel.setToolTipTextAt(1, "Material");
1678
+    
15891679         objectPanel.add(skyboxPanel);
15901680         objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
15911681         objectPanel.setToolTipTextAt(2, "Backgrounds");
....@@ -1602,6 +1692,10 @@
16021692         objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
16031693         objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
16041694         
1695
+        patchMaterial = true;
1696
+        cameraView.patchMaterial = this;
1697
+        objectPanel.setSelectedIndex(1);
1698
+                
16051699         /*
16061700         aConstraints.gridx = 0;
16071701         aConstraints.gridwidth = 1;
....@@ -1639,9 +1733,9 @@
16391733         scenePanel.add(tabbedPane);
16401734 
16411735         //if (Globals.ADVANCED)
1642
-            tabbedPane.add(infoPanel);
1643
-        tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1644
-        tabbedPane.setToolTipTextAt(3, "Information");
1736
+//            tabbedPane.add(infoPanel);
1737
+//        tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1738
+//        tabbedPane.setToolTipTextAt(3, "Information");
16451739         
16461740         /*
16471741         cTree jTree = new cTree(null);
....@@ -1739,7 +1833,7 @@
17391833 
17401834         frame.getContentPane().setLayout(new BorderLayout());
17411835         /**/
1742
-        JTabbedPane worldPane = new JTabbedPane();
1836
+        //JTabbedPane worldPane = new JTabbedPane();
17431837         //worldPane.add(bigPanel);
17441838         //worldPane.add(worldPanel);
17451839                 /**/
....@@ -1799,7 +1893,15 @@
17991893                 
18001894                 // Skin
18011895                 colorField.setFloat(material.color);
1802
-                saturationField.setFloat(material.modulation);
1896
+                float saturation = material.modulation;
1897
+                
1898
+                if (!cameraView.Skinshader)
1899
+                {
1900
+                    saturation /= 1.5;
1901
+                }
1902
+                
1903
+                saturationField.setFloat(saturation);
1904
+                
18031905                 subsurfaceField.setFloat(material.subsurface);
18041906                 selfshadowField.setFloat(material.diffuseness);
18051907                 diffusenessField.setFloat(material.factor);
....@@ -2110,6 +2212,21 @@
21102212         });
21112213         presetpanel.add(bump0);
21122214         
2215
+        cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
2216
+        borderShader.setToolTipText("Border fade");
2217
+        borderShader.addMouseListener(new MouseAdapter()
2218
+        {
2219
+            public void mouseClicked(MouseEvent e)
2220
+            {
2221
+                borderfadeField.setFloat(0.5);
2222
+                opacityField.setFloat(0.75);
2223
+
2224
+                materialtouched = true;
2225
+                applySelf();
2226
+            }
2227
+        });
2228
+        presetpanel.add(borderShader);
2229
+        
21132230         cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
21142231         halo.setToolTipText("Halo");
21152232         halo.addMouseListener(new MouseAdapter()
....@@ -2217,9 +2334,20 @@
22172334 
22182335         cGridBag huepanel = new cGridBag();
22192336             cGridBag huelabel = new cGridBag();
2220
-        skin = GetLabel("icons/hue.png", false);
2221
-        skin.fit = true;
2222
-            huelabel.add(skin);
2337
+        cLabel hue = GetLabel("icons/hue.png", false);
2338
+        hue.fit = true;
2339
+        
2340
+        hue.addMouseListener(new MouseAdapter()
2341
+        {
2342
+            public void mousePressed(MouseEvent e)
2343
+            {
2344
+                int x = e.getX();
2345
+                
2346
+                colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
2347
+            }
2348
+        });
2349
+        
2350
+            huelabel.add(hue);
22232351             huelabel.preferredWidth = 20;
22242352             huepanel.add(new cGridBag()); // Label
22252353             huepanel.add(huelabel); // Field/slider
....@@ -3495,32 +3623,8 @@
34953623 
34963624         if (multiplyToggle != null)
34973625                 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
-        }
3626
+        
3627
+        AllocProjectedVertices(object);
35243628 
35253629         SetMaterial(mat, object.projectedVertices);
35263630     }
....@@ -3830,7 +3934,7 @@
38303934             //System.out.println("ObjEditor " + event);
38313935             applySelf0(true);
38323936             //parent.applySelf();
3833
-            objEditor.refreshContents();
3937
+     // conflicts with requestFocus       objEditor.refreshContents();
38343938         } else if (source == resetButton)
38353939         {
38363940             CameraPane.fullreset = true;
....@@ -4123,7 +4227,7 @@
41234227     {
41244228         //Save(true);
41254229         Replace();
4126
-        SetUndoStates();
4230
+        SetVersionStates();
41274231     }
41284232     
41294233     private boolean Equal(byte[] compress, byte[] name)
....@@ -4142,8 +4246,6 @@
41424246         return true;
41434247     }
41444248 
4145
-    java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
4146
-    
41474249     void DeleteVersion()
41484250     {
41494251         for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
....@@ -4151,9 +4253,13 @@
41514253             copy.versionlist[i] = copy.versionlist[i+1];
41524254         }
41534255         
4154
-        CopyChanged();
4256
+        if (copy.versionlist[copy.versionindex] == null)
4257
+            copy.versionindex -= 1;
41554258         
4156
-        SetUndoStates();
4259
+        if (copy.versionindex != -1)
4260
+            CopyChanged();
4261
+        
4262
+        SetVersionStates();
41574263     }
41584264     
41594265     public boolean Save(boolean user)
....@@ -4161,7 +4267,7 @@
41614267         System.err.println("Save");
41624268         Replace();
41634269         
4164
-        cRadio tab = GetCurrentTab();
4270
+        //cRadio tab = GetCurrentTab();
41654271         
41664272         Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
41674273         
....@@ -4199,7 +4305,7 @@
41994305 //            copy.versionlist[i] = null;
42004306 //        }
42014307 
4202
-        SetUndoStates();
4308
+        SetVersionStates();
42034309         
42044310         // test save
42054311         if (false)
....@@ -4259,12 +4365,12 @@
42594365     {
42604366         Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
42614367         
4262
-        SetUndoStates();
4368
+        SetVersionStates();
42634369         
42644370         boolean temp = CameraPane.SWITCH;
42654371         CameraPane.SWITCH = false;
42664372         
4267
-        copy.ExtractBigData(versiontable);
4373
+        copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
42684374         
42694375         copy.clear();
42704376         
....@@ -4276,7 +4382,7 @@
42764382             copy.add(obj.get(i));
42774383         }
42784384         
4279
-        copy.RestoreBigData(versiontable);
4385
+        copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
42804386         
42814387         CameraPane.SWITCH = temp;
42824388         
....@@ -4326,22 +4432,27 @@
43264432         return count;
43274433     }
43284434     
4329
-    void SetUndoStates()
4435
+    void SetVersionStates()
43304436     {
4331
-        cRadio tab = GetCurrentTab();
4437
+        //if (true)
4438
+        //    return;
4439
+                    
4440
+        //cRadio tab = GetCurrentTab();
43324441         
4333
-        restoreButton.setEnabled(true); // copy.versionindex != -1);
4334
-        replaceButton.setEnabled(true); // copy.versionindex != -1);
4442
+        restoreButton.setEnabled(copy.versionindex != -1);
4443
+        replaceButton.setEnabled(copy.versionindex != -1);
43354444         
43364445         previousVersionButton.setEnabled(copy.versionindex > 0);
43374446         nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
43384447         
4339
-        deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
4340
-                                        copy.versionlist[copy.versionindex + 1] != null);
4448
+        deleteVersionButton.setEnabled(copy.versionindex != -1);
4449
+                                        //copy.versionlist[copy.versionindex + 1] != null);
43414450         
43424451         muteSlider = true;
4452
+        versionSlider.setMinimum(0);
43434453         versionSlider.setMaximum(VersionCount() - 1);
43444454         versionSlider.setInteger(copy.versionindex);
4455
+        versionSlider.setEnabled(copy.versionindex != -1);
43454456         muteSlider = false;
43464457     }
43474458     
....@@ -4352,7 +4463,7 @@
43524463         
43534464         System.err.println("Undo");
43544465         
4355
-        cRadio tab = GetCurrentTab();
4466
+        //cRadio tab = GetCurrentTab();
43564467         
43574468         if (copy.versionindex == 0)
43584469         {
....@@ -4384,7 +4495,7 @@
43844495     {
43854496         System.err.println("Restore");
43864497         
4387
-        cRadio tab = GetCurrentTab();
4498
+        //cRadio tab = GetCurrentTab();
43884499         
43894500         if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
43904501         {
....@@ -4400,9 +4511,9 @@
44004511 
44014512     public boolean Replace()
44024513     {
4403
-        System.err.println("Replace");
4514
+        //System.err.println("Replace");
44044515         
4405
-        cRadio tab = GetCurrentTab();
4516
+        //cRadio tab = GetCurrentTab();
44064517         
44074518         if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
44084519         {
....@@ -4420,7 +4531,7 @@
44204531         // Option?
44214532         Replace();
44224533         
4423
-        cRadio tab = GetCurrentTab();
4534
+        //cRadio tab = GetCurrentTab();
44244535         
44254536         if (copy.versionlist[copy.versionindex + 1] == null)
44264537         {
....@@ -4739,9 +4850,11 @@
47394850             if (muteSlider)
47404851                 return;
47414852             
4853
+            Replace();
4854
+            
47424855             int version = versionSlider.getInteger();
47434856             
4744
-            if (copy.versionlist[version] != null)
4857
+            if (version != -1 && copy.versionlist[version] != null)
47454858             {
47464859                 copy.versionindex = version;
47474860                 CopyChanged();
....@@ -5100,7 +5213,9 @@
51005213         }
51015214         
51025215         if (previousVersionButton != null && copy.versionlist != null)
5103
-            SetUndoStates();
5216
+            SetVersionStates();
5217
+        
5218
+        cameraView.requestFocusInWindow();
51045219     }
51055220     
51065221     static TweenManager tweenManager = new TweenManager();
....@@ -5132,7 +5247,7 @@
51325247 //                group = (Composite) group.get(0);
51335248 //            }
51345249 
5135
-        System.out.println("makeSomething of " + thing);
5250
+        //System.out.println("makeSomething of " + thing);
51365251 
51375252         /*
51385253         if (deselect && jList != null)
....@@ -5486,11 +5601,15 @@
54865601 
54875602             copy.versionlist = readobj.versionlist;
54885603             copy.versionindex = readobj.versionindex;
5604
+            copy.versiontable = readobj.versiontable;
54895605             
54905606         if (copy.versionlist == null)
54915607         {
5608
+            // Backward compatibility
54925609             copy.versionlist = new Object3D[100];
54935610             copy.versionindex = -1;
5611
+            
5612
+            //Save(true);
54945613         }
54955614         
54965615             //? SetUndoStates();
....@@ -5582,6 +5701,8 @@
55825701 
55835702     void save()
55845703     {
5704
+        Replace();
5705
+        
55855706         if (lastname == null)
55865707         {
55875708             return;