Skin shader

Normand Briere

2017-05-07 314b34423070cf127464da79a53cddf6b1c38587

 ObjEditor.java
..
..
@@ -692,7 +692,7 @@
692
692
     protected static ImageIcon createImageIcon(String path,
693
693
             String description)
694
694
     {
695
-        java.net.URL imgURL = GraphreeD.class.getResource(path);
695
+        java.net.URL imgURL = GrafreeD.class.getResource(path);
696
696
         if (imgURL != null)
697
697
         {
698
698
             return new ImageIcon(imgURL, description);
..
..
@@ -1107,7 +1107,7 @@
1107
1107
         //frontScroll.setLabel("------------------------------ XZ (front) ---------------------------------------------------");
1108
1108
         //sideScroll.setLabel("------------------------------- YZ (side) ---------------------------------------------------");
1109
1109
 
1110
-//            GridBagConstraints gbc = (GridBagConstraints) GraphreeD.clone(aConstraints);
1110
+//            GridBagConstraints gbc = (GridBagConstraints) GrafreeD.clone(aConstraints);
1111
1111
         Camera cam = GetCamera(copy, 0);
1112
1112
 
1113
1113
         Composite cams = null;
..
..
@@ -1334,7 +1334,7 @@
1334
1334
         frame.getContentPane().add(/*"Center",*/framePanel);
1335
1335
         //frame.getContentPane().add(/*"Center",*/ worldPane);
1336
1336
 
1337
-//            aConstraints = gbc; // (GridBagConstraints) GraphreeD.clone(gbc);
1337
+//            aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1338
1338
 
1339
1339
         frame.setSize(1024, 768);
1340
1340
         frame.show();
..
..
@@ -2345,7 +2345,7 @@
2345
2345
 
2346
2346
     void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2347
2347
     {
2348
-        if (GraphreeD.standAlone)
2348
+        if (GrafreeD.standAlone)
2349
2349
         {
2350
2350
             /**/
2351
2351
             FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
..
..
@@ -3183,8 +3183,8 @@
3183
3183
 
3184
3184
                 CameraPane.ANIMATION ^= true;
3185
3185
 
3186
-                GraphreeD.wav.cursor = 0;
3187
-                GraphreeD.wav.loop = 0;
3186
+                GrafreeD.wav.cursor = 0;
3187
+                GrafreeD.wav.loop = 0;
3188
3188
             }
3189
3189
         } else
3190
3190
         {
..
..
@@ -4085,7 +4085,7 @@
4085
4085
 
4086
4086
     void load() // throws ClassNotFoundException
4087
4087
     {
4088
-        if (GraphreeD.standAlone)
4088
+        if (GrafreeD.standAlone)
4089
4089
         {
4090
4090
             FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4091
4091
             browser.show();
..
..
@@ -4190,7 +4190,7 @@
4190
4190
 
4191
4191
     void saveAs()
4192
4192
     {
4193
-        if (GraphreeD.standAlone)
4193
+        if (GrafreeD.standAlone)
4194
4194
         {
4195
4195
             FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4196
4196
             browser.setVisible(true);
..
..
@@ -4213,10 +4213,20 @@
4213
4213
 
4214
4214
         Object3D object = copy.selection.get(0);
4215
4215
         
4216
+        FileObject fileobj = null;
4217
+        
4218
+        if (object instanceof FileObject)
4219
+            fileobj = (FileObject)object;
4220
+        
4216
4221
         if (object.fileparent != null)
4217
4222
         {
4218
-            FileObject fileobj = (FileObject) object.fileparent;
4223
+            assert(fileobj == null);
4219
4224
             
4225
+            fileobj = (FileObject) object.fileparent;
4226
+        }
4227
+            
4228
+        if (fileobj != null)
4229
+        {
4220
4230
             System.out.println("WriteObject " + object + " : " + fileobj.name);
4221
4231
             WriteObject(object, fileobj.name);
4222
4232
         }
..
..
@@ -4259,7 +4269,7 @@
4259
4269
             }
4260
4270
         }
4261
4271
         else
4262
-        //if (GraphreeD.standAlone)
4272
+        //if (GrafreeD.standAlone)
4263
4273
         {
4264
4274
             FileDialog browser = new FileDialog(frame, "Export", FileDialog.SAVE);
4265
4275
             browser.setVisible(true);
..
..
@@ -4291,7 +4301,7 @@
4291
4301
             Object3D objectparent = obj.parent;
4292
4302
             obj.parent = null;
4293
4303
 
4294
-            Object3D object = (Object3D) GraphreeD.clone(obj);
4304
+            Object3D object = (Object3D) GrafreeD.clone(obj);
4295
4305
 
4296
4306
             obj.parent = objectparent;
4297
4307
 
..
..
@@ -4325,7 +4335,7 @@
4325
4335
         buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4326
4336
         cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4327
4337
         copy.generatePOV(buffer);
4328
-        if (GraphreeD.standAlone)
4338
+        if (GrafreeD.standAlone)
4329
4339
         {
4330
4340
             FileDialog browser = new FileDialog(frame, "Export POV", 1);
4331
4341
             browser.show();