Scale slider

Normand Briere

2019-09-02 0050edcb88bac197578ec518425c8c1e1b4e469f

Scale slider

 GroupEditor.java
..
..
@@ -1330,6 +1330,7 @@
1330
1330
 
1331
1331
                 oe.treePanel.add(versionManagerPanel);
1332
1332
                 oe.treePanel.Return();
1333
+                
1333
1334
         versionSliderPane = AddSlider(oe.treePanel, "Version", 0, 0, 0);
1334
1335
             versionSlider = (cNumberSlider)versionSliderPane.getComponent(1);
1335
1336
             versionSliderPane.preferredHeight = 3;
..
..
@@ -4304,6 +4305,31 @@
4304
4305
             ResetTransform(-1);
4305
4306
         }
4306
4307
         
4308
+        void ScaleSelection(int scale)
4309
+        {
4310
+            Object3D obj;
4311
+            for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
4312
+            {
4313
+                    obj = (Object3D)e.nextElement();
4314
+                    
4315
+                    if (obj.toParent == null)
4316
+                        continue;
4317
+                    
4318
+                    obj.Scale(scale);
4319
+                    
4320
+                    if (obj.parent == null)
4321
+                    {
4322
+                        System.out.println("NULL PARENT!");
4323
+                    //    new Exception().printStackTrace();
4324
+                    }
4325
+                    else
4326
+                        TouchTransform(obj);
4327
+                        //obj.parent.Touch();
4328
+            }
4329
+
4330
+            refreshContents();
4331
+        }
4332
+        
4307
4333
         void ResetTransform(int mask)
4308
4334
         {
4309
4335
             Object3D obj;
 ObjEditor.java
..
..
@@ -555,7 +555,7 @@
555
555
 //                        }
556
556
 //                    }
557
557
 //                }
558
-                cameraView.transformMode = objectTabbedPane.getSelectedIndex() == 4;
558
+                cameraView.transformMode = objectTabbedPane.getSelectedIndex() == 5;
559
559
                 
560
560
 //                refreshContents(false); // To refresh Info tab
561
561
                 cameraView.repaint();
..
..
@@ -1726,6 +1726,12 @@
1726
1726
         //XYZPanel.setName("XYZ");
1727
1727
 
1728
1728
         transformPanel.add(resetTransformPanel);
1729
+        
1730
+        cGridBag scalePanel = AddSlider(transformPanel, "Scale", 1, 10, 1);
1731
+        scalePanel.preferredHeight = 2;
1732
+        scaleSlider = (cNumberSlider)scalePanel.getComponent(1);        
1733
+        transformPanel.add(scalePanel);
1734
+        
1729
1735
         transformPanel.add(XYZPanel);
1730
1736
         
1731
1737
         /*
..
..
@@ -1781,7 +1787,7 @@
1781
1787
         figurePanel = new cGridBag();
1782
1788
         figurePanel.add(new cButton("FIGURES amd POSES coming soon!"));
1783
1789
         objectTabbedPane.add(figurePanel);
1784
-        objectTabbedPane.setIconAt(objectTabCount, GetIcon("icons/run.png"));
1790
+        objectTabbedPane.setIconAt(objectTabCount, GetIcon("icons/figure.png"));
1785
1791
         objectTabbedPane.setToolTipTextAt(objectTabCount++, "Figures and poses");
1786
1792
         
1787
1793
 //        JPanel north = new JPanel(new BorderLayout());
..
..
@@ -5189,9 +5195,16 @@
5189
5195
     cNumberSlider versionSlider;
5190
5196
     cNumberSlider versionField;
5191
5197
     
5198
+    cNumberSlider scaleSlider;
5199
+    
5200
+    void ScaleSelection(int scale)
5201
+    {
5202
+    }
5203
+            
5192
5204
     public void stateChanged(ChangeEvent e)
5193
5205
     {
5194
5206
         // assert(false);
5207
+        // Main version slider
5195
5208
         if (e.getSource() == versionSlider)
5196
5209
         {
5197
5210
             if (muteSlider)
..
..
@@ -5212,6 +5225,7 @@
5212
5225
             return;
5213
5226
         }
5214
5227
 
5228
+        // Version slider of edited object
5215
5229
         if (e.getSource() == versionField)
5216
5230
         {
5217
5231
             int version = versionField.getInteger();
..
..
@@ -5225,6 +5239,14 @@
5225
5239
             return;
5226
5240
         }
5227
5241
         
5242
+        if (e.getSource() == scaleSlider)
5243
+        {
5244
+            int scale = scaleSlider.getInteger();
5245
+
5246
+            ScaleSelection(scale);
5247
+            return;
5248
+        }
5249
+
5228
5250
         if (freezematerial)
5229
5251
         {
5230
5252
             return;
 Object3D.java
..
..
@@ -3356,6 +3356,18 @@
3356
3356
         }
3357
3357
     }
3358
3358
     
3359
+    public void Scale(int scale)
3360
+    {
3361
+        Object3D obj = this;
3362
+        
3363
+        obj.toParent[0][0] = obj.toParent[1][1] = obj.toParent[2][2] = scale;
3364
+        obj.toParent[0][1] = obj.toParent[1][0] = obj.toParent[2][0] = 0;
3365
+        obj.toParent[0][2] = obj.toParent[1][2] = obj.toParent[2][1] = 0;
3366
+        obj.fromParent[0][0] = obj.fromParent[1][1] = obj.fromParent[2][2] = 1/scale;
3367
+        obj.fromParent[0][1] = obj.fromParent[1][0] = obj.fromParent[2][0] = 0;
3368
+        obj.fromParent[0][2] = obj.fromParent[1][2] = obj.fromParent[2][1] = 0;
3369
+    }
3370
+    
3359
3371
     public void TextureRatioTransform(int axis)
3360
3372
     {
3361
3373
         cTexture tex = GetTextures();
 icons/figure.png
Binary files differ
 icons/figure256.png
Binary files differ