Slider tooltips.

Normand Briere

2019-05-05 481df91095a82824d2a98d4db860b3caadbda70a

 ObjEditor.java
..
..
@@ -319,8 +319,21 @@
319
319
         toggleTextureItem.addItemListener(this);
320
320
         toggleTextureItem.setState(CameraPane.textureon);
321
321
         
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
+        
322
334
         if (Globals.ADVANCED)
323
335
         {
336
+        cameraMenu.add("-");
324
337
                 cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
325
338
                 toggleLiveItem.addItemListener(this);
326
339
                 toggleLiveItem.setState(Globals.isLIVE());
..
..
@@ -350,18 +363,6 @@
350
363
                 cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
351
364
                 toggleTimelineItem.addItemListener(this);
352
365
         }
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);
365
366
         
366
367
 //		cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
367
368
 //		toggleRootItem.addItemListener(this);
..
..
@@ -1329,7 +1330,7 @@
1329
1330
         scrollpane.addMouseWheelListener(this); // Default not fast enough
1330
1331
 
1331
1332
         /*JTabbedPane*/ scenePanel = new cGridBag();
1332
-        scenePanel.preferredWidth = 7;
1333
+        scenePanel.preferredWidth = 6;
1333
1334
         
1334
1335
         JTabbedPane tabbedPane = new JTabbedPane();
1335
1336
         tabbedPane.add(scrollpane);
..
..
@@ -1435,8 +1436,8 @@
1435
1436
 
1436
1437
 //            aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1437
1438
 
1438
-        frame.setSize(1024, 768);
1439
-        frame.show();
1439
+        frame.setSize(1280, 860);
1440
+        frame.setVisible(true);
1440
1441
 
1441
1442
         gridPanel.setDividerLocation(1.0);
1442
1443
 
..
..
@@ -1938,7 +1939,7 @@
1938
1939
 
1939
1940
         //? flashIt = false;
1940
1941
         CameraPane pane = (CameraPane) cameraView;
1941
-        pane.clickStart(location.x, location.y, 0);
1942
+        pane.clickStart(location.x, location.y, 0, 0);
1942
1943
         pane.clickEnd(location.x, location.y, 0, true);
1943
1944
 
1944
1945
         if (group.selection.size() == 1)
..
..
@@ -2399,7 +2400,7 @@
2399
2400
         {
2400
2401
             /**/
2401
2402
             FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2402
-            browser.show();
2403
+            browser.setVisible(true);
2403
2404
             String filename = browser.getFile();
2404
2405
             if (filename != null && filename.length() > 0)
2405
2406
             {
..
..
@@ -3276,7 +3277,6 @@
3276
3277
             callee.refreshContents();
3277
3278
         } else
3278
3279
         {
3279
-                new Exception().printStackTrace();
3280
3280
             System.exit(0);
3281
3281
         }
3282
3282
     }
..
..
@@ -3443,6 +3443,36 @@
3443
3443
             {
3444
3444
                 //System.out.println("Propagate = " + propagate);
3445
3445
                 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
+                
3446
3476
                 if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3447
3477
                 {
3448
3478
                     copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);