Fix box and VR keys.

Normand Briere

2019-08-16 64e20f390e4b8e58bd0006dde8fa10fba1dac1d5

 Torus.java
..
..
@@ -2,6 +2,8 @@
2
2
 
3
3
 class Torus extends Biparam implements java.io.Serializable
4
4
 {
5
+        static final long serialVersionUID = -7637054329820073252L; // Old
6
+
5
7
     Torus()
6
8
     {
7
9
         inPnt = new cVector();
..
..
@@ -54,6 +56,11 @@
54
56
         buffer.append("}\n");
55
57
     }
56
58
 
59
+    double uStretch()
60
+    {
61
+        return 6; // Actually 6.28 (I think)
62
+    }
63
+    
57
64
     Vertex biparamFunction(double u, double v)
58
65
     {
59
66
         if (u == 1)
..
..
@@ -61,21 +68,33 @@
61
68
         if (v == 1)
62
69
             v = 0;
63
70
         
64
-        double uAng = LA.toRadians((1-u) * 360);
65
-        double vAng = LA.toRadians(v * 360);
66
-        double x = (double)Math.cos(uAng) * (major + (double)Math.cos(vAng) * minor);
67
-        double y = (double)Math.sin(vAng) * minor;
71
+        double uAng = u * 2 * Math.PI;
72
+        double vAng = -v * 2 * Math.PI;
73
+        double cosua = Math.cos(uAng);
74
+        double sinua = Math.sin(uAng);
75
+        double cosva = Math.cos(vAng);
76
+        double sinva = Math.sin(vAng);
77
+        
78
+        double radius = (major + cosva * minor);
79
+        double x = cosua * radius;
80
+        double y = sinva * minor;
68
81
         if (Math.abs(y) < 1E-10)
69
82
             y = 0; // hashtable issue
70
-        double z = (double)Math.sin(uAng) * (major + (double)Math.cos(vAng) * minor);
83
+        
84
+        double z = sinua * radius;
71
85
         cVector tPos = LA.newVector(x, y, z);
72
-        double xx = (double)(Math.cos(uAng) * Math.cos(vAng)) * minor;
73
-        double zz = (double)(Math.sin(uAng) * Math.cos(vAng)) * minor;
86
+        
87
+        double xx = cosua * cosva * minor;
88
+        double zz = sinua * cosva * minor;
89
+        
74
90
         cVector tNorm = LA.newVector(xx, y, zz);
75
91
         Vertex temp = new Vertex(tPos);
76
92
         //temp.pos = tPos; // useless new
77
93
         temp.norm = tNorm;
78
94
 		LA.vecNormalize(temp.norm);
95
+                
96
+        temp.y += minor;
97
+                
79
98
         return temp;
80
99
     }
81
100
 
..
..
@@ -107,55 +126,59 @@
107
126
         return rad2 <= minor * minor;
108
127
     }
109
128
 
110
-    void drawEditHandles(ClickInfo info, int level)
129
+    void drawEditHandles(//ClickInfo info,
130
+            int level)
111
131
     {
112
132
         if (level == 0)
113
133
         {
114
134
             return;
115
135
         } else
116
136
         {
117
-            super.drawEditHandles(info, level);
137
+            super.drawEditHandles(//info,
138
+                    level);
118
139
             cVector temp = LA.newVector(0, 0, minor);
119
140
             LA.xformPos(temp, toParent, temp);
120
-            Rectangle majorSpot = calcHotSpot(temp, info);
141
+            Rectangle majorSpot = calcHotSpot(temp); //, info);
121
142
             majorSpot.translate(4, 4);
122
143
             temp.x = major;
123
144
             temp.y = temp.z = 0;
124
145
             LA.xformPos(temp, toParent, temp);
125
-            Rectangle minorSpot = calcHotSpot(temp, info);
146
+            Rectangle minorSpot = calcHotSpot(temp); //, info);
126
147
             minorSpot.translate(4, 4);
127
-            info.g.setColor(Color.green);
128
-            info.g.fillRect(majorSpot.x, majorSpot.y, majorSpot.width, majorSpot.height);
129
-            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);
130
151
             return;
131
152
         }
132
153
     }
133
154
 
134
-    boolean doEditClick(ClickInfo info, int level)
155
+    boolean doEditClick(//ClickInfo info,
156
+            int level)
135
157
     {
136
158
         if (level == 0)
137
159
             return false;
138
160
         hitSomething = 0;
139
-        if (super.doEditClick(info, level))
161
+        if (super.doEditClick(//info,
162
+                level))
140
163
         {
141
164
             hitSomething = 1;
142
165
             return true;
143
166
         }
144
167
         cVector temp = LA.newVector(0, 0, minor);
145
168
         LA.xformPos(temp, toParent, temp);
146
-        Rectangle majorSpot = calcHotSpot(temp, info);
169
+        Rectangle majorSpot = calcHotSpot(temp); //, info);
147
170
         majorSpot.translate(4, 4);
148
171
         temp.x = major;
149
172
         temp.y = temp.z = 0;
150
173
         LA.xformPos(temp, toParent, temp);
151
-        Rectangle minorSpot = calcHotSpot(temp, info);
174
+        Rectangle minorSpot = calcHotSpot(temp); //, info);
152
175
         minorSpot.translate(4, 4);
153
-        if (majorSpot.contains(info.x, info.y))
176
+        if (majorSpot.contains(clickInfo.x, clickInfo.y))
154
177
         {
155
178
             hitSomething = 2;
156
179
             startRad = major;
157
180
         } else
158
-        if (minorSpot.contains(info.x, info.y))
181
+        if (minorSpot.contains(clickInfo.x, clickInfo.y))
159
182
         {
160
183
             hitSomething = 3;
161
184
             startRad = minor;
..
..
@@ -163,23 +186,25 @@
163
186
         {
164
187
             return false;
165
188
         }
166
-        startX = info.x;
189
+        startX = clickInfo.x;
167
190
         return true;
168
191
     }
169
192
 
170
-    void doEditDrag(ClickInfo info)
193
+    void doEditDrag(//ClickInfo info,
194
+            boolean opposite)
171
195
     {
172
196
         if (hitSomething == 0)
173
197
             return;
174
198
         if (hitSomething == 1)
175
199
         {
176
-            super.doEditDrag(info);
200
+            super.doEditDrag(//info,
201
+                    opposite);
177
202
             return;
178
203
         }
179
-        double deltaR = info.x - startX;
204
+        double deltaR = clickInfo.x - startX;
180
205
         //cVector delta = LA.newVector(info.x - startX, 0, 0);
181
206
         //LA.xformDir(delta, info.camera.fromScreen, delta);
182
-		deltaR /= 100 * info.camera.SCALE / info.camera.Distance();
207
+		deltaR /= 100 * clickInfo.camera.SCALE / clickInfo.camera.Distance();
183
208
         double newRad = startRad + deltaR;
184
209
         if (newRad < 0)
185
210
             newRad = 0;
..
..
@@ -188,7 +213,7 @@
188
213
         else
189
214
             minor = newRad;
190
215
         recalculate();
191
-        info.pane.repaint();
216
+        clickInfo.pane.repaint();
192
217
     }
193
218
 
194
219
     double major;