blame | history | patch | commit | commitdiff
Normand Briere
2019-05-05 1e3de699b037989e8deded5c7830139f97c64136 
 ObjEditor.java
....@@ -143,6 +143,8 @@
143143         //nameField.removeActionListener(this);
144144 //        objEditor.ctrlPanel.remove(nameField);
145145         
146
+        objEditor.ctrlPanel.remove(namePanel);
147
+        
146148         if (!GroupEditor.allparams)
147149             return;
148150         
....@@ -165,7 +167,6 @@
165167 //        objEditor.ctrlPanel.remove(fasterButton);
166168 //        objEditor.ctrlPanel.remove(remarkButton);
167169         
168
-        objEditor.ctrlPanel.remove(namePanel);
169170         objEditor.ctrlPanel.remove(setupPanel);
170171         objEditor.ctrlPanel.remove(commandsPanel);
171172         objEditor.ctrlPanel.remove(pushPanel);
....@@ -308,44 +309,61 @@
308309         //normalLensItem.addActionListener(this);
309310         cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
310311         revertCameraItem.addActionListener(this);
311
-        cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
312
-        toggleTimelineItem.addItemListener(this);
312
+        
313313         cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
314314         toggleFullScreenItem.addItemListener(this);
315315         toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
316316         cameraMenu.add("-");
317
+        
317318         cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
318319         toggleTextureItem.addItemListener(this);
319320         toggleTextureItem.setState(CameraPane.textureon);
320
-        cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
321
-        toggleLiveItem.addItemListener(this);
322
-        toggleLiveItem.setState(Globals.isLIVE());
323
-        cameraMenu.add(stepItem = new MenuItem("Step"));
324
-        stepItem.addActionListener(this);
325
-//		cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
326
-//		toggleDLItem.addItemListener(this);
327
-//                toggleDLItem.setState(false);
328
-        cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
329
-        toggleRenderItem.addItemListener(this);
330
-        toggleRenderItem.setState(!CameraPane.frozen);
331
-        cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
332
-        toggleDebugItem.addItemListener(this);
333
-        toggleDebugItem.setState(CameraPane.DEBUG);
334
-        cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
335
-        toggleFrustumItem.addItemListener(this);
336
-        toggleFrustumItem.setState(CameraPane.FRUSTUM);
337
-        cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
338
-        toggleFootContactItem.addItemListener(this);
339
-        toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
340
-        cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
341
-        toggleRandomItem.addItemListener(this);
342
-        toggleRandomItem.setState(CameraPane.RANDOM);
321
+        
322
+        cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
323
+        toggleSwitchItem.addItemListener(this);
324
+        toggleSwitchItem.setState(CameraPane.SWITCH);
325
+        
343326         cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
344327         toggleHandleItem.addItemListener(this);
345328         toggleHandleItem.setState(CameraPane.HANDLES);
329
+        
346330         cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
347331         togglePaintItem.addItemListener(this);
348332         togglePaintItem.setState(CameraPane.PAINTMODE);
333
+        
334
+        if (Globals.ADVANCED)
335
+        {
336
+        cameraMenu.add("-");
337
+                cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
338
+                toggleLiveItem.addItemListener(this);
339
+                toggleLiveItem.setState(Globals.isLIVE());
340
+
341
+                cameraMenu.add(stepItem = new MenuItem("Step"));
342
+                stepItem.addActionListener(this);
343
+        //		cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
344
+        //		toggleDLItem.addItemListener(this);
345
+        //                toggleDLItem.setState(false);
346
+
347
+                cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
348
+                toggleRenderItem.addItemListener(this);
349
+                toggleRenderItem.setState(!CameraPane.frozen);
350
+
351
+                cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
352
+                toggleDebugItem.addItemListener(this);
353
+                toggleDebugItem.setState(CameraPane.DEBUG);
354
+
355
+                cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
356
+                toggleFrustumItem.addItemListener(this);
357
+                toggleFrustumItem.setState(CameraPane.FRUSTUM);
358
+
359
+                cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
360
+                toggleFootContactItem.addItemListener(this);
361
+                toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
362
+                
363
+                cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
364
+                toggleTimelineItem.addItemListener(this);
365
+        }
366
+        
349367 //		cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
350368 //		toggleRootItem.addItemListener(this);
351369 //                    toggleRootItem.setState(false);
....@@ -359,7 +377,7 @@
359377         objectPanel = new JTabbedPane();
360378         toolbarPanel = new JPanel();
361379         toolbarPanel.setName("Toolbar");
362
-        treePanel = new JPanel();
380
+        treePanel = new cGridBag();
363381         treePanel.setName("Tree");
364382         ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
365383         ctrlPanel.setName("Edit");
....@@ -367,13 +385,15 @@
367385         materialPanel.setName("Material");
368386         /*JTextPane*/
369387         infoarea = createTextPane();
388
+        doc = infoarea.getStyledDocument();
389
+
370390         infoarea.setEditable(true);
371391         SetText();
372392 //            infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
373393 //            infoarea.setOpaque(false);
374394 //            //infoarea.setForeground(textcolor);
375
-            infoarea.setLineWrap(true);
376
-            infoarea.setWrapStyleWord(true);
395
+// TEXTAREA           infoarea.setLineWrap(true);
396
+// TEXTAREA           infoarea.setWrapStyleWord(true);
377397         infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
378398         infoPanel.setPreferredSize(new Dimension(50, 200));
379399         infoPanel.setName("Info");
....@@ -384,14 +404,14 @@
384404         mainPanel.setName("Main");
385405         mainPanel.setContinuousLayout(true);
386406         mainPanel.setOneTouchExpandable(true);
387
-        mainPanel.setDividerLocation(1.0);
388407         mainPanel.setDividerSize(9);
389
-        mainPanel.setResizeWeight(0);
408
+        mainPanel.setDividerLocation(0.5); //1.0);
409
+        mainPanel.setResizeWeight(0.5);
390410 
391411         //ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
392412         //mainPanel.setLayout(new GridBagLayout());
393413         toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
394
-        treePanel.setLayout(new GridBagLayout());
414
+//        treePanel.setLayout(new GridBagLayout());
395415         //ctrlPanel.setLayout(new GridBagLayout());
396416         //materialPanel.setLayout(new GridBagLayout());
397417 
....@@ -432,7 +452,7 @@
432452     static String newline = "\n";
433453     protected static final String buttonString = "JButton";
434454     StyledDocument doc;
435
-    JTextArea infoarea;
455
+    JTextPane infoarea;
436456 
437457     void ClearInfo()
438458     {
....@@ -499,7 +519,10 @@
499519                 }
500520 
501521         if (full)
502
-            si.SendInfo("    BBox: " + minima + " - " + maxima, "regular");
522
+        {
523
+            si.SendInfo("    BBox min: " + minima, "regular");
524
+            si.SendInfo("    BBox max: " + maxima, "regular");
525
+        }
503526         
504527                 if (sel.bRep != null)
505528                 {
....@@ -597,6 +620,9 @@
597620             {
598621                 CameraPane.pointflow = (PointFlow) sel;
599622             }
623
+            
624
+            si.SendInfo("_____________________", "regular");
625
+            si.SendInfo("", "regular");
600626         }
601627     }
602628 
....@@ -628,52 +654,52 @@
628654                 cameraView.ToggleFullScreen();
629655         }
630656 
631
-    private JTextArea createTextPane()
657
+    private JTextPane createTextPane()
632658     {
633
-        String[] initString =
634
-        {
635
-            "This is an editable JTextPane, ", //regular
636
-            "another ", //italic
637
-            "styled ", //bold
638
-            "text ", //small
639
-            "component, ", //large
640
-            "which supports embedded components..." + newline,//regular
641
-            " " + newline, //button
642
-            "...and embedded icons..." + newline, //regular
643
-            " ", //icon
644
-            newline + "JTextPane is a subclass of JEditorPane that "
645
-            + "uses a StyledEditorKit and StyledDocument, and provides "
646
-            + "cover methods for interacting with those objects."
647
-        };
659
+// TEXTAREA       String[] initString =
660
+//        {
661
+//            "This is an editable JTextPane, ", //regular
662
+//            "another ", //italic
663
+//            "styled ", //bold
664
+//            "text ", //small
665
+//            "component, ", //large
666
+//            "which supports embedded components..." + newline,//regular
667
+//            " " + newline, //button
668
+//            "...and embedded icons..." + newline, //regular
669
+//            " ", //icon
670
+//            newline + "JTextPane is a subclass of JEditorPane that "
671
+//            + "uses a StyledEditorKit and StyledDocument, and provides "
672
+//            + "cover methods for interacting with those objects."
673
+//        };
674
+//
675
+//        String[] initStyles =
676
+//        {
677
+//            "regular", "italic", "bold", "small", "large",
678
+//            "regular", "button", "regular", "icon",
679
+//            "regular"
680
+//        };
681
+//
682
+//        JTextPane textPane = new JTextPane();
683
+//        textPane.setEditable(true);
684
+//        /*StyledDocument*/ doc = textPane.getStyledDocument();
685
+//        addStylesToDocument(doc);
686
+//
687
+//        try
688
+//        {
689
+//            for (int j = 0; j < 2; j++)
690
+//            {
691
+//                for (int i = 0; i < initString.length; i++)
692
+//                {
693
+//                    doc.insertString(doc.getLength(), initString[i],
694
+//                            doc.getStyle(initStyles[i]));
695
+//                }
696
+//            }
697
+//        } catch (BadLocationException ble)
698
+//        {
699
+//            System.err.println("Couldn't insert initial text into text pane.");
700
+//        }
648701 
649
-        String[] initStyles =
650
-        {
651
-            "regular", "italic", "bold", "small", "large",
652
-            "regular", "button", "regular", "icon",
653
-            "regular"
654
-        };
655
-
656
-        JTextPane textPane = new JTextPane();
657
-        textPane.setEditable(true);
658
-        /*StyledDocument*/ doc = textPane.getStyledDocument();
659
-        addStylesToDocument(doc);
660
-
661
-        try
662
-        {
663
-            for (int j = 0; j < 2; j++)
664
-            {
665
-                for (int i = 0; i < initString.length; i++)
666
-                {
667
-                    doc.insertString(doc.getLength(), initString[i],
668
-                            doc.getStyle(initStyles[i]));
669
-                }
670
-            }
671
-        } catch (BadLocationException ble)
672
-        {
673
-            System.err.println("Couldn't insert initial text into text pane.");
674
-        }
675
-
676
-        return new JTextArea(); // textPane;
702
+        return new JTextPane(); // textPane;
677703     }
678704 
679705     protected void addStylesToDocument(StyledDocument doc)
....@@ -943,10 +969,6 @@
943969 
944970     void SetupUI2(ObjEditor oe)
945971     {
946
-//            oe.aConstraints.weightx = 0;
947
-//            oe.aConstraints.weighty = 0;
948
-//            oe.aConstraints.gridx = 0;
949
-//            oe.aConstraints.gridy = 0;
950972         //SetupName(oe);
951973         
952974             namePanel = new cGridBag();
....@@ -963,27 +985,45 @@
963985             setupPanel = new cGridBag().setVertical(false);
964986             
965987         liveCB = AddCheckBox(setupPanel, "Live", copy.live);
966
-        link2masterCB = AddCheckBox(setupPanel, "Supp", copy.link2master);
988
+                liveCB.setToolTipText("Animate object");
967989         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
990
+                hideCB.setToolTipText("Hide object");
968991 //            Return();
969992         markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
970
-        rewindCB = AddCheckBox(setupPanel, "Rew", copy.rewind);
971
-        randomCB = AddCheckBox(setupPanel, "Rand", copy.random);
993
+        markCB.setToolTipText("Set the animation target transform");
994
+        
995
+        rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
996
+        rewindCB.setToolTipText("Rewind animation");
997
+        
998
+        randomCB = AddCheckBox(setupPanel, "Random", copy.random);
999
+        randomCB.setToolTipText("Option for switch node");
9721000 
1001
+        if (Globals.ADVANCED)
1002
+        {
1003
+                link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
1004
+                link2masterCB.setToolTipText("Attach to support");
1005
+                speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
1006
+                speedupCB.setToolTipText("Option motion capture");
1007
+        }
1008
+        
9731009         oe.ctrlPanel.add(setupPanel);
9741010         oe.ctrlPanel.Return();
9751011         
9761012             commandsPanel = new cGridBag().setVertical(false);
9771013         
9781014         resetButton = AddButton(commandsPanel, "Reset");
1015
+        resetButton.setToolTipText("Jump to frame zero");
9791016         stepButton = AddButton(commandsPanel, "Step");
1017
+        stepButton.setToolTipText("Step one frame");
9801018 //            resetAllButton = AddButton(oe, "Reset All");
9811019 //            stepAllButton = AddButton(oe, "Step All");
982
-        speedupCB = AddCheckBox(commandsPanel, "Speed", copy.speedup);
9831020 //            Return();
9841021         slowerButton = AddButton(commandsPanel, "Slow");
1022
+        slowerButton.setToolTipText("Decrease animation speed");
9851023         fasterButton = AddButton(commandsPanel, "Fast");
1024
+        fasterButton.setToolTipText("Increase animation speed");
9861025         remarkButton = AddButton(commandsPanel, "Remark");
1026
+        remarkButton.setToolTipText("Set the current transform as the target");
9871027 
9881028         oe.ctrlPanel.add(commandsPanel);
9891029         oe.ctrlPanel.Return();
....@@ -1290,7 +1330,7 @@
12901330         scrollpane.addMouseWheelListener(this); // Default not fast enough
12911331 
12921332         /*JTabbedPane*/ scenePanel = new cGridBag();
1293
-        scenePanel.preferredWidth = 7;
1333
+        scenePanel.preferredWidth = 6;
12941334         
12951335         JTabbedPane tabbedPane = new JTabbedPane();
12961336         tabbedPane.add(scrollpane);
....@@ -1396,8 +1436,8 @@
13961436 
13971437 //            aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
13981438 
1399
-        frame.setSize(1024, 768);
1400
-        frame.show();
1439
+        frame.setSize(1280, 860);
1440
+        frame.setVisible(true);
14011441 
14021442         gridPanel.setDividerLocation(1.0);
14031443 
....@@ -1436,17 +1476,25 @@
14361476 
14371477         cGridBag editBar = new cGridBag().setVertical(false);
14381478             
1439
-        editBar.add(createMaterialButton = new cButton("Create")); // , aConstraints);
1479
+        editBar.add(createMaterialButton = new cButton("Create", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1480
+                createMaterialButton.setToolTipText("Create material");
14401481 
14411482         /*
14421483         ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
14431484          */
14441485 
1445
-        editBar.add(clearMaterialButton = new cButton("Clear")); // , aConstraints);
1446
-        editBar.add(resetSlidersButton = new cButton("Reset")); // , aConstraints);
1447
-        editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1448
-        editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1486
+        editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1487
+                clearMaterialButton.setToolTipText("Clear material");
1488
+        
1489
+        if (Globals.ADVANCED)
1490
+        {
1491
+                editBar.add(resetSlidersButton = new cButton("Reset", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1492
+                editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1493
+                editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1494
+        }
14491495 
1496
+        editBar.preferredHeight = 15;
1497
+        
14501498         panel.add(editBar);
14511499         
14521500         /**/
....@@ -1712,12 +1760,15 @@
17121760         opacityPowerField.addChangeListener(this);
17131761         /**/
17141762 
1715
-        resetSlidersButton.addActionListener(this);
17161763         clearMaterialButton.addActionListener(this);
17171764         createMaterialButton.addActionListener(this);
1718
-
1719
-        propagateToggle.addItemListener(this);
1720
-        multiplyToggle.addItemListener(this);
1765
+        
1766
+        if (Globals.ADVANCED)
1767
+        {
1768
+                resetSlidersButton.addActionListener(this);
1769
+                propagateToggle.addItemListener(this);
1770
+                multiplyToggle.addItemListener(this);
1771
+        }
17211772     }
17221773 
17231774     void DropFile(java.io.File[] files, boolean textures)
....@@ -2349,7 +2400,7 @@
23492400         {
23502401             /**/
23512402             FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2352
-            browser.show();
2403
+            browser.setVisible(true);
23532404             String filename = browser.getFile();
23542405             if (filename != null && filename.length() > 0)
23552406             {
....@@ -2709,7 +2760,8 @@
27092760             return;
27102761         }
27112762 
2712
-        multiplyToggle.setSelected(mat.multiply);
2763
+        if (multiplyToggle != null)
2764
+                multiplyToggle.setSelected(mat.multiply);
27132765 
27142766         assert (object.projectedVertices != null);
27152767 
....@@ -2924,7 +2976,7 @@
29242976             frame.validate();
29252977 
29262978             return;
2927
-        } else if (event.getSource() == toggleRandomItem)
2979
+        } else if (event.getSource() == toggleSwitchItem)
29282980         {
29292981             cameraView.ToggleRandom();
29302982             cameraView.repaint();
....@@ -2969,6 +3021,7 @@
29693021         if (event.getSource() == randomCB)
29703022         {
29713023             copy.random ^= true;
3024
+            objEditor.refreshContents();
29723025             return;
29733026         }
29743027         if (event.getSource() == speedupCB)
....@@ -3192,7 +3245,7 @@
31923245         if (!Globals.ANIMATION)
31933246         {
31943247             FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3195
-            browser.show();
3248
+            browser.setVisible(true);
31963249             String filename = browser.getFile();
31973250             if (filename != null && filename.length() > 0)
31983251             {
....@@ -3224,7 +3277,6 @@
32243277             callee.refreshContents();
32253278         } else
32263279         {
3227
-                new Exception().printStackTrace();
32283280             System.exit(0);
32293281         }
32303282     }
....@@ -3254,7 +3306,7 @@
32543306     void CreateMaterial()
32553307     {
32563308         //copy.ClearMaterial(); // PATCH
3257
-        copy.CreateMaterialS(multiplyToggle.isSelected());
3309
+        copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
32583310         if (copy.selection.size() > 0)
32593311         //SetMaterial(copy);
32603312         {
....@@ -3313,11 +3365,11 @@
33133365     {
33143366         copy.ResetBlockLoop(); // temporary problem
33153367 
3316
-        boolean random = CameraPane.RANDOM;
3317
-        CameraPane.RANDOM = false; // parse everything
3368
+        boolean random = CameraPane.SWITCH;
3369
+        CameraPane.SWITCH = false; // parse everything
33183370         copy.ResetDisplayList();
33193371         copy.HardTouch();
3320
-        CameraPane.RANDOM = random;
3372
+        CameraPane.SWITCH = random;
33213373     }
33223374 
33233375 //	public void applySelf()
....@@ -4417,7 +4469,7 @@
44174469     CheckboxMenuItem toggleFootContactItem;
44184470     CheckboxMenuItem toggleDLItem;
44194471     CheckboxMenuItem toggleTextureItem;
4420
-    CheckboxMenuItem toggleRandomItem;
4472
+    CheckboxMenuItem toggleSwitchItem;
44214473     CheckboxMenuItem toggleRootItem;
44224474     CheckboxMenuItem animationItem;
44234475     CheckboxMenuItem toggleHandleItem;
....@@ -4425,7 +4477,7 @@
44254477     JSplitPane mainPanel;
44264478     JScrollPane scrollpane;
44274479     JPanel toolbarPanel;
4428
-    JPanel treePanel;
4480
+    cGridBag treePanel;
44294481     JPanel radioPanel;
44304482     ButtonGroup buttonGroup;
44314483     cGridBag ctrlPanel;