Rename link2master to link2support.

Normand Briere

2019-09-18 f9325048496d7cdbcad233f8a6b84c88e79adcc2

 Torus.java
..
..
@@ -2,14 +2,14 @@
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
     {
9
9
         inPnt = new cVector();
10
10
         name = "Torus";
11
-        uDivs = 35; // 64;
12
-        vDivs = 19; // 24;
11
+        uDivs = 61; // 35; // 64;
12
+        vDivs = 21; // 19; // 24;
13
13
         minUDivs = 3;
14
14
         minVDivs = 3;
15
15
         retile();
..
..
@@ -25,9 +25,9 @@
25
25
         return t;
26
26
     }
27
27
 
28
-    protected void deepCopySelf(Object3D other)
28
+    protected void deepCopyNode(Object3D other)
29
29
     {
30
-        super.deepCopySelf(other);
30
+        super.deepCopyNode(other);
31
31
         Torus t = (Torus)other;
32
32
         t.major = major;
33
33
         t.minor = minor;
..
..
@@ -56,6 +56,11 @@
56
56
         buffer.append("}\n");
57
57
     }
58
58
 
59
+    double uStretch()
60
+    {
61
+        return 6; // Actually 6.28 (I think)
62
+    }
63
+    
59
64
     Vertex biparamFunction(double u, double v)
60
65
     {
61
66
         if (u == 1)
..
..
@@ -64,7 +69,7 @@
64
69
             v = 0;
65
70
         
66
71
         double uAng = u * 2 * Math.PI;
67
-        double vAng = v * 2 * Math.PI;
72
+        double vAng = -v * 2 * Math.PI;
68
73
         double cosua = Math.cos(uAng);
69
74
         double sinua = Math.sin(uAng);
70
75
         double cosva = Math.cos(vAng);
..
..
@@ -87,6 +92,9 @@
87
92
         //temp.pos = tPos; // useless new
88
93
         temp.norm = tNorm;
89
94
 		LA.vecNormalize(temp.norm);
95
+                
96
+        temp.y += minor;
97
+                
90
98
         return temp;
91
99
     }
92
100
 
..
..
@@ -118,55 +126,59 @@
118
126
         return rad2 <= minor * minor;
119
127
     }
120
128
 
121
-    void drawEditHandles(ClickInfo info, int level)
129
+    void drawEditHandles(//ClickInfo info,
130
+            int level)
122
131
     {
123
132
         if (level == 0)
124
133
         {
125
134
             return;
126
135
         } else
127
136
         {
128
-            super.drawEditHandles(info, level);
137
+            super.drawEditHandles(//info,
138
+                    level);
129
139
             cVector temp = LA.newVector(0, 0, minor);
130
140
             LA.xformPos(temp, toParent, temp);
131
-            Rectangle majorSpot = calcHotSpot(temp, info);
141
+            Rectangle majorSpot = calcHotSpot(temp); //, info);
132
142
             majorSpot.translate(4, 4);
133
143
             temp.x = major;
134
144
             temp.y = temp.z = 0;
135
145
             LA.xformPos(temp, toParent, temp);
136
-            Rectangle minorSpot = calcHotSpot(temp, info);
146
+            Rectangle minorSpot = calcHotSpot(temp); //, info);
137
147
             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);
148
+            clickInfo.g.setColor(Color.green);
149
+            clickInfo.g.fillRect(majorSpot.x, majorSpot.y, majorSpot.width, majorSpot.height);
150
+            clickInfo.g.fillRect(minorSpot.x, minorSpot.y, minorSpot.width, minorSpot.height);
141
151
             return;
142
152
         }
143
153
     }
144
154
 
145
-    boolean doEditClick(ClickInfo info, int level)
155
+    boolean doEditClick(//ClickInfo info,
156
+            int level)
146
157
     {
147
158
         if (level == 0)
148
159
             return false;
149
160
         hitSomething = 0;
150
-        if (super.doEditClick(info, level))
161
+        if (super.doEditClick(//info,
162
+                level))
151
163
         {
152
164
             hitSomething = 1;
153
165
             return true;
154
166
         }
155
167
         cVector temp = LA.newVector(0, 0, minor);
156
168
         LA.xformPos(temp, toParent, temp);
157
-        Rectangle majorSpot = calcHotSpot(temp, info);
169
+        Rectangle majorSpot = calcHotSpot(temp); //, info);
158
170
         majorSpot.translate(4, 4);
159
171
         temp.x = major;
160
172
         temp.y = temp.z = 0;
161
173
         LA.xformPos(temp, toParent, temp);
162
-        Rectangle minorSpot = calcHotSpot(temp, info);
174
+        Rectangle minorSpot = calcHotSpot(temp); //, info);
163
175
         minorSpot.translate(4, 4);
164
-        if (majorSpot.contains(info.x, info.y))
176
+        if (majorSpot.contains(clickInfo.x, clickInfo.y))
165
177
         {
166
178
             hitSomething = 2;
167
179
             startRad = major;
168
180
         } else
169
-        if (minorSpot.contains(info.x, info.y))
181
+        if (minorSpot.contains(clickInfo.x, clickInfo.y))
170
182
         {
171
183
             hitSomething = 3;
172
184
             startRad = minor;
..
..
@@ -174,23 +186,25 @@
174
186
         {
175
187
             return false;
176
188
         }
177
-        startX = info.x;
189
+        startX = clickInfo.x;
178
190
         return true;
179
191
     }
180
192
 
181
-    void doEditDrag(ClickInfo info, boolean opposite)
193
+    void doEditDrag(//ClickInfo info,
194
+            boolean opposite)
182
195
     {
183
196
         if (hitSomething == 0)
184
197
             return;
185
198
         if (hitSomething == 1)
186
199
         {
187
-            super.doEditDrag(info, opposite);
200
+            super.doEditDrag(//info,
201
+                    opposite);
188
202
             return;
189
203
         }
190
-        double deltaR = info.x - startX;
204
+        double deltaR = clickInfo.x - startX;
191
205
         //cVector delta = LA.newVector(info.x - startX, 0, 0);
192
206
         //LA.xformDir(delta, info.camera.fromScreen, delta);
193
-		deltaR /= 100 * info.camera.SCALE / info.camera.Distance();
207
+		deltaR /= 100 * clickInfo.camera.SCALE / clickInfo.camera.Distance();
194
208
         double newRad = startRad + deltaR;
195
209
         if (newRad < 0)
196
210
             newRad = 0;
..
..
@@ -199,7 +213,7 @@
199
213
         else
200
214
             minor = newRad;
201
215
         recalculate();
202
-        info.pane.repaint();
216
+        clickInfo.pane.repaint();
203
217
     }
204
218
 
205
219
     double major;