blame | history | patch | commit | commitdiff
Normand Briere
2019-06-09 cd87df088b1850ba0c90beb6c866c443e4eaf3b9 
 ObjEditor.java
....@@ -319,8 +319,21 @@
319319         toggleTextureItem.addItemListener(this);
320320         toggleTextureItem.setState(CameraPane.textureon);
321321         
322
+        cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
323
+        toggleSwitchItem.addItemListener(this);
324
+        toggleSwitchItem.setState(CameraPane.SWITCH);
325
+        
326
+        cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
327
+        toggleHandleItem.addItemListener(this);
328
+        toggleHandleItem.setState(CameraPane.HANDLES);
329
+        
330
+        cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
331
+        togglePaintItem.addItemListener(this);
332
+        togglePaintItem.setState(CameraPane.PAINTMODE);
333
+        
322334         if (Globals.ADVANCED)
323335         {
336
+        cameraMenu.add("-");
324337                 cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
325338                 toggleLiveItem.addItemListener(this);
326339                 toggleLiveItem.setState(Globals.isLIVE());
....@@ -350,18 +363,6 @@
350363                 cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
351364                 toggleTimelineItem.addItemListener(this);
352365         }
353
-        
354
-        cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
355
-        toggleSwitchItem.addItemListener(this);
356
-        toggleSwitchItem.setState(CameraPane.SWITCH);
357
-        
358
-        cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
359
-        toggleHandleItem.addItemListener(this);
360
-        toggleHandleItem.setState(CameraPane.HANDLES);
361
-        
362
-        cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
363
-        togglePaintItem.addItemListener(this);
364
-        togglePaintItem.setState(CameraPane.PAINTMODE);
365366         
366367 //		cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
367368 //		toggleRootItem.addItemListener(this);
....@@ -500,13 +501,13 @@
500501         //SendInfo("Name:", "bold");
501502         if (sel.GetTextures() != null || debug)
502503         {
503
-            si.SendInfo(sel.toString(), "bold");
504
+            si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
504505             //SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
505506             if (sel.Size() > 0)
506507             {
507508                 si.SendInfo("#children = " + sel.Size(), "regular");
508509             }
509
-            si.SendInfo((debug ? "    Parent: " : "    ") + sel.parent, "regular");
510
+            si.SendInfo((debug ? "    Parent: " : "    ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
510511             if (debug)
511512             {
512513                 try
....@@ -548,7 +549,7 @@
548549                 }
549550                 if (sel.support != null)
550551                 {
551
-                    si.SendInfo("    support: " + sel.support, "regular");
552
+                    si.SendInfo("    support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
552553                 }
553554                 if (sel.scriptnode != null)
554555                 {
....@@ -751,7 +752,7 @@
751752     protected static ImageIcon createImageIcon(String path,
752753             String description)
753754     {
754
-        java.net.URL imgURL = GrafreeD.class.getResource(path);
755
+        java.net.URL imgURL = Grafreed.class.getResource(path);
755756         if (imgURL != null)
756757         {
757758             return new ImageIcon(imgURL, description);
....@@ -783,6 +784,7 @@
783784 //    NumberSlider vDivsField;
784785 //    JCheckBox endcaps;
785786     JCheckBox liveCB;
787
+    JCheckBox selectCB;
786788     JCheckBox hideCB;
787789     JCheckBox link2masterCB;
788790     JCheckBox markCB;
....@@ -985,9 +987,11 @@
985987             
986988         liveCB = AddCheckBox(setupPanel, "Live", copy.live);
987989                 liveCB.setToolTipText("Animate object");
990
+        selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
991
+                selectCB.setToolTipText("Make object selectable");
992
+//            Return();
988993         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
989994                 hideCB.setToolTipText("Hide object");
990
-//            Return();
991995         markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
992996         markCB.setToolTipText("Set the animation target transform");
993997         
....@@ -1027,7 +1031,7 @@
10271031         oe.ctrlPanel.add(commandsPanel);
10281032         oe.ctrlPanel.Return();
10291033 
1030
-    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
10311035     normalpushField = (cNumberSlider)pushPanel.getComponent(1);
10321036     //Return();
10331037 
....@@ -1329,7 +1333,7 @@
13291333         scrollpane.addMouseWheelListener(this); // Default not fast enough
13301334 
13311335         /*JTabbedPane*/ scenePanel = new cGridBag();
1332
-        scenePanel.preferredWidth = 7;
1336
+        scenePanel.preferredWidth = 6;
13331337         
13341338         JTabbedPane tabbedPane = new JTabbedPane();
13351339         tabbedPane.add(scrollpane);
....@@ -1435,8 +1439,8 @@
14351439 
14361440 //            aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
14371441 
1438
-        frame.setSize(1024, 768);
1439
-        frame.show();
1442
+        frame.setSize(1280, 860);
1443
+        frame.setVisible(true);
14401444 
14411445         gridPanel.setDividerLocation(1.0);
14421446 
....@@ -1475,19 +1479,19 @@
14751479 
14761480         cGridBag editBar = new cGridBag().setVertical(false);
14771481             
1478
-        editBar.add(createMaterialButton = new cButton("Create", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1482
+        editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
14791483                 createMaterialButton.setToolTipText("Create material");
14801484 
14811485         /*
14821486         ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
14831487          */
14841488 
1485
-        editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1489
+        editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
14861490                 clearMaterialButton.setToolTipText("Clear material");
14871491         
14881492         if (Globals.ADVANCED)
14891493         {
1490
-                editBar.add(resetSlidersButton = new cButton("Reset", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1494
+                editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
14911495                 editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
14921496                 editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
14931497         }
....@@ -1938,7 +1942,7 @@
19381942 
19391943         //? flashIt = false;
19401944         CameraPane pane = (CameraPane) cameraView;
1941
-        pane.clickStart(location.x, location.y, 0);
1945
+        pane.clickStart(location.x, location.y, 0, 0);
19421946         pane.clickEnd(location.x, location.y, 0, true);
19431947 
19441948         if (group.selection.size() == 1)
....@@ -2395,11 +2399,11 @@
23952399 
23962400     void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
23972401     {
2398
-        if (GrafreeD.standAlone)
2402
+        if (Grafreed.standAlone)
23992403         {
24002404             /**/
24012405             FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2402
-            browser.show();
2406
+            browser.setVisible(true);
24032407             String filename = browser.getFile();
24042408             if (filename != null && filename.length() > 0)
24052409             {
....@@ -3006,6 +3010,10 @@
30063010         {
30073011             copy.live ^= true;
30083012             return;
3013
+        } else if (event.getSource() == selectCB)
3014
+        {
3015
+            copy.dontselect ^= true;
3016
+            return;
30093017         } else if (event.getSource() == hideCB)
30103018         {
30113019             copy.hide ^= true;
....@@ -3254,8 +3262,8 @@
32543262 
32553263                 Globals.ANIMATION ^= true;
32563264 
3257
-                GrafreeD.wav.cursor = 0;
3258
-                GrafreeD.wav.loop = 0;
3265
+                Grafreed.wav.cursor = 0;
3266
+                Grafreed.wav.loop = 0;
32593267             }
32603268         } else
32613269         {
....@@ -3276,7 +3284,6 @@
32763284             callee.refreshContents();
32773285         } else
32783286         {
3279
-                new Exception().printStackTrace();
32803287             System.exit(0);
32813288         }
32823289     }
....@@ -3443,6 +3450,36 @@
34433450             {
34443451                 //System.out.println("Propagate = " + propagate);
34453452                 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
+                
34463483                 if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
34473484                 {
34483485                     copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
....@@ -3558,7 +3595,7 @@
35583595         }
35593596         
35603597         if (normalpushField != null)
3561
-                copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
3598
+                copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
35623599     }
35633600 
35643601         void SnapObject()
....@@ -4170,7 +4207,7 @@
41704207 
41714208     void load() // throws ClassNotFoundException
41724209     {
4173
-        if (GrafreeD.standAlone)
4210
+        if (Grafreed.standAlone)
41744211         {
41754212             FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
41764213             browser.show();
....@@ -4275,7 +4312,7 @@
42754312 
42764313     void saveAs()
42774314     {
4278
-        if (GrafreeD.standAlone)
4315
+        if (Grafreed.standAlone)
42794316         {
42804317             FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
42814318             browser.setVisible(true);
....@@ -4386,7 +4423,7 @@
43864423             Object3D objectparent = obj.parent;
43874424             obj.parent = null;
43884425 
4389
-            Object3D object = (Object3D) GrafreeD.clone(obj);
4426
+            Object3D object = (Object3D) Grafreed.clone(obj);
43904427 
43914428             obj.parent = objectparent;
43924429 
....@@ -4420,7 +4457,7 @@
44204457         buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
44214458         cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
44224459         copy.generatePOV(buffer);
4423
-        if (GrafreeD.standAlone)
4460
+        if (Grafreed.standAlone)
44244461         {
44254462             FileDialog browser = new FileDialog(frame, "Export POV", 1);
44264463             browser.show();