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);
....@@ -483,13 +501,13 @@
483501         //SendInfo("Name:", "bold");
484502         if (sel.GetTextures() != null || debug)
485503         {
486
-            si.SendInfo(sel.toString(), "bold");
504
+            si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
487505             //SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
488506             if (sel.Size() > 0)
489507             {
490508                 si.SendInfo("#children = " + sel.Size(), "regular");
491509             }
492
-            si.SendInfo((debug ? "    Parent: " : "    ") + sel.parent, "regular");
510
+            si.SendInfo((debug ? "    Parent: " : "    ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
493511             if (debug)
494512             {
495513                 try
....@@ -531,7 +549,7 @@
531549                 }
532550                 if (sel.support != null)
533551                 {
534
-                    si.SendInfo("    support: " + sel.support, "regular");
552
+                    si.SendInfo("    support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
535553                 }
536554                 if (sel.scriptnode != null)
537555                 {
....@@ -734,7 +752,7 @@
734752     protected static ImageIcon createImageIcon(String path,
735753             String description)
736754     {
737
-        java.net.URL imgURL = GrafreeD.class.getResource(path);
755
+        java.net.URL imgURL = Grafreed.class.getResource(path);
738756         if (imgURL != null)
739757         {
740758             return new ImageIcon(imgURL, description);
....@@ -766,6 +784,7 @@
766784 //    NumberSlider vDivsField;
767785 //    JCheckBox endcaps;
768786     JCheckBox liveCB;
787
+    JCheckBox selectCB;
769788     JCheckBox hideCB;
770789     JCheckBox link2masterCB;
771790     JCheckBox markCB;
....@@ -951,10 +970,6 @@
951970 
952971     void SetupUI2(ObjEditor oe)
953972     {
954
-//            oe.aConstraints.weightx = 0;
955
-//            oe.aConstraints.weighty = 0;
956
-//            oe.aConstraints.gridx = 0;
957
-//            oe.aConstraints.gridy = 0;
958973         //SetupName(oe);
959974         
960975             namePanel = new cGridBag();
....@@ -971,32 +986,52 @@
971986             setupPanel = new cGridBag().setVertical(false);
972987             
973988         liveCB = AddCheckBox(setupPanel, "Live", copy.live);
974
-        link2masterCB = AddCheckBox(setupPanel, "Supp", copy.link2master);
975
-        hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
989
+                liveCB.setToolTipText("Animate object");
990
+        selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
991
+                selectCB.setToolTipText("Make object selectable");
976992 //            Return();
993
+        hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
994
+                hideCB.setToolTipText("Hide object");
977995         markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
978
-        rewindCB = AddCheckBox(setupPanel, "Rew", copy.rewind);
979
-        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");
9801003 
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
+        
9811012         oe.ctrlPanel.add(setupPanel);
9821013         oe.ctrlPanel.Return();
9831014         
9841015             commandsPanel = new cGridBag().setVertical(false);
9851016         
9861017         resetButton = AddButton(commandsPanel, "Reset");
1018
+        resetButton.setToolTipText("Jump to frame zero");
9871019         stepButton = AddButton(commandsPanel, "Step");
1020
+        stepButton.setToolTipText("Step one frame");
9881021 //            resetAllButton = AddButton(oe, "Reset All");
9891022 //            stepAllButton = AddButton(oe, "Step All");
990
-        speedupCB = AddCheckBox(commandsPanel, "Speed", copy.speedup);
9911023 //            Return();
9921024         slowerButton = AddButton(commandsPanel, "Slow");
1025
+        slowerButton.setToolTipText("Decrease animation speed");
9931026         fasterButton = AddButton(commandsPanel, "Fast");
1027
+        fasterButton.setToolTipText("Increase animation speed");
9941028         remarkButton = AddButton(commandsPanel, "Remark");
1029
+        remarkButton.setToolTipText("Set the current transform as the target");
9951030 
9961031         oe.ctrlPanel.add(commandsPanel);
9971032         oe.ctrlPanel.Return();
9981033 
999
-    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
10001035     normalpushField = (cNumberSlider)pushPanel.getComponent(1);
10011036     //Return();
10021037 
....@@ -1298,7 +1333,7 @@
12981333         scrollpane.addMouseWheelListener(this); // Default not fast enough
12991334 
13001335         /*JTabbedPane*/ scenePanel = new cGridBag();
1301
-        scenePanel.preferredWidth = 7;
1336
+        scenePanel.preferredWidth = 6;
13021337         
13031338         JTabbedPane tabbedPane = new JTabbedPane();
13041339         tabbedPane.add(scrollpane);
....@@ -1404,8 +1439,8 @@
14041439 
14051440 //            aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
14061441 
1407
-        frame.setSize(1024, 768);
1408
-        frame.show();
1442
+        frame.setSize(1280, 860);
1443
+        frame.setVisible(true);
14091444 
14101445         gridPanel.setDividerLocation(1.0);
14111446 
....@@ -1444,19 +1479,22 @@
14441479 
14451480         cGridBag editBar = new cGridBag().setVertical(false);
14461481             
1447
-        editBar.add(createMaterialButton = new cButton("Create", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1482
+        editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
14481483                 createMaterialButton.setToolTipText("Create material");
14491484 
14501485         /*
14511486         ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
14521487          */
14531488 
1454
-        editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1489
+        editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
14551490                 clearMaterialButton.setToolTipText("Clear material");
14561491         
1457
-        editBar.add(resetSlidersButton = new cButton("Reset", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1458
-        editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1459
-        editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
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
+        }
14601498 
14611499         editBar.preferredHeight = 15;
14621500         
....@@ -1725,12 +1763,15 @@
17251763         opacityPowerField.addChangeListener(this);
17261764         /**/
17271765 
1728
-        resetSlidersButton.addActionListener(this);
17291766         clearMaterialButton.addActionListener(this);
17301767         createMaterialButton.addActionListener(this);
1731
-
1732
-        propagateToggle.addItemListener(this);
1733
-        multiplyToggle.addItemListener(this);
1768
+        
1769
+        if (Globals.ADVANCED)
1770
+        {
1771
+                resetSlidersButton.addActionListener(this);
1772
+                propagateToggle.addItemListener(this);
1773
+                multiplyToggle.addItemListener(this);
1774
+        }
17341775     }
17351776 
17361777     void DropFile(java.io.File[] files, boolean textures)
....@@ -1901,7 +1942,7 @@
19011942 
19021943         //? flashIt = false;
19031944         CameraPane pane = (CameraPane) cameraView;
1904
-        pane.clickStart(location.x, location.y, 0);
1945
+        pane.clickStart(location.x, location.y, 0, 0);
19051946         pane.clickEnd(location.x, location.y, 0, true);
19061947 
19071948         if (group.selection.size() == 1)
....@@ -2358,11 +2399,11 @@
23582399 
23592400     void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
23602401     {
2361
-        if (GrafreeD.standAlone)
2402
+        if (Grafreed.standAlone)
23622403         {
23632404             /**/
23642405             FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2365
-            browser.show();
2406
+            browser.setVisible(true);
23662407             String filename = browser.getFile();
23672408             if (filename != null && filename.length() > 0)
23682409             {
....@@ -2722,7 +2763,8 @@
27222763             return;
27232764         }
27242765 
2725
-        multiplyToggle.setSelected(mat.multiply);
2766
+        if (multiplyToggle != null)
2767
+                multiplyToggle.setSelected(mat.multiply);
27262768 
27272769         assert (object.projectedVertices != null);
27282770 
....@@ -2937,7 +2979,7 @@
29372979             frame.validate();
29382980 
29392981             return;
2940
-        } else if (event.getSource() == toggleRandomItem)
2982
+        } else if (event.getSource() == toggleSwitchItem)
29412983         {
29422984             cameraView.ToggleRandom();
29432985             cameraView.repaint();
....@@ -2968,6 +3010,10 @@
29683010         {
29693011             copy.live ^= true;
29703012             return;
3013
+        } else if (event.getSource() == selectCB)
3014
+        {
3015
+            copy.dontselect ^= true;
3016
+            return;
29713017         } else if (event.getSource() == hideCB)
29723018         {
29733019             copy.hide ^= true;
....@@ -2982,6 +3028,7 @@
29823028         if (event.getSource() == randomCB)
29833029         {
29843030             copy.random ^= true;
3031
+            objEditor.refreshContents();
29853032             return;
29863033         }
29873034         if (event.getSource() == speedupCB)
....@@ -3205,7 +3252,7 @@
32053252         if (!Globals.ANIMATION)
32063253         {
32073254             FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3208
-            browser.show();
3255
+            browser.setVisible(true);
32093256             String filename = browser.getFile();
32103257             if (filename != null && filename.length() > 0)
32113258             {
....@@ -3215,8 +3262,8 @@
32153262 
32163263                 Globals.ANIMATION ^= true;
32173264 
3218
-                GrafreeD.wav.cursor = 0;
3219
-                GrafreeD.wav.loop = 0;
3265
+                Grafreed.wav.cursor = 0;
3266
+                Grafreed.wav.loop = 0;
32203267             }
32213268         } else
32223269         {
....@@ -3237,7 +3284,6 @@
32373284             callee.refreshContents();
32383285         } else
32393286         {
3240
-                new Exception().printStackTrace();
32413287             System.exit(0);
32423288         }
32433289     }
....@@ -3267,7 +3313,7 @@
32673313     void CreateMaterial()
32683314     {
32693315         //copy.ClearMaterial(); // PATCH
3270
-        copy.CreateMaterialS(multiplyToggle.isSelected());
3316
+        copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
32713317         if (copy.selection.size() > 0)
32723318         //SetMaterial(copy);
32733319         {
....@@ -3326,11 +3372,11 @@
33263372     {
33273373         copy.ResetBlockLoop(); // temporary problem
33283374 
3329
-        boolean random = CameraPane.RANDOM;
3330
-        CameraPane.RANDOM = false; // parse everything
3375
+        boolean random = CameraPane.SWITCH;
3376
+        CameraPane.SWITCH = false; // parse everything
33313377         copy.ResetDisplayList();
33323378         copy.HardTouch();
3333
-        CameraPane.RANDOM = random;
3379
+        CameraPane.SWITCH = random;
33343380     }
33353381 
33363382 //	public void applySelf()
....@@ -3404,6 +3450,36 @@
34043450             {
34053451                 //System.out.println("Propagate = " + propagate);
34063452                 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
+                
34073483                 if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
34083484                 {
34093485                     copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
....@@ -3519,7 +3595,7 @@
35193595         }
35203596         
35213597         if (normalpushField != null)
3522
-                copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
3598
+                copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
35233599     }
35243600 
35253601         void SnapObject()
....@@ -4131,7 +4207,7 @@
41314207 
41324208     void load() // throws ClassNotFoundException
41334209     {
4134
-        if (GrafreeD.standAlone)
4210
+        if (Grafreed.standAlone)
41354211         {
41364212             FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
41374213             browser.show();
....@@ -4236,7 +4312,7 @@
42364312 
42374313     void saveAs()
42384314     {
4239
-        if (GrafreeD.standAlone)
4315
+        if (Grafreed.standAlone)
42404316         {
42414317             FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
42424318             browser.setVisible(true);
....@@ -4347,7 +4423,7 @@
43474423             Object3D objectparent = obj.parent;
43484424             obj.parent = null;
43494425 
4350
-            Object3D object = (Object3D) GrafreeD.clone(obj);
4426
+            Object3D object = (Object3D) Grafreed.clone(obj);
43514427 
43524428             obj.parent = objectparent;
43534429 
....@@ -4381,7 +4457,7 @@
43814457         buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
43824458         cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
43834459         copy.generatePOV(buffer);
4384
-        if (GrafreeD.standAlone)
4460
+        if (Grafreed.standAlone)
43854461         {
43864462             FileDialog browser = new FileDialog(frame, "Export POV", 1);
43874463             browser.show();
....@@ -4430,7 +4506,7 @@
44304506     CheckboxMenuItem toggleFootContactItem;
44314507     CheckboxMenuItem toggleDLItem;
44324508     CheckboxMenuItem toggleTextureItem;
4433
-    CheckboxMenuItem toggleRandomItem;
4509
+    CheckboxMenuItem toggleSwitchItem;
44344510     CheckboxMenuItem toggleRootItem;
44354511     CheckboxMenuItem animationItem;
44364512     CheckboxMenuItem toggleHandleItem;