blame | history | patch | commit | commitdiff
Normand Briere
2019-06-25 d2f456cf5280f59425084532bd2397ec625f7577 
 ObjEditor.java
....@@ -4,6 +4,7 @@
44 
55 import java.awt.*;
66 import java.awt.event.*;
7
+import java.awt.image.BufferedImage;
78 import javax.swing.*;
89 import javax.swing.event.*;
910 import javax.swing.text.*;
....@@ -35,6 +36,67 @@
3536 
3637     GroupEditor callee;
3738     JFrame frame;
39
+    
40
+    static ObjEditor theFrame;
41
+    
42
+    cButton GetButton(String name, boolean border)
43
+    {
44
+        try
45
+        {
46
+            ImageIcon icon = GetIcon(name);
47
+            return new cButton(icon, border);
48
+        }
49
+        catch (Exception e)
50
+        {
51
+            return new cButton(name, border);
52
+        }
53
+    }
54
+
55
+    cToggleButton GetToggleButton(String name, boolean border)
56
+    {
57
+        try
58
+        {
59
+            ImageIcon icon = GetIcon(name);
60
+            return new cToggleButton(icon, border);
61
+        }
62
+        catch (Exception e)
63
+        {
64
+            return new cToggleButton(name, border);
65
+        }
66
+    }
67
+
68
+    cCheckBox GetCheckBox(String name, boolean border)
69
+    {
70
+        try
71
+        {
72
+            ImageIcon icon = GetIcon(name);
73
+            return new cCheckBox(icon, border);
74
+        }
75
+        catch (Exception e)
76
+        {
77
+            return new cCheckBox(name, border);
78
+        }
79
+    }
80
+
81
+    private ImageIcon GetIcon(String name) throws IOException
82
+    {
83
+        BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
84
+        
85
+        if (image.getWidth() != 24 && image.getHeight() != 24)
86
+        {
87
+            BufferedImage resized = new BufferedImage(24, 24, image.getType());
88
+            Graphics2D g = resized.createGraphics();
89
+            g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
90
+            //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
91
+            g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
92
+            g.dispose();
93
+            
94
+            image = resized;
95
+        }
96
+        
97
+        javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
98
+        return icon;
99
+    }
38100     
39101     // SCRIPT
40102     
....@@ -168,7 +230,8 @@
168230 //        objEditor.ctrlPanel.remove(remarkButton);
169231         
170232         objEditor.ctrlPanel.remove(setupPanel);
171
-        objEditor.ctrlPanel.remove(commandsPanel);
233
+        objEditor.ctrlPanel.remove(setupPanel2);
234
+        objEditor.ctrlPanel.remove(objectCommandsPanel);
172235         objEditor.ctrlPanel.remove(pushPanel);
173236         //objEditor.ctrlPanel.remove(fillPanel);
174237         
....@@ -243,6 +306,7 @@
243306         //localCopy.parent = null;
244307 
245308         frame = new JFrame();
309
+                frame.setUndecorated(true);
246310         objEditor = this;
247311         this.callee = callee;
248312 
....@@ -278,7 +342,7 @@
278342         frame.setMenuBar(menuBar = new MenuBar());
279343         menuBar.add(fileMenu = new Menu("File"));
280344         fileMenu.add(newItem = new MenuItem("New"));
281
-        fileMenu.add(loadItem = new MenuItem("Load..."));
345
+        fileMenu.add(loadItem = new MenuItem("Open..."));
282346         
283347                 //oe.menuBar.add(menu = new Menu("Include"));
284348         Menu menu = new Menu("Import");
....@@ -319,14 +383,47 @@
319383         closeItem.addActionListener(this);
320384 
321385         objectPanel = new JTabbedPane();
386
+        
387
+        ChangeListener changeListener = new ChangeListener()
388
+        {
389
+            public void stateChanged(ChangeEvent changeEvent)
390
+            {
391
+//                if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
392
+//                {
393
+//                    if (latestObject != null)
394
+//                    {
395
+//                        refreshContents(true);
396
+//                        SetMaterial(latestObject);
397
+//                    }
398
+//                    
399
+//                    materialFlushed = true;
400
+//                }
401
+
402
+                refreshContents(false); // To refresh Info tab
403
+            }
404
+        };
405
+        objectPanel.addChangeListener(changeListener);
406
+    
322407         toolbarPanel = new JPanel();
323408         toolbarPanel.setName("Toolbar");
324409         treePanel = new cGridBag();
325410         treePanel.setName("Tree");
411
+        
412
+        editPanel = new cGridBag().setVertical(true);
413
+        editPanel.setName("Edit");
414
+        
326415         ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
327
-        ctrlPanel.setName("Edit");
416
+        
417
+        editCommandsPanel = new cGridBag();
418
+        editPanel.add(editCommandsPanel);
419
+        editPanel.add(ctrlPanel);
420
+                
421
+        toolboxPanel = new cGridBag().setVertical(false);
422
+        toolboxPanel.setName("Toolbox");
423
+        
328424         materialPanel = new cGridBag().setVertical(true);
329425         materialPanel.setName("Material");
426
+        
330427         /*JTextPane*/
331428         infoarea = createTextPane();
332429         doc = infoarea.getStyledDocument();
....@@ -419,10 +516,10 @@
419516             e.printStackTrace();
420517         }
421518         
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();
519
+//        String selection = infoarea.getText();
520
+//        java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
521
+//        java.awt.datatransfer.Clipboard clipboard = 
522
+//                Toolkit.getDefaultToolkit().getSystemClipboard();
426523         //clipboard.setContents(data, data);
427524     }
428525     
....@@ -582,19 +679,91 @@
582679         }
583680     }
584681 
682
+static GraphicsDevice device = GraphicsEnvironment
683
+        .getLocalGraphicsEnvironment().getScreenDevices()[0];
684
+
685
+    Rectangle keeprect;
686
+        cRadio radio;
687
+        
688
+cButton keepButton;
689
+	cButton twoButton; // Full 3D
690
+	cButton sixButton;
691
+	cButton threeButton;
692
+	cButton sevenButton;
693
+	cButton fourButton; // full panel
694
+	cButton oneButton; // full XYZ
695
+        //cButton currentLayout;
696
+        
697
+        boolean maximized;
698
+    
699
+        cButton fullscreenLayout;
700
+
701
+        void Minimize()
702
+        {
703
+            frame.setState(Frame.ICONIFIED);
704
+        }
705
+        
706
+        void Maximize()
707
+        {
708
+            if (maximized)
709
+            {
710
+                frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
711
+            }
712
+            else
713
+            {
714
+                keeprect = frame.getBounds();
715
+                Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
716
+                Dimension rect2 = frame.getToolkit().getScreenSize();
717
+                frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
718
+//                frame.setState(Frame.MAXIMIZED_BOTH);
719
+            }
720
+            
721
+            maximized ^= true;
722
+        }
723
+        
585724         void ToggleFullScreen()
586725         {
587726                 if (CameraPane.FULLSCREEN)
588727                 {
589
-                    frame.getContentPane().remove(/*"Center",*/bigThree);
590
-                    framePanel.add(bigThree);
591
-                    frame.getContentPane().add(/*"Center",*/framePanel);
728
+                    device.setFullScreenWindow(null);
729
+                    //frame.setVisible(false);
730
+//                frame.removeNotify();
731
+//                frame.setUndecorated(false);
732
+//                frame.addNotify();
733
+                //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
734
+                    
735
+// X                   frame.getContentPane().remove(/*"Center",*/bigThree);
736
+// X                   framePanel.add(bigThree);
737
+// X                   frame.getContentPane().add(/*"Center",*/framePanel);
738
+                    framePanel.setDividerLocation(1);
739
+                    
740
+                    //frame.setVisible(true);
741
+                    radio.layout = keepButton;
742
+                    //theFrame = null;
743
+                    keepButton = null;
744
+                    radio.layout.doClick();
745
+                    
592746                 } else
593747                 {
594
-                    frame.getContentPane().remove(/*"Center",*/framePanel);
595
-                    framePanel.remove(bigThree);
596
-                    frame.getContentPane().add(/*"Center",*/bigThree);
748
+                    keepButton = radio.layout;
749
+                    //keeprect = frame.getBounds();
750
+//                frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
751
+//                        frame.getToolkit().getScreenSize().height);
752
+                    //frame.setVisible(false);
753
+                    device.setFullScreenWindow(frame);
754
+//                frame.removeNotify();
755
+//                frame.setUndecorated(true);
756
+//                frame.addNotify();
757
+// X                   frame.getContentPane().remove(/*"Center",*/framePanel);
758
+// X                   framePanel.remove(bigThree);
759
+// X                   frame.getContentPane().add(/*"Center",*/bigThree);
760
+                    framePanel.setDividerLocation(0);
761
+
762
+                    radio.layout = fullscreenLayout;
763
+                    radio.layout.doClick();
764
+                    //frame.setVisible(true);
597765                 }
766
+                
598767                 cameraView.ToggleFullScreen();
599768         }
600769 
....@@ -736,7 +905,12 @@
736905     JCheckBox speedupCB;
737906     JCheckBox rewindCB;
738907     JCheckBox flipVCB;
908
+    
909
+    cCheckBox toggleTextureCB;
910
+    cCheckBox toggleSwitchCB;
911
+        
739912     JComboBox texresMenu;
913
+    
740914     JButton resetButton;
741915     JButton stepButton;
742916     JButton stepAllButton;
....@@ -745,9 +919,13 @@
745919     JButton fasterButton;
746920     JButton remarkButton;
747921     
922
+    cGridBag editPanel;
923
+    cGridBag editCommandsPanel;
924
+    
748925     cGridBag namePanel;
749926     cGridBag setupPanel;
750
-    cGridBag commandsPanel;
927
+    cGridBag setupPanel2;
928
+    cGridBag objectCommandsPanel;
751929     cGridBag pushPanel;
752930     cGridBag fillPanel;
753931 
....@@ -939,40 +1117,44 @@
9391117         markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
9401118         markCB.setToolTipText("Set the animation target transform");
9411119         
942
-        rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
1120
+            setupPanel2 = new cGridBag().setVertical(false);
1121
+            
1122
+        rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
9431123         rewindCB.setToolTipText("Rewind animation");
9441124         
945
-        randomCB = AddCheckBox(setupPanel, "Random", copy.random);
946
-        randomCB.setToolTipText("Option for switch node");
1125
+        randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1126
+        randomCB.setToolTipText("Randomly Rewind or Go back and forth");
9471127 
9481128         if (Globals.ADVANCED)
9491129         {
950
-                link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
1130
+                link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
9511131                 link2masterCB.setToolTipText("Attach to support");
952
-                speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
1132
+                speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
9531133                 speedupCB.setToolTipText("Option motion capture");
9541134         }
9551135         
9561136         oe.ctrlPanel.add(setupPanel);
9571137         oe.ctrlPanel.Return();
1138
+        oe.ctrlPanel.add(setupPanel2);
1139
+        oe.ctrlPanel.Return();
9581140         
959
-            commandsPanel = new cGridBag().setVertical(false);
1141
+            objectCommandsPanel = new cGridBag().setVertical(false);
9601142         
961
-        resetButton = AddButton(commandsPanel, "Reset");
1143
+        resetButton = AddButton(objectCommandsPanel, "Reset");
9621144         resetButton.setToolTipText("Jump to frame zero");
963
-        stepButton = AddButton(commandsPanel, "Step");
1145
+        stepButton = AddButton(objectCommandsPanel, "Step");
9641146         stepButton.setToolTipText("Step one frame");
9651147 //            resetAllButton = AddButton(oe, "Reset All");
9661148 //            stepAllButton = AddButton(oe, "Step All");
9671149 //            Return();
968
-        slowerButton = AddButton(commandsPanel, "Slow");
1150
+        slowerButton = AddButton(objectCommandsPanel, "Slow");
9691151         slowerButton.setToolTipText("Decrease animation speed");
970
-        fasterButton = AddButton(commandsPanel, "Fast");
1152
+        fasterButton = AddButton(objectCommandsPanel, "Fast");
9711153         fasterButton.setToolTipText("Increase animation speed");
972
-        remarkButton = AddButton(commandsPanel, "Remark");
1154
+        remarkButton = AddButton(objectCommandsPanel, "Remark");
9731155         remarkButton.setToolTipText("Set the current transform as the target");
9741156 
975
-        oe.ctrlPanel.add(commandsPanel);
1157
+        oe.ctrlPanel.add(objectCommandsPanel);
9761158         oe.ctrlPanel.Return();
9771159 
9781160     pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
....@@ -1178,8 +1360,11 @@
11781360         //worldPanel.setName("World");
11791361 	centralPanel = new cGridBag();
11801362         centralPanel.preferredWidth = 20;
1181
-	timelinePanel = new JPanel(new BorderLayout());
1182
-        timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1363
+        
1364
+        if (Globals.ADVANCED)
1365
+        {
1366
+            timelinePanel = new JPanel(new BorderLayout());
1367
+            timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
11831368 
11841369         cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
11851370         cameraPanel.setContinuousLayout(true);
....@@ -1188,7 +1373,10 @@
11881373 //        cameraPanel.setDividerSize(9);
11891374         cameraPanel.setResizeWeight(1.0);
11901375         
1376
+        }
1377
+        
11911378         centralPanel.add(cameraView);
1379
+        centralPanel.setFocusable(true);
11921380         //frame.setJMenuBar(timelineMenubar);
11931381         //centralPanel.add(timelinePanel);
11941382         
....@@ -1251,11 +1439,12 @@
12511439         //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
12521440         //tmp.setName("Edit");
12531441         objectPanel.add(materialPanel);
1442
+        objectPanel.add(toolboxPanel);
12541443 //        JPanel north = new JPanel(new BorderLayout());
12551444 //        north.setName("Edit");
12561445 //        north.add(ctrlPanel, BorderLayout.NORTH);
12571446 //        objectPanel.add(north);
1258
-        objectPanel.add(ctrlPanel);
1447
+        objectPanel.add(editPanel);
12591448         objectPanel.add(infoPanel);
12601449 
12611450         /*
....@@ -1282,9 +1471,7 @@
12821471         JTabbedPane tabbedPane = new JTabbedPane();
12831472         tabbedPane.add(scrollpane);
12841473 
1285
-        tabbedPane.add(FSPane = new cFileSystemPane(this));
1286
-
1287
-        optionsPanel = new cGridBag().setVertical(true);
1474
+        optionsPanel = new cGridBag().setVertical(false);
12881475 
12891476         optionsPanel.setName("Options");
12901477         
....@@ -1292,6 +1479,8 @@
12921479         
12931480         tabbedPane.add(optionsPanel);
12941481         
1482
+        tabbedPane.add(FSPane = new cFileSystemPane(this));
1483
+
12951484         scenePanel.add(tabbedPane);
12961485 
12971486         /*
....@@ -1384,8 +1573,12 @@
13841573 //            aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
13851574 
13861575         frame.setSize(1280, 860);
1576
+        
1577
+        frame.validate();
13871578         frame.setVisible(true);
13881579 
1580
+                    cameraView.requestFocusInWindow();
1581
+                    
13891582         gridPanel.setDividerLocation(1.0);
13901583 
13911584         frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
....@@ -2072,19 +2265,19 @@
20722265 
20732266     void LoadObjFile(String fullname)
20742267     {
2075
-        /*
2268
+        System.out.println("Loading " + fullname);
2269
+        /**/
20762270         //lastFilename = fullname;
20772271         if(loadObjThread == null)
20782272         {
2079
-        loadObjThread = new LoadOBJThread();
2080
-        loadObjThread.start();
2273
+            loadObjThread = new LoadOBJThread();
2274
+            loadObjThread.start();
20812275         }
20822276         
20832277         loadObjThread.add(fullname);
2084
-         */
2278
+        /**/
20852279 
2086
-        System.out.println("Loading " + fullname);
2087
-        makeSomething(new FileObject(fullname, true), true);
2280
+        //makeSomething(new FileObject(fullname, true), true);
20882281     }
20892282 
20902283     void LoadGFDFile(String fullname)
....@@ -2701,6 +2894,8 @@
27012894 
27022895     void SetMaterial(Object3D object)
27032896     {
2897
+        latestObject = object;
2898
+        
27042899         cMaterial mat = object.material;
27052900 
27062901         if (mat == null)
....@@ -2886,7 +3081,7 @@
28863081             cameraView.ToggleDL();
28873082             cameraView.repaint();
28883083             return;
2889
-        } else if (event.getSource() == toggleTextureItem)
3084
+        } else if (event.getSource() == toggleTextureItem || event.getSource() == toggleTextureCB)
28903085         {
28913086             cameraView.ToggleTexture();
28923087             // june 2013           copy.HardTouch();
....@@ -2925,7 +3120,7 @@
29253120             frame.validate();
29263121 
29273122             return;
2928
-        } else if (event.getSource() == toggleSwitchItem)
3123
+        } else if (event.getSource() == toggleSwitchItem || event.getSource() == toggleSwitchCB)
29293124         {
29303125             cameraView.ToggleSwitch();
29313126             cameraView.repaint();
....@@ -3214,7 +3409,7 @@
32143409         objEditor.refreshContents();
32153410     }
32163411     
3217
-    static public byte[] Compress(Object o)
3412
+    static public byte[] Compress(Object3D o)
32183413     {
32193414         try
32203415         {
....@@ -3222,8 +3417,13 @@
32223417             java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
32233418             ObjectOutputStream out = new ObjectOutputStream(zstream);
32243419 
3420
+        Object3D parent = o.parent;
3421
+        o.parent = null;
3422
+        
32253423             out.writeObject(o);
32263424             
3425
+        o.parent = parent;
3426
+        
32273427             out.flush();
32283428 
32293429             zstream.close();
....@@ -3304,6 +3504,8 @@
33043504     
33053505     public void Save()
33063506     {
3507
+        System.err.println("Save");
3508
+        
33073509         cRadio tab = GetCurrentTab();
33083510         
33093511         boolean temp = CameraPane.SWITCH;
....@@ -3388,6 +3590,8 @@
33883590     
33893591     public void Undo()
33903592     {
3593
+        System.err.println("Undo");
3594
+        
33913595         cRadio tab = GetCurrentTab();
33923596         
33933597         if (tab.undoindex == 0)
....@@ -3571,7 +3775,7 @@
35713775         assert false;
35723776     }
35733777 
3574
-    void EditSelection()
3778
+    void EditSelection(boolean newWindow)
35753779     {
35763780     }
35773781 
....@@ -4066,7 +4270,8 @@
40664270 
40674271     void makeSomething(Object3D thing, boolean resetmodel) // deselect)
40684272     {
4069
-        Save();
4273
+        if (Globals.SAVEONMAKE) // && resetmodel)
4274
+            Save();
40704275         //Tween.set(thing, 0).target(1).start(tweenManager);
40714276         //Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
40724277 //            if (thing instanceof GenericJointDemo)
....@@ -4153,6 +4358,12 @@
41534358         {
41544359             ResetModel();
41554360             Select(thing.GetTreePath(), true, false); // unselect... false);
4361
+            
4362
+        if (thing.Size() == 0)
4363
+        {
4364
+            //EditSelection(false);
4365
+        }
4366
+        
41564367             refreshContents();
41574368         }
41584369 
....@@ -4290,6 +4501,7 @@
42904501 
42914502         try
42924503         {
4504
+            // Try compressed version first.
42934505             java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
42944506             java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
42954507             java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
....@@ -4359,6 +4571,12 @@
43594571 
43604572     void LoadIt(Object obj)
43614573     {
4574
+        if (obj == null)
4575
+        {
4576
+            // Invalid file
4577
+            return;
4578
+        }
4579
+        
43624580         System.out.println("Loaded " + obj);
43634581         //new Exception().printStackTrace();
43644582         Object3D readobj = (Object3D) obj;
....@@ -4368,6 +4586,7 @@
43684586         
43694587         if (readobj != null)
43704588         {
4589
+        if (Globals.SAVEONMAKE)
43714590             Save();
43724591             try
43734592             {
....@@ -4739,18 +4958,31 @@
47394958     CheckboxMenuItem togglePaintItem;
47404959     JSplitPane mainPanel;
47414960     JScrollPane scrollpane;
4961
+    
47424962     JPanel toolbarPanel;
4963
+    
47434964     cGridBag treePanel;
4965
+    
47444966     JPanel radioPanel;
47454967     ButtonGroup buttonGroup;
4746
-    cGridBag ctrlPanel;
4968
+    
4969
+    cGridBag toolboxPanel;
47474970     cGridBag materialPanel;
4971
+    cGridBag ctrlPanel;
4972
+    
47484973     JScrollPane infoPanel;
4974
+    
47494975     cGridBag optionsPanel;
4976
+    
47504977     JTabbedPane objectPanel;
4978
+    boolean materialFlushed;
4979
+    Object3D latestObject;
4980
+    
47514981     cGridBag XYZPanel;
4982
+    
47524983     JSplitPane gridPanel;
47534984     JSplitPane bigPanel;
4985
+    
47544986     cGridBag bigThree;
47554987     cGridBag scenePanel;
47564988     cGridBag centralPanel;
....@@ -4865,7 +5097,7 @@
48655097     cNumberSlider fogField;
48665098     JLabel opacityPowerLabel;
48675099     cNumberSlider opacityPowerField;
4868
-    JTree jTree;
5100
+    cTree jTree;
48695101     //ObjectUI parent;
48705102     
48715103     cNumberSlider normalpushField;