blame | history | patch | commit | commitdiff
Normand Briere
2019-08-15 33504fc9a180903aace77613264550754fba5706 
 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;
....@@ -5526,6 +5574,11 @@
55265574         if (fullname == null)
55275575             return "";
55285576         
5577
+        if (fullname.pigment != null)
5578
+        {
5579
+            return fullname.pigment;
5580
+        }
5581
+        
55295582    //     System.out.println("Fullname = " + fullname);
55305583         
55315584         // Does not work on Windows due to C:
....@@ -5538,7 +5591,7 @@
55385591         
55395592         if (split.length == 0)
55405593         {
5541
-                return "";
5594
+                return fullname.pigment = "";
55425595         }
55435596         
55445597         if (split.length <= 2)
....@@ -5546,22 +5599,27 @@
55465599                 if (fullname.name.endsWith(":"))
55475600                 {
55485601                         // Windows
5549
-                        return fullname.name.substring(0, fullname.name.length()-1);
5602
+                        return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
55505603                 }
55515604                 
5552
-                return split[0];
5605
+                return fullname.pigment = split[0];
55535606         }
55545607         
55555608         // Windows
55565609         assert(split.length == 4);
55575610         
5558
-        return split[0] + ":" + split[1];
5611
+        return fullname.pigment = split[0] + ":" + split[1];
55595612     }
55605613     
55615614     static String GetBump(cTexture fullname)
55625615     {
55635616         if (fullname == null)
55645617             return "";
5618
+        
5619
+        if (fullname.bump != null)
5620
+        {
5621
+            return fullname.bump;
5622
+        }
55655623         
55665624   //      System.out.println("Fullname = " + fullname);
55675625         // Does not work on Windows due to C:
....@@ -5573,12 +5631,12 @@
55735631         
55745632         if (split.length == 0)
55755633         {
5576
-                return "";
5634
+                return fullname.bump = "";
55775635         }
55785636         
55795637         if (split.length == 1)
55805638         {
5581
-                return "";
5639
+                return fullname.bump = "";
55825640         }
55835641         
55845642         if (split.length == 2)
....@@ -5586,16 +5644,16 @@
55865644                 if (fullname.name.endsWith(":"))
55875645                 {
55885646                         // Windows
5589
-                        return "";
5647
+                        return fullname.bump = "";
55905648                 }
55915649                 
5592
-                return split[1];
5650
+                return fullname.bump = split[1];
55935651         }
55945652         
55955653         // Windows
55965654         assert(split.length == 4);
55975655         
5598
-        return split[2] + ":" + split[3];
5656
+        return fullname.bump = split[2] + ":" + split[3];
55995657     }
56005658     
56015659     String GetPigmentTexture()
....@@ -5678,6 +5736,9 @@
56785736             texname = "";
56795737         
56805738         GetTextures().name = texname + ":" + GetBump(GetTextures());
5739
+
5740
+        GetTextures().pigment = null;
5741
+        
56815742         Touch();
56825743     }
56835744 
....@@ -5751,6 +5812,8 @@
57515812         
57525813         GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
57535814         
5815
+        GetTextures().bump = null;
5816
+        
57545817         Touch();
57555818     }
57565819 
....@@ -5775,12 +5838,23 @@
57755838         }
57765839     }
57775840     
5778
-    void EmbedTextures()
5841
+    void EmbedTextures(boolean embed)
57795842     {
57805843         if (blockloop)
57815844             return;
57825845         
5783
-        CameraPane.EmbedTextures(texture);
5846
+        //if (GetTextures() != null)
5847
+        if (embed)
5848
+            CameraPane.EmbedTextures(GetTextures());
5849
+        else
5850
+        {
5851
+            GetTextures().pigmentdata = null;
5852
+            GetTextures().bumpdata = null;
5853
+            GetTextures().pw = 0;
5854
+            GetTextures().ph = 0;
5855
+            GetTextures().bw = 0;
5856
+            GetTextures().bh = 0;
5857
+        }
57845858         
57855859         int nb = Size();
57865860         for (int i = 0; i < nb; i++)
....@@ -5791,7 +5865,7 @@
57915865                 continue;
57925866 
57935867             blockloop = true;
5794
-            child.EmbedTextures();
5868
+            child.EmbedTextures(embed);
57955869             blockloop = false;
57965870         }
57975871     }
....@@ -5882,8 +5956,10 @@
58825956         if (support != null)
58835957             support = support;
58845958         
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);
5959
+        boolean usecalllists = !IsLive() && IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5960
+        //boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5961
+        
5962
+        //usecalllists &= display.DrawMode() == display.DEFAULT; // Don't compute list in shadow pass.
58875963         
58885964         if (!usecalllists && bRep != null && bRep.displaylist > 0)
58895965         {
....@@ -5893,8 +5969,9 @@
58935969    //     usecalllists &= !(parent instanceof RandomNode);
58945970    //     usecalllists = false;
58955971 
5896
-        if (GetBRep() != null)
5897
-            usecalllists = usecalllists;
5972
+        if (display.DrawMode() == display.SHADOW)
5973
+            //GetBRep() != null)
5974
+            usecalllists = !!usecalllists;
58985975         //System.out.println("draw " + this);
58995976         //new Exception().printStackTrace();
59005977 
....@@ -5916,7 +5993,7 @@
59165993             if (!(this instanceof Composite))
59175994                 touched = false;
59185995             //if (displaylist == -1 && usecalllists)
5919
-            if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
5996
+            if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
59205997             {
59215998                 bRep.displaylist = display.GenList();
59225999                 assert(bRep.displaylist != 0);
....@@ -5927,7 +6004,7 @@
59276004 
59286005             //System.out.println("\tnew list " + list);
59296006             //gl.glDrawBuffer(gl.GL_NONE);
5930
-            if (usecalllists)
6007
+            if (usecalllists && bRep.displaylist > 0)
59316008             {
59326009 //            System.err.println("new list " + bRep.displaylist + " for " + this);
59336010                 display.NewList(bRep.displaylist);
....@@ -5936,7 +6013,7 @@
59366013             CallList(display, root, selected, blocked);
59376014             
59386015           //  compiled = true;
5939
-            if (usecalllists)
6016
+            if (usecalllists && bRep.displaylist > 0)
59406017             {
59416018 //            System.err.println("end list " + bRep.displaylist + " for " + this);
59426019                 display.EndList();
....@@ -7287,20 +7364,23 @@
72877364         }
72887365     }
72897366 
7290
-    protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
7367
+    static ClickInfo clickInfo = new ClickInfo();
7368
+        
7369
+    protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
7370
+            Point outPt, Rectangle outRec)
72917371     {
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;
7372
+        int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
7373
+        int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
7374
+        double[][] toscreen = clickInfo.toScreen;
72957375         if (toscreen == null)
72967376         {
7297
-            toscreen = new Camera(info.camera.viewCode).toScreen;
7377
+            toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
72987378         }
72997379         cVector vec = in;
73007380         LA.xformPos(in, toscreen, in);
73017381         //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();
7382
+        vec.x *= 100 * clickInfo.camera.SCALE / clickInfo.camera.Distance();
7383
+        vec.y *= 100 * clickInfo.camera.SCALE / clickInfo.camera.Distance();
73047384         outPt.x = hc + (int) vec.x;
73057385         outPt.y = vc - (int) vec.y;
73067386         outRec.x = outPt.x - 3;
....@@ -7308,15 +7388,18 @@
73087388         outRec.width = outRec.height = 6;
73097389     }
73107390 
7311
-    protected Rectangle calcHotSpot(cVector in, ClickInfo info)
7391
+    protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
7392
+            )
73127393     {
73137394         Point pt = new Point(0, 0);
73147395         Rectangle rec = new Rectangle();
7315
-        calcHotSpot(in, info, pt, rec);
7396
+        calcHotSpot(in, //clickInfo,
7397
+                pt, rec);
73167398         return rec;
73177399     }
73187400 
7319
-    void drawEditHandles0(ClickInfo info, int level)
7401
+    void drawEditHandles0(//ClickInfo clickInfo,
7402
+            int level)
73207403     {
73217404         if (level == 0)
73227405         {
....@@ -7325,16 +7408,19 @@
73257408         {
73267409             cVector origin = new cVector();
73277410             //LA.xformPos(origin, toParent, origin);
7328
-            Rectangle spot = calcHotSpot(origin, info);
7411
+            if (this.clickInfo == null)
7412
+                this.clickInfo = new ClickInfo();
7413
+            
7414
+            Rectangle spot = calcHotSpot(origin); //, clickInfo);
73297415             Rectangle boundary = new Rectangle();
73307416             boundary.x = spot.x - 30;
73317417             boundary.y = spot.y - 30;
73327418             boundary.width = spot.width + 60;
73337419             boundary.height = spot.height + 60;
7334
-            info.g.setColor(Color.red);
7420
+            clickInfo.g.setColor(Color.red);
73357421             int spotw = spot.x + spot.width;
73367422             int spoth = spot.y + spot.height;
7337
-            info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7423
+            clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
73387424 //            if (CameraPane.Xmin > spot.x)
73397425 //            {
73407426 //                CameraPane.Xmin = spot.x;
....@@ -7351,11 +7437,6 @@
73517437 //            {
73527438 //                CameraPane.Ymax = spoth;
73537439 //            }
7354
-            spot.translate(32, 32);
7355
-            spotw = spot.x + spot.width;
7356
-            spoth = spot.y + spot.height;
7357
-            info.g.setColor(Color.cyan);
7358
-            info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
73597440 //            if (CameraPane.Xmin > spot.x)
73607441 //            {
73617442 //                CameraPane.Xmin = spot.x;
....@@ -7374,10 +7455,15 @@
73747455 //            }
73757456             // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
73767457             //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7377
-            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);
7458
+            spot.translate(32, 0);
7459
+            clickInfo.g.setColor(Color.yellow);
7460
+            clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7461
+            
7462
+            spot.translate(32, 64);
7463
+            spotw = spot.x + spot.width;
7464
+            spoth = spot.y + spot.height;
7465
+            clickInfo.g.setColor(Color.cyan);
7466
+            clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
73817467 //            if (CameraPane.Xmin > spot.x)
73827468 //            {
73837469 //                CameraPane.Xmin = spot.x;
....@@ -7394,8 +7480,9 @@
73947480 //            {
73957481 //                CameraPane.Ymax = spoth;
73967482 //            }
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);
7483
+            clickInfo.g.setColor(Color.green);
7484
+            clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
7485
+                    (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
73997486             //info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
74007487 //            if (CameraPane.Xmin > boundary.x)
74017488 //            {
....@@ -7417,7 +7504,8 @@
74177504         }
74187505     }
74197506 
7420
-    boolean doEditClick0(ClickInfo info, int level)
7507
+    boolean doEditClick0(//ClickInfo clickInfo, 
7508
+                int level)
74217509     {
74227510         if (level == 0)
74237511         {
....@@ -7426,8 +7514,8 @@
74267514 
74277515         boolean retval = false;
74287516 
7429
-        startX = info.x;
7430
-        startY = info.y;
7517
+        startX = clickInfo.x;
7518
+        startY = clickInfo.y;
74317519 
74327520         hitSomething = -1;
74337521         cVector origin = new cVector();
....@@ -7437,22 +7525,53 @@
74377525         {
74387526             centerPt = new Point(0, 0);
74397527         }
7440
-        calcHotSpot(origin, info, centerPt, spot);
7441
-        if (spot.contains(info.x, info.y))
7528
+        calcHotSpot(origin, //info,
7529
+                centerPt, spot);
7530
+        if (spot.contains(clickInfo.x, clickInfo.y))
74427531         {
74437532             hitSomething = hitCenter;
74447533             retval = true;
74457534         }
74467535         spot.translate(32, 0);
7447
-        if (spot.contains(info.x, info.y))
7536
+        if (spot.contains(clickInfo.x, clickInfo.y))
74487537         {
74497538             hitSomething = hitRotate;
74507539             retval = true;
74517540         }
74527541         spot.translate(0, 32);
7453
-        if (spot.contains(info.x, info.y))
7542
+        spot.translate(32, 0);
7543
+        spot.translate(0, 32);
7544
+        if (spot.contains(clickInfo.x, clickInfo.y))
74547545         {
74557546             hitSomething = hitScale;
7547
+            
7548
+        double scale = 0.005f * clickInfo.camera.Distance();
7549
+                double hScale = (double) (clickInfo.x - centerPt.x) / 64;
7550
+                double sign = 1;
7551
+                if (hScale < 0)
7552
+                {
7553
+                    sign = -1;
7554
+                }
7555
+                hScale = sign*Math.pow(sign*hScale, scale * 50);
7556
+                if (hScale < 0.01)
7557
+                {
7558
+                    //hScale = 0.01;
7559
+                }
7560
+                
7561
+                double vScale = (double) (clickInfo.y - centerPt.y) / 64;
7562
+                sign = 1;
7563
+                if (vScale < 0)
7564
+                {
7565
+                    sign = -1;
7566
+                }
7567
+                vScale = sign*Math.pow(sign*vScale, scale * 50);
7568
+                if (vScale < 0.01)
7569
+                {
7570
+                    //vScale = 0.01;
7571
+                }
7572
+                
7573
+                clickInfo.scale = Math.sqrt(hScale*hScale + vScale*vScale);
7574
+                
74567575             retval = true;
74577576         }
74587577 
....@@ -7462,7 +7581,7 @@
74627581         }
74637582 
74647583         //System.out.println("info.modifiers = " + info.modifiers);
7465
-        modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
7584
+        modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
74667585         //System.out.println("modified = " + modified);
74677586         //new Exception().printStackTrace();
74687587         //viewCode = info.pane.renderCamera.viewCode;
....@@ -7490,7 +7609,8 @@
74907609         return true;
74917610     }
74927611 
7493
-    void doEditDrag0(ClickInfo info, boolean opposite)
7612
+    void doEditDrag0(//ClickInfo info,
7613
+            boolean opposite)
74947614     {
74957615         if (hitSomething == 0)
74967616         {
....@@ -7504,7 +7624,7 @@
75047624 
75057625         //System.out.println("hitSomething = " + hitSomething);
75067626 
7507
-        double scale = 0.005f * info.camera.Distance();
7627
+        double scale = 0.005f * clickInfo.camera.Distance();
75087628         
75097629         cVector xlate = new cVector();
75107630         //cVector xlate2 = new cVector();
....@@ -7538,8 +7658,8 @@
75387658                     toParent[3][i] = xlate.get(i);
75397659                     LA.matInvert(toParent, fromParent);
75407660                      */
7541
-                    cVector delta = LA.newVector(0, 0, startY - info.y);
7542
-                    LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
7661
+                    cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
7662
+                    LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
75437663 
75447664                     LA.matCopy(startMat, toParent);
75457665                     LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
....@@ -7548,7 +7668,7 @@
75487668                 } else
75497669                 {
75507670                     //LA.xformDir(delta, info.camera.fromScreen, delta);
7551
-                    cVector up = new cVector(info.camera.up);
7671
+                    cVector up = new cVector(clickInfo.camera.up);
75527672                     cVector away = new cVector();
75537673                     //cVector right2 = new cVector();
75547674                     //LA.vecCross(up, cVector.Z, right);
....@@ -7565,19 +7685,19 @@
75657685                     LA.xformDir(up, ClickInfo.matbuffer, up);
75667686     //                if (!CameraPane.LOCALTRANSFORM)
75677687                         LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7568
-                    LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
7688
+                    LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
75697689     //                if (!CameraPane.LOCALTRANSFORM)
75707690                         LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
75717691                     //LA.vecCross(up, cVector.Z, right2);
75727692 
7573
-                    cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
7693
+                    cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
75747694 
75757695                     //System.out.println("DELTA0 = " + delta);
75767696                     //System.out.println("AWAY = " + info.camera.away);
75777697                     //System.out.println("UP = " + info.camera.up);
75787698                     if (away.z > 0)
75797699                     {
7580
-                        if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7700
+                        if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
75817701                         {
75827702                             delta.x = -delta.x;
75837703                         } else
....@@ -7592,7 +7712,7 @@
75927712                     //System.out.println("DELTA1 = " + delta);
75937713                     LA.xformDir(delta, ClickInfo.matbuffer, delta);
75947714                     //System.out.println("DELTA2 = " + delta);
7595
-                    LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
7715
+                    LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
75967716                     LA.matCopy(startMat, toParent);
75977717                     //System.out.println("DELTA3 = " + delta);
75987718                     LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
....@@ -7602,8 +7722,8 @@
76027722                 break;
76037723 
76047724             case hitRotate: // rotate
7605
-                int dx = info.x - centerPt.x;
7606
-                int dy = -(info.y - centerPt.y);
7725
+                int dx = clickInfo.x - centerPt.x;
7726
+                int dy = -(clickInfo.y - centerPt.y);
76077727                 double angle = (double) Math.atan2(dx, dy);
76087728                 angle = -(1.570796 - angle);
76097729 
....@@ -7626,7 +7746,7 @@
76267746                 }
76277747                 /**/
76287748 
7629
-                switch (info.pane.RenderCamera().viewCode)
7749
+                switch (clickInfo.pane.RenderCamera().viewCode)
76307750                 {
76317751                     case 1: // '\001'
76327752                         LA.matZRotate(toParent, angle);
....@@ -7653,7 +7773,7 @@
76537773                 break;
76547774 
76557775             case hitScale: // scale
7656
-                double hScale = (double) (info.x - centerPt.x) / 32;
7776
+                double hScale = (double) (clickInfo.x - centerPt.x) / 64;
76577777                 double sign = 1;
76587778                 if (hScale < 0)
76597779                 {
....@@ -7665,7 +7785,7 @@
76657785                     //hScale = 0.01;
76667786                 }
76677787                 
7668
-                double vScale = (double) (info.y - centerPt.y) / 32;
7788
+                double vScale = (double) (clickInfo.y - centerPt.y) / 64;
76697789                 sign = 1;
76707790                 if (vScale < 0)
76717791                 {
....@@ -7676,6 +7796,7 @@
76767796                 {
76777797                     //vScale = 0.01;
76787798                 }
7799
+                
76797800                 LA.matCopy(startMat, toParent);
76807801                 /**/
76817802                 for (int i = 0; i < 3; i++)
....@@ -7685,14 +7806,14 @@
76857806                 }
76867807                 /**/
76877808 
7688
-                double totalScale = Math.sqrt(hScale*hScale + vScale*vScale) / Math.sqrt(2);
7809
+                double totalScale = Math.sqrt(hScale*hScale + vScale*vScale) / clickInfo.scale;
76897810                         
76907811                 if (totalScale < 0.01)
76917812                 {
76927813                     totalScale = 0.01;
76937814                 }
76947815                 
7695
-                switch (info.pane.RenderCamera().viewCode)
7816
+                switch (clickInfo.pane.RenderCamera().viewCode)
76967817                 {
76977818                     case 3: // '\001'
76987819                         if (modified || opposite)
....@@ -7759,7 +7880,7 @@
77597880         } // NEW ...
77607881         
77617882         
7762
-        info.pane.repaint();
7883
+        clickInfo.pane.repaint();
77637884     }
77647885 
77657886     boolean overflow = false;