Dangerous "reset".

Normand Briere

2019-11-07 f868664f7e7626f651e6ade9c9f6863851ef43b7

 BezierSurface.java
..
..
@@ -67,7 +67,7 @@
67
67
         return l;
68
68
     }
69
69
 
70
-	void draw(CameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
70
+	void draw(iCameraPane display, Object3D /*Composite*/ root, boolean selected, boolean blocked)
71
71
 	{
72
72
 	//	((BezierSurface)parent.parent).currentHandle = (Sphere)this;
73
73
         //        parent.parent.recalculate();
..
..
@@ -117,39 +117,43 @@
117
117
             Point prev = new Point(0, 0);
118
118
             Point curr = new Point(0, 0);
119
119
             Rectangle dummy = new Rectangle();
120
-            calcHotSpot(sample, info, prev, dummy);
120
+            calcHotSpot(sample, //info,
121
+                    prev, dummy);
121
122
 			sample = ((Sphere)ctrlPnts.get(i)).getCenter();
122
-            calcHotSpot(sample, info, curr, dummy);
123
+            calcHotSpot(sample, //info,
124
+                    curr, dummy);
123
125
             info.g.drawLine(prev.x, prev.y, curr.x, curr.y);
124
126
             prev.x = curr.x;
125
127
             prev.y = curr.y;
126
128
         }
127
129
     }
128
130
 
129
-    void drawEditHandles(ClickInfo info, int level)
131
+    void drawEditHandles(//ClickInfo info,
132
+            int level)
130
133
     {
131
-        info.g.setColor(Color.red);
134
+        clickInfo.g.setColor(Color.red);
132
135
         int count = ctrlPnts.size();
133
136
         for (int i=0; i < count; i++)
134
137
         {
135
138
             cVector p = ((Sphere)ctrlPnts.elementAt(i)).getCenter();
136
-            Rectangle spot = calcHotSpot(p, info);
137
-            info.g.fillRect(spot.x, spot.y, spot.width, spot.height);
139
+            Rectangle spot = calcHotSpot(p); //, info);
140
+            clickInfo.g.fillRect(spot.x, spot.y, spot.width, spot.height);
138
141
         }
139
142
 
140
143
     }
141
144
 
142
-    boolean doEditClick(ClickInfo info, int level)
145
+    boolean doEditClick(//ClickInfo info,
146
+            int level)
143
147
     {
144
-        startX = info.x;
145
-        startY = info.y;
148
+        startX = clickInfo.x;
149
+        startY = clickInfo.y;
146
150
         int nPoints = ctrlPnts.size();
147
151
         hitSomething = false;
148
152
         for (int i=0; i < nPoints; i++)
149
153
         {
150
154
             cVector p = ((Sphere)ctrlPnts.elementAt(i)).getCenter();
151
-            Rectangle r = calcHotSpot(p, info);
152
-            if (r.contains(info.x, info.y))
155
+            Rectangle r = calcHotSpot(p); //, info);
156
+            if (r.contains(clickInfo.x, clickInfo.y))
153
157
             {
154
158
                 hitSomething = true;
155
159
                 hitIndex = i;