blame | history | patch | commit | commitdiff
Normand Briere
2019-06-11 4113164b3be1e50251ac40d6fd65660f0a6c2e63 
 ObjEditor.java
....@@ -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
....@@ -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)
....@@ -3212,23 +3214,40 @@
32123214         objEditor.refreshContents();
32133215     }
32143216     
3215
-    Object3D graphs[] = new Object3D[10000];
3216
-    int undoindex = 0;
3217
-    
3218
-    static public Object clone(Object o)
3217
+    static public byte[] Compress(Object o)
32193218     {
32203219         try
32213220         {
32223221             ByteArrayOutputStream baos = new ByteArrayOutputStream();
3223
-            ObjectOutputStream out = new ObjectOutputStream(baos);
3222
+            java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3223
+            ObjectOutputStream out = new ObjectOutputStream(zstream);
32243224 
32253225             out.writeObject(o);
3226
+            
3227
+            out.flush();
32263228 
3227
-            ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
3228
-            ObjectInputStream in = new ObjectInputStream(bais);
3229
+            zstream.close();
3230
+            out.close();
3231
+            
3232
+            return baos.toByteArray();
3233
+        } catch (Exception e)
3234
+        {
3235
+            System.err.println(e);
3236
+            return null;
3237
+        }
3238
+    }
3239
+
3240
+    static public Object Uncompress(byte[] bytes)
3241
+    {
3242
+        System.out.println("#bytes = " + bytes.length);
3243
+        try
3244
+        {
3245
+            ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3246
+            java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3247
+            ObjectInputStream in = new ObjectInputStream(istream);
32293248             Object obj = in.readObject();
32303249             in.close();
3231
-            out.close();
3250
+            
32323251             return obj;
32333252         } catch (Exception e)
32343253         {
....@@ -3237,16 +3256,68 @@
32373256         }
32383257     }
32393258 
3259
+    static public Object clone(Object o)
3260
+    {
3261
+        try
3262
+        {
3263
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
3264
+            ObjectOutputStream out = new ObjectOutputStream(baos);
3265
+
3266
+            out.writeObject(o);
3267
+            
3268
+            out.flush();
3269
+            out.close();
3270
+            
3271
+            byte[] bytes = baos.toByteArray();
3272
+            
3273
+            System.out.println("clone = " + bytes.length);
3274
+
3275
+            ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3276
+            ObjectInputStream in = new ObjectInputStream(bais);
3277
+            Object obj = in.readObject();
3278
+            in.close();
3279
+            
3280
+            return obj;
3281
+        } catch (Exception e)
3282
+        {
3283
+            System.err.println(e);
3284
+            return null;
3285
+        }
3286
+    }
3287
+
3288
+    cRadio GetCurrentTab()
3289
+    {
3290
+        cRadio ab;
3291
+        for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3292
+        {
3293
+            ab = (cRadio)e.nextElement();
3294
+            if(ab.GetObject() == copy)
3295
+            {
3296
+                return ab;
3297
+            }
3298
+        }
3299
+        
3300
+        return null;
3301
+    }
3302
+    
3303
+    java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3304
+    
32403305     public void Save()
32413306     {
3242
-        if (true) return;
3307
+        cRadio tab = GetCurrentTab();
3308
+        
3309
+        copy.ExtractBigData(hashtable);
32433310         
32443311         //EditorFrame.m_MainFrame.requestFocusInWindow();
3245
-        graphs[undoindex++] = (Object3D)clone(copy);
3312
+        tab.graphs[tab.undoindex++] = Compress(copy);
32463313 
3247
-        for (int i = undoindex; i < graphs.length; i++)
3314
+        copy.RestoreBigData(hashtable);
3315
+        
3316
+        //assert(hashtable.isEmpty());
3317
+        
3318
+        for (int i = tab.undoindex; i < tab.graphs.length; i++)
32483319         {
3249
-            graphs[i] = null;
3320
+            tab.graphs[i] = null;
32503321         }
32513322 
32523323         // test save
....@@ -3254,7 +3325,7 @@
32543325         {
32553326             try
32563327             {
3257
-                FileOutputStream ostream = new FileOutputStream("save" + undoindex);
3328
+                FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
32583329                 ObjectOutputStream p = new ObjectOutputStream(ostream);
32593330 
32603331                 p.writeObject(copy);
....@@ -3269,48 +3340,76 @@
32693340         }
32703341     }
32713342 
3343
+    void CopyChanged(Object3D obj)
3344
+    {
3345
+        copy.ExtractBigData(hashtable);
3346
+        
3347
+        copy.clear();
3348
+        
3349
+        for (int i=0; i<obj.Size(); i++)
3350
+        {
3351
+            copy.add(obj.get(i));
3352
+        }
3353
+        
3354
+        copy.RestoreBigData(hashtable);
3355
+        
3356
+        //assert(hashtable.isEmpty());
3357
+        
3358
+        copy.Touch();
3359
+        
3360
+        ResetModel();
3361
+        copy.HardTouch(); // recompile?
3362
+        
3363
+        cRadio ab;
3364
+        for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3365
+        {
3366
+            ab = (cRadio)e.nextElement();
3367
+            Object3D test = copy.GetObject(ab.object.GetUUID());
3368
+            //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
3369
+            if (test != null)
3370
+            {
3371
+                test.editWindow = ab.object.editWindow;
3372
+                ab.object = test;
3373
+            }
3374
+        }
3375
+        
3376
+        refreshContents();
3377
+    }
3378
+    
32723379     public void Undo()
32733380     {
3274
-        if (undoindex == 0)
3381
+        cRadio tab = GetCurrentTab();
3382
+        
3383
+        if (tab.undoindex == 0)
32753384         {
32763385             java.awt.Toolkit.getDefaultToolkit().beep();
32773386             return;
32783387         }
32793388 
3280
-        if (graphs[undoindex] == null)
3389
+        if (tab.graphs[tab.undoindex] == null)
32813390         {
32823391             Save();
3283
-            undoindex -= 1;
3392
+            tab.undoindex -= 1;
32843393         }
32853394 
3286
-        undoindex -= 1;
3395
+        tab.undoindex -= 1;
32873396 
3288
-        copy = graphs[undoindex];
3289
-        
3290
-        cameraView.object = copy;
3291
-        copy.Touch();
3292
-        
3293
-        ResetModel();
3294
-        refreshContents();
3397
+        CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
32953398     }
32963399 
32973400     public void Redo()
32983401     {
3299
-        if (graphs[undoindex + 1] == null)
3402
+        cRadio tab = GetCurrentTab();
3403
+        
3404
+        if (tab.graphs[tab.undoindex + 1] == null)
33003405         {
33013406             java.awt.Toolkit.getDefaultToolkit().beep();
33023407             return;
33033408         }
33043409 
3305
-        undoindex += 1;
3410
+        tab.undoindex += 1;
33063411 
3307
-        copy = graphs[undoindex];
3308
-
3309
-        cameraView.object = copy;
3310
-        copy.Touch();
3311
-        
3312
-        ResetModel();
3313
-        refreshContents();
3412
+        CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
33143413     }
33153414 
33163415         void ImportGFD()
....@@ -4259,6 +4358,7 @@
42594358         
42604359         if (readobj != null)
42614360         {
4361
+            Save();
42624362             try
42634363             {
42644364                 //readobj.deepCopySelf(copy);