Camera global inverse.

Normand Briere

2019-07-25 f2b6a33fdf84a06b958f9cb9d667a2eff3063d8b

 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
     {
..
..
@@ -263,9 +263,11 @@
263
263
         editWindow = objectUI.GetEditor();
264
264
     }
265
265
 
266
-    void drawEditHandles(ClickInfo info, int level)
266
+    void drawEditHandles(//ClickInfo info,
267
+            int level)
267
268
     {
268
-        super.drawEditHandles(info, level);
269
+        super.drawEditHandles(//info,
270
+                level);
269
271
         if (level == 1)
270
272
         {
271
273
             return;
..
..
@@ -273,37 +275,39 @@
273
275
         {
274
276
             cVector temp = new cVector();
275
277
             LA.xformPos(base, toParent, temp);
276
-            Rectangle baseSpot = calcHotSpot(temp, info);
278
+            Rectangle baseSpot = calcHotSpot(temp); //, info);
277
279
             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);
280
+            Rectangle apexSpot = calcHotSpot(temp); //, info);
281
+            clickInfo.g.setColor(Color.green);
282
+            clickInfo.g.fillRect(baseSpot.x, baseSpot.y, baseSpot.width, baseSpot.height);
283
+            clickInfo.g.fillRect(apexSpot.x, apexSpot.y, apexSpot.width, apexSpot.height);
282
284
             return;
283
285
         }
284
286
     }
285
287
 
286
-    boolean doEditClick(ClickInfo info, int level)
288
+    boolean doEditClick(//ClickInfo info,
289
+            int level)
287
290
     {
288
291
         //if (level == 0)
289
292
             //return false;
290
293
         hitSomething = 0;
291
-        if (super.doEditClick(info, level))
294
+        if (super.doEditClick(//info,
295
+                level))
292
296
         {
293
297
             hitSomething = 1;
294
298
             return true;
295
299
         }
296
300
         cVector temp = new cVector();
297
301
         LA.xformPos(base, toParent, temp);
298
-        Rectangle baseSpot = calcHotSpot(temp, info);
302
+        Rectangle baseSpot = calcHotSpot(temp); //, info);
299
303
         LA.xformPos(apex, toParent, temp);
300
-        Rectangle apexSpot = calcHotSpot(temp, info);
301
-        if (baseSpot.contains(info.x, info.y))
304
+        Rectangle apexSpot = calcHotSpot(temp); //, info);
305
+        if (baseSpot.contains(clickInfo.x, clickInfo.y))
302
306
         {
303
307
             hitSomething = 2;
304
308
             startRad = baseRadius;
305
309
         } else
306
-        if (apexSpot.contains(info.x, info.y))
310
+        if (apexSpot.contains(clickInfo.x, clickInfo.y))
307
311
         {
308
312
             hitSomething = 3;
309
313
             startRad = apexRadius;
..
..
@@ -311,20 +315,22 @@
311
315
         {
312
316
             return false;
313
317
         }
314
-        startX = info.x;
318
+        startX = clickInfo.x;
315
319
         return true;
316
320
     }
317
321
 
318
-    void doEditDrag(ClickInfo info, boolean opposite)
322
+    void doEditDrag(//ClickInfo info,
323
+            boolean opposite)
319
324
     {
320
325
         if (hitSomething == 0)
321
326
             return;
322
327
         if (hitSomething == 1)
323
328
         {
324
-            super.doEditDrag(info, opposite);
329
+            super.doEditDrag(//info,
330
+                    opposite);
325
331
             return;
326
332
         }
327
-        double deltaR = info.x - startX;
333
+        double deltaR = clickInfo.x - startX;
328
334
         double newRad = startRad + deltaR;
329
335
         if (newRad < 0)
330
336
             newRad = 0;
..
..
@@ -333,7 +339,7 @@
333
339
         else
334
340
             apexRadius = newRad;
335
341
         recalculate();
336
-        info.pane.repaint();
342
+        clickInfo.pane.repaint();
337
343
     }
338
344
 
339
345
     cVector base;