blame | history | patch | commit | commitdiff
Normand Briere
2019-06-24 c67da2e5d8655704601d6d06e8bc60aabe212253 
 ObjEditor.java
....@@ -36,6 +36,8 @@
3636     GroupEditor callee;
3737     JFrame frame;
3838     
39
+    static ObjEditor theFrame;
40
+    
3941     // SCRIPT
4042     
4143     transient JFrame textpanel = null;
....@@ -168,7 +170,8 @@
168170 //        objEditor.ctrlPanel.remove(remarkButton);
169171         
170172         objEditor.ctrlPanel.remove(setupPanel);
171
-        objEditor.ctrlPanel.remove(commandsPanel);
173
+        objEditor.ctrlPanel.remove(setupPanel2);
174
+        objEditor.ctrlPanel.remove(objectCommandsPanel);
172175         objEditor.ctrlPanel.remove(pushPanel);
173176         //objEditor.ctrlPanel.remove(fillPanel);
174177         
....@@ -243,6 +246,7 @@
243246         //localCopy.parent = null;
244247 
245248         frame = new JFrame();
249
+                frame.setUndecorated(true);
246250         objEditor = this;
247251         this.callee = callee;
248252 
....@@ -278,7 +282,7 @@
278282         frame.setMenuBar(menuBar = new MenuBar());
279283         menuBar.add(fileMenu = new Menu("File"));
280284         fileMenu.add(newItem = new MenuItem("New"));
281
-        fileMenu.add(loadItem = new MenuItem("Load..."));
285
+        fileMenu.add(loadItem = new MenuItem("Open..."));
282286         
283287                 //oe.menuBar.add(menu = new Menu("Include"));
284288         Menu menu = new Menu("Import");
....@@ -323,9 +327,18 @@
323327         toolbarPanel.setName("Toolbar");
324328         treePanel = new cGridBag();
325329         treePanel.setName("Tree");
330
+        
331
+        editPanel = new cGridBag().setVertical(true);
332
+        editPanel.setName("Edit");
333
+        
326334         ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
327
-        ctrlPanel.setName("Edit");
335
+        
336
+        editCommandsPanel = new cGridBag();
337
+        editPanel.add(editCommandsPanel);
338
+        editPanel.add(ctrlPanel);
339
+                
328340         materialPanel = new cGridBag().setVertical(true);
341
+        
329342         materialPanel.setName("Material");
330343         /*JTextPane*/
331344         infoarea = createTextPane();
....@@ -419,10 +432,10 @@
419432             e.printStackTrace();
420433         }
421434         
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();
435
+//        String selection = infoarea.getText();
436
+//        java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
437
+//        java.awt.datatransfer.Clipboard clipboard = 
438
+//                Toolkit.getDefaultToolkit().getSystemClipboard();
426439         //clipboard.setContents(data, data);
427440     }
428441     
....@@ -582,19 +595,89 @@
582595         }
583596     }
584597 
598
+static GraphicsDevice device = GraphicsEnvironment
599
+        .getLocalGraphicsEnvironment().getScreenDevices()[0];
600
+
601
+    Rectangle keeprect;
602
+        cRadio radio;
603
+        
604
+cButton keepButton;
605
+	cButton twoButton; // Full 3D
606
+	cButton sixButton;
607
+	cButton threeButton;
608
+	cButton sevenButton;
609
+	cButton fourButton; // full panel
610
+	cButton oneButton; // full XYZ
611
+        //cButton currentLayout;
612
+        
613
+        boolean maximized;
614
+    
615
+        void Minimize()
616
+        {
617
+            frame.setState(Frame.ICONIFIED);
618
+        }
619
+        
620
+        void Maximize()
621
+        {
622
+            if (maximized)
623
+            {
624
+                frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
625
+            }
626
+            else
627
+            {
628
+                keeprect = frame.getBounds();
629
+                Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
630
+                Dimension rect2 = frame.getToolkit().getScreenSize();
631
+                frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
632
+//                frame.setState(Frame.MAXIMIZED_BOTH);
633
+            }
634
+            
635
+            maximized ^= true;
636
+        }
637
+        
585638         void ToggleFullScreen()
586639         {
587640                 if (CameraPane.FULLSCREEN)
588641                 {
589
-                    frame.getContentPane().remove(/*"Center",*/bigThree);
590
-                    framePanel.add(bigThree);
591
-                    frame.getContentPane().add(/*"Center",*/framePanel);
642
+                    device.setFullScreenWindow(null);
643
+                    //frame.setVisible(false);
644
+//                frame.removeNotify();
645
+//                frame.setUndecorated(false);
646
+//                frame.addNotify();
647
+                //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
648
+                    
649
+// X                   frame.getContentPane().remove(/*"Center",*/bigThree);
650
+// X                   framePanel.add(bigThree);
651
+// X                   frame.getContentPane().add(/*"Center",*/framePanel);
652
+                    framePanel.setDividerLocation(1);
653
+                    
654
+                    //frame.setVisible(true);
655
+                    radio.layout = keepButton;
656
+                    //theFrame = null;
657
+                    keepButton = null;
658
+                    radio.layout.doClick();
659
+                    
592660                 } else
593661                 {
594
-                    frame.getContentPane().remove(/*"Center",*/framePanel);
595
-                    framePanel.remove(bigThree);
596
-                    frame.getContentPane().add(/*"Center",*/bigThree);
662
+                    keepButton = radio.layout;
663
+                    //keeprect = frame.getBounds();
664
+//                frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
665
+//                        frame.getToolkit().getScreenSize().height);
666
+                    //frame.setVisible(false);
667
+                    device.setFullScreenWindow(frame);
668
+//                frame.removeNotify();
669
+//                frame.setUndecorated(true);
670
+//                frame.addNotify();
671
+// X                   frame.getContentPane().remove(/*"Center",*/framePanel);
672
+// X                   framePanel.remove(bigThree);
673
+// X                   frame.getContentPane().add(/*"Center",*/bigThree);
674
+                    framePanel.setDividerLocation(0);
675
+
676
+                    radio.layout = twoButton;
677
+                    radio.layout.doClick();
678
+                    //frame.setVisible(true);
597679                 }
680
+                
598681                 cameraView.ToggleFullScreen();
599682         }
600683 
....@@ -745,9 +828,13 @@
745828     JButton fasterButton;
746829     JButton remarkButton;
747830     
831
+    cGridBag editPanel;
832
+    cGridBag editCommandsPanel;
833
+    
748834     cGridBag namePanel;
749835     cGridBag setupPanel;
750
-    cGridBag commandsPanel;
836
+    cGridBag setupPanel2;
837
+    cGridBag objectCommandsPanel;
751838     cGridBag pushPanel;
752839     cGridBag fillPanel;
753840 
....@@ -939,40 +1026,44 @@
9391026         markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
9401027         markCB.setToolTipText("Set the animation target transform");
9411028         
942
-        rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
1029
+            setupPanel2 = new cGridBag().setVertical(false);
1030
+            
1031
+        rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
9431032         rewindCB.setToolTipText("Rewind animation");
9441033         
945
-        randomCB = AddCheckBox(setupPanel, "Random", copy.random);
946
-        randomCB.setToolTipText("Option for switch node");
1034
+        randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1035
+        randomCB.setToolTipText("Randomly Rewind or Go back and forth");
9471036 
9481037         if (Globals.ADVANCED)
9491038         {
950
-                link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
1039
+                link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
9511040                 link2masterCB.setToolTipText("Attach to support");
952
-                speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
1041
+                speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
9531042                 speedupCB.setToolTipText("Option motion capture");
9541043         }
9551044         
9561045         oe.ctrlPanel.add(setupPanel);
9571046         oe.ctrlPanel.Return();
1047
+        oe.ctrlPanel.add(setupPanel2);
1048
+        oe.ctrlPanel.Return();
9581049         
959
-            commandsPanel = new cGridBag().setVertical(false);
1050
+            objectCommandsPanel = new cGridBag().setVertical(false);
9601051         
961
-        resetButton = AddButton(commandsPanel, "Reset");
1052
+        resetButton = AddButton(objectCommandsPanel, "Reset");
9621053         resetButton.setToolTipText("Jump to frame zero");
963
-        stepButton = AddButton(commandsPanel, "Step");
1054
+        stepButton = AddButton(objectCommandsPanel, "Step");
9641055         stepButton.setToolTipText("Step one frame");
9651056 //            resetAllButton = AddButton(oe, "Reset All");
9661057 //            stepAllButton = AddButton(oe, "Step All");
9671058 //            Return();
968
-        slowerButton = AddButton(commandsPanel, "Slow");
1059
+        slowerButton = AddButton(objectCommandsPanel, "Slow");
9691060         slowerButton.setToolTipText("Decrease animation speed");
970
-        fasterButton = AddButton(commandsPanel, "Fast");
1061
+        fasterButton = AddButton(objectCommandsPanel, "Fast");
9711062         fasterButton.setToolTipText("Increase animation speed");
972
-        remarkButton = AddButton(commandsPanel, "Remark");
1063
+        remarkButton = AddButton(objectCommandsPanel, "Remark");
9731064         remarkButton.setToolTipText("Set the current transform as the target");
9741065 
975
-        oe.ctrlPanel.add(commandsPanel);
1066
+        oe.ctrlPanel.add(objectCommandsPanel);
9761067         oe.ctrlPanel.Return();
9771068 
9781069     pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
....@@ -1178,8 +1269,11 @@
11781269         //worldPanel.setName("World");
11791270 	centralPanel = new cGridBag();
11801271         centralPanel.preferredWidth = 20;
1181
-	timelinePanel = new JPanel(new BorderLayout());
1182
-        timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1272
+        
1273
+        if (Globals.ADVANCED)
1274
+        {
1275
+            timelinePanel = new JPanel(new BorderLayout());
1276
+            timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
11831277 
11841278         cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
11851279         cameraPanel.setContinuousLayout(true);
....@@ -1188,7 +1282,10 @@
11881282 //        cameraPanel.setDividerSize(9);
11891283         cameraPanel.setResizeWeight(1.0);
11901284         
1285
+        }
1286
+        
11911287         centralPanel.add(cameraView);
1288
+        centralPanel.setFocusable(true);
11921289         //frame.setJMenuBar(timelineMenubar);
11931290         //centralPanel.add(timelinePanel);
11941291         
....@@ -1255,7 +1352,7 @@
12551352 //        north.setName("Edit");
12561353 //        north.add(ctrlPanel, BorderLayout.NORTH);
12571354 //        objectPanel.add(north);
1258
-        objectPanel.add(ctrlPanel);
1355
+        objectPanel.add(editPanel);
12591356         objectPanel.add(infoPanel);
12601357 
12611358         /*
....@@ -1386,6 +1483,8 @@
13861483         frame.setSize(1280, 860);
13871484         frame.setVisible(true);
13881485 
1486
+                    cameraView.requestFocusInWindow();
1487
+                    
13891488         gridPanel.setDividerLocation(1.0);
13901489 
13911490         frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
....@@ -1935,6 +2034,7 @@
19352034             e2.printStackTrace();
19362035         }
19372036     }
2037
+    
19382038     LoadJMEThread loadThread;
19392039 
19402040     class LoadJMEThread extends Thread
....@@ -1992,6 +2092,7 @@
19922092             //LoadFile0(filename, converter);
19932093         }
19942094     }
2095
+    
19952096     LoadOBJThread loadObjThread;
19962097 
19972098     class LoadOBJThread extends Thread
....@@ -2070,19 +2171,19 @@
20702171 
20712172     void LoadObjFile(String fullname)
20722173     {
2073
-        /*
2174
+        System.out.println("Loading " + fullname);
2175
+        /**/
20742176         //lastFilename = fullname;
20752177         if(loadObjThread == null)
20762178         {
2077
-        loadObjThread = new LoadOBJThread();
2078
-        loadObjThread.start();
2179
+            loadObjThread = new LoadOBJThread();
2180
+            loadObjThread.start();
20792181         }
20802182         
20812183         loadObjThread.add(fullname);
2082
-         */
2184
+        /**/
20832185 
2084
-        System.out.println("Loading " + fullname);
2085
-        makeSomething(new FileObject(fullname, true), true);
2186
+        //makeSomething(new FileObject(fullname, true), true);
20862187     }
20872188 
20882189     void LoadGFDFile(String fullname)
....@@ -2925,7 +3026,7 @@
29253026             return;
29263027         } else if (event.getSource() == toggleSwitchItem)
29273028         {
2928
-            cameraView.ToggleRandom();
3029
+            cameraView.ToggleSwitch();
29293030             cameraView.repaint();
29303031             return;
29313032         } else if (event.getSource() == toggleHandleItem)
....@@ -3212,23 +3313,45 @@
32123313         objEditor.refreshContents();
32133314     }
32143315     
3215
-    Object3D graphs[] = new Object3D[10000];
3216
-    int undoindex = 0;
3217
-    
3218
-    static public Object clone(Object o)
3316
+    static public byte[] Compress(Object3D o)
32193317     {
32203318         try
32213319         {
32223320             ByteArrayOutputStream baos = new ByteArrayOutputStream();
3223
-            ObjectOutputStream out = new ObjectOutputStream(baos);
3321
+            java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3322
+            ObjectOutputStream out = new ObjectOutputStream(zstream);
32243323 
3324
+        Object3D parent = o.parent;
3325
+        o.parent = null;
3326
+        
32253327             out.writeObject(o);
3328
+            
3329
+        o.parent = parent;
3330
+        
3331
+            out.flush();
32263332 
3227
-            ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
3228
-            ObjectInputStream in = new ObjectInputStream(bais);
3333
+            zstream.close();
3334
+            out.close();
3335
+            
3336
+            return baos.toByteArray();
3337
+        } catch (Exception e)
3338
+        {
3339
+            System.err.println(e);
3340
+            return null;
3341
+        }
3342
+    }
3343
+
3344
+    static public Object Uncompress(byte[] bytes)
3345
+    {
3346
+        System.out.println("#bytes = " + bytes.length);
3347
+        try
3348
+        {
3349
+            ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3350
+            java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3351
+            ObjectInputStream in = new ObjectInputStream(istream);
32293352             Object obj = in.readObject();
32303353             in.close();
3231
-            out.close();
3354
+            
32323355             return obj;
32333356         } catch (Exception e)
32343357         {
....@@ -3237,16 +3360,73 @@
32373360         }
32383361     }
32393362 
3363
+    static public Object clone(Object o)
3364
+    {
3365
+        try
3366
+        {
3367
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
3368
+            ObjectOutputStream out = new ObjectOutputStream(baos);
3369
+
3370
+            out.writeObject(o);
3371
+            
3372
+            out.flush();
3373
+            out.close();
3374
+            
3375
+            byte[] bytes = baos.toByteArray();
3376
+            
3377
+            System.out.println("clone = " + bytes.length);
3378
+
3379
+            ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3380
+            ObjectInputStream in = new ObjectInputStream(bais);
3381
+            Object obj = in.readObject();
3382
+            in.close();
3383
+            
3384
+            return obj;
3385
+        } catch (Exception e)
3386
+        {
3387
+            System.err.println(e);
3388
+            return null;
3389
+        }
3390
+    }
3391
+
3392
+    cRadio GetCurrentTab()
3393
+    {
3394
+        cRadio ab;
3395
+        for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3396
+        {
3397
+            ab = (cRadio)e.nextElement();
3398
+            if(ab.GetObject() == copy)
3399
+            {
3400
+                return ab;
3401
+            }
3402
+        }
3403
+        
3404
+        return null;
3405
+    }
3406
+    
3407
+    java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3408
+    
32403409     public void Save()
32413410     {
3242
-        if (true) return;
3411
+        cRadio tab = GetCurrentTab();
3412
+        
3413
+        boolean temp = CameraPane.SWITCH;
3414
+        CameraPane.SWITCH = false;
3415
+        
3416
+        copy.ExtractBigData(hashtable);
32433417         
32443418         //EditorFrame.m_MainFrame.requestFocusInWindow();
3245
-        graphs[undoindex++] = (Object3D)clone(copy);
3419
+        tab.graphs[tab.undoindex++] = Compress(copy);
32463420 
3247
-        for (int i = undoindex; i < graphs.length; i++)
3421
+        copy.RestoreBigData(hashtable);
3422
+
3423
+        CameraPane.SWITCH = temp;
3424
+        
3425
+        //assert(hashtable.isEmpty());
3426
+        
3427
+        for (int i = tab.undoindex; i < tab.graphs.length; i++)
32483428         {
3249
-            graphs[i] = null;
3429
+            tab.graphs[i] = null;
32503430         }
32513431 
32523432         // test save
....@@ -3254,7 +3434,7 @@
32543434         {
32553435             try
32563436             {
3257
-                FileOutputStream ostream = new FileOutputStream("save" + undoindex);
3437
+                FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
32583438                 ObjectOutputStream p = new ObjectOutputStream(ostream);
32593439 
32603440                 p.writeObject(copy);
....@@ -3269,48 +3449,81 @@
32693449         }
32703450     }
32713451 
3452
+    void CopyChanged(Object3D obj)
3453
+    {
3454
+        boolean temp = CameraPane.SWITCH;
3455
+        CameraPane.SWITCH = false;
3456
+        
3457
+        copy.ExtractBigData(hashtable);
3458
+        
3459
+        copy.clear();
3460
+        
3461
+        for (int i=0; i<obj.Size(); i++)
3462
+        {
3463
+            copy.add(obj.get(i));
3464
+        }
3465
+        
3466
+        copy.RestoreBigData(hashtable);
3467
+        
3468
+        CameraPane.SWITCH = temp;
3469
+        
3470
+        //assert(hashtable.isEmpty());
3471
+        
3472
+        copy.Touch();
3473
+        
3474
+        ResetModel();
3475
+        copy.HardTouch(); // recompile?
3476
+        
3477
+        cRadio ab;
3478
+        for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3479
+        {
3480
+            ab = (cRadio)e.nextElement();
3481
+            Object3D test = copy.GetObject(ab.object.GetUUID());
3482
+            //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
3483
+            if (test != null)
3484
+            {
3485
+                test.editWindow = ab.object.editWindow;
3486
+                ab.object = test;
3487
+            }
3488
+        }
3489
+        
3490
+        refreshContents();
3491
+    }
3492
+    
32723493     public void Undo()
32733494     {
3274
-        if (undoindex == 0)
3495
+        cRadio tab = GetCurrentTab();
3496
+        
3497
+        if (tab.undoindex == 0)
32753498         {
32763499             java.awt.Toolkit.getDefaultToolkit().beep();
32773500             return;
32783501         }
32793502 
3280
-        if (graphs[undoindex] == null)
3503
+        if (tab.graphs[tab.undoindex] == null)
32813504         {
32823505             Save();
3283
-            undoindex -= 1;
3506
+            tab.undoindex -= 1;
32843507         }
32853508 
3286
-        undoindex -= 1;
3509
+        tab.undoindex -= 1;
32873510 
3288
-        copy = graphs[undoindex];
3289
-        
3290
-        cameraView.object = copy;
3291
-        copy.Touch();
3292
-        
3293
-        ResetModel();
3294
-        refreshContents();
3511
+        CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
32953512     }
32963513 
32973514     public void Redo()
32983515     {
3299
-        if (graphs[undoindex + 1] == null)
3516
+        cRadio tab = GetCurrentTab();
3517
+        
3518
+        if (tab.graphs[tab.undoindex + 1] == null)
33003519         {
33013520             java.awt.Toolkit.getDefaultToolkit().beep();
33023521             return;
33033522         }
33043523 
3305
-        undoindex += 1;
3524
+        tab.undoindex += 1;
33063525 
3307
-        copy = graphs[undoindex];
3308
-
3309
-        cameraView.object = copy;
3310
-        copy.Touch();
3311
-        
3312
-        ResetModel();
3313
-        refreshContents();
3526
+        CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
33143527     }
33153528 
33163529         void ImportGFD()
....@@ -4181,6 +4394,7 @@
41814394 
41824395         try
41834396         {
4397
+            // Try compressed version first.
41844398             java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
41854399             java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
41864400             java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
....@@ -4250,6 +4464,12 @@
42504464 
42514465     void LoadIt(Object obj)
42524466     {
4467
+        if (obj == null)
4468
+        {
4469
+            // Invalid file
4470
+            return;
4471
+        }
4472
+        
42534473         System.out.println("Loaded " + obj);
42544474         //new Exception().printStackTrace();
42554475         Object3D readobj = (Object3D) obj;
....@@ -4259,6 +4479,7 @@
42594479         
42604480         if (readobj != null)
42614481         {
4482
+            Save();
42624483             try
42634484             {
42644485                 //readobj.deepCopySelf(copy);