Rename link2master to link2support.

Normand Briere

2019-09-18 f9325048496d7cdbcad233f8a6b84c88e79adcc2

 Camera.java
..
..
@@ -52,7 +52,7 @@
52
52
             perspective = true;
53
53
             break;
54
54
         case 1: // '\001'
55
-            location = LA.newVector(4, 0, 0);
55
+            location = LA.newVector(0, 0, 4); // Needed for translation direction
56
56
             perspective = false;
57
57
             break;
58
58
         case 2: // '\002'
..
..
@@ -63,7 +63,7 @@
63
63
             //LA.matXRotate(fromScreen, LA.toRadians(90));
64
64
             break;
65
65
         case 3: // '\003'
66
-            location = LA.newVector(0, 0, 4);
66
+            location = LA.newVector(4, 0, 0); // Needed for translation direction
67
67
             //LA.matZRotate(toScreen, LA.toRadians(-90));
68
68
             //LA.matXRotate(toScreen, LA.toRadians(-90));
69
69
             //LA.matXRotate(fromScreen, LA.toRadians(90));
..
..
@@ -112,6 +112,7 @@
112
112
         
113
113
         material.shift = 90;
114
114
         material.cameralight = 0.2f;
115
+        material.shadowbias = 10;
115
116
     }
116
117
 
117
118
     void setAspect(int width, int height)
..
..
@@ -158,6 +159,11 @@
158
159
 	void RotatePosition(float dx, float dy)
