blame | history | patch | commit | commitdiff
Normand Briere
2019-07-27 1af7d3700724834e40ad8636bc9a56cdc3b19b15 
 Object3D.java
....@@ -2567,7 +2567,8 @@
25672567     private static final int editSelf = 1;
25682568     private static final int editChild = 2;
25692569     
2570
-    void drawEditHandles(ClickInfo info, int level)
2570
+    void drawEditHandles(//ClickInfo info,
2571
+            int level)
25712572     {
25722573         if (level == 0)
25732574         {
....@@ -2575,7 +2576,8 @@
25752576                 return;
25762577             
25772578             Object3D selectee;
2578
-            for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(info, level + 1))
2579
+            for (java.util.Enumeration e = selection.elements(); e.hasMoreElements(); selectee.drawEditHandles(//info,
2580
+                                                                                                        level + 1))
25792581             {
25802582                 selectee = (Object3D) e.nextElement();
25812583             }
....@@ -2583,19 +2585,22 @@
25832585         } else
25842586         {
25852587             //super.
2586
-                    drawEditHandles0(info, level + 1);
2588
+                    drawEditHandles0(//info,
2589
+                            level + 1);
25872590         }
25882591     }
25892592 
2590
-    boolean doEditClick(ClickInfo info, int level)
2593
+    boolean doEditClick(//ClickInfo info,
2594
+            int level)
25912595     {
25922596         doSomething = 0;
25932597         if (level == 0)
25942598         {
2595
-            return doParentClick(info);
2599
+            return doParentClick(); //info);
25962600         }
25972601         if (//super.
2598
-                doEditClick0(info, level))
2602
+                doEditClick0(//info,
2603
+                    level))
25992604         {
26002605             doSomething = 1;
26012606             return true;
....@@ -2605,7 +2610,7 @@
26052610         }
26062611     }
26072612 
2608
-    boolean doParentClick(ClickInfo info)
2613
+    boolean doParentClick() //ClickInfo info)
26092614     {
26102615         if (selection == null)
26112616         {
....@@ -2618,7 +2623,8 @@
26182623         for (java.util.Enumeration e = selection.elements(); e.hasMoreElements();)
26192624         {
26202625             Object3D selectee = (Object3D) e.nextElement();
2621
-            if (selectee.doEditClick(info, 1))
2626
+            if (selectee.doEditClick(//info,
2627
+                    1))
26222628             {
26232629                 childToDrag = selectee;
26242630                 doSomething = 2;
....@@ -2630,13 +2636,15 @@
26302636         return retval;
26312637     }
26322638 
2633
-    void doEditDrag(ClickInfo info, boolean opposite)
2639
+    void doEditDrag(//ClickInfo clickInfo,
2640
+            boolean opposite)
26342641     {
26352642         switch (doSomething)
26362643         {
26372644             case 1: // '\001'
26382645                 //super.
2639
-                        doEditDrag0(info, opposite);
2646
+                        doEditDrag0(//clickInfo,
2647
+                                opposite);
26402648                 break;
26412649 
26422650             case 2: // '\002'
....@@ -2649,11 +2657,13 @@
26492657                     {
26502658                         //sel.hitSomething = childToDrag.hitSomething;
26512659                         //childToDrag.doEditDrag(info);
2652
-                        sel.doEditDrag(info, opposite);
2660
+                        sel.doEditDrag(//clickInfo,
2661
+                                opposite);
26532662                     } else
26542663                     {
26552664                         //super.
2656
-                                doEditDrag0(info, opposite);
2665
+                                doEditDrag0(//clickInfo,
2666
+                                        opposite);
26572667                     }
26582668                 }
26592669                 break;
....@@ -2671,6 +2681,9 @@
26712681         {
26722682             deselectAll();
26732683         }
2684
+        
2685
+        new Exception().printStackTrace();
2686
+        
26742687         ClickInfo newInfo = new ClickInfo();
26752688         newInfo.flags = info.flags;
26762689         newInfo.bounds = info.bounds;
....@@ -5894,7 +5907,7 @@
58945907             support = support;
58955908         
58965909         //boolean usecalllists = IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null || !link2master); // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5897
-        boolean usecalllists = !IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
5910
+        boolean usecalllists = false; //!IsLive(); // IsStatic() && GetBRep() != null && (!CameraPane.SUPPORT || support == null) && !link2master; // !(this instanceof cSpring) && !(this instanceof BezierPatch);
58985911         
58995912         if (!usecalllists && bRep != null && bRep.displaylist > 0)
59005913         {
....@@ -7298,20 +7311,23 @@
72987311         }
72997312     }
73007313 
7301
-    protected void calcHotSpot(cVector in, ClickInfo info, Point outPt, Rectangle outRec)
7314
+    static ClickInfo clickInfo = new ClickInfo();
7315
+        
7316
+    protected void calcHotSpot(cVector in, //ClickInfo clickInfo,
7317
+            Point outPt, Rectangle outRec)
73027318     {
7303
-        int hc = info.bounds.x + info.bounds.width / 2;
7304
-        int vc = info.bounds.y + info.bounds.height / 2;
7305
-        double[][] toscreen = info.toScreen;
7319
+        int hc = clickInfo.bounds.x + clickInfo.bounds.width / 2;
7320
+        int vc = clickInfo.bounds.y + clickInfo.bounds.height / 2;
7321
+        double[][] toscreen = clickInfo.toScreen;
73067322         if (toscreen == null)
73077323         {
7308
-            toscreen = new Camera(info.camera.viewCode).toScreen;
7324
+            toscreen = new Camera(clickInfo.camera.viewCode).toScreen;
73097325         }
73107326         cVector vec = in;
73117327         LA.xformPos(in, toscreen, in);
73127328         //System.out.println("Distance = " + info.camera.Distance());
7313
-        vec.x *= 100 * info.camera.SCALE / info.camera.Distance();
7314
-        vec.y *= 100 * info.camera.SCALE / info.camera.Distance();
7329
+        vec.x *= 100 * clickInfo.camera.SCALE / clickInfo.camera.Distance();
7330
+        vec.y *= 100 * clickInfo.camera.SCALE / clickInfo.camera.Distance();
73157331         outPt.x = hc + (int) vec.x;
73167332         outPt.y = vc - (int) vec.y;
73177333         outRec.x = outPt.x - 3;
....@@ -7319,15 +7335,18 @@
73197335         outRec.width = outRec.height = 6;
73207336     }
73217337 
7322
-    protected Rectangle calcHotSpot(cVector in, ClickInfo info)
7338
+    protected Rectangle calcHotSpot(cVector in//, ClickInfo clickInfo
7339
+            )
73237340     {
73247341         Point pt = new Point(0, 0);
73257342         Rectangle rec = new Rectangle();
7326
-        calcHotSpot(in, info, pt, rec);
7343
+        calcHotSpot(in, //clickInfo,
7344
+                pt, rec);
73277345         return rec;
73287346     }
73297347 
7330
-    void drawEditHandles0(ClickInfo info, int level)
7348
+    void drawEditHandles0(//ClickInfo clickInfo,
7349
+            int level)
73317350     {
73327351         if (level == 0)
73337352         {
....@@ -7336,16 +7355,19 @@
73367355         {
73377356             cVector origin = new cVector();
73387357             //LA.xformPos(origin, toParent, origin);
7339
-            Rectangle spot = calcHotSpot(origin, info);
7358
+            if (this.clickInfo == null)
7359
+                this.clickInfo = new ClickInfo();
7360
+            
7361
+            Rectangle spot = calcHotSpot(origin); //, clickInfo);
73407362             Rectangle boundary = new Rectangle();
73417363             boundary.x = spot.x - 30;
73427364             boundary.y = spot.y - 30;
73437365             boundary.width = spot.width + 60;
73447366             boundary.height = spot.height + 60;
7345
-            info.g.setColor(Color.red);
7367
+            clickInfo.g.setColor(Color.red);
73467368             int spotw = spot.x + spot.width;
73477369             int spoth = spot.y + spot.height;
7348
-            info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7370
+            clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
73497371 //            if (CameraPane.Xmin > spot.x)
73507372 //            {
73517373 //                CameraPane.Xmin = spot.x;
....@@ -7365,8 +7387,8 @@
73657387             spot.translate(32, 32);
73667388             spotw = spot.x + spot.width;
73677389             spoth = spot.y + spot.height;
7368
-            info.g.setColor(Color.cyan);
7369
-            info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7390
+            clickInfo.g.setColor(Color.cyan);
7391
+            clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
73707392 //            if (CameraPane.Xmin > spot.x)
73717393 //            {
73727394 //                CameraPane.Xmin = spot.x;
....@@ -7386,9 +7408,9 @@
73867408             // bonhommes info.g.drawLine(spotw, spoth, spotw, spoth - boundary.height/2); // 15
73877409             //info.g.drawLine(spotw, spoth, spotw - boundary.width/2, spoth); // 15
73887410             spot.translate(0, -32);
7389
-            info.g.setColor(Color.yellow);
7390
-            info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7391
-            info.g.setColor(Color.green);
7411
+            clickInfo.g.setColor(Color.yellow);
7412
+            clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
7413
+            clickInfo.g.setColor(Color.green);
73927414 //            if (CameraPane.Xmin > spot.x)
73937415 //            {
73947416 //                CameraPane.Xmin = spot.x;
....@@ -7405,8 +7427,8 @@
74057427 //            {
74067428 //                CameraPane.Ymax = spoth;
74077429 //            }
7408
-            info.g.drawArc(boundary.x + info.DX, boundary.y + info.DY,
7409
-                    (int)(boundary.width * info.W), (int)(boundary.height * info.W), 0, 360);
7430
+            clickInfo.g.drawArc(boundary.x + clickInfo.DX, boundary.y + clickInfo.DY,
7431
+                    (int)(boundary.width * clickInfo.W), (int)(boundary.height * clickInfo.W), 0, 360);
74107432             //info.g.drawArc(spot.x, spotw, spot.width/2, boundary.height/2, 0, 360);
74117433 //            if (CameraPane.Xmin > boundary.x)
74127434 //            {
....@@ -7428,7 +7450,8 @@
74287450         }
74297451     }
74307452 
7431
-    boolean doEditClick0(ClickInfo info, int level)
7453
+    boolean doEditClick0(//ClickInfo clickInfo, 
7454
+                int level)
74327455     {
74337456         if (level == 0)
74347457         {
....@@ -7437,8 +7460,8 @@
74377460 
74387461         boolean retval = false;
74397462 
7440
-        startX = info.x;
7441
-        startY = info.y;
7463
+        startX = clickInfo.x;
7464
+        startY = clickInfo.y;
74427465 
74437466         hitSomething = -1;
74447467         cVector origin = new cVector();
....@@ -7448,22 +7471,51 @@
74487471         {
74497472             centerPt = new Point(0, 0);
74507473         }
7451
-        calcHotSpot(origin, info, centerPt, spot);
7452
-        if (spot.contains(info.x, info.y))
7474
+        calcHotSpot(origin, //info,
7475
+                centerPt, spot);
7476
+        if (spot.contains(clickInfo.x, clickInfo.y))
74537477         {
74547478             hitSomething = hitCenter;
74557479             retval = true;
74567480         }
74577481         spot.translate(32, 0);
7458
-        if (spot.contains(info.x, info.y))
7482
+        if (spot.contains(clickInfo.x, clickInfo.y))
74597483         {
74607484             hitSomething = hitRotate;
74617485             retval = true;
74627486         }
74637487         spot.translate(0, 32);
7464
-        if (spot.contains(info.x, info.y))
7488
+        if (spot.contains(clickInfo.x, clickInfo.y))
74657489         {
74667490             hitSomething = hitScale;
7491
+            
7492
+        double scale = 0.005f * clickInfo.camera.Distance();
7493
+                double hScale = (double) (clickInfo.x /*- centerPt.x*/) / 32;
7494
+                double sign = 1;
7495
+                if (hScale < 0)
7496
+                {
7497
+                    sign = -1;
7498
+                }
7499
+                hScale = sign*Math.pow(sign*hScale, scale * 50);
7500
+                if (hScale < 0.01)
7501
+                {
7502
+                    //hScale = 0.01;
7503
+                }
7504
+                
7505
+                double vScale = (double) (clickInfo.y /*- centerPt.y*/) / 32;
7506
+                sign = 1;
7507
+                if (vScale < 0)
7508
+                {
7509
+                    sign = -1;
7510
+                }
7511
+                vScale = sign*Math.pow(sign*vScale, scale * 50);
7512
+                if (vScale < 0.01)
7513
+                {
7514
+                    //vScale = 0.01;
7515
+                }
7516
+                
7517
+                clickInfo.scale = Math.sqrt(hScale*hScale + vScale*vScale);
7518
+                
74677519             retval = true;
74687520         }
74697521 
....@@ -7473,7 +7525,7 @@
74737525         }
74747526 
74757527         //System.out.println("info.modifiers = " + info.modifiers);
7476
-        modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
7528
+        modified = (clickInfo.modifiers & CameraPane.SHIFT) != 0; // Was META
74777529         //System.out.println("modified = " + modified);
74787530         //new Exception().printStackTrace();
74797531         //viewCode = info.pane.renderCamera.viewCode;
....@@ -7501,7 +7553,8 @@
75017553         return true;
75027554     }
75037555 
7504
-    void doEditDrag0(ClickInfo info, boolean opposite)
7556
+    void doEditDrag0(//ClickInfo info,
7557
+            boolean opposite)
75057558     {
75067559         if (hitSomething == 0)
75077560         {
....@@ -7515,7 +7568,7 @@
75157568 
75167569         //System.out.println("hitSomething = " + hitSomething);
75177570 
7518
-        double scale = 0.005f * info.camera.Distance();
7571
+        double scale = 0.005f * clickInfo.camera.Distance();
75197572         
75207573         cVector xlate = new cVector();
75217574         //cVector xlate2 = new cVector();
....@@ -7549,8 +7602,8 @@
75497602                     toParent[3][i] = xlate.get(i);
75507603                     LA.matInvert(toParent, fromParent);
75517604                      */
7552
-                    cVector delta = LA.newVector(0, 0, startY - info.y);
7553
-                    LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
7605
+                    cVector delta = LA.newVector(0, 0, startY - clickInfo.y);
7606
+                    LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
75547607 
75557608                     LA.matCopy(startMat, toParent);
75567609                     LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
....@@ -7559,7 +7612,7 @@
75597612                 } else
75607613                 {
75617614                     //LA.xformDir(delta, info.camera.fromScreen, delta);
7562
-                    cVector up = new cVector(info.camera.up);
7615
+                    cVector up = new cVector(clickInfo.camera.up);
75637616                     cVector away = new cVector();
75647617                     //cVector right2 = new cVector();
75657618                     //LA.vecCross(up, cVector.Z, right);
....@@ -7576,19 +7629,19 @@
75767629                     LA.xformDir(up, ClickInfo.matbuffer, up);
75777630     //                if (!CameraPane.LOCALTRANSFORM)
75787631                         LA.xformDir(up, Globals.theRenderer.RenderCamera().toScreen, up);
7579
-                    LA.xformDir(info.camera.away, ClickInfo.matbuffer, away);
7632
+                    LA.xformDir(clickInfo.camera.away, ClickInfo.matbuffer, away);
75807633     //                if (!CameraPane.LOCALTRANSFORM)
75817634                         LA.xformDir(away, Globals.theRenderer.RenderCamera().toScreen, away);
75827635                     //LA.vecCross(up, cVector.Z, right2);
75837636 
7584
-                    cVector delta = LA.newVector(info.x - startX, startY - info.y, 0);
7637
+                    cVector delta = LA.newVector(clickInfo.x - startX, startY - clickInfo.y, 0);
75857638 
75867639                     //System.out.println("DELTA0 = " + delta);
75877640                     //System.out.println("AWAY = " + info.camera.away);
75887641                     //System.out.println("UP = " + info.camera.up);
75897642                     if (away.z > 0)
75907643                     {
7591
-                        if (info.camera.up.x == 0) // LA.vecDot(right, right2)<0)
7644
+                        if (clickInfo.camera.up.x == 0) // LA.vecDot(right, right2)<0)
75927645                         {
75937646                             delta.x = -delta.x;
75947647                         } else
....@@ -7603,7 +7656,7 @@
76037656                     //System.out.println("DELTA1 = " + delta);
76047657                     LA.xformDir(delta, ClickInfo.matbuffer, delta);
76057658                     //System.out.println("DELTA2 = " + delta);
7606
-                    LA.xformDir(delta, new Camera(info.camera.viewCode).fromScreen, delta);
7659
+                    LA.xformDir(delta, new Camera(clickInfo.camera.viewCode).fromScreen, delta);
76077660                     LA.matCopy(startMat, toParent);
76087661                     //System.out.println("DELTA3 = " + delta);
76097662                     LA.matTranslate(toParent, delta.x * scale, delta.y * scale, delta.z * scale);
....@@ -7613,8 +7666,8 @@
76137666                 break;
76147667 
76157668             case hitRotate: // rotate
7616
-                int dx = info.x - centerPt.x;
7617
-                int dy = -(info.y - centerPt.y);
7669
+                int dx = clickInfo.x - centerPt.x;
7670
+                int dy = -(clickInfo.y - centerPt.y);
76187671                 double angle = (double) Math.atan2(dx, dy);
76197672                 angle = -(1.570796 - angle);
76207673 
....@@ -7637,7 +7690,7 @@
76377690                 }
76387691                 /**/
76397692 
7640
-                switch (info.pane.RenderCamera().viewCode)
7693
+                switch (clickInfo.pane.RenderCamera().viewCode)
76417694                 {
76427695                     case 1: // '\001'
76437696                         LA.matZRotate(toParent, angle);
....@@ -7664,7 +7717,7 @@
76647717                 break;
76657718 
76667719             case hitScale: // scale
7667
-                double hScale = (double) (info.x - centerPt.x) / 32;
7720
+                double hScale = (double) (clickInfo.x /*- centerPt.x*/) / 32;
76687721                 double sign = 1;
76697722                 if (hScale < 0)
76707723                 {
....@@ -7676,7 +7729,7 @@
76767729                     //hScale = 0.01;
76777730                 }
76787731                 
7679
-                double vScale = (double) (info.y - centerPt.y) / 32;
7732
+                double vScale = (double) (clickInfo.y /*- centerPt.y*/) / 32;
76807733                 sign = 1;
76817734                 if (vScale < 0)
76827735                 {
....@@ -7687,6 +7740,7 @@
76877740                 {
76887741                     //vScale = 0.01;
76897742                 }
7743
+                
76907744                 LA.matCopy(startMat, toParent);
76917745                 /**/
76927746                 for (int i = 0; i < 3; i++)
....@@ -7696,14 +7750,14 @@
76967750                 }
76977751                 /**/
76987752 
7699
-                double totalScale = Math.sqrt(hScale*hScale + vScale*vScale) / Math.sqrt(2);
7753
+                double totalScale = Math.sqrt(hScale*hScale + vScale*vScale) / clickInfo.scale;
77007754                         
77017755                 if (totalScale < 0.01)
77027756                 {
77037757                     totalScale = 0.01;
77047758                 }
77057759                 
7706
-                switch (info.pane.RenderCamera().viewCode)
7760
+                switch (clickInfo.pane.RenderCamera().viewCode)
77077761                 {
77087762                     case 3: // '\001'
77097763                         if (modified || opposite)
....@@ -7770,7 +7824,7 @@
77707824         } // NEW ...
77717825         
77727826         
7773
-        info.pane.repaint();
7827
+        clickInfo.pane.repaint();
77747828     }
77757829 
77767830     boolean overflow = false;