blame | history | patch | commit | commitdiff
Normand Briere
2019-06-17 13e9febe94aaeebad9c97f6d3e2aa4d73b2495c8 
 ObjEditor.java
....@@ -278,7 +278,7 @@
278278         frame.setMenuBar(menuBar = new MenuBar());
279279         menuBar.add(fileMenu = new Menu("File"));
280280         fileMenu.add(newItem = new MenuItem("New"));
281
-        fileMenu.add(loadItem = new MenuItem("Load..."));
281
+        fileMenu.add(loadItem = new MenuItem("Open..."));
282282         
283283                 //oe.menuBar.add(menu = new Menu("Include"));
284284         Menu menu = new Menu("Import");
....@@ -419,10 +419,10 @@
419419             e.printStackTrace();
420420         }
421421         
422
-        String selection = infoarea.getText();
423
-        java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
424
-        java.awt.datatransfer.Clipboard clipboard = 
425
-                Toolkit.getDefaultToolkit().getSystemClipboard();
422
+//        String selection = infoarea.getText();
423
+//        java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
424
+//        java.awt.datatransfer.Clipboard clipboard = 
425
+//                Toolkit.getDefaultToolkit().getSystemClipboard();
426426         //clipboard.setContents(data, data);
427427     }
428428     
....@@ -1935,6 +1935,7 @@
19351935             e2.printStackTrace();
19361936         }
19371937     }
1938
+    
19381939     LoadJMEThread loadThread;
19391940 
19401941     class LoadJMEThread extends Thread
....@@ -1992,6 +1993,7 @@
19921993             //LoadFile0(filename, converter);
19931994         }
19941995     }
1996
+    
19951997     LoadOBJThread loadObjThread;
19961998 
19971999     class LoadOBJThread extends Thread
....@@ -2070,19 +2072,19 @@
20702072 
20712073     void LoadObjFile(String fullname)
20722074     {
2073
-        /*
2075
+        System.out.println("Loading " + fullname);
2076
+        /**/
20742077         //lastFilename = fullname;
20752078         if(loadObjThread == null)
20762079         {
2077
-        loadObjThread = new LoadOBJThread();
2078
-        loadObjThread.start();
2080
+            loadObjThread = new LoadOBJThread();
2081
+            loadObjThread.start();
20792082         }
20802083         
20812084         loadObjThread.add(fullname);
2082
-         */
2085
+        /**/
20832086 
2084
-        System.out.println("Loading " + fullname);
2085
-        makeSomething(new FileObject(fullname, true), true);
2087
+        //makeSomething(new FileObject(fullname, true), true);
20862088     }
20872089 
20882090     void LoadGFDFile(String fullname)
....@@ -2925,7 +2927,7 @@
29252927             return;
29262928         } else if (event.getSource() == toggleSwitchItem)
29272929         {
2928
-            cameraView.ToggleRandom();
2930
+            cameraView.ToggleSwitch();
29292931             cameraView.repaint();
29302932             return;
29312933         } else if (event.getSource() == toggleHandleItem)
....@@ -3207,10 +3209,224 @@
32073209         {
32083210             copy.remove(1);
32093211         }
3212
+        
32103213         ResetModel();
32113214         objEditor.refreshContents();
32123215     }
32133216     
3217
+    static public byte[] Compress(Object3D o)
3218
+    {
3219
+        try
3220
+        {
3221
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
3222
+            java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3223
+            ObjectOutputStream out = new ObjectOutputStream(zstream);
3224
+
3225
+        Object3D parent = o.parent;
3226
+        o.parent = null;
3227
+        
3228
+            out.writeObject(o);
3229
+            
3230
+        o.parent = parent;
3231
+        
3232
+            out.flush();
3233
+
3234
+            zstream.close();
3235
+            out.close();
3236
+            
3237
+            return baos.toByteArray();
3238
+        } catch (Exception e)
3239
+        {
3240
+            System.err.println(e);
3241
+            return null;
3242
+        }
3243
+    }
3244
+
3245
+    static public Object Uncompress(byte[] bytes)
3246
+    {
3247
+        System.out.println("#bytes = " + bytes.length);
3248
+        try
3249
+        {
3250
+            ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3251
+            java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3252
+            ObjectInputStream in = new ObjectInputStream(istream);
3253
+            Object obj = in.readObject();
3254
+            in.close();
3255
+            
3256
+            return obj;
3257
+        } catch (Exception e)
3258
+        {
3259
+            System.err.println(e);
3260
+            return null;
3261
+        }
3262
+    }
3263
+
3264
+    static public Object clone(Object o)
3265
+    {
3266
+        try
3267
+        {
3268
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
3269
+            ObjectOutputStream out = new ObjectOutputStream(baos);
3270
+
3271
+            out.writeObject(o);
3272
+            
3273
+            out.flush();
3274
+            out.close();
3275
+            
3276
+            byte[] bytes = baos.toByteArray();
3277
+            
3278
+            System.out.println("clone = " + bytes.length);
3279
+
3280
+            ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3281
+            ObjectInputStream in = new ObjectInputStream(bais);
3282
+            Object obj = in.readObject();
3283
+            in.close();
3284
+            
3285
+            return obj;
3286
+        } catch (Exception e)
3287
+        {
3288
+            System.err.println(e);
3289
+            return null;
3290
+        }
3291
+    }
3292
+
3293
+    cRadio GetCurrentTab()
3294
+    {
3295
+        cRadio ab;
3296
+        for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3297
+        {
3298
+            ab = (cRadio)e.nextElement();
3299
+            if(ab.GetObject() == copy)
3300
+            {
3301
+                return ab;
3302
+            }
3303
+        }
3304
+        
3305
+        return null;
3306
+    }
3307
+    
3308
+    java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3309
+    
3310
+    public void Save()
3311
+    {
3312
+        cRadio tab = GetCurrentTab();
3313
+        
3314
+        boolean temp = CameraPane.SWITCH;
3315
+        CameraPane.SWITCH = false;
3316
+        
3317
+        copy.ExtractBigData(hashtable);
3318
+        
3319
+        //EditorFrame.m_MainFrame.requestFocusInWindow();
3320
+        tab.graphs[tab.undoindex++] = Compress(copy);
3321
+
3322
+        copy.RestoreBigData(hashtable);
3323
+
3324
+        CameraPane.SWITCH = temp;
3325
+        
3326
+        //assert(hashtable.isEmpty());
3327
+        
3328
+        for (int i = tab.undoindex; i < tab.graphs.length; i++)
3329
+        {
3330
+            tab.graphs[i] = null;
3331
+        }
3332
+
3333
+        // test save
3334
+        if (false)
3335
+        {
3336
+            try
3337
+            {
3338
+                FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
3339
+                ObjectOutputStream p = new ObjectOutputStream(ostream);
3340
+
3341
+                p.writeObject(copy);
3342
+                
3343
+                p.flush();
3344
+
3345
+                ostream.close();
3346
+            } catch (Exception e)
3347
+            {
3348
+                e.printStackTrace();
3349
+            }
3350
+        }
3351
+    }
3352
+
3353
+    void CopyChanged(Object3D obj)
3354
+    {
3355
+        boolean temp = CameraPane.SWITCH;
3356
+        CameraPane.SWITCH = false;
3357
+        
3358
+        copy.ExtractBigData(hashtable);
3359
+        
3360
+        copy.clear();
3361
+        
3362
+        for (int i=0; i<obj.Size(); i++)
3363
+        {
3364
+            copy.add(obj.get(i));
3365
+        }
3366
+        
3367
+        copy.RestoreBigData(hashtable);
3368
+        
3369
+        CameraPane.SWITCH = temp;
3370
+        
3371
+        //assert(hashtable.isEmpty());
3372
+        
3373
+        copy.Touch();
3374
+        
3375
+        ResetModel();
3376
+        copy.HardTouch(); // recompile?
3377
+        
3378
+        cRadio ab;
3379
+        for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3380
+        {
3381
+            ab = (cRadio)e.nextElement();
3382
+            Object3D test = copy.GetObject(ab.object.GetUUID());
3383
+            //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
3384
+            if (test != null)
3385
+            {
3386
+                test.editWindow = ab.object.editWindow;
3387
+                ab.object = test;
3388
+            }
3389
+        }
3390
+        
3391
+        refreshContents();
3392
+    }
3393
+    
3394
+    public void Undo()
3395
+    {
3396
+        cRadio tab = GetCurrentTab();
3397
+        
3398
+        if (tab.undoindex == 0)
3399
+        {
3400
+            java.awt.Toolkit.getDefaultToolkit().beep();
3401
+            return;
3402
+        }
3403
+
3404
+        if (tab.graphs[tab.undoindex] == null)
3405
+        {
3406
+            Save();
3407
+            tab.undoindex -= 1;
3408
+        }
3409
+
3410
+        tab.undoindex -= 1;
3411
+
3412
+        CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
3413
+    }
3414
+
3415
+    public void Redo()
3416
+    {
3417
+        cRadio tab = GetCurrentTab();
3418
+        
3419
+        if (tab.graphs[tab.undoindex + 1] == null)
3420
+        {
3421
+            java.awt.Toolkit.getDefaultToolkit().beep();
3422
+            return;
3423
+        }
3424
+
3425
+        tab.undoindex += 1;
3426
+
3427
+        CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
3428
+    }
3429
+
32143430         void ImportGFD()
32153431         {
32163432             FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
....@@ -3855,6 +4071,7 @@
38554071 
38564072     void makeSomething(Object3D thing, boolean resetmodel) // deselect)
38574073     {
4074
+        Save();
38584075         //Tween.set(thing, 0).target(1).start(tweenManager);
38594076         //Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
38604077 //            if (thing instanceof GenericJointDemo)
....@@ -4078,6 +4295,7 @@
40784295 
40794296         try
40804297         {
4298
+            // Try compressed version first.
40814299             java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
40824300             java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
40834301             java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
....@@ -4147,6 +4365,12 @@
41474365 
41484366     void LoadIt(Object obj)
41494367     {
4368
+        if (obj == null)
4369
+        {
4370
+            // Invalid file
4371
+            return;
4372
+        }
4373
+        
41504374         System.out.println("Loaded " + obj);
41514375         //new Exception().printStackTrace();
41524376         Object3D readobj = (Object3D) obj;
....@@ -4156,6 +4380,7 @@
41564380         
41574381         if (readobj != null)
41584382         {
4383
+            Save();
41594384             try
41604385             {
41614386                 //readobj.deepCopySelf(copy);