Skin shader + material panel fix.

Normand Briere

2019-08-17 ecc1309a04b527c62ffe97e814daf050dbd025cd

 Grafreed.java
..
..
@@ -62,7 +62,7 @@
62
62
     
63
63
     static void ParseFileSystem(java.io.File dir, iResourceCallBack callback, String prefix)
64
64
     {
65
-        callback.CallBack(RemovePrefix(dir.toString(),prefix).split("/"));
65
+        callback.ResourceCallBack(RemovePrefix(dir.toString(),prefix).split("/"));
66
66
         File[] listFiles = dir.listFiles();
67
67
         if (listFiles != null)
68
68
         {
..
..
@@ -75,7 +75,7 @@
75
75
         
76
76
     static interface iResourceCallBack
77
77
     {
78
-        void CallBack(String[] path);
78
+        void ResourceCallBack(String[] path);
79
79
     }
80
80
     
81
81
     static void ParseResources(String path, iResourceCallBack callback)
..
..
@@ -94,7 +94,7 @@
94
94
                     String name = entries.nextElement().getName();
95
95
                     
96
96
                     if (name.startsWith(path + "/"))
97
-                        callback.CallBack(RemovePrefix(name, path).split("/"));
97
+                        callback.ResourceCallBack(RemovePrefix(name, path + "/").split("/"));
98
98
                 }
99
99
                 jar.close();
100
100
             } catch (Exception ex)
..
..
@@ -110,7 +110,7 @@
110
110
                 try
111
111
                 {
112
112
                     java.io.File apps = new java.io.File(url.toURI());
113
-                    ParseFileSystem(apps, callback, RemovePrefix(url.toString(), "file:"));
113
+                    ParseFileSystem(apps, callback, RemovePrefix(url.toString() + "/", "file:"));
114
114
 //                    for (java.io.File app : apps.listFiles())
115
115
 //                    {
116
116
 //                        //System.out.println(RemovePrefix(app.toString(), RemovePrefix(url.toString(), "file:") + "/"));
..
..
@@ -676,7 +676,8 @@
676
676
     
677
677
     public static void main(String argv[])
678
678
     {
679
-                String osArch = System.getProperty("os.arch");
679
+         String osArch = System.getProperty("os.arch");
680
+        if (Globals.DEBUG)
680
681
                 System.out.println("os.arch = " + osArch);
681
682
                 
682
683
         if (argv.length == 0)
..
..
@@ -928,6 +929,9 @@
928
929
         grafreed.universe = new cGroup();
929
930
         grafreed.universe.name = "Grafreed";
930
931
         grafreed.universe.material = new cMaterial();
932
+        grafreed.universe.skyboxname = "cubemaps/penguins-skyboxes/yonder";
933
+        grafreed.universe.skyboxext = "jpg";
934
+        
931
935
         //   theApplet3D.universe.textures = CameraPane.DEFAULT_TEXTURE;
932
936
 
933
937
         grafreed.universe.root = true;
..
..
@@ -935,6 +939,8 @@
935
939
         //mon.stop();
936
940
         //System.out.println(mon);
937
941
         //timeflow.app.TimeflowAppLauncher.GetTimeFlow();
942
+        
943
+        javax.swing.ToolTipManager.sharedInstance().setEnabled(Globals.TOOLTIPS);
938
944
     }
939
945
 
940
946
     static Object3D materials;
..
..
@@ -950,6 +956,8 @@
950
956
             java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
951
957
 
952
958
             readobj = (Object3D) p.readObject();
959
+            p.close();
960
+            zstream.close();
953
961
             istream.close();
954
962
 
955
963
             readobj.ResetDisplayList();
..
..
@@ -963,6 +971,7 @@
963
971
                 java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
964
972
 
965
973
                 readobj = (Object3D) p.readObject();
974
+                p.close();
966
975
                 istream.close();
967
976
 
968
977
                 readobj.ResetDisplayList();