159
160
 	{
160
161
         if(hAspect != 0) return;
162
+        
163
+        if (CameraPane.IMAGEFLIP)
164
+        {
165
+            dx = -dx;
166
+        }
161
167
         
162
168
         if (CameraPane.ROTATECAMERA)
163
169
         {
..
..
@@ -215,6 +221,11 @@
215
221
 	void Translate(float dx, float dy, float scale)
216
222
 	{
217
223
         if(hAspect != 0) return;
224
+        
225
+        if (CameraPane.IMAGEFLIP)
226
+        {
227
+            dx = -dx;
228
+        }
218
229
         
219
230
         if (CameraPane.ROTATECAMERA)
220
231
         {
..
..
@@ -275,24 +286,34 @@
275
286
                 if (scale == 0)
276
287
                 {
277
288
                     // Zoom
278
-                    LA.vecSub(location, lookAt, location);
279
-
280
-                    cVector p = location;
281
-
282
289
                     double factor = Math.exp(-dy/300.0); // (1 + dy/100);
283
290
 
284
-                    p.x *= factor;
285
-                    p.y *= factor;
286
-                    p.z *= factor;
291
+                    if (viewCode != 0)
292
+                    {
293
+                        LA.vecSub(location, lookAt, location);
287
294
 
288
-                    LA.vecAdd(location, lookAt, location);
295
+                        cVector p = location;
296
+
297
+                        p.x *= factor;
298
+                        p.y *= factor;
299
+                        p.z *= factor;
300
+
301
+                        LA.vecAdd(location, lookAt, location);
302
+                    }
303
+                    else
304
+                    if (//shaper_fovy < 180 && factor > 1 ||
305
+                        shaper_fovy * factor < 150)
306
+                    {
307
+                        shaper_fovy *= factor;
308
+                        //System.out.println("fovy = " + shaper_fovy);
309
+                    }
289
310
                 }
290
311
                 else
291
312
                 {
292
313
                     LA.vecSub(location, lookAt, direction);
293
314
 
294
315
                     //scale /= Distance();
295
-                    scale /= shaper_fovy/20;
316
+           //         scale /= shaper_fovy/20;
296
317
 
297
318
                     location.x -= dy * direction.x / scale;
298
319
                     //location.y -= dy * direction.y / scale;
..
..
@@ -313,21 +334,31 @@
313
334
 	
314
335
 	void RotateInterest(float dx, float dy)
315
336
 	{
337
+            right.mul(-1);
338
+            
316
339
             cStatic.point1.set(location);
317
340
             location.set(lookAt);
318
341
             lookAt.set(cStatic.point1);
319
-            right.mul(-1);
342
+            
343
+            cStatic.point1.set(locationBuf);
344
+            locationBuf.set(lookAtBuf);
345
+            lookAtBuf.set(cStatic.point1);
320
346
          //   UP.mul(-1);
321
347
             
322
348
             RotatePosition(dx,-dy);
323
349
             
324
350
          //   UP.mul(-1);
325
351
             right.mul(-1);
352
+            
326
353
             cStatic.point1.set(location);
327
354
             location.set(lookAt);
328
355
             lookAt.set(cStatic.point1);
329
356
             
330
-            //computeTransform();
357
+            cStatic.point1.set(locationBuf);
358
+            locationBuf.set(lookAtBuf);
359
+            lookAtBuf.set(cStatic.point1);
360
+            
361
+            computeTransform();
331
362
 	}
332
363
 	
333
364
     //synchronized // june 2014
..
..
@@ -340,17 +371,52 @@
340
371
             fromScreen = LA.newMatrix();
341
372
         }
342
373
         
374
+        if (locationBuf == null)
375
+        {
376
+            locationBuf = new cVector();
377
+            locationBuf.set(location);
378
+            lookAtBuf = new cVector();
379
+            lookAtBuf.set(lookAt);
380
+            upBuf = new cVector();
381
+            upBuf.set(UP);
382
+//            up2Buf = new cVector();
383
+//            up2Buf.set(UP2);
384
+        }
385
+        else
386
+        {
387
+            double K = 0.25;
388
+            
389
+            locationBuf.y = location.y * K + locationBuf.y * (1 - K);
390
+            lookAtBuf.y = lookAt.y * K + lookAtBuf.y * (1 - K);
391
+            
392
+            upBuf.x = UP.x * K + upBuf.x * (1 - K);
393
+            upBuf.y = UP.y * K + upBuf.y * (1 - K);
394
+            upBuf.z = UP.z * K + upBuf.z * (1 - K);
395
+            upBuf.normalize();
396
+//            up2Buf.x = UP2.x * K + up2Buf.x * (1 - K);
397
+//            up2Buf.y = UP2.y * K + up2Buf.y * (1 - K);
398
+//            up2Buf.z = UP2.z * K + up2Buf.z * (1 - K);
399
+            
400
+            K = 1;
401
+            
402
+            locationBuf.x = location.x * K + locationBuf.x * (1 - K);
403
+            locationBuf.z = location.z * K + locationBuf.z * (1 - K);
404
+            lookAtBuf.x = lookAt.x * K + lookAtBuf.x * (1 - K);
405
+            lookAtBuf.z = lookAt.z * K + lookAtBuf.z * (1 - K);
406
+        }
407
+        
343
408
         cVector up2 = up;
344
409
         cVector right2 = right;
345
410
         
346
-	up2.x = UP.x;
347
-	up2.y = UP.y;
348
-	up2.z = UP.z;
349
-        LA.vecSub(lookAt, location, away);
411
+	up2.x = upBuf.x;
412
+	up2.y = upBuf.y;
413
+	up2.z = upBuf.z;
414
+        LA.vecSub(lookAtBuf, locationBuf, away);
350
415
         LA.vecNormalize(away);
351
416
         LA.vecCross(away, up2, right2);
352
417
 		if (right2.length2() < 0.0001)
353
418
 		{
419
+                    //System.out.println("right2.length2() < 0.0001");
354
420
 			// UP failed
355
421
 			up2.x = UP2.x;
356
422
 			up2.y = UP2.y;
..
..
@@ -360,6 +426,7 @@
360
426
 			LA.vecCross(away, up2, right2);
361
427
 			if (!(right2.length2() > 0))
362
428
                         {
429
+                    System.exit(0);
363
430
                             // old problem...
364
431
                             assert (right2.length2() <= 0 || right2.length2() > 0); // weirdest thing ever
365
432
                             up2.x = UP.x = 0;
..
..
@@ -389,10 +456,10 @@
389
456
 		}
390
457
 
391
458
         for (int i=0; i < 3; i++)
392
-            fromScreen[3][i] = location.get(i);
459
+            fromScreen[3][i] = locationBuf.get(i);
393
460
 
394
461
         for (int i=0; i < 3; i++)
395
-            temp[3][i] = -location.get(i);
462
+            temp[3][i] = -locationBuf.get(i);
396
463
 
397
464
         LA.matConcat(temp, toScreen, toScreen);
398
465
 
..
..
@@ -404,9 +471,16 @@
404
471
             LA.matConcat(fromScreen, rotate, fromScreen);
405
472
             //LA.matConcat(toScreen, rotate_1, toScreen);
406
473
         }
474
+        
475
+        if (CameraPane.IMAGEFLIP)
476
+        {
477
+            double[][] flip = { { -1,0,0,0 }, { 0,1,0,0}, { 0,0,1,0}, { 0,0,0,1 } };
478
+        
479
+            LA.matConcat(fromScreen, flip, fromScreen);
480
+        }
481
+        
407
482
 		//if (this == CameraPane.lightCamera)
408
483
 			//CameraPane.lighttouched = true;
409
-        
410
484
         LA.matInvert(fromScreen, toScreen);
411
485
     }
412
486
 
..
..
@@ -472,11 +546,20 @@
472
546
     static final int viewFront = 2;
473
547
     static final int viewSide = 3;
474
548
     int viewCode;
549
+    
475
550
     cVector location;
476
551
     cVector lookAt;
552
+    
553
+    transient cVector locationBuf;
554
+    transient cVector lookAtBuf;
555
+    transient cVector upBuf;
556
+    //transient cVector up2Buf;
557
+    
477
558
     cVector direction;
478
-    double toScreen[][];
479
-    double fromScreen[][];
559
+    
560
+    double[][] toScreen;
561
+    double[][] fromScreen;
562
+    
480
563
     boolean perspective;
481
564
     int hAspect = 0; // Free camera
482
565
     int vAspect;