Fix textures in jar.

Normand Briere

2019-08-15 24a2a946b35279605e645349bd6b82e9e60aac88

 ObjEditor.java
..
..
@@ -75,8 +75,16 @@
75
75
         return new cCheckBox(icon, border);
76
76
     }
77
77
 
78
+    static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
79
+    
78
80
     ImageIcon GetIcon(String name)
79
81
     {
82
+        javax.swing.ImageIcon iconCache = icons.get(name);
83
+        if (iconCache != null)
84
+        {
85
+            return iconCache;
86
+        }
87
+        
80
88
         try
81
89
         {
82
90
             BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
..
..
@@ -94,10 +102,14 @@
94
102
 //            }
95
103
 
96
104
             javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
105
+            
106
+            icons.put(name, icon);
107
+            
97
108
             return icon;
98
109
         }
99
110
         catch (Exception e)
100
111
         {
112
+            //icons.put(name, null);
101
113
             return null;
102
114
         }
103
115
     }
..
..
@@ -433,6 +445,8 @@
433
445
         
434
446
         ChangeListener changeListener = new ChangeListener()
435
447
         {
448
+            //String name;
449
+            
436
450
             public void stateChanged(ChangeEvent changeEvent)
437
451
             {
438
452
 //                if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
..
..
@@ -451,7 +465,37 @@
451
465
 //                        EditSelection(false);
452
466
 //                }
453
467
 
468
+//                if (objectPanel.getSelectedIndex() == 4)
469
+//                {
470
+//                    name = copy.skyboxname;
471
+//                    
472
+//                    if (name == null)
473
+//                    {
474
+//                        name = "";
475
+//                    }
476
+//                    
477
+//                    copy.skyboxname = "cubemaps/default-skyboxes/rgb";
478
+//                    copy.skyboxext = "jpg";
479
+//                }
480
+//                else
481
+//                {
482
+//                    if (name != null)
483
+//                    {
484
+//                        if (name.equals(""))
485
+//                        {
486
+//                            copy.skyboxname = null;
487
+//                            copy.skyboxext = null;
488
+//                        }
489
+//                        else
490
+//                        {
491
+//                            copy.skyboxname = name;
492
+//                        }
493
+//                    }
494
+//                }
495
+                cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
496
+                
454
497
 //                refreshContents(false); // To refresh Info tab
498
+                cameraView.repaint();
455
499
             }
456
500
         };
457
501
         objectPanel.addChangeListener(changeListener);
..
..
@@ -1645,9 +1689,9 @@
1645
1689
         scenePanel.add(tabbedPane);
1646
1690
 
1647
1691
         //if (Globals.ADVANCED)
1648
-            tabbedPane.add(infoPanel);
1649
-        tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1650
-        tabbedPane.setToolTipTextAt(3, "Information");
1692
+//            tabbedPane.add(infoPanel);
1693
+//        tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1694
+//        tabbedPane.setToolTipTextAt(3, "Information");
1651
1695
         
1652
1696
         /*
1653
1697
         cTree jTree = new cTree(null);
..
..
@@ -1745,7 +1789,7 @@
1745
1789
 
1746
1790
         frame.getContentPane().setLayout(new BorderLayout());
1747
1791
         /**/
1748
-        JTabbedPane worldPane = new JTabbedPane();
1792
+        //JTabbedPane worldPane = new JTabbedPane();
1749
1793
         //worldPane.add(bigPanel);
1750
1794
         //worldPane.add(worldPanel);
1751
1795
                 /**/
..
..
@@ -4129,7 +4173,7 @@
4129
4173
     {
4130
4174
         //Save(true);
4131
4175
         Replace();
4132
-        SetUndoStates();
4176
+        SetVersionStates();
4133
4177
     }
4134
4178
     
4135
4179
     private boolean Equal(byte[] compress, byte[] name)
..
..
@@ -4159,7 +4203,7 @@
4159
4203
         
4160
4204
         CopyChanged();
4161
4205
         
4162
-        SetUndoStates();
4206
+        SetVersionStates();
4163
4207
     }
4164
4208
     
4165
4209
     public boolean Save(boolean user)
..
..
@@ -4205,7 +4249,7 @@
4205
4249
 //            copy.versionlist[i] = null;
4206
4250
 //        }
4207
4251
 
4208
-        SetUndoStates();
4252
+        SetVersionStates();
4209
4253
         
4210
4254
         // test save
4211
4255
         if (false)
..
..
@@ -4265,7 +4309,7 @@
4265
4309
     {
4266
4310
         Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
4267
4311
         
4268
-        SetUndoStates();
4312
+        SetVersionStates();
4269
4313
         
4270
4314
         boolean temp = CameraPane.SWITCH;
4271
4315
         CameraPane.SWITCH = false;
..
..
@@ -4332,7 +4376,7 @@
4332
4376
         return count;
4333
4377
     }
4334
4378
     
4335
-    void SetUndoStates()
4379
+    void SetVersionStates()
4336
4380
     {
4337
4381
         //if (true)
4338
4382
         //    return;
..
..
@@ -4750,6 +4794,8 @@
4750
4794
             if (muteSlider)
4751
4795
                 return;
4752
4796
             
4797
+            Replace();
4798
+            
4753
4799
             int version = versionSlider.getInteger();
4754
4800
             
4755
4801
             if (version != -1 && copy.versionlist[version] != null)
..
..
@@ -5111,7 +5157,7 @@
5111
5157
         }
5112
5158
         
5113
5159
         if (previousVersionButton != null && copy.versionlist != null)
5114
-            SetUndoStates();
5160
+            SetVersionStates();
5115
5161
     }
5116
5162
     
5117
5163
     static TweenManager tweenManager = new TweenManager();
..
..
@@ -5504,7 +5550,7 @@
5504
5550
             copy.versionlist = new Object3D[100];
5505
5551
             copy.versionindex = -1;
5506
5552
             
5507
-            Save(true);
5553
+            //Save(true);
5508
5554
         }
5509
5555
         
5510
5556
             //? SetUndoStates();
..
..
@@ -5596,6 +5642,8 @@
5596
5642
 
5597
5643
     void save()
5598
5644
     {
5645
+        Replace();
5646
+        
5599
5647
         if (lastname == null)
5600
5648
         {
5601
5649
             return;