Fix physics UI

Normand Briere

2019-08-06 b3ae4e889872ca0b9ca76f1d17b2f0b961226729

 Torus.java
..
..
@@ -2,7 +2,7 @@
2
2
 
3
3
 class Torus extends Biparam implements java.io.Serializable
4
4
 {
5
-        //static final long serialVersionUID = -7637054329820073252L;
5
+        static final long serialVersionUID = -7637054329820073252L; // Old
6
6
 
7
7
     Torus()
8
8
     {
..
..
@@ -64,7 +64,7 @@
64
64
             v = 0;
65
65
         
66
66
         double uAng = u * 2 * Math.PI;
67
-        double vAng = v * 2 * Math.PI;
67
+        double vAng = -v * 2 * Math.PI;
68
68
         double cosua = Math.cos(uAng);
69
69
         double sinua = Math.sin(uAng);
70
70
         double cosva = Math.cos(vAng);
..
..
@@ -118,55 +118,59 @@
118
118
         return rad2 <= minor * minor;
119
119
     }
120
120
 
121
-    void drawEditHandles(ClickInfo info, int level)
121
+    void drawEditHandles(//ClickInfo info,
122
+            int level)
122
123
     {
123
124
         if (level == 0)
124
125
         {
125
126
             return;
126
127
         } else
127
128
         {
128
-            super.drawEditHandles(info, level);
129
+            super.drawEditHandles(//info,
130
+                    level);
129
131
             cVector temp = LA.newVector(0, 0, minor);
130
132
             LA.xformPos(temp, toParent, temp);
131
-            Rectangle majorSpot = calcHotSpot(temp, info);
133
+            Rectangle majorSpot = calcHotSpot(temp); //, info);
132
134
             majorSpot.translate(4, 4);
133
135
             temp.x = major;
134
136
             temp.y = temp.z = 0;
135
137
             LA.xformPos(temp, toParent, temp);
136
-            Rectangle minorSpot = calcHotSpot(temp, info);
138
+            Rectangle minorSpot = calcHotSpot(temp); //, info);
137
139
             minorSpot.translate(4, 4);
138
-            info.g.setColor(Color.green);
139
-            info.g.fillRect(majorSpot.x, majorSpot.y, majorSpot.width, majorSpot.height);
140
-            info.g.fillRect(minorSpot.x, minorSpot.y, minorSpot.width, minorSpot.height);
140
+            clickInfo.g.setColor(Color.green);
141
+            clickInfo.g.fillRect(majorSpot.x, majorSpot.y, majorSpot.width, majorSpot.height);
142
+            clickInfo.g.fillRect(minorSpot.x, minorSpot.y, minorSpot.width, minorSpot.height);
141
143
             return;
142
144
         }
143
145
     }
144
146
 
145
-    boolean doEditClick(ClickInfo info, int level)
147
+    boolean doEditClick(//ClickInfo info,
148
+            int level)
146
149
     {
147
150
         if (level == 0)
148
151
             return false;
149
152
         hitSomething = 0;
150
-        if (super.doEditClick(info, level))
153
+        if (super.doEditClick(//info,
154
+                level))
151
155
         {
152
156
             hitSomething = 1;
153
157
             return true;
154
158
         }
155
159
         cVector temp = LA.newVector(0, 0, minor);
156
160
         LA.xformPos(temp, toParent, temp);
157
-        Rectangle majorSpot = calcHotSpot(temp, info);
161
+        Rectangle majorSpot = calcHotSpot(temp); //, info);
158
162
         majorSpot.translate(4, 4);
159
163
         temp.x = major;
160
164
         temp.y = temp.z = 0;
161
165
         LA.xformPos(temp, toParent, temp);
162
-        Rectangle minorSpot = calcHotSpot(temp, info);
166
+        Rectangle minorSpot = calcHotSpot(temp); //, info);
163
167
         minorSpot.translate(4, 4);
164
-        if (majorSpot.contains(info.x, info.y))
168
+        if (majorSpot.contains(clickInfo.x, clickInfo.y))
165
169
         {
166
170
             hitSomething = 2;
167
171
             startRad = major;
168
172
         } else
169
-        if (minorSpot.contains(info.x, info.y))
173
+        if (minorSpot.contains(clickInfo.x, clickInfo.y))
170
174
         {
171
175
             hitSomething = 3;
172
176
             startRad = minor;
..
..
@@ -174,23 +178,25 @@
174
178
         {
175
179
             return false;
176
180
         }
177
-        startX = info.x;
181
+        startX = clickInfo.x;
178
182
         return true;
179
183
     }
180
184
 
181
-    void doEditDrag(ClickInfo info, boolean opposite)
185
+    void doEditDrag(//ClickInfo info,
186
+            boolean opposite)
182
187
     {
183
188
         if (hitSomething == 0)
184
189
             return;
185
190
         if (hitSomething == 1)
186
191
         {
187
-            super.doEditDrag(info, opposite);
192
+            super.doEditDrag(//info,
193
+                    opposite);
188
194
             return;
189
195
         }
190
-        double deltaR = info.x - startX;
196
+        double deltaR = clickInfo.x - startX;
191
197
         //cVector delta = LA.newVector(info.x - startX, 0, 0);
192
198
         //LA.xformDir(delta, info.camera.fromScreen, delta);
193
-		deltaR /= 100 * info.camera.SCALE / info.camera.Distance();
199
+		deltaR /= 100 * clickInfo.camera.SCALE / clickInfo.camera.Distance();
194
200
         double newRad = startRad + deltaR;
195
201
         if (newRad < 0)
196
202
             newRad = 0;
..
..
@@ -199,7 +205,7 @@
199
205
         else
200
206
             minor = newRad;
201
207
         recalculate();
202
-        info.pane.repaint();
208
+        clickInfo.pane.repaint();
203
209
     }
204
210
 
205
211
     double major;