Reset transform, fix loop versioning.

Normand Briere

2019-08-17 d5d6485126da83b06645e90e3e4ce66659a56009

 Cone.java
..
..
@@ -2,7 +2,7 @@
2
2
 
3
3
 class Cone extends Biparam implements java.io.Serializable
4
4
 {
5
-    //static final long serialVersionUID = -679715043452968126L;
5
+    static final long serialVersionUID = -2558098774090336324L; // -679715043452968126L;
6
6
 
7
7
     Cone()
8
8
     {
..
..
@@ -193,6 +193,16 @@
193
193
         return inside;
194
194
     }
195
195
 
196
+    double uStretch()
197
+    {
198
+        return 6; // Actually 6.28 (I think)
199
+    }
200
+    
201
+    double vFlip(double v)
202
+    {
203
+        return 1-v;
204
+    }
205
+    
196
206
     Vertex biparamFunction(double u, double v)
197
207
     {
198
208
         cVector tPos;
..
..
@@ -263,9 +273,11 @@
263
273
         editWindow = objectUI.GetEditor();
264
274
     }
265
275
 
266
-    void drawEditHandles(ClickInfo info, int level)
276
+    void drawEditHandles(//ClickInfo info,
277
+            int level)
267
278
     {
268
-        super.drawEditHandles(info, level);
279
+        super.drawEditHandles(//info,
280
+                level);
269
281
         if (level == 1)
270
282
         {
271
283
             return;
..
..
@@ -273,37 +285,39 @@
273
285
         {
274
286
             cVector temp = new cVector();
275
287
             LA.xformPos(base, toParent, temp);
276
-            Rectangle baseSpot = calcHotSpot(temp, info);
288
+            Rectangle baseSpot = calcHotSpot(temp); //, info);
277
289
             LA.xformPos(apex, toParent, temp);
278
-            Rectangle apexSpot = calcHotSpot(temp, info);
279
-            info.g.setColor(Color.green);
280
-            info.g.fillRect(baseSpot.x, baseSpot.y, baseSpot.width, baseSpot.height);
281
-            info.g.fillRect(apexSpot.x, apexSpot.y, apexSpot.width, apexSpot.height);
290
+            Rectangle apexSpot = calcHotSpot(temp); //, info);
291
+            clickInfo.g.setColor(Color.green);
292
+            clickInfo.g.fillRect(baseSpot.x, baseSpot.y, baseSpot.width, baseSpot.height);
293
+            clickInfo.g.fillRect(apexSpot.x, apexSpot.y, apexSpot.width, apexSpot.height);
282
294
             return;
283
295
         }
284
296
     }
285
297
 
286
-    boolean doEditClick(ClickInfo info, int level)
298
+    boolean doEditClick(//ClickInfo info,
299
+            int level)
287
300
     {
288
301
         //if (level == 0)
289
302
             //return false;
290
303
         hitSomething = 0;
291
-        if (super.doEditClick(info, level))
304
+        if (super.doEditClick(//info,
305
+                level))
292
306
         {
293
307
             hitSomething = 1;
294
308
             return true;
295
309
         }
296
310
         cVector temp = new cVector();
297
311
         LA.xformPos(base, toParent, temp);
298
-        Rectangle baseSpot = calcHotSpot(temp, info);
312
+        Rectangle baseSpot = calcHotSpot(temp); //, info);
299
313
         LA.xformPos(apex, toParent, temp);
300
-        Rectangle apexSpot = calcHotSpot(temp, info);
301
-        if (baseSpot.contains(info.x, info.y))
314
+        Rectangle apexSpot = calcHotSpot(temp); //, info);
315
+        if (baseSpot.contains(clickInfo.x, clickInfo.y))
302
316
         {
303
317
             hitSomething = 2;
304
318
             startRad = baseRadius;
305
319
         } else
306
-        if (apexSpot.contains(info.x, info.y))
320
+        if (apexSpot.contains(clickInfo.x, clickInfo.y))
307
321
         {
308
322
             hitSomething = 3;
309
323
             startRad = apexRadius;
..
..
@@ -311,20 +325,22 @@
311
325
         {
312
326
             return false;
313
327
         }
314
-        startX = info.x;
328
+        startX = clickInfo.x;
315
329
         return true;
316
330
     }
317
331
 
318
-    void doEditDrag(ClickInfo info, boolean opposite)
332
+    void doEditDrag(//ClickInfo info,
333
+            boolean opposite)
319
334
     {
320
335
         if (hitSomething == 0)
321
336
             return;
322
337
         if (hitSomething == 1)
323
338
         {
324
-            super.doEditDrag(info, opposite);
339
+            super.doEditDrag(//info,
340
+                    opposite);
325
341
             return;
326
342
         }
327
-        double deltaR = info.x - startX;
343
+        double deltaR = clickInfo.x - startX;
328
344
         double newRad = startRad + deltaR;
329
345
         if (newRad < 0)
330
346
             newRad = 0;
..
..
@@ -333,7 +349,7 @@
333
349
         else
334
350
             apexRadius = newRad;
335
351
         recalculate();
336
-        info.pane.repaint();
352
+        clickInfo.pane.repaint();
337
353
     }
338
354
 
339
355
     cVector base;