blame | history | patch | commit | commitdiff
Normand Briere
2019-06-03 e24558ddeacfc945b9e9ba0a32b552d04e2ed4dd 
 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     {
....@@ -481,13 +501,13 @@
481501         //SendInfo("Name:", "bold");
482502         if (sel.GetTextures() != null || debug)
483503         {
484
-            si.SendInfo(sel.toString(), "bold");
504
+            si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
485505             //SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
486506             if (sel.Size() > 0)
487507             {
488508                 si.SendInfo("#children = " + sel.Size(), "regular");
489509             }
490
-            si.SendInfo((debug ? "    Parent: " : "    ") + sel.parent, "regular");
510
+            si.SendInfo((debug ? "    Parent: " : "    ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
491511             if (debug)
492512             {
493513                 try
....@@ -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                 {
....@@ -526,7 +549,7 @@
526549                 }
527550                 if (sel.support != null)
528551                 {
529
-                    si.SendInfo("    support: " + sel.support, "regular");
552
+                    si.SendInfo("    support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
530553                 }
531554                 if (sel.scriptnode != null)
532555                 {
....@@ -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)
....@@ -726,7 +752,7 @@
726752     protected static ImageIcon createImageIcon(String path,
727753             String description)
728754     {
729
-        java.net.URL imgURL = GrafreeD.class.getResource(path);
755
+        java.net.URL imgURL = Grafreed.class.getResource(path);
730756         if (imgURL != null)
731757         {
732758             return new ImageIcon(imgURL, description);
....@@ -758,6 +784,7 @@
758784 //    NumberSlider vDivsField;
759785 //    JCheckBox endcaps;
760786     JCheckBox liveCB;
787
+    JCheckBox selectCB;
761788     JCheckBox hideCB;
762789     JCheckBox link2masterCB;
763790     JCheckBox markCB;
....@@ -943,10 +970,6 @@
943970 
944971     void SetupUI2(ObjEditor oe)
945972     {
946
-//            oe.aConstraints.weightx = 0;
947
-//            oe.aConstraints.weighty = 0;
948
-//            oe.aConstraints.gridx = 0;
949
-//            oe.aConstraints.gridy = 0;
950973         //SetupName(oe);
951974         
952975             namePanel = new cGridBag();
....@@ -963,32 +986,52 @@
963986             setupPanel = new cGridBag().setVertical(false);
964987             
965988         liveCB = AddCheckBox(setupPanel, "Live", copy.live);
966
-        link2masterCB = AddCheckBox(setupPanel, "Supp", copy.link2master);
967
-        hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
989
+                liveCB.setToolTipText("Animate object");
990
+        selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
991
+                selectCB.setToolTipText("Make object selectable");
968992 //            Return();
993
+        hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
994
+                hideCB.setToolTipText("Hide object");
969995         markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
970
-        rewindCB = AddCheckBox(setupPanel, "Rew", copy.rewind);
971
-        randomCB = AddCheckBox(setupPanel, "Rand", copy.random);
996
+        markCB.setToolTipText("Set the animation target transform");
997
+        
998
+        rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
999
+        rewindCB.setToolTipText("Rewind animation");
1000
+        
1001
+        randomCB = AddCheckBox(setupPanel, "Random", copy.random);
1002
+        randomCB.setToolTipText("Option for switch node");
9721003 
1004
+        if (Globals.ADVANCED)
1005
+        {
1006
+                link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
1007
+                link2masterCB.setToolTipText("Attach to support");
1008
+                speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
1009
+                speedupCB.setToolTipText("Option motion capture");
1010
+        }
1011
+        
9731012         oe.ctrlPanel.add(setupPanel);
9741013         oe.ctrlPanel.Return();
9751014         
9761015             commandsPanel = new cGridBag().setVertical(false);
9771016         
9781017         resetButton = AddButton(commandsPanel, "Reset");
1018
+        resetButton.setToolTipText("Jump to frame zero");
9791019         stepButton = AddButton(commandsPanel, "Step");
1020
+        stepButton.setToolTipText("Step one frame");
9801021 //            resetAllButton = AddButton(oe, "Reset All");
9811022 //            stepAllButton = AddButton(oe, "Step All");
982
-        speedupCB = AddCheckBox(commandsPanel, "Speed", copy.speedup);
9831023 //            Return();
9841024         slowerButton = AddButton(commandsPanel, "Slow");
1025
+        slowerButton.setToolTipText("Decrease animation speed");
9851026         fasterButton = AddButton(commandsPanel, "Fast");
1027
+        fasterButton.setToolTipText("Increase animation speed");
9861028         remarkButton = AddButton(commandsPanel, "Remark");
1029
+        remarkButton.setToolTipText("Set the current transform as the target");
9871030 
9881031         oe.ctrlPanel.add(commandsPanel);
9891032         oe.ctrlPanel.Return();
9901033 
991
-    pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
1034
+    pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
9921035     normalpushField = (cNumberSlider)pushPanel.getComponent(1);
9931036     //Return();
9941037 
....@@ -1290,7 +1333,7 @@
12901333         scrollpane.addMouseWheelListener(this); // Default not fast enough
12911334 
12921335         /*JTabbedPane*/ scenePanel = new cGridBag();
1293
-        scenePanel.preferredWidth = 7;
1336
+        scenePanel.preferredWidth = 6;
12941337         
12951338         JTabbedPane tabbedPane = new JTabbedPane();
12961339         tabbedPane.add(scrollpane);
....@@ -1396,8 +1439,8 @@
13961439 
13971440 //            aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
13981441 
1399
-        frame.setSize(1024, 768);
1400
-        frame.show();
1442
+        frame.setSize(1280, 860);
1443
+        frame.setVisible(true);
14011444 
14021445         gridPanel.setDividerLocation(1.0);
14031446 
....@@ -1436,17 +1479,25 @@
14361479 
14371480         cGridBag editBar = new cGridBag().setVertical(false);
14381481             
1439
-        editBar.add(createMaterialButton = new cButton("Create")); // , aConstraints);
1482
+        editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
1483
+                createMaterialButton.setToolTipText("Create material");
14401484 
14411485         /*
14421486         ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
14431487          */
14441488 
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);
1489
+        editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
1490
+                clearMaterialButton.setToolTipText("Clear material");
1491
+        
1492
+        if (Globals.ADVANCED)
1493
+        {
1494
+                editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
1495
+                editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1496
+                editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1497
+        }
14491498 
1499
+        editBar.preferredHeight = 15;
1500
+        
14501501         panel.add(editBar);
14511502         
14521503         /**/
....@@ -1712,12 +1763,15 @@
17121763         opacityPowerField.addChangeListener(this);
17131764         /**/
17141765 
1715
-        resetSlidersButton.addActionListener(this);
17161766         clearMaterialButton.addActionListener(this);
17171767         createMaterialButton.addActionListener(this);
1718
-
1719
-        propagateToggle.addItemListener(this);
1720
-        multiplyToggle.addItemListener(this);
1768
+        
1769
+        if (Globals.ADVANCED)
1770
+        {
1771
+                resetSlidersButton.addActionListener(this);
1772
+                propagateToggle.addItemListener(this);
1773
+                multiplyToggle.addItemListener(this);
1774
+        }
17211775     }
17221776 
17231777     void DropFile(java.io.File[] files, boolean textures)
....@@ -1888,7 +1942,7 @@
18881942 
18891943         //? flashIt = false;
18901944         CameraPane pane = (CameraPane) cameraView;
1891
-        pane.clickStart(location.x, location.y, 0);
1945
+        pane.clickStart(location.x, location.y, 0, 0);
18921946         pane.clickEnd(location.x, location.y, 0, true);
18931947 
18941948         if (group.selection.size() == 1)
....@@ -2345,11 +2399,11 @@
23452399 
23462400     void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
23472401     {
2348
-        if (GrafreeD.standAlone)
2402
+        if (Grafreed.standAlone)
23492403         {
23502404             /**/
23512405             FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2352
-            browser.show();
2406
+            browser.setVisible(true);
23532407             String filename = browser.getFile();
23542408             if (filename != null && filename.length() > 0)
23552409             {
....@@ -2709,7 +2763,8 @@
27092763             return;
27102764         }
27112765 
2712
-        multiplyToggle.setSelected(mat.multiply);
2766
+        if (multiplyToggle != null)
2767
+                multiplyToggle.setSelected(mat.multiply);
27132768 
27142769         assert (object.projectedVertices != null);
27152770 
....@@ -2924,7 +2979,7 @@
29242979             frame.validate();
29252980 
29262981             return;
2927
-        } else if (event.getSource() == toggleRandomItem)
2982
+        } else if (event.getSource() == toggleSwitchItem)
29282983         {
29292984             cameraView.ToggleRandom();
29302985             cameraView.repaint();
....@@ -2955,6 +3010,10 @@
29553010         {
29563011             copy.live ^= true;
29573012             return;
3013
+        } else if (event.getSource() == selectCB)
3014
+        {
3015
+            copy.dontselect ^= true;
3016
+            return;
29583017         } else if (event.getSource() == hideCB)
29593018         {
29603019             copy.hide ^= true;
....@@ -2969,6 +3028,7 @@
29693028         if (event.getSource() == randomCB)
29703029         {
29713030             copy.random ^= true;
3031
+            objEditor.refreshContents();
29723032             return;
29733033         }
29743034         if (event.getSource() == speedupCB)
....@@ -3192,7 +3252,7 @@
31923252         if (!Globals.ANIMATION)
31933253         {
31943254             FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3195
-            browser.show();
3255
+            browser.setVisible(true);
31963256             String filename = browser.getFile();
31973257             if (filename != null && filename.length() > 0)
31983258             {
....@@ -3202,8 +3262,8 @@
32023262 
32033263                 Globals.ANIMATION ^= true;
32043264 
3205
-                GrafreeD.wav.cursor = 0;
3206
-                GrafreeD.wav.loop = 0;
3265
+                Grafreed.wav.cursor = 0;
3266
+                Grafreed.wav.loop = 0;
32073267             }
32083268         } else
32093269         {
....@@ -3224,7 +3284,6 @@
32243284             callee.refreshContents();
32253285         } else
32263286         {
3227
-                new Exception().printStackTrace();
32283287             System.exit(0);
32293288         }
32303289     }
....@@ -3254,7 +3313,7 @@
32543313     void CreateMaterial()
32553314     {
32563315         //copy.ClearMaterial(); // PATCH
3257
-        copy.CreateMaterialS(multiplyToggle.isSelected());
3316
+        copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
32583317         if (copy.selection.size() > 0)
32593318         //SetMaterial(copy);
32603319         {
....@@ -3313,11 +3372,11 @@
33133372     {
33143373         copy.ResetBlockLoop(); // temporary problem
33153374 
3316
-        boolean random = CameraPane.RANDOM;
3317
-        CameraPane.RANDOM = false; // parse everything
3375
+        boolean random = CameraPane.SWITCH;
3376
+        CameraPane.SWITCH = false; // parse everything
33183377         copy.ResetDisplayList();
33193378         copy.HardTouch();
3320
-        CameraPane.RANDOM = random;
3379
+        CameraPane.SWITCH = random;
33213380     }
33223381 
33233382 //	public void applySelf()
....@@ -3391,6 +3450,36 @@
33913450             {
33923451                 //System.out.println("Propagate = " + propagate);
33933452                 copy.UpdateMaterial(anchor, current, propagate);
3453
+                
3454
+                if (copy.material != null)
3455
+                {
3456
+                    cMaterial mat = copy.material;
3457
+                            
3458
+                    colorField.SetToolTipValue((mat.color));
3459
+                    modulationField.SetToolTipValue((mat.modulation));
3460
+                    metalnessField.SetToolTipValue((mat.metalness));
3461
+                    diffuseField.SetToolTipValue((mat.diffuse));
3462
+                    specularField.SetToolTipValue((mat.specular));
3463
+                    shininessField.SetToolTipValue((mat.shininess));
3464
+                    shiftField.SetToolTipValue((mat.shift));
3465
+                    ambientField.SetToolTipValue((mat.ambient));
3466
+                    lightareaField.SetToolTipValue((mat.lightarea));
3467
+                    diffusenessField.SetToolTipValue((mat.factor));
3468
+                    velvetField.SetToolTipValue((mat.velvet));
3469
+                    sheenField.SetToolTipValue((mat.sheen));
3470
+                    subsurfaceField.SetToolTipValue((mat.subsurface));
3471
+                    backlitField.SetToolTipValue((mat.bump));
3472
+                    anisoField.SetToolTipValue((mat.aniso));
3473
+                    anisoVField.SetToolTipValue((mat.anisoV));
3474
+                    cameraField.SetToolTipValue((mat.cameralight));
3475
+                    selfshadowField.SetToolTipValue((mat.diffuseness));
3476
+                    shadowField.SetToolTipValue((mat.shadow));
3477
+                    textureField.SetToolTipValue((mat.texture));
3478
+                    opacityField.SetToolTipValue((mat.opacity));
3479
+                    fakedepthField.SetToolTipValue((mat.fakedepth));
3480
+                    shadowbiasField.SetToolTipValue((mat.shadowbias));
3481
+                }
3482
+                
33943483                 if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
33953484                 {
33963485                     copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
....@@ -3506,7 +3595,7 @@
35063595         }
35073596         
35083597         if (normalpushField != null)
3509
-                copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
3598
+                copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
35103599     }
35113600 
35123601         void SnapObject()
....@@ -4118,7 +4207,7 @@
41184207 
41194208     void load() // throws ClassNotFoundException
41204209     {
4121
-        if (GrafreeD.standAlone)
4210
+        if (Grafreed.standAlone)
41224211         {
41234212             FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
41244213             browser.show();
....@@ -4223,7 +4312,7 @@
42234312 
42244313     void saveAs()
42254314     {
4226
-        if (GrafreeD.standAlone)
4315
+        if (Grafreed.standAlone)
42274316         {
42284317             FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
42294318             browser.setVisible(true);
....@@ -4334,7 +4423,7 @@
43344423             Object3D objectparent = obj.parent;
43354424             obj.parent = null;
43364425 
4337
-            Object3D object = (Object3D) GrafreeD.clone(obj);
4426
+            Object3D object = (Object3D) Grafreed.clone(obj);
43384427 
43394428             obj.parent = objectparent;
43404429 
....@@ -4368,7 +4457,7 @@
43684457         buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
43694458         cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
43704459         copy.generatePOV(buffer);
4371
-        if (GrafreeD.standAlone)
4460
+        if (Grafreed.standAlone)
43724461         {
43734462             FileDialog browser = new FileDialog(frame, "Export POV", 1);
43744463             browser.show();
....@@ -4417,7 +4506,7 @@
44174506     CheckboxMenuItem toggleFootContactItem;
44184507     CheckboxMenuItem toggleDLItem;
44194508     CheckboxMenuItem toggleTextureItem;
4420
-    CheckboxMenuItem toggleRandomItem;
4509
+    CheckboxMenuItem toggleSwitchItem;
44214510     CheckboxMenuItem toggleRootItem;
44224511     CheckboxMenuItem animationItem;
44234512     CheckboxMenuItem toggleHandleItem;
....@@ -4425,7 +4514,7 @@
44254514     JSplitPane mainPanel;
44264515     JScrollPane scrollpane;
44274516     JPanel toolbarPanel;
4428
-    JPanel treePanel;
4517
+    cGridBag treePanel;
44294518     JPanel radioPanel;
44304519     ButtonGroup buttonGroup;
44314520     cGridBag ctrlPanel;