blame | history | patch | commit | commitdiff
Normand Briere
2019-05-05 623dc0fa8cbd9473830a1786f6d49fa808a09439 
 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);
....@@ -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);
....@@ -1329,7 +1330,7 @@
13291330         scrollpane.addMouseWheelListener(this); // Default not fast enough
13301331 
13311332         /*JTabbedPane*/ scenePanel = new cGridBag();
1332
-        scenePanel.preferredWidth = 7;
1333
+        scenePanel.preferredWidth = 6;
13331334         
13341335         JTabbedPane tabbedPane = new JTabbedPane();
13351336         tabbedPane.add(scrollpane);
....@@ -1435,8 +1436,8 @@
14351436 
14361437 //            aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
14371438 
1438
-        frame.setSize(1024, 768);
1439
-        frame.show();
1439
+        frame.setSize(1280, 860);
1440
+        frame.setVisible(true);
14401441 
14411442         gridPanel.setDividerLocation(1.0);
14421443 
....@@ -1475,19 +1476,19 @@
14751476 
14761477         cGridBag editBar = new cGridBag().setVertical(false);
14771478             
1478
-        editBar.add(createMaterialButton = new cButton("Create", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1479
+        editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
14791480                 createMaterialButton.setToolTipText("Create material");
14801481 
14811482         /*
14821483         ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
14831484          */
14841485 
1485
-        editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1486
+        editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
14861487                 clearMaterialButton.setToolTipText("Clear material");
14871488         
14881489         if (Globals.ADVANCED)
14891490         {
1490
-                editBar.add(resetSlidersButton = new cButton("Reset", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1491
+                editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
14911492                 editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
14921493                 editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
14931494         }
....@@ -1938,7 +1939,7 @@
19381939 
19391940         //? flashIt = false;
19401941         CameraPane pane = (CameraPane) cameraView;
1941
-        pane.clickStart(location.x, location.y, 0);
1942
+        pane.clickStart(location.x, location.y, 0, 0);
19421943         pane.clickEnd(location.x, location.y, 0, true);
19431944 
19441945         if (group.selection.size() == 1)
....@@ -2395,11 +2396,11 @@
23952396 
23962397     void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
23972398     {
2398
-        if (GrafreeD.standAlone)
2399
+        if (Grafreed.standAlone)
23992400         {
24002401             /**/
24012402             FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2402
-            browser.show();
2403
+            browser.setVisible(true);
24032404             String filename = browser.getFile();
24042405             if (filename != null && filename.length() > 0)
24052406             {
....@@ -3254,8 +3255,8 @@
32543255 
32553256                 Globals.ANIMATION ^= true;
32563257 
3257
-                GrafreeD.wav.cursor = 0;
3258
-                GrafreeD.wav.loop = 0;
3258
+                Grafreed.wav.cursor = 0;
3259
+                Grafreed.wav.loop = 0;
32593260             }
32603261         } else
32613262         {
....@@ -3276,7 +3277,6 @@
32763277             callee.refreshContents();
32773278         } else
32783279         {
3279
-                new Exception().printStackTrace();
32803280             System.exit(0);
32813281         }
32823282     }
....@@ -3443,6 +3443,36 @@
34433443             {
34443444                 //System.out.println("Propagate = " + propagate);
34453445                 copy.UpdateMaterial(anchor, current, propagate);
3446
+                
3447
+                if (copy.material != null)
3448
+                {
3449
+                    cMaterial mat = copy.material;
3450
+                            
3451
+                    colorField.SetToolTipValue((mat.color));
3452
+                    modulationField.SetToolTipValue((mat.modulation));
3453
+                    metalnessField.SetToolTipValue((mat.metalness));
3454
+                    diffuseField.SetToolTipValue((mat.diffuse));
3455
+                    specularField.SetToolTipValue((mat.specular));
3456
+                    shininessField.SetToolTipValue((mat.shininess));
3457
+                    shiftField.SetToolTipValue((mat.shift));
3458
+                    ambientField.SetToolTipValue((mat.ambient));
3459
+                    lightareaField.SetToolTipValue((mat.lightarea));
3460
+                    diffusenessField.SetToolTipValue((mat.factor));
3461
+                    velvetField.SetToolTipValue((mat.velvet));
3462
+                    sheenField.SetToolTipValue((mat.sheen));
3463
+                    subsurfaceField.SetToolTipValue((mat.subsurface));
3464
+                    backlitField.SetToolTipValue((mat.bump));
3465
+                    anisoField.SetToolTipValue((mat.aniso));
3466
+                    anisoVField.SetToolTipValue((mat.anisoV));
3467
+                    cameraField.SetToolTipValue((mat.cameralight));
3468
+                    selfshadowField.SetToolTipValue((mat.diffuseness));
3469
+                    shadowField.SetToolTipValue((mat.shadow));
3470
+                    textureField.SetToolTipValue((mat.texture));
3471
+                    opacityField.SetToolTipValue((mat.opacity));
3472
+                    fakedepthField.SetToolTipValue((mat.fakedepth));
3473
+                    shadowbiasField.SetToolTipValue((mat.shadowbias));
3474
+                }
3475
+                
34463476                 if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
34473477                 {
34483478                     copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
....@@ -4170,7 +4200,7 @@
41704200 
41714201     void load() // throws ClassNotFoundException
41724202     {
4173
-        if (GrafreeD.standAlone)
4203
+        if (Grafreed.standAlone)
41744204         {
41754205             FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
41764206             browser.show();
....@@ -4275,7 +4305,7 @@
42754305 
42764306     void saveAs()
42774307     {
4278
-        if (GrafreeD.standAlone)
4308
+        if (Grafreed.standAlone)
42794309         {
42804310             FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
42814311             browser.setVisible(true);
....@@ -4386,7 +4416,7 @@
43864416             Object3D objectparent = obj.parent;
43874417             obj.parent = null;
43884418 
4389
-            Object3D object = (Object3D) GrafreeD.clone(obj);
4419
+            Object3D object = (Object3D) Grafreed.clone(obj);
43904420 
43914421             obj.parent = objectparent;
43924422 
....@@ -4420,7 +4450,7 @@
44204450         buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
44214451         cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
44224452         copy.generatePOV(buffer);
4423
-        if (GrafreeD.standAlone)
4453
+        if (Grafreed.standAlone)
44244454         {
44254455             FileDialog browser = new FileDialog(frame, "Export POV", 1);
44264456             browser.show();