blame | history | patch | commit | commitdiff
Normand Briere
2019-07-30 475f8cbdbd96fdbf8f5b216ffebb31a51f25c2f9 
 Object3D.java
....@@ -24,11 +24,17 @@
2424     
2525     private UUID uuid = UUID.randomUUID();
2626     
27
-    // TEMPORARY for mocap undo
28
-    mocap.reader.BVHReader.BVHResult bvh;
29
-    Object3D skeleton;
27
+    // TEMPORARY for mocap undo. No need to be transient.
28
+    mocap.reader.BVHReader.BVHResult savebvh;
29
+    Object3D saveskeleton;
3030     //
3131     
32
+    String skyboxname;
33
+    String skyboxext;
34
+    
35
+    byte[] versions[];
36
+    int versionindex = -1;    
37
+        
3238     ScriptNode scriptnode;
3339 
3440         void InitOthers()
....@@ -170,24 +176,35 @@
170176 
171177     void ExtractBigData(java.util.Hashtable<java.util.UUID, Object3D> hashtable)
172178     {
179
+        Object3D o;
180
+        
173181         if (hashtable.containsKey(GetUUID()))
174182         {
175
-            Object3D o = hashtable.get(GetUUID());
183
+            o = hashtable.get(GetUUID());
176184 
177185             Grafreed.Assert(this.bRep == o.bRep);
178
-            if (this.bRep != null)
179
-                assert(this.bRep.support == o.transientrep);
186
+            //if (this.bRep != null)
187
+            //    assert(this.bRep.support == o.transientrep);
188
+            if (this.support != null)
189
+                assert(this.support.bRep == o.transientrep);
190
+        }
191
+        else
192
+        {
193
+            o = new Object3D("copy of " + this.name);
180194 
181
-            return;
195
+            hashtable.put(GetUUID(), o);
182196         }
183197 
184
-        Object3D o = new Object3D("copy of " + this.name);
185
-
186
-        hashtable.put(GetUUID(), o);
187
-
188
-        for (int i=0; i<Size(); i++)
198
+        if (!blockloop)
189199         {
190
-            get(i).ExtractBigData(hashtable);
200
+            blockloop = true;
201
+
202
+            for (int i=0; i<Size(); i++)
203
+            {
204
+                get(i).ExtractBigData(hashtable);
205
+            }
206
+
207
+            blockloop = false;
191208         }
192209         
193210         ExtractBigData(o);
....@@ -195,11 +212,26 @@
195212 
196213     void ExtractBigData(Object3D o)
197214     {
215
+        if (o.bRep != null)
216
+            Grafreed.Assert(o.bRep == this.bRep);
217
+        
198218         o.bRep = this.bRep;
199
-        if (this.bRep != null)
219
+// July 2019       if (this.bRep != null)
220
+//        {
221
+//            o.transientrep = this.bRep.support;
222
+//            o.bRep.support = null;
223
+//        }
224
+        o.selection = this.selection;
225
+        o.versions = this.versions;
226
+        o.versionindex = this.versionindex;
227
+        
228
+        if (this.support != null)
200229         {
201
-            o.transientrep = this.bRep.support;
202
-            o.bRep.support = null;
230
+            if (o.transientrep != null)
231
+                Grafreed.Assert(o.transientrep == this.support.bRep);
232
+
233
+            o.transientrep = this.support.bRep;
234
+            this.support.bRep = null;
203235         }
204236         
205237         //    o.support = this.support;
....@@ -219,14 +251,14 @@
219251         if (!hashtable.containsKey(GetUUID()))
220252             return;
221253 
254
+        Object3D o = hashtable.get(GetUUID());
255
+
256
+        RestoreBigData(o);
257
+
222258         if (blockloop)
223259             return;
224260 
225261         blockloop = true;
226
-
227
-        Object3D o = hashtable.get(GetUUID());
228
-
229
-        RestoreBigData(o);
230262 
231263         //hashtable.remove(GetUUID());
232264 
....@@ -241,8 +273,17 @@
241273     void RestoreBigData(Object3D o)
242274     {
243275         this.bRep = o.bRep;
244
-        if (this.bRep != null)
245
-            this.bRep.support = o.transientrep;
276
+        if (this.support != null && o.transientrep != null)
277
+        {
278
+            this.support.bRep = o.transientrep;
279
+        }
280
+        
281
+        this.selection = o.selection;
282
+        
283
+        this.versions = o.versions;
284
+        this.versionindex = o.versionindex;
285
+// July 2019        if (this.bRep != null)
286
+//            this.bRep.support = o.transientrep;
246287     //    this.support = o.support;
247288     //    this.fileparent = o.fileparent;
248289     }
....@@ -388,6 +429,7 @@
388429         }
389430         
390431     boolean live = false;
432
+    transient boolean keepdontselect;
391433     boolean dontselect = false;
392434     boolean hide = false;
393435     boolean link2master = false; // performs reset support/master at each frame
....@@ -1374,6 +1416,7 @@
13741416                     toParent = LA.newMatrix();
13751417                     fromParent = LA.newMatrix();
13761418                 }
1419
+                
13771420                 LA.matCopy(other.toParent, toParent);
13781421                 LA.matCopy(other.fromParent, fromParent);
13791422                 
....@@ -2527,7 +2570,8 @@
25272570     private static final int editSelf = 1;
25282571     private static final int editChild = 2;
25292572     
2530
-    void drawEditHandles(ClickInfo info, int level)
2573
+    void drawEditHandles(//ClickInfo info,
2574
+            int level)
25312575     {
25322576         if (level == 0)
25332577         {
....@@ -2535,7 +2579,8 @@
25352579                 return;
25362580             
25372581             Object3D selectee;
2538
-            for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
2582
+            for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
2583
+                                                                                                        level + 1))
25392584             {
25402585                 selectee = (Object3D) e.nextElement();
25412586             }
....@@ -2543,19 +2588,22 @@
25432588         } else
25442589         {
25452590             //super.
2546
-                    drawEditHandles0(info, level + 1);
2591
+                    drawEditHandles0(//info,
2592
+                            level + 1);
25472593         }
25482594     }
25492595 
2550
-    boolean doEditClick(ClickInfo info, int level)
2596
+    boolean doEditClick(//ClickInfo info,
2597
+            int level)
25512598     {
25522599         doSomething = 0;
25532600         if (level == 0)
25542601         {
2555
-            return doParentClick(info);
2602
+            return doParentClick(); //info);
25562603         }
25572604         if (//super.
2558
-                doEditClick0(info, level))
2605
+                doEditClick0(//info,
2606
+                    level))
25592607         {
25602608             doSomething = 1;
25612609             return true;
....@@ -2565,7 +2613,7 @@
25652613         }
25662614     }
25672615 
2568
-    boolean doParentClick(ClickInfo info)
2616
+    boolean doParentClick() //ClickInfo info)
25692617     {
25702618         if (selection == null)
25712619         {
....@@ -2578,7 +2626,8 @@
25782626         for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
25792627         {
25802628             Object3D selectee = (Object3D) e.nextElement();
2581
-            if (selectee.doEditClick(info, 1))
2629
+            if (selectee.doEditClick(//info,
2630
+                    1))
25822631             {
25832632                 childToDrag = selectee;
25842633                 doSomething = 2;
....@@ -2590,13 +2639,15 @@
25902639         return retval;
25912640     }
25922641 
2593
-    void doEditDrag(ClickInfo info, boolean opposite)
2642
+    void doEditDrag(//ClickInfo clickInfo,
2643
+            boolean opposite)
25942644     {
25952645         switch (doSomething)
25962646         {
25972647             case 1: // '\001'
25982648                 //super.
2599
-                        doEditDrag0(info, opposite);
2649
+                        doEditDrag0(//clickInfo,
2650
+                                opposite);
26002651                 break;
26012652 
26022653             case 2: // '\002'
....@@ -2609,11 +2660,13 @@
26092660                     {
26102661                         //sel.hitSomething = childToDrag.hitSomething;
26112662                         //childToDrag.doEditDrag(info);
2612
-                        sel.doEditDrag(info, opposite);
2663
+                        sel.doEditDrag(//clickInfo,
2664
+                                opposite);
26132665                     } else
26142666                     {
26152667                         //super.
2616
-                                doEditDrag0(info, opposite);
2668
+                                doEditDrag0(//clickInfo,
2669
+                                        opposite);
26172670                     }
26182671                 }
26192672                 break;
....@@ -2631,6 +2684,9 @@
26312684         {
26322685             deselectAll();
26332686         }
2687
+        
2688
+        new Exception().printStackTrace();
2689
+        
26342690         ClickInfo newInfo = new ClickInfo();
26352691         newInfo.flags = info.flags;
26362692         newInfo.bounds = info.bounds;
....@@ -3078,7 +3134,7 @@
30783134     {
30793135         if (bRep != null)
30803136         {
3081
-            bRep.GenerateNormalsMINE();
3137
+            bRep.MergeNormals(); //.GenerateNormalsMINE();
30823138             Touch();
30833139         }
30843140     }
....@@ -5381,6 +5437,51 @@
53815437         blockloop = false;
53825438     }
53835439 
5440
+    void ResetSelectable()
5441
+    {
5442
+        if (blockloop)
5443
+            return;
5444
+        
5445
+        blockloop = true;
5446
+
5447
+        keepdontselect = dontselect;
5448
+        dontselect = true;
5449
+        
5450
+        Object3D child;
5451
+        int nb = Size();
5452
+        for (int i = 0; i < nb; i++)
5453
+        {
5454
+            child = (Object3D) get(i);
5455
+            if (child == null)
5456
+                continue;
5457
+            child.ResetSelectable();
5458
+        }
5459
+        
5460
+        blockloop = false;
5461
+    }
5462
+
5463
+    void RestoreSelectable()
5464
+    {
5465
+        if (blockloop)
5466
+            return;
5467
+        
5468
+        blockloop = true;
5469
+
5470
+        dontselect = keepdontselect;
5471
+        
5472
+        Object3D child;
5473
+        int nb = Size();
5474
+        for (int i = 0; i < nb; i++)
5475
+        {
5476
+            child = (Object3D) get(i);
5477
+            if (child == null)
5478
+                continue;
5479
+            child.RestoreSelectable();
5480
+        }
5481
+        
5482
+        blockloop = false;
5483
+    }
5484
+
53845485     boolean IsSelected()
53855486     {
53865487         if (parent == null)
....@@ -5690,6 +5791,38 @@
56905791         }
56915792     }
56925793     
5794
+    void EmbedTextures(boolean embed)
5795
+    {
5796
+        if (blockloop)
5797
+            return;
5798
+        
5799
+        //if (GetTextures() != null)
5800
+        if (embed)
5801
+            CameraPane.EmbedTextures(GetTextures());
5802
+        else
5803
+        {
5804
+            GetTextures().pigmentdata = null;
5805
+            GetTextures().bumpdata = null;
5806
+            GetTextures().pw = 0;
5807
+            GetTextures().ph = 0;
5808
+            GetTextures().bw = 0;
5809
+            GetTextures().bh = 0;
5810
+        }
5811
+        
5812
+        int nb = Size();
5813
+        for (int i = 0; i < nb; i++)
5814
+        {
5815
+            Object3D child = (Object3D) get(i);
5816
+
5817
+            if (child == null)
5818
+                continue;
5819
+
5820
+            blockloop = true;
5821
+            child.EmbedTextures(embed);
5822
+            blockloop = false;
5823
+        }
5824
+    }
5825
+    
56935826     void draw(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
56945827     {
56955828         Draw(display, root, selected, blocked);
....@@ -5777,7 +5910,7 @@
57775910             support = support;
57785911         
57795912         //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5780
-        boolean usecalllists = !IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5913
+        boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
57815914         
57825915         if (!usecalllists && bRep != null && bRep.displaylist > 0)
57835916         {
....@@ -5798,7 +5931,7 @@
57985931         
57995932         if (!selectmode && //display.DrawMode() != display.SELECTION &&
58005933                 //(touched || (bRep != null && bRep.displaylist <= 0)))
5801
-                (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE || touched || (bRep != null && bRep.displaylist <= 0)))
5934
+                (Globals.isLIVE() && Globals.COMPUTESHADOWWHENLIVE || touched && Globals.COMPUTESHADOWWHENLIVE)) // || (bRep != null && bRep.displaylist <= 0)))
58025935         {
58035936             Globals.lighttouched = true;
58045937         } // all panes...
....@@ -7181,20 +7314,23 @@
71817314         }
71827315     }
71837316 
7184
-    protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
7317
+    static ClickInfo clickInfo = new ClickInfo();
7318
+        
7319
+    protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
7320
+            Point outPt, Rectangle outRec)
71857321     {
7186
-        int hc = info.bounds.x + info.bounds.width / 2;
7187
-        int vc = info.bounds.y + info.bounds.height / 2;
7188
-        double[][] toscreen = info.toScreen;
7322
+        int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
7323
+        int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
7324
+        double[][] toscreen = clickInfo.toScreen;
71897325         if (toscreen == null)
71907326         {
7191
-            toscreen = new Camera(info.camera.viewCode).toScreen;
7327
+            toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
71927328         }
71937329         cVector vec = in;
71947330         LA.xformPos(in, toscreen, in);
71957331         //System.out.println("Distance = " + info.camera.Distance());
7196
-        vec.x *= 100 * info.camera.SCALE / info.camera.Distance();
7197
-        vec.y *= 100 * info.camera.SCALE / info.camera.Distance();
7332
+        vec.x *= 100 * clickInfo.camera.SCALE / clickInfo.camera.Distance();
7333
+        vec.y *= 100 * clickInfo.camera.SCALE / clickInfo.camera.Distance();
71987334         outPt.x = hc + (int) vec.x;
71997335         outPt.y = vc - (int) vec.y;
72007336         outRec.x = outPt.x - 3;
....@@ -7202,15 +7338,18 @@
72027338         outRec.width = outRec.height = 6;
72037339     }
72047340 
7205
-    protected Rectangle calcHotSpot(cVector in, ClickInfo info)
7341
+    protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
7342
+            )
72067343     {
72077344         Point pt = new Point(0, 0);
72087345         Rectangle rec = new Rectangle();
7209
-        calcHotSpot(in, info, pt, rec);
7346
+        calcHotSpot(in, //clickInfo,
7347
+                pt, rec);
72107348         return rec;
72117349     }
72127350 
7213
-    void drawEditHandles0(ClickInfo info, int level)
7351
+    void drawEditHandles0(//ClickInfo clickInfo,
7352
+            int level)
72147353     {
72157354         if (level == 0)
72167355         {
....@@ -7219,16 +7358,19 @@
72197358         {
72207359             cVector origin = new cVector();
72217360             //LA.xformPos(origin, toParent, origin);
7222
-            Rectangle spot = calcHotSpot(origin, info);
7361
+            if (this.clickInfo == null)
7362
+                this.clickInfo = new ClickInfo();
7363
+            
7364
+            Rectangle spot = calcHotSpot(origin); //, clickInfo);
72237365             Rectangle boundary = new Rectangle();
72247366             boundary.x = spot.x - 30;
72257367             boundary.y = spot.y - 30;
72267368             boundary.width = spot.width + 60;
72277369             boundary.height = spot.height + 60;
7228
-            info.g.setColor(Color.red);
7370
+            clickInfo.g.setColor(Color.red);
72297371             int spotw = spot.x + spot.width;
72307372             int spoth = spot.y + spot.height;
7231
-            info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7373
+            clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
72327374 //            if (CameraPane.Xmin > spot.x)
72337375 //            {
72347376 //                CameraPane.Xmin = spot.x;
....@@ -7248,8 +7390,8 @@
72487390             spot.translate(32, 32);
72497391             spotw = spot.x + spot.width;
72507392             spoth = spot.y + spot.height;
7251
-            info.g.setColor(Color.cyan);
7252
-            info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7393
+            clickInfo.g.setColor(Color.cyan);
7394
+            clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
72537395 //            if (CameraPane.Xmin > spot.x)
72547396 //            {
72557397 //                CameraPane.Xmin = spot.x;
....@@ -7269,9 +7411,9 @@
72697411             // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
72707412             //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
72717413             spot.translate(0, -32);
7272
-            info.g.setColor(Color.yellow);
7273
-            info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7274
-            info.g.setColor(Color.green);
7414
+            clickInfo.g.setColor(Color.yellow);
7415
+            clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7416
+            clickInfo.g.setColor(Color.green);
72757417 //            if (CameraPane.Xmin > spot.x)
72767418 //            {
72777419 //                CameraPane.Xmin = spot.x;
....@@ -7288,8 +7430,8 @@
72887430 //            {
72897431 //                CameraPane.Ymax = spoth;
72907432 //            }
7291
-            info.g.drawArc(boundary.x, boundary.y,
7292
-                    boundary.width, boundary.height, 0, 360);
7433
+            clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
7434
+                    (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
72937435             //info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
72947436 //            if (CameraPane.Xmin > boundary.x)
72957437 //            {
....@@ -7311,7 +7453,8 @@
73117453         }
73127454     }
73137455 
7314
-    boolean doEditClick0(ClickInfo info, int level)
7456
+    boolean doEditClick0(//ClickInfo clickInfo, 
7457
+                int level)
73157458     {
73167459         if (level == 0)
73177460         {
....@@ -7320,8 +7463,8 @@
73207463 
73217464         boolean retval = false;
73227465 
7323
-        startX = info.x;
7324
-        startY = info.y;
7466
+        startX = clickInfo.x;
7467
+        startY = clickInfo.y;
73257468 
73267469         hitSomething = -1;
73277470         cVector origin = new cVector();
....@@ -7331,22 +7474,51 @@
73317474         {
73327475             centerPt = new Point(0, 0);
73337476         }
7334
-        calcHotSpot(origin, info, centerPt, spot);
7335
-        if (spot.contains(info.x, info.y))
7477
+        calcHotSpot(origin, //info,
7478
+                centerPt, spot);
7479
+        if (spot.contains(clickInfo.x, clickInfo.y))
73367480         {
73377481             hitSomething = hitCenter;
73387482             retval = true;
73397483         }
73407484         spot.translate(32, 0);
7341
-        if (spot.contains(info.x, info.y))
7485
+        if (spot.contains(clickInfo.x, clickInfo.y))
73427486         {
73437487             hitSomething = hitRotate;
73447488             retval = true;
73457489         }
73467490         spot.translate(0, 32);
7347
-        if (spot.contains(info.x, info.y))
7491
+        if (spot.contains(clickInfo.x, clickInfo.y))
73487492         {
73497493             hitSomething = hitScale;
7494
+            
7495
+        double scale = 0.005f * clickInfo.camera.Distance();
7496
+                double hScale = (double) (clickInfo.x /*- centerPt.x*/) / 32;
7497
+                double sign = 1;
7498
+                if (hScale < 0)
7499
+                {
7500
+                    sign = -1;
7501
+                }
7502
+                hScale = sign*Math.pow(sign*hScale, scale * 50);
7503
+                if (hScale < 0.01)
7504
+                {
7505
+                    //hScale = 0.01;
7506
+                }
7507
+                
7508
+                double vScale = (double) (clickInfo.y /*- centerPt.y*/) / 32;
7509
+                sign = 1;
7510
+                if (vScale < 0)
7511
+                {
7512
+                    sign = -1;
7513
+                }
7514
+                vScale = sign*Math.pow(sign*vScale, scale * 50);
7515
+                if (vScale < 0.01)
7516
+                {
7517
+                    //vScale = 0.01;
7518
+                }
7519
+                
7520
+                clickInfo.scale = Math.sqrt(hScale*hScale + vScale*vScale);
7521
+                
73507522             retval = true;
73517523         }
73527524 
....@@ -7356,7 +7528,7 @@
73567528         }
73577529 
73587530         //System.out.println("info.modifiers = " + info.modifiers);
7359
-        modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
7531
+        modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
73607532         //System.out.println("modified = " + modified);
73617533         //new Exception().printStackTrace();
73627534         //viewCode = info.pane.renderCamera.viewCode;
....@@ -7384,7 +7556,8 @@
73847556         return true;
73857557     }
73867558 
7387
-    void doEditDrag0(ClickInfo info, boolean opposite)
7559
+    void doEditDrag0(//ClickInfo info,
7560
+            boolean opposite)
73887561     {
73897562         if (hitSomething == 0)
73907563         {
....@@ -7398,7 +7571,7 @@
73987571 
73997572         //System.out.println("hitSomething = " + hitSomething);
74007573 
7401
-        double scale = 0.005f * info.camera.Distance();
7574
+        double scale = 0.005f * clickInfo.camera.Distance();
74027575         
74037576         cVector xlate = new cVector();
74047577         //cVector xlate2 = new cVector();
....@@ -7432,8 +7605,8 @@
74327605                     toParent[3][i] = xlate.get(i);
74337606                     LA.matInvert(toParent, fromParent);
74347607                      */
7435
-                    cVector delta = LA.newVector(0, 0, startY - info.y);
7436
-                    LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
7608
+                    cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
7609
+                    LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
74377610 
74387611                     LA.matCopy(startMat, toParent);
74397612                     LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
....@@ -7442,7 +7615,7 @@
74427615                 } else
74437616                 {
74447617                     //LA.xformDir(delta, info.camera.fromScreen, delta);
7445
-                    cVector up = new cVector(info.camera.up);
7618
+                    cVector up = new cVector(clickInfo.camera.up);
74467619                     cVector away = new cVector();
74477620                     //cVector right2 = new cVector();
74487621                     //LA.vecCross(up, cVector.Z, right);
....@@ -7459,19 +7632,19 @@
74597632                     LA.xformDir(up, ClickInfo.matbuffer, up);
74607633     //                if (!CameraPane.LOCALTRANSFORM)
74617634                         LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7462
-                    LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
7635
+                    LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
74637636     //                if (!CameraPane.LOCALTRANSFORM)
74647637                         LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
74657638                     //LA.vecCross(up, cVector.Z, right2);
74667639 
7467
-                    cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
7640
+                    cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
74687641 
74697642                     //System.out.println("DELTA0 = " + delta);
74707643                     //System.out.println("AWAY = " + info.camera.away);
74717644                     //System.out.println("UP = " + info.camera.up);
74727645                     if (away.z > 0)
74737646                     {
7474
-                        if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7647
+                        if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
74757648                         {
74767649                             delta.x = -delta.x;
74777650                         } else
....@@ -7486,7 +7659,7 @@
74867659                     //System.out.println("DELTA1 = " + delta);
74877660                     LA.xformDir(delta, ClickInfo.matbuffer, delta);
74887661                     //System.out.println("DELTA2 = " + delta);
7489
-                    LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
7662
+                    LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
74907663                     LA.matCopy(startMat, toParent);
74917664                     //System.out.println("DELTA3 = " + delta);
74927665                     LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
....@@ -7496,8 +7669,8 @@
74967669                 break;
74977670 
74987671             case hitRotate: // rotate
7499
-                int dx = info.x - centerPt.x;
7500
-                int dy = -(info.y - centerPt.y);
7672
+                int dx = clickInfo.x - centerPt.x;
7673
+                int dy = -(clickInfo.y - centerPt.y);
75017674                 double angle = (double) Math.atan2(dx, dy);
75027675                 angle = -(1.570796 - angle);
75037676 
....@@ -7520,7 +7693,7 @@
75207693                 }
75217694                 /**/
75227695 
7523
-                switch (info.pane.RenderCamera().viewCode)
7696
+                switch (clickInfo.pane.RenderCamera().viewCode)
75247697                 {
75257698                     case 1: // '\001'
75267699                         LA.matZRotate(toParent, angle);
....@@ -7547,7 +7720,7 @@
75477720                 break;
75487721 
75497722             case hitScale: // scale
7550
-                double hScale = (double) (info.x - centerPt.x) / 32;
7723
+                double hScale = (double) (clickInfo.x /*- centerPt.x*/) / 32;
75517724                 double sign = 1;
75527725                 if (hScale < 0)
75537726                 {
....@@ -7559,7 +7732,7 @@
75597732                     //hScale = 0.01;
75607733                 }
75617734                 
7562
-                double vScale = (double) (info.y - centerPt.y) / 32;
7735
+                double vScale = (double) (clickInfo.y /*- centerPt.y*/) / 32;
75637736                 sign = 1;
75647737                 if (vScale < 0)
75657738                 {
....@@ -7570,6 +7743,7 @@
75707743                 {
75717744                     //vScale = 0.01;
75727745                 }
7746
+                
75737747                 LA.matCopy(startMat, toParent);
75747748                 /**/
75757749                 for (int i = 0; i < 3; i++)
....@@ -7579,14 +7753,14 @@
75797753                 }
75807754                 /**/
75817755 
7582
-                double totalScale = Math.sqrt(hScale*hScale + vScale*vScale) / Math.sqrt(2);
7756
+                double totalScale = Math.sqrt(hScale*hScale + vScale*vScale) / clickInfo.scale;
75837757                         
75847758                 if (totalScale < 0.01)
75857759                 {
75867760                     totalScale = 0.01;
75877761                 }
75887762                 
7589
-                switch (info.pane.RenderCamera().viewCode)
7763
+                switch (clickInfo.pane.RenderCamera().viewCode)
75907764                 {
75917765                     case 3: // '\001'
75927766                         if (modified || opposite)
....@@ -7653,7 +7827,7 @@
76537827         } // NEW ...
76547828         
76557829         
7656
-        info.pane.repaint();
7830
+        clickInfo.pane.repaint();
76577831     }
76587832 
76597833     boolean overflow = false;