Replace on make off.

Normand Briere

2019-09-22 e96132853038f55cdb6e27f116852cff0e813f00

 Spline.java
..
..
@@ -19,9 +19,9 @@
19
19
         return spline;
20
20
     }
21
21
 
22
-    protected void deepCopySelf(Object3D other)
22
+    protected void deepCopyNode(Object3D other)
23
23
     {
24
-        super.deepCopySelf(other);
24
+        super.deepCopyNode(other);
25
25
         Spline spline = (Spline)other;
26
26
         spline.type = type;
27
27
         int count = ctrlPnts.size();
..
..
@@ -157,11 +157,13 @@
157
157
             Point prev = new Point(0, 0);
158
158
             Point curr = new Point(0, 0);
159
159
             Rectangle dummy = new Rectangle();
160
-            calcHotSpot(sample, info, prev, dummy);
160
+            calcHotSpot(sample, //info,
161
+                    prev, dummy);
161
162
             for (double t = 0.1; t < 1.01; t += 0.1)
162
163
             {
163
164
                 solve(t, a, b, c, d, sample);
164
-                calcHotSpot(sample, info, curr, dummy);
165
+                calcHotSpot(sample, //info,
166
+                        curr, dummy);
165
167
                 info.g.drawLine(prev.x, prev.y, curr.x, curr.y);
166
168
                 info.g.drawLine(prev.x, prev.y + 1, curr.x, curr.y + 1);
167
169
                 info.g.drawLine(prev.x + 1, prev.y, curr.x + 1, curr.y);
..
..
@@ -181,7 +183,7 @@
181
183
         for (int i=0; i < count; i++)
182
184
         {
183
185
             cVector p = (cVector)ctrlPnts.elementAt(i);
184
-            Rectangle spot = calcHotSpot(p, info);
186
+            Rectangle spot = calcHotSpot(p); //, info);
185
187
             info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
186
188
         }
187
189
 
..
..
@@ -189,7 +191,7 @@
189
191
 
190
192
     boolean doEditClick(ClickInfo info, int level)
191
193
     {
192
-        boolean modified = (info.modifiers & CameraPane.META) != 0;
194
+        boolean modified = (info.modifiers & CameraPane.SHIFT) != 0; // Was META
193
195
         startX = info.x;
194
196
         startY = info.y;
195
197
         int nPoints = ctrlPnts.size();
..
..
@@ -197,7 +199,7 @@
197
199
         for (int i=0; i < nPoints; i++)
198
200
         {
199
201
             cVector p = (cVector)ctrlPnts.elementAt(i);
200
-            Rectangle r = calcHotSpot(p, info);
202
+            Rectangle r = calcHotSpot(p); //, info);
201
203
             if (r.contains(info.x, info.y))
202
204
             {
203
205
                 hitSomething = true;
..
..
@@ -235,7 +237,8 @@
235
237
             for (double t = 0; t < 1.001; t += 0.01)
236
238
             {
237
239
                 solve(t, a, b, c, d, sample);
238
-                calcHotSpot(sample, info, pnt, rect);
240
+                calcHotSpot(sample, //info,
241
+                        pnt, rect);
239
242
                 if (!rect.contains(info.x, info.y))
240
243
                     continue;
241
244
                 hitSomething = true;