Rename Grafreed

Normand Briere

2019-05-05 623dc0fa8cbd9473830a1786f6d49fa808a09439

 Object3D.java
..
..
@@ -954,7 +954,7 @@
954
954
 
955
955
     public Object clone()
956
956
     {
957
-        return GrafreeD.clone(this);
957
+        return Grafreed.clone(this);
958
958
     }
959
959
 
960
960
     Object3D copyExpand()
..
..
@@ -1729,7 +1729,7 @@
1729
1729
             Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1730
1730
             o.bRep = transientrep;
1731
1731
             if (clone)
1732
-                o.bRep = (BoundaryRep) GrafreeD.clone(transientrep);
1732
+                o.bRep = (BoundaryRep) Grafreed.clone(transientrep);
1733
1733
             o.CreateMaterial();
1734
1734
             o.SetAttributes(this, -1);
1735
1735
             //parent
..
..
@@ -1742,7 +1742,7 @@
1742
1742
             Object3D o = new Object3D((clone?"Ge:":"Li:") + this.name);
1743
1743
             o.bRep = bRep;
1744
1744
             if (clone)
1745
-                o.bRep = (BoundaryRep) GrafreeD.clone(bRep);
1745
+                o.bRep = (BoundaryRep) Grafreed.clone(bRep);
1746
1746
             o.CreateMaterial();
1747
1747
             //o.overwriteThis(this, -1);
1748
1748
             o.SetAttributes(this, -1);
..
..
@@ -2477,13 +2477,13 @@
2477
2477
         return retval;
2478
2478
     }
2479
2479
 
2480
-    void doEditDrag(ClickInfo info)
2480
+    void doEditDrag(ClickInfo info, boolean opposite)
2481
2481
     {
2482
2482
         switch (doSomething)
2483
2483
         {
2484
2484
             case 1: // '\001'
2485
2485
                 //super.
2486
-                        doEditDrag0(info);
2486
+                        doEditDrag0(info, opposite);
2487
2487
                 break;
2488
2488
 
2489
2489
             case 2: // '\002'
..
..
@@ -2496,11 +2496,11 @@
2496
2496
                     {
2497
2497
                         //sel.hitSomething = childToDrag.hitSomething;
2498
2498
                         //childToDrag.doEditDrag(info);
2499
-                        sel.doEditDrag(info);
2499
+                        sel.doEditDrag(info, opposite);
2500
2500
                     } else
2501
2501
                     {
2502
2502
                         //super.
2503
-                                doEditDrag0(info);
2503
+                                doEditDrag0(info, opposite);
2504
2504
                     }
2505
2505
                 }
2506
2506
                 break;
..
..
@@ -3204,7 +3204,7 @@
3204
3204
         
3205
3205
         BoundaryRep sup = bRep.support;
3206
3206
         bRep.support = null;
3207
-        BoundaryRep temprep = (BoundaryRep) GrafreeD.clone(bRep);
3207
+        BoundaryRep temprep = (BoundaryRep) Grafreed.clone(bRep);
3208
3208
 //            bRep.SplitInTwo(onlyone); // thread...
3209
3209
             temprep.SplitInTwo(reduction34, onlyone);
3210
3210
             bRep = temprep;
..
..
@@ -3728,7 +3728,7 @@
3728
3728
             if (child == null)
3729
3729
                 continue;
3730
3730
             
3731
-            if (GrafreeD.RENDERME > 0)
3731
+            if (Grafreed.RENDERME > 0)
3732
3732
             {
3733
3733
                 if (child instanceof Merge)
3734
3734
                     ((Merge)child).renderme();
..
..
@@ -3879,7 +3879,7 @@
3879
3879
                 if (child == null)
3880
3880
                     continue;
3881
3881
                 
3882
-                if (GrafreeD.RENDERME > 0)
3882
+                if (Grafreed.RENDERME > 0)
3883
3883
                 {
3884
3884
                     if (child instanceof Merge)
3885
3885
                         ((Merge)child).renderme();
..
..
@@ -4074,7 +4074,7 @@
4074
4074
                 if (child == null)
4075
4075
                     continue;
4076
4076
                 
4077
-                if (GrafreeD.RENDERME > 0)
4077
+                if (Grafreed.RENDERME > 0)
4078
4078
                 {
4079
4079
                     if (child instanceof Merge)
4080
4080
                         ((Merge)child).renderme();
..
..
@@ -7012,7 +7012,7 @@
7012
7012
         return true;
7013
7013
     }
7014
7014
 
7015
-    void doEditDrag0(ClickInfo info)
7015
+    void doEditDrag0(ClickInfo info, boolean opposite)
7016
7016
     {
7017
7017
         if (hitSomething == 0)
7018
7018
         {
..
..
@@ -7039,7 +7039,7 @@
7039
7039
                 
7040
7040
                 scale *= 0.05f * Globals.theRenderer.RenderCamera().Distance();
7041
7041
                 
7042
-                if (modified)
7042
+                if (modified || opposite)
7043
7043
                 {
7044
7044
                     //assert(false);
7045
7045
                             /*
..
..
@@ -7133,6 +7133,7 @@
7133
7133
 
7134
7134
                 if (modified)
7135
7135
                 {
7136
+                    // Rotate 90 degrees
7136
7137
                     angle /= (Math.PI / 4);
7137
7138
                     angle = Math.floor(angle + 0.5);
7138
7139
                     angle *= (Math.PI / 4);
..
..
@@ -7566,7 +7567,7 @@
7566
7567
         {
7567
7568
             assert(bRep != null);
7568
7569
             if (!(support instanceof GenericJoint)) // support.bRep != null)
7569
-                GrafreeD.Assert(support.bRep == bRep.support);
7570
+                Grafreed.Assert(support.bRep == bRep.support);
7570
7571
         }
7571
7572
         else
7572
7573
         {