Sort by size

Normand Briere

2019-10-20 49d9c15d375942997692f7fccfb697665d0cb59e

 ObjEditor.java
..
..
@@ -474,7 +474,7 @@
474
474
 		importOBJItem.addActionListener(this);
475
475
 		import3DSItem = menu.add(new MenuItem("3DS file..."));
476
476
 		import3DSItem.addActionListener(this);
477
-                if (Globals.ADVANCED)
477
+                //if (Globals.ADVANCED)
478
478
                 {
479
479
 		importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
480
480
 		importVRMLX3DItem.addActionListener(this);
..
..
@@ -1761,9 +1761,14 @@
1761
1761
 
1762
1762
         transformPanel.add(resetTransformPanel);
1763
1763
         
1764
-        cGridBag scalePanel = AddSlider(transformPanel, "Scale", 1, 10, 1);
1764
+        cGridBag scalePanel = AddSlider(transformPanel, "Inflate", 1, 10, 1);
1765
1765
         scalePanel.preferredHeight = 2;
1766
1766
         scaleSlider = (cNumberSlider)scalePanel.getComponent(1);        
1767
+        transformPanel.add(scalePanel);
1768
+        
1769
+        scalePanel = AddSlider(transformPanel, "Deflate", 1, 10, 1);
1770
+        scalePanel.preferredHeight = 2;
1771
+        scaleInvSlider = (cNumberSlider)scalePanel.getComponent(1);        
1767
1772
         transformPanel.add(scalePanel);
1768
1773
         
1769
1774
         transformPanel.add(XYZPanel);
..
..
@@ -5545,8 +5550,9 @@
5545
5550
     cNumberSlider versionField; // selection (off)
5546
5551
     
5547
5552
     cNumberSlider scaleSlider;
5553
+    cNumberSlider scaleInvSlider;
5548
5554
     
5549
-    void ScaleSelection(int scale)
5555
+    void ScaleSelection(float scale)
5550
5556
     {
5551
5557
     }
5552
5558
             
..
..
@@ -5596,9 +5602,10 @@
5596
5602
             return;
5597
5603
         }
5598
5604
         
5599
-        if (e.getSource() == scaleSlider)
5605
+        if (!muteSlider && (e.getSource() == scaleSlider || e.getSource() == scaleInvSlider))
5600
5606
         {
5601
-            int scale = scaleSlider.getInteger();
5607
+            float scale = scaleSlider.getInteger();
5608
+            scale /= scaleInvSlider.getInteger();
5602
5609
 
5603
5610
             ScaleSelection(scale);
5604
5611
             return;