blame | history | patch | commit | commitdiff
Normand Briere
2019-08-12 b1d79b74514041a059b454a9f6fc3970773c0cb8 
 Object3D.java
....@@ -22,6 +22,7 @@
2222     //static final long serialVersionUID = -607422624994562685L;
2323     static final long serialVersionUID = 5022536242724664900L;
2424     
25
+    // Use GetUUID for backward compatibility with null.
2526     private UUID uuid = UUID.randomUUID();
2627     
2728     // TEMPORARY for mocap undo. No need to be transient.
....@@ -29,7 +30,10 @@
2930     Object3D saveskeleton;
3031     //
3132     
32
-    byte[] versions[];
33
+    String skyboxname;
34
+    String skyboxext;
35
+    
36
+    Object3D versionlist[];
3337     int versionindex = -1;    
3438         
3539     ScriptNode scriptnode;
....@@ -219,7 +223,7 @@
219223 //            o.bRep.support = null;
220224 //        }
221225         o.selection = this.selection;
222
-        o.versions = this.versions;
226
+        o.versionlist = this.versionlist;
223227         o.versionindex = this.versionindex;
224228         
225229         if (this.support != null)
....@@ -242,6 +246,29 @@
242246     //    this.support = null;
243247     //    this.fileparent = null;
244248     }
249
+
250
+//    Object3D GetObject(java.util.UUID uuid)
251
+//    {
252
+//        if (this.uuid.equals(uuid))
253
+//            return this;
254
+//            
255
+//        if (blockloop)
256
+//            return null;
257
+//
258
+//        blockloop = true;
259
+//
260
+//        for (int i=0; i<Size(); i++)
261
+//        {
262
+//            Object3D o = get(i).GetObject(uuid);
263
+//            
264
+//            if (o != null)
265
+//                return o;
266
+//        }
267
+//        
268
+//        blockloop = false;
269
+//        
270
+//        return null;
271
+//    }
245272 
246273     void RestoreBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
247274     {
....@@ -277,7 +304,7 @@
277304         
278305         this.selection = o.selection;
279306         
280
-        this.versions = o.versions;
307
+        this.versionlist = o.versionlist;
281308         this.versionindex = o.versionindex;
282309 // July 2019        if (this.bRep != null)
283310 //            this.bRep.support = o.transientrep;
....@@ -1011,6 +1038,9 @@
10111038         
10121039         if (material == null || material.multiply)
10131040             return true;
1041
+        
1042
+        if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
1043
+            return false;
10141044         
10151045         // Transparent objects are dynamic because we have to sort the triangles.
10161046         return material.opacity > 0.99;
....@@ -2438,6 +2468,11 @@
24382468         else
24392469         {
24402470             //((ObjEditor)editWindow).SetupUI2(null);
2471
+            if (objectUI != null)
2472
+                ((ObjEditor)objectUI).pinButton.setSelected(pinned);
2473
+            else
2474
+                //new Exception().printStackTrace();
2475
+                System.err.println("objectUI is null");
24412476         }
24422477     }
24432478 
....@@ -2567,7 +2602,8 @@
25672602     private static final int editSelf = 1;
25682603     private static final int editChild = 2;
25692604     
2570
-    void drawEditHandles(ClickInfo info, int level)
2605
+    void drawEditHandles(//ClickInfo info,
2606
+            int level)
25712607     {
25722608         if (level == 0)
25732609         {
....@@ -2575,7 +2611,8 @@
25752611                 return;
25762612             
25772613             Object3D selectee;
2578
-            for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
2614
+            for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
2615
+                                                                                                        level + 1))
25792616             {
25802617                 selectee = (Object3D) e.nextElement();
25812618             }
....@@ -2583,19 +2620,22 @@
25832620         } else
25842621         {
25852622             //super.
2586
-                    drawEditHandles0(info, level + 1);
2623
+                    drawEditHandles0(//info,
2624
+                            level + 1);
25872625         }
25882626     }
25892627 
2590
-    boolean doEditClick(ClickInfo info, int level)
2628
+    boolean doEditClick(//ClickInfo info,
2629
+            int level)
25912630     {
25922631         doSomething = 0;
25932632         if (level == 0)
25942633         {
2595
-            return doParentClick(info);
2634
+            return doParentClick(); //info);
25962635         }
25972636         if (//super.
2598
-                doEditClick0(info, level))
2637
+                doEditClick0(//info,
2638
+                    level))
25992639         {
26002640             doSomething = 1;
26012641             return true;
....@@ -2605,7 +2645,7 @@
26052645         }
26062646     }
26072647 
2608
-    boolean doParentClick(ClickInfo info)
2648
+    boolean doParentClick() //ClickInfo info)
26092649     {
26102650         if (selection == null)
26112651         {
....@@ -2618,7 +2658,8 @@
26182658         for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
26192659         {
26202660             Object3D selectee = (Object3D) e.nextElement();
2621
-            if (selectee.doEditClick(info, 1))
2661
+            if (selectee.doEditClick(//info,
2662
+                    1))
26222663             {
26232664                 childToDrag = selectee;
26242665                 doSomething = 2;
....@@ -2630,13 +2671,15 @@
26302671         return retval;
26312672     }
26322673 
2633
-    void doEditDrag(ClickInfo info, boolean opposite)
2674
+    void doEditDrag(//ClickInfo clickInfo,
2675
+            boolean opposite)
26342676     {
26352677         switch (doSomething)
26362678         {
26372679             case 1: // '\001'
26382680                 //super.
2639
-                        doEditDrag0(info, opposite);
2681
+                        doEditDrag0(//clickInfo,
2682
+                                opposite);
26402683                 break;
26412684 
26422685             case 2: // '\002'
....@@ -2649,11 +2692,13 @@
26492692                     {
26502693                         //sel.hitSomething = childToDrag.hitSomething;
26512694                         //childToDrag.doEditDrag(info);
2652
-                        sel.doEditDrag(info, opposite);
2695
+                        sel.doEditDrag(//clickInfo,
2696
+                                opposite);
26532697                     } else
26542698                     {
26552699                         //super.
2656
-                                doEditDrag0(info, opposite);
2700
+                                doEditDrag0(//clickInfo,
2701
+                                        opposite);
26572702                     }
26582703                 }
26592704                 break;
....@@ -2671,6 +2716,9 @@
26712716         {
26722717             deselectAll();
26732718         }
2719
+        
2720
+        new Exception().printStackTrace();
2721
+        
26742722         ClickInfo newInfo = new ClickInfo();
26752723         newInfo.flags = info.flags;
26762724         newInfo.bounds = info.bounds;
....@@ -5775,12 +5823,23 @@
57755823         }
57765824     }
57775825     
5778
-    void EmbedTextures()
5826
+    void EmbedTextures(boolean embed)
57795827     {
57805828         if (blockloop)
57815829             return;
57825830         
5783
-        CameraPane.EmbedTextures(texture);
5831
+        //if (GetTextures() != null)
5832
+        if (embed)
5833
+            CameraPane.EmbedTextures(GetTextures());
5834
+        else
5835
+        {
5836
+            GetTextures().pigmentdata = null;
5837
+            GetTextures().bumpdata = null;
5838
+            GetTextures().pw = 0;
5839
+            GetTextures().ph = 0;
5840
+            GetTextures().bw = 0;
5841
+            GetTextures().bh = 0;
5842
+        }
57845843         
57855844         int nb = Size();
57865845         for (int i = 0; i < nb; i++)
....@@ -5791,7 +5850,7 @@
57915850                 continue;
57925851 
57935852             blockloop = true;
5794
-            child.EmbedTextures();
5853
+            child.EmbedTextures(embed);
57955854             blockloop = false;
57965855         }
57975856     }
....@@ -5882,8 +5941,10 @@
58825941         if (support != null)
58835942             support = support;
58845943         
5885
-        //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5886
-        boolean usecalllists = !IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5944
+        boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5945
+        //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5946
+        
5947
+        //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
58875948         
58885949         if (!usecalllists && bRep != null && bRep.displaylist > 0)
58895950         {
....@@ -5893,8 +5954,9 @@
58935954    //     usecalllists &= !(parent instanceof RandomNode);
58945955    //     usecalllists = false;
58955956 
5896
-        if (GetBRep() != null)
5897
-            usecalllists = usecalllists;
5957
+        if (display.DrawMode() == display.SHADOW)
5958
+            //GetBRep() != null)
5959
+            usecalllists = !!usecalllists;
58985960         //System.out.println("draw " + this);
58995961         //new Exception().printStackTrace();
59005962 
....@@ -5916,7 +5978,7 @@
59165978             if (!(this instanceof Composite))
59175979                 touched = false;
59185980             //if (displaylist == -1 && usecalllists)
5919
-            if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
5981
+            if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
59205982             {
59215983                 bRep.displaylist = display.GenList();
59225984                 assert(bRep.displaylist != 0);
....@@ -5927,7 +5989,7 @@
59275989 
59285990             //System.out.println("\tnew list " + list);
59295991             //gl.glDrawBuffer(gl.GL_NONE);
5930
-            if (usecalllists)
5992
+            if (usecalllists && bRep.displaylist > 0)
59315993             {
59325994 //            System.err.println("new list " + bRep.displaylist + " for " + this);
59335995                 display.NewList(bRep.displaylist);
....@@ -5936,7 +5998,7 @@
59365998             CallList(display, root, selected, blocked);
59375999             
59386000           //  compiled = true;
5939
-            if (usecalllists)
6001
+            if (usecalllists && bRep.displaylist > 0)
59406002             {
59416003 //            System.err.println("end list " + bRep.displaylist + " for " + this);
59426004                 display.EndList();
....@@ -7287,20 +7349,23 @@
72877349         }
72887350     }
72897351 
7290
-    protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
7352
+    static ClickInfo clickInfo = new ClickInfo();
7353
+        
7354
+    protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
7355
+            Point outPt, Rectangle outRec)
72917356     {
7292
-        int hc = info.bounds.x + info.bounds.width / 2;
7293
-        int vc = info.bounds.y + info.bounds.height / 2;
7294
-        double[][] toscreen = info.toScreen;
7357
+        int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
7358
+        int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
7359
+        double[][] toscreen = clickInfo.toScreen;
72957360         if (toscreen == null)
72967361         {
7297
-            toscreen = new Camera(info.camera.viewCode).toScreen;
7362
+            toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
72987363         }
72997364         cVector vec = in;
73007365         LA.xformPos(in, toscreen, in);
73017366         //System.out.println("Distance = " + info.camera.Distance());
7302
-        vec.x *= 100 * info.camera.SCALE / info.camera.Distance();
7303
-        vec.y *= 100 * info.camera.SCALE / info.camera.Distance();
7367
+        vec.x *= 100 * clickInfo.camera.SCALE / clickInfo.camera.Distance();
7368
+        vec.y *= 100 * clickInfo.camera.SCALE / clickInfo.camera.Distance();
73047369         outPt.x = hc + (int) vec.x;
73057370         outPt.y = vc - (int) vec.y;
73067371         outRec.x = outPt.x - 3;
....@@ -7308,15 +7373,18 @@
73087373         outRec.width = outRec.height = 6;
73097374     }
73107375 
7311
-    protected Rectangle calcHotSpot(cVector in, ClickInfo info)
7376
+    protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
7377
+            )
73127378     {
73137379         Point pt = new Point(0, 0);
73147380         Rectangle rec = new Rectangle();
7315
-        calcHotSpot(in, info, pt, rec);
7381
+        calcHotSpot(in, //clickInfo,
7382
+                pt, rec);
73167383         return rec;
73177384     }
73187385 
7319
-    void drawEditHandles0(ClickInfo info, int level)
7386
+    void drawEditHandles0(//ClickInfo clickInfo,
7387
+            int level)
73207388     {
73217389         if (level == 0)
73227390         {
....@@ -7325,16 +7393,19 @@
73257393         {
73267394             cVector origin = new cVector();
73277395             //LA.xformPos(origin, toParent, origin);
7328
-            Rectangle spot = calcHotSpot(origin, info);
7396
+            if (this.clickInfo == null)
7397
+                this.clickInfo = new ClickInfo();
7398
+            
7399
+            Rectangle spot = calcHotSpot(origin); //, clickInfo);
73297400             Rectangle boundary = new Rectangle();
73307401             boundary.x = spot.x - 30;
73317402             boundary.y = spot.y - 30;
73327403             boundary.width = spot.width + 60;
73337404             boundary.height = spot.height + 60;
7334
-            info.g.setColor(Color.red);
7405
+            clickInfo.g.setColor(Color.red);
73357406             int spotw = spot.x + spot.width;
73367407             int spoth = spot.y + spot.height;
7337
-            info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7408
+            clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
73387409 //            if (CameraPane.Xmin > spot.x)
73397410 //            {
73407411 //                CameraPane.Xmin = spot.x;
....@@ -7354,8 +7425,8 @@
73547425             spot.translate(32, 32);
73557426             spotw = spot.x + spot.width;
73567427             spoth = spot.y + spot.height;
7357
-            info.g.setColor(Color.cyan);
7358
-            info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7428
+            clickInfo.g.setColor(Color.cyan);
7429
+            clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
73597430 //            if (CameraPane.Xmin > spot.x)
73607431 //            {
73617432 //                CameraPane.Xmin = spot.x;
....@@ -7375,9 +7446,9 @@
73757446             // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
73767447             //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
73777448             spot.translate(0, -32);
7378
-            info.g.setColor(Color.yellow);
7379
-            info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7380
-            info.g.setColor(Color.green);
7449
+            clickInfo.g.setColor(Color.yellow);
7450
+            clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7451
+            clickInfo.g.setColor(Color.green);
73817452 //            if (CameraPane.Xmin > spot.x)
73827453 //            {
73837454 //                CameraPane.Xmin = spot.x;
....@@ -7394,8 +7465,8 @@
73947465 //            {
73957466 //                CameraPane.Ymax = spoth;
73967467 //            }
7397
-            info.g.drawArc(boundary.x + info.DX, boundary.y + info.DY,
7398
-                    (int)(boundary.width * info.W), (int)(boundary.height * info.W), 0, 360);
7468
+            clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
7469
+                    (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
73997470             //info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
74007471 //            if (CameraPane.Xmin > boundary.x)
74017472 //            {
....@@ -7417,7 +7488,8 @@
74177488         }
74187489     }
74197490 
7420
-    boolean doEditClick0(ClickInfo info, int level)
7491
+    boolean doEditClick0(//ClickInfo clickInfo, 
7492
+                int level)
74217493     {
74227494         if (level == 0)
74237495         {
....@@ -7426,8 +7498,8 @@
74267498 
74277499         boolean retval = false;
74287500 
7429
-        startX = info.x;
7430
-        startY = info.y;
7501
+        startX = clickInfo.x;
7502
+        startY = clickInfo.y;
74317503 
74327504         hitSomething = -1;
74337505         cVector origin = new cVector();
....@@ -7437,22 +7509,51 @@
74377509         {
74387510             centerPt = new Point(0, 0);
74397511         }
7440
-        calcHotSpot(origin, info, centerPt, spot);
7441
-        if (spot.contains(info.x, info.y))
7512
+        calcHotSpot(origin, //info,
7513
+                centerPt, spot);
7514
+        if (spot.contains(clickInfo.x, clickInfo.y))
74427515         {
74437516             hitSomething = hitCenter;
74447517             retval = true;
74457518         }
74467519         spot.translate(32, 0);
7447
-        if (spot.contains(info.x, info.y))
7520
+        if (spot.contains(clickInfo.x, clickInfo.y))
74487521         {
74497522             hitSomething = hitRotate;
74507523             retval = true;
74517524         }
74527525         spot.translate(0, 32);
7453
-        if (spot.contains(info.x, info.y))
7526
+        if (spot.contains(clickInfo.x, clickInfo.y))
74547527         {
74557528             hitSomething = hitScale;
7529
+            
7530
+        double scale = 0.005f * clickInfo.camera.Distance();
7531
+                double hScale = (double) (clickInfo.x - centerPt.x) / 32;
7532
+                double sign = 1;
7533
+                if (hScale < 0)
7534
+                {
7535
+                    sign = -1;
7536
+                }
7537
+                hScale = sign*Math.pow(sign*hScale, scale * 50);
7538
+                if (hScale < 0.01)
7539
+                {
7540
+                    //hScale = 0.01;
7541
+                }
7542
+                
7543
+                double vScale = (double) (clickInfo.y - centerPt.y) / 32;
7544
+                sign = 1;
7545
+                if (vScale < 0)
7546
+                {
7547
+                    sign = -1;
7548
+                }
7549
+                vScale = sign*Math.pow(sign*vScale, scale * 50);
7550
+                if (vScale < 0.01)
7551
+                {
7552
+                    //vScale = 0.01;
7553
+                }
7554
+                
7555
+                clickInfo.scale = Math.sqrt(hScale*hScale + vScale*vScale);
7556
+                
74567557             retval = true;
74577558         }
74587559 
....@@ -7462,7 +7563,7 @@
74627563         }
74637564 
74647565         //System.out.println("info.modifiers = " + info.modifiers);
7465
-        modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
7566
+        modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
74667567         //System.out.println("modified = " + modified);
74677568         //new Exception().printStackTrace();
74687569         //viewCode = info.pane.renderCamera.viewCode;
....@@ -7490,7 +7591,8 @@
74907591         return true;
74917592     }
74927593 
7493
-    void doEditDrag0(ClickInfo info, boolean opposite)
7594
+    void doEditDrag0(//ClickInfo info,
7595
+            boolean opposite)
74947596     {
74957597         if (hitSomething == 0)
74967598         {
....@@ -7504,7 +7606,7 @@
75047606 
75057607         //System.out.println("hitSomething = " + hitSomething);
75067608 
7507
-        double scale = 0.005f * info.camera.Distance();
7609
+        double scale = 0.005f * clickInfo.camera.Distance();
75087610         
75097611         cVector xlate = new cVector();
75107612         //cVector xlate2 = new cVector();
....@@ -7538,8 +7640,8 @@
75387640                     toParent[3][i] = xlate.get(i);
75397641                     LA.matInvert(toParent, fromParent);
75407642                      */
7541
-                    cVector delta = LA.newVector(0, 0, startY - info.y);
7542
-                    LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
7643
+                    cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
7644
+                    LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
75437645 
75447646                     LA.matCopy(startMat, toParent);
75457647                     LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
....@@ -7548,7 +7650,7 @@
75487650                 } else
75497651                 {
75507652                     //LA.xformDir(delta, info.camera.fromScreen, delta);
7551
-                    cVector up = new cVector(info.camera.up);
7653
+                    cVector up = new cVector(clickInfo.camera.up);
75527654                     cVector away = new cVector();
75537655                     //cVector right2 = new cVector();
75547656                     //LA.vecCross(up, cVector.Z, right);
....@@ -7565,19 +7667,19 @@
75657667                     LA.xformDir(up, ClickInfo.matbuffer, up);
75667668     //                if (!CameraPane.LOCALTRANSFORM)
75677669                         LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7568
-                    LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
7670
+                    LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
75697671     //                if (!CameraPane.LOCALTRANSFORM)
75707672                         LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
75717673                     //LA.vecCross(up, cVector.Z, right2);
75727674 
7573
-                    cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
7675
+                    cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
75747676 
75757677                     //System.out.println("DELTA0 = " + delta);
75767678                     //System.out.println("AWAY = " + info.camera.away);
75777679                     //System.out.println("UP = " + info.camera.up);
75787680                     if (away.z > 0)
75797681                     {
7580
-                        if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7682
+                        if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
75817683                         {
75827684                             delta.x = -delta.x;
75837685                         } else
....@@ -7592,7 +7694,7 @@
75927694                     //System.out.println("DELTA1 = " + delta);
75937695                     LA.xformDir(delta, ClickInfo.matbuffer, delta);
75947696                     //System.out.println("DELTA2 = " + delta);
7595
-                    LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
7697
+                    LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
75967698                     LA.matCopy(startMat, toParent);
75977699                     //System.out.println("DELTA3 = " + delta);
75987700                     LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
....@@ -7602,8 +7704,8 @@
76027704                 break;
76037705 
76047706             case hitRotate: // rotate
7605
-                int dx = info.x - centerPt.x;
7606
-                int dy = -(info.y - centerPt.y);
7707
+                int dx = clickInfo.x - centerPt.x;
7708
+                int dy = -(clickInfo.y - centerPt.y);
76077709                 double angle = (double) Math.atan2(dx, dy);
76087710                 angle = -(1.570796 - angle);
76097711 
....@@ -7626,7 +7728,7 @@
76267728                 }
76277729                 /**/
76287730 
7629
-                switch (info.pane.RenderCamera().viewCode)
7731
+                switch (clickInfo.pane.RenderCamera().viewCode)
76307732                 {
76317733                     case 1: // '\001'
76327734                         LA.matZRotate(toParent, angle);
....@@ -7653,7 +7755,7 @@
76537755                 break;
76547756 
76557757             case hitScale: // scale
7656
-                double hScale = (double) (info.x - centerPt.x) / 32;
7758
+                double hScale = (double) (clickInfo.x - centerPt.x) / 32;
76577759                 double sign = 1;
76587760                 if (hScale < 0)
76597761                 {
....@@ -7665,7 +7767,7 @@
76657767                     //hScale = 0.01;
76667768                 }
76677769                 
7668
-                double vScale = (double) (info.y - centerPt.y) / 32;
7770
+                double vScale = (double) (clickInfo.y - centerPt.y) / 32;
76697771                 sign = 1;
76707772                 if (vScale < 0)
76717773                 {
....@@ -7676,6 +7778,7 @@
76767778                 {
76777779                     //vScale = 0.01;
76787780                 }
7781
+                
76797782                 LA.matCopy(startMat, toParent);
76807783                 /**/
76817784                 for (int i = 0; i < 3; i++)
....@@ -7685,14 +7788,14 @@
76857788                 }
76867789                 /**/
76877790 
7688
-                double totalScale = Math.sqrt(hScale*hScale + vScale*vScale) / Math.sqrt(2);
7791
+                double totalScale = Math.sqrt(hScale*hScale + vScale*vScale) / clickInfo.scale;
76897792                         
76907793                 if (totalScale < 0.01)
76917794                 {
76927795                     totalScale = 0.01;
76937796                 }
76947797                 
7695
-                switch (info.pane.RenderCamera().viewCode)
7798
+                switch (clickInfo.pane.RenderCamera().viewCode)
76967799                 {
76977800                     case 3: // '\001'
76987801                         if (modified || opposite)
....@@ -7759,7 +7862,7 @@
77597862         } // NEW ...
77607863         
77617864         
7762
-        info.pane.repaint();
7865
+        clickInfo.pane.repaint();
77637866     }
77647867 
77657868     boolean overflow = false;