blame | history | patch | commit | commitdiff
Normand Briere
2019-08-14 0c1f740dd6ddd6432dc29266e42ef851e26027bb 
 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[] = new byte[100][];
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;
....@@ -426,6 +453,7 @@
426453         }
427454         
428455     boolean live = false;
456
+    transient boolean keepdontselect;
429457     boolean dontselect = false;
430458     boolean hide = false;
431459     boolean link2master = false; // performs reset support/master at each frame
....@@ -1010,6 +1038,9 @@
10101038         
10111039         if (material == null || material.multiply)
10121040             return true;
1041
+        
1042
+        if (projectedVertices != null && projectedVertices.length > 2 && projectedVertices[2].y >= 10000)
1043
+            return false;
10131044         
10141045         // Transparent objects are dynamic because we have to sort the triangles.
10151046         return material.opacity > 0.99;
....@@ -2437,6 +2468,11 @@
24372468         else
24382469         {
24392470             //((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");
24402476         }
24412477     }
24422478 
....@@ -2566,7 +2602,8 @@
25662602     private static final int editSelf = 1;
25672603     private static final int editChild = 2;
25682604     
2569
-    void drawEditHandles(ClickInfo info, int level)
2605
+    void drawEditHandles(//ClickInfo info,
2606
+            int level)
25702607     {
25712608         if (level == 0)
25722609         {
....@@ -2574,7 +2611,8 @@
25742611                 return;
25752612             
25762613             Object3D selectee;
2577
-            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))
25782616             {
25792617                 selectee = (Object3D) e.nextElement();
25802618             }
....@@ -2582,19 +2620,22 @@
25822620         } else
25832621         {
25842622             //super.
2585
-                    drawEditHandles0(info, level + 1);
2623
+                    drawEditHandles0(//info,
2624
+                            level + 1);
25862625         }
25872626     }
25882627 
2589
-    boolean doEditClick(ClickInfo info, int level)
2628
+    boolean doEditClick(//ClickInfo info,
2629
+            int level)
25902630     {
25912631         doSomething = 0;
25922632         if (level == 0)
25932633         {
2594
-            return doParentClick(info);
2634
+            return doParentClick(); //info);
25952635         }
25962636         if (//super.
2597
-                doEditClick0(info, level))
2637
+                doEditClick0(//info,
2638
+                    level))
25982639         {
25992640             doSomething = 1;
26002641             return true;
....@@ -2604,7 +2645,7 @@
26042645         }
26052646     }
26062647 
2607
-    boolean doParentClick(ClickInfo info)
2648
+    boolean doParentClick() //ClickInfo info)
26082649     {
26092650         if (selection == null)
26102651         {
....@@ -2617,7 +2658,8 @@
26172658         for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
26182659         {
26192660             Object3D selectee = (Object3D) e.nextElement();
2620
-            if (selectee.doEditClick(info, 1))
2661
+            if (selectee.doEditClick(//info,
2662
+                    1))
26212663             {
26222664                 childToDrag = selectee;
26232665                 doSomething = 2;
....@@ -2629,13 +2671,15 @@
26292671         return retval;
26302672     }
26312673 
2632
-    void doEditDrag(ClickInfo info, boolean opposite)
2674
+    void doEditDrag(//ClickInfo clickInfo,
2675
+            boolean opposite)
26332676     {
26342677         switch (doSomething)
26352678         {
26362679             case 1: // '\001'
26372680                 //super.
2638
-                        doEditDrag0(info, opposite);
2681
+                        doEditDrag0(//clickInfo,
2682
+                                opposite);
26392683                 break;
26402684 
26412685             case 2: // '\002'
....@@ -2648,11 +2692,13 @@
26482692                     {
26492693                         //sel.hitSomething = childToDrag.hitSomething;
26502694                         //childToDrag.doEditDrag(info);
2651
-                        sel.doEditDrag(info, opposite);
2695
+                        sel.doEditDrag(//clickInfo,
2696
+                                opposite);
26522697                     } else
26532698                     {
26542699                         //super.
2655
-                                doEditDrag0(info, opposite);
2700
+                                doEditDrag0(//clickInfo,
2701
+                                        opposite);
26562702                     }
26572703                 }
26582704                 break;
....@@ -2670,6 +2716,9 @@
26702716         {
26712717             deselectAll();
26722718         }
2719
+        
2720
+        new Exception().printStackTrace();
2721
+        
26732722         ClickInfo newInfo = new ClickInfo();
26742723         newInfo.flags = info.flags;
26752724         newInfo.bounds = info.bounds;
....@@ -3117,7 +3166,7 @@
31173166     {
31183167         if (bRep != null)
31193168         {
3120
-            bRep.GenerateNormalsMINE();
3169
+            bRep.MergeNormals(); //.GenerateNormalsMINE();
31213170             Touch();
31223171         }
31233172     }
....@@ -5420,6 +5469,51 @@
54205469         blockloop = false;
54215470     }
54225471 
5472
+    void ResetSelectable()
5473
+    {
5474
+        if (blockloop)
5475
+            return;
5476
+        
5477
+        blockloop = true;
5478
+
5479
+        keepdontselect = dontselect;
5480
+        dontselect = true;
5481
+        
5482
+        Object3D child;
5483
+        int nb = Size();
5484
+        for (int i = 0; i < nb; i++)
5485
+        {
5486
+            child = (Object3D) get(i);
5487
+            if (child == null)
5488
+                continue;
5489
+            child.ResetSelectable();
5490
+        }
5491
+        
5492
+        blockloop = false;
5493
+    }
5494
+
5495
+    void RestoreSelectable()
5496
+    {
5497
+        if (blockloop)
5498
+            return;
5499
+        
5500
+        blockloop = true;
5501
+
5502
+        dontselect = keepdontselect;
5503
+        
5504
+        Object3D child;
5505
+        int nb = Size();
5506
+        for (int i = 0; i < nb; i++)
5507
+        {
5508
+            child = (Object3D) get(i);
5509
+            if (child == null)
5510
+                continue;
5511
+            child.RestoreSelectable();
5512
+        }
5513
+        
5514
+        blockloop = false;
5515
+    }
5516
+
54235517     boolean IsSelected()
54245518     {
54255519         if (parent == null)
....@@ -5480,6 +5574,11 @@
54805574         if (fullname == null)
54815575             return "";
54825576         
5577
+        if (fullname.pigment != null)
5578
+        {
5579
+            return fullname.pigment;
5580
+        }
5581
+        
54835582    //     System.out.println("Fullname = " + fullname);
54845583         
54855584         // Does not work on Windows due to C:
....@@ -5492,7 +5591,7 @@
54925591         
54935592         if (split.length == 0)
54945593         {
5495
-                return "";
5594
+                return fullname.pigment = "";
54965595         }
54975596         
54985597         if (split.length <= 2)
....@@ -5500,22 +5599,27 @@
55005599                 if (fullname.name.endsWith(":"))
55015600                 {
55025601                         // Windows
5503
-                        return fullname.name.substring(0, fullname.name.length()-1);
5602
+                        return fullname.pigment = fullname.name.substring(0, fullname.name.length()-1);
55045603                 }
55055604                 
5506
-                return split[0];
5605
+                return fullname.pigment = split[0];
55075606         }
55085607         
55095608         // Windows
55105609         assert(split.length == 4);
55115610         
5512
-        return split[0] + ":" + split[1];
5611
+        return fullname.pigment = split[0] + ":" + split[1];
55135612     }
55145613     
55155614     static String GetBump(cTexture fullname)
55165615     {
55175616         if (fullname == null)
55185617             return "";
5618
+        
5619
+        if (fullname.bump != null)
5620
+        {
5621
+            return fullname.bump;
5622
+        }
55195623         
55205624   //      System.out.println("Fullname = " + fullname);
55215625         // Does not work on Windows due to C:
....@@ -5527,12 +5631,12 @@
55275631         
55285632         if (split.length == 0)
55295633         {
5530
-                return "";
5634
+                return fullname.bump = "";
55315635         }
55325636         
55335637         if (split.length == 1)
55345638         {
5535
-                return "";
5639
+                return fullname.bump = "";
55365640         }
55375641         
55385642         if (split.length == 2)
....@@ -5540,16 +5644,16 @@
55405644                 if (fullname.name.endsWith(":"))
55415645                 {
55425646                         // Windows
5543
-                        return "";
5647
+                        return fullname.bump = "";
55445648                 }
55455649                 
5546
-                return split[1];
5650
+                return fullname.bump = split[1];
55475651         }
55485652         
55495653         // Windows
55505654         assert(split.length == 4);
55515655         
5552
-        return split[2] + ":" + split[3];
5656
+        return fullname.bump = split[2] + ":" + split[3];
55535657     }
55545658     
55555659     String GetPigmentTexture()
....@@ -5632,6 +5736,9 @@
56325736             texname = "";
56335737         
56345738         GetTextures().name = texname + ":" + GetBump(GetTextures());
5739
+
5740
+        GetTextures().pigment = null;
5741
+        
56355742         Touch();
56365743     }
56375744 
....@@ -5705,6 +5812,8 @@
57055812         
57065813         GetTextures().name = Object3D.GetPigment(GetTextures()) + ":" + texname;
57075814         
5815
+        GetTextures().bump = null;
5816
+        
57085817         Touch();
57095818     }
57105819 
....@@ -5725,6 +5834,38 @@
57255834 
57265835             blockloop = true;
57275836             child.ResetBumpTexture();
5837
+            blockloop = false;
5838
+        }
5839
+    }
5840
+    
5841
+    void EmbedTextures(boolean embed)
5842
+    {
5843
+        if (blockloop)
5844
+            return;
5845
+        
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
+        }
5858
+        
5859
+        int nb = Size();
5860
+        for (int i = 0; i < nb; i++)
5861
+        {
5862
+            Object3D child = (Object3D) get(i);
5863
+
5864
+            if (child == null)
5865
+                continue;
5866
+
5867
+            blockloop = true;
5868
+            child.EmbedTextures(embed);
57285869             blockloop = false;
57295870         }
57305871     }
....@@ -5815,8 +5956,10 @@
58155956         if (support != null)
58165957             support = support;
58175958         
5818
-        //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5819
-        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.
58205963         
58215964         if (!usecalllists && bRep != null && bRep.displaylist > 0)
58225965         {
....@@ -5826,8 +5969,9 @@
58265969    //     usecalllists &= !(parent instanceof RandomNode);
58275970    //     usecalllists = false;
58285971 
5829
-        if (GetBRep() != null)
5830
-            usecalllists = usecalllists;
5972
+        if (display.DrawMode() == display.SHADOW)
5973
+            //GetBRep() != null)
5974
+            usecalllists = !!usecalllists;
58315975         //System.out.println("draw " + this);
58325976         //new Exception().printStackTrace();
58335977 
....@@ -5849,7 +5993,7 @@
58495993             if (!(this instanceof Composite))
58505994                 touched = false;
58515995             //if (displaylist == -1 && usecalllists)
5852
-            if ((bRep != null && bRep.displaylist <= 0) && usecalllists) // june 2013
5996
+            if (bRep.displaylist <= 0 && usecalllists) // && display.DrawMode() == display.DEFAULT) // june 2013
58535997             {
58545998                 bRep.displaylist = display.GenList();
58555999                 assert(bRep.displaylist != 0);
....@@ -5860,7 +6004,7 @@
58606004 
58616005             //System.out.println("\tnew list " + list);
58626006             //gl.glDrawBuffer(gl.GL_NONE);
5863
-            if (usecalllists)
6007
+            if (usecalllists && bRep.displaylist > 0)
58646008             {
58656009 //            System.err.println("new list " + bRep.displaylist + " for " + this);
58666010                 display.NewList(bRep.displaylist);
....@@ -5869,7 +6013,7 @@
58696013             CallList(display, root, selected, blocked);
58706014             
58716015           //  compiled = true;
5872
-            if (usecalllists)
6016
+            if (usecalllists && bRep.displaylist > 0)
58736017             {
58746018 //            System.err.println("end list " + bRep.displaylist + " for " + this);
58756019                 display.EndList();
....@@ -7220,20 +7364,23 @@
72207364         }
72217365     }
72227366 
7223
-    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)
72247371     {
7225
-        int hc = info.bounds.x + info.bounds.width / 2;
7226
-        int vc = info.bounds.y + info.bounds.height / 2;
7227
-        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;
72287375         if (toscreen == null)
72297376         {
7230
-            toscreen = new Camera(info.camera.viewCode).toScreen;
7377
+            toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
72317378         }
72327379         cVector vec = in;
72337380         LA.xformPos(in, toscreen, in);
72347381         //System.out.println("Distance = " + info.camera.Distance());
7235
-        vec.x *= 100 * info.camera.SCALE / info.camera.Distance();
7236
-        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();
72377384         outPt.x = hc + (int) vec.x;
72387385         outPt.y = vc - (int) vec.y;
72397386         outRec.x = outPt.x - 3;
....@@ -7241,15 +7388,18 @@
72417388         outRec.width = outRec.height = 6;
72427389     }
72437390 
7244
-    protected Rectangle calcHotSpot(cVector in, ClickInfo info)
7391
+    protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
7392
+            )
72457393     {
72467394         Point pt = new Point(0, 0);
72477395         Rectangle rec = new Rectangle();
7248
-        calcHotSpot(in, info, pt, rec);
7396
+        calcHotSpot(in, //clickInfo,
7397
+                pt, rec);
72497398         return rec;
72507399     }
72517400 
7252
-    void drawEditHandles0(ClickInfo info, int level)
7401
+    void drawEditHandles0(//ClickInfo clickInfo,
7402
+            int level)
72537403     {
72547404         if (level == 0)
72557405         {
....@@ -7258,16 +7408,19 @@
72587408         {
72597409             cVector origin = new cVector();
72607410             //LA.xformPos(origin, toParent, origin);
7261
-            Rectangle spot = calcHotSpot(origin, info);
7411
+            if (this.clickInfo == null)
7412
+                this.clickInfo = new ClickInfo();
7413
+            
7414
+            Rectangle spot = calcHotSpot(origin); //, clickInfo);
72627415             Rectangle boundary = new Rectangle();
72637416             boundary.x = spot.x - 30;
72647417             boundary.y = spot.y - 30;
72657418             boundary.width = spot.width + 60;
72667419             boundary.height = spot.height + 60;
7267
-            info.g.setColor(Color.red);
7420
+            clickInfo.g.setColor(Color.red);
72687421             int spotw = spot.x + spot.width;
72697422             int spoth = spot.y + spot.height;
7270
-            info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7423
+            clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
72717424 //            if (CameraPane.Xmin > spot.x)
72727425 //            {
72737426 //                CameraPane.Xmin = spot.x;
....@@ -7284,11 +7437,6 @@
72847437 //            {
72857438 //                CameraPane.Ymax = spoth;
72867439 //            }
7287
-            spot.translate(32, 32);
7288
-            spotw = spot.x + spot.width;
7289
-            spoth = spot.y + spot.height;
7290
-            info.g.setColor(Color.cyan);
7291
-            info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
72927440 //            if (CameraPane.Xmin > spot.x)
72937441 //            {
72947442 //                CameraPane.Xmin = spot.x;
....@@ -7307,10 +7455,15 @@
73077455 //            }
73087456             // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
73097457             //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
7310
-            spot.translate(0, -32);
7311
-            info.g.setColor(Color.yellow);
7312
-            info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7313
-            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);
73147467 //            if (CameraPane.Xmin > spot.x)
73157468 //            {
73167469 //                CameraPane.Xmin = spot.x;
....@@ -7327,8 +7480,9 @@
73277480 //            {
73287481 //                CameraPane.Ymax = spoth;
73297482 //            }
7330
-            info.g.drawArc(boundary.x + info.DX, boundary.y + info.DY,
7331
-                    (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);
73327486             //info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
73337487 //            if (CameraPane.Xmin > boundary.x)
73347488 //            {
....@@ -7350,7 +7504,8 @@
73507504         }
73517505     }
73527506 
7353
-    boolean doEditClick0(ClickInfo info, int level)
7507
+    boolean doEditClick0(//ClickInfo clickInfo, 
7508
+                int level)
73547509     {
73557510         if (level == 0)
73567511         {
....@@ -7359,8 +7514,8 @@
73597514 
73607515         boolean retval = false;
73617516 
7362
-        startX = info.x;
7363
-        startY = info.y;
7517
+        startX = clickInfo.x;
7518
+        startY = clickInfo.y;
73647519 
73657520         hitSomething = -1;
73667521         cVector origin = new cVector();
....@@ -7370,22 +7525,53 @@
73707525         {
73717526             centerPt = new Point(0, 0);
73727527         }
7373
-        calcHotSpot(origin, info, centerPt, spot);
7374
-        if (spot.contains(info.x, info.y))
7528
+        calcHotSpot(origin, //info,
7529
+                centerPt, spot);
7530
+        if (spot.contains(clickInfo.x, clickInfo.y))
73757531         {
73767532             hitSomething = hitCenter;
73777533             retval = true;
73787534         }
73797535         spot.translate(32, 0);
7380
-        if (spot.contains(info.x, info.y))
7536
+        if (spot.contains(clickInfo.x, clickInfo.y))
73817537         {
73827538             hitSomething = hitRotate;
73837539             retval = true;
73847540         }
73857541         spot.translate(0, 32);
7386
-        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))
73877545         {
73887546             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
+                
73897575             retval = true;
73907576         }
73917577 
....@@ -7395,7 +7581,7 @@
73957581         }
73967582 
73977583         //System.out.println("info.modifiers = " + info.modifiers);
7398
-        modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
7584
+        modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
73997585         //System.out.println("modified = " + modified);
74007586         //new Exception().printStackTrace();
74017587         //viewCode = info.pane.renderCamera.viewCode;
....@@ -7423,7 +7609,8 @@
74237609         return true;
74247610     }
74257611 
7426
-    void doEditDrag0(ClickInfo info, boolean opposite)
7612
+    void doEditDrag0(//ClickInfo info,
7613
+            boolean opposite)
74277614     {
74287615         if (hitSomething == 0)
74297616         {
....@@ -7437,7 +7624,7 @@
74377624 
74387625         //System.out.println("hitSomething = " + hitSomething);
74397626 
7440
-        double scale = 0.005f * info.camera.Distance();
7627
+        double scale = 0.005f * clickInfo.camera.Distance();
74417628         
74427629         cVector xlate = new cVector();
74437630         //cVector xlate2 = new cVector();
....@@ -7471,8 +7658,8 @@
74717658                     toParent[3][i] = xlate.get(i);
74727659                     LA.matInvert(toParent, fromParent);
74737660                      */
7474
-                    cVector delta = LA.newVector(0, 0, startY - info.y);
7475
-                    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);
74767663 
74777664                     LA.matCopy(startMat, toParent);
74787665                     LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
....@@ -7481,7 +7668,7 @@
74817668                 } else
74827669                 {
74837670                     //LA.xformDir(delta, info.camera.fromScreen, delta);
7484
-                    cVector up = new cVector(info.camera.up);
7671
+                    cVector up = new cVector(clickInfo.camera.up);
74857672                     cVector away = new cVector();
74867673                     //cVector right2 = new cVector();
74877674                     //LA.vecCross(up, cVector.Z, right);
....@@ -7498,19 +7685,19 @@
74987685                     LA.xformDir(up, ClickInfo.matbuffer, up);
74997686     //                if (!CameraPane.LOCALTRANSFORM)
75007687                         LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7501
-                    LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
7688
+                    LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
75027689     //                if (!CameraPane.LOCALTRANSFORM)
75037690                         LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
75047691                     //LA.vecCross(up, cVector.Z, right2);
75057692 
7506
-                    cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
7693
+                    cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
75077694 
75087695                     //System.out.println("DELTA0 = " + delta);
75097696                     //System.out.println("AWAY = " + info.camera.away);
75107697                     //System.out.println("UP = " + info.camera.up);
75117698                     if (away.z > 0)
75127699                     {
7513
-                        if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7700
+                        if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
75147701                         {
75157702                             delta.x = -delta.x;
75167703                         } else
....@@ -7525,7 +7712,7 @@
75257712                     //System.out.println("DELTA1 = " + delta);
75267713                     LA.xformDir(delta, ClickInfo.matbuffer, delta);
75277714                     //System.out.println("DELTA2 = " + delta);
7528
-                    LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
7715
+                    LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
75297716                     LA.matCopy(startMat, toParent);
75307717                     //System.out.println("DELTA3 = " + delta);
75317718                     LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
....@@ -7535,8 +7722,8 @@
75357722                 break;
75367723 
75377724             case hitRotate: // rotate
7538
-                int dx = info.x - centerPt.x;
7539
-                int dy = -(info.y - centerPt.y);
7725
+                int dx = clickInfo.x - centerPt.x;
7726
+                int dy = -(clickInfo.y - centerPt.y);
75407727                 double angle = (double) Math.atan2(dx, dy);
75417728                 angle = -(1.570796 - angle);
75427729 
....@@ -7559,7 +7746,7 @@
75597746                 }
75607747                 /**/
75617748 
7562
-                switch (info.pane.RenderCamera().viewCode)
7749
+                switch (clickInfo.pane.RenderCamera().viewCode)
75637750                 {
75647751                     case 1: // '\001'
75657752                         LA.matZRotate(toParent, angle);
....@@ -7586,7 +7773,7 @@
75867773                 break;
75877774 
75887775             case hitScale: // scale
7589
-                double hScale = (double) (info.x - centerPt.x) / 32;
7776
+                double hScale = (double) (clickInfo.x - centerPt.x) / 64;
75907777                 double sign = 1;
75917778                 if (hScale < 0)
75927779                 {
....@@ -7598,7 +7785,7 @@
75987785                     //hScale = 0.01;
75997786                 }
76007787                 
7601
-                double vScale = (double) (info.y - centerPt.y) / 32;
7788
+                double vScale = (double) (clickInfo.y - centerPt.y) / 64;
76027789                 sign = 1;
76037790                 if (vScale < 0)
76047791                 {
....@@ -7609,6 +7796,7 @@
76097796                 {
76107797                     //vScale = 0.01;
76117798                 }
7799
+                
76127800                 LA.matCopy(startMat, toParent);
76137801                 /**/
76147802                 for (int i = 0; i < 3; i++)
....@@ -7618,14 +7806,14 @@
76187806                 }
76197807                 /**/
76207808 
7621
-                double totalScale = Math.sqrt(hScale*hScale + vScale*vScale) / Math.sqrt(2);
7809
+                double totalScale = Math.sqrt(hScale*hScale + vScale*vScale) / clickInfo.scale;
76227810                         
76237811                 if (totalScale < 0.01)
76247812                 {
76257813                     totalScale = 0.01;
76267814                 }
76277815                 
7628
-                switch (info.pane.RenderCamera().viewCode)
7816
+                switch (clickInfo.pane.RenderCamera().viewCode)
76297817                 {
76307818                     case 3: // '\001'
76317819                         if (modified || opposite)
....@@ -7692,7 +7880,7 @@
76927880         } // NEW ...
76937881         
76947882         
7695
-        info.pane.repaint();
7883
+        clickInfo.pane.repaint();
76967884     }
76977885 
76987886     boolean overflow = false;