Rename link2master to link2support.

Normand Briere

2019-09-18 f9325048496d7cdbcad233f8a6b84c88e79adcc2

 Camera.java
..
..
@@ -3,7 +3,6 @@
3
3
 // Decompiler options: packimports(3) 
4
4
 // Source File Name:   Camera.java
5
5
 
6
-
7
6
 class Camera extends Object3D
8
7
 {
9
8
     static final long serialVersionUID = 4754289789178680517L;
..
..
@@ -21,7 +20,7 @@
21
20
         //<-2.2,0.7,-2> and pointed it at <-0.61,0.3,-0.6>
22
21
     //    location = LA.newVector(2,0.7,-2);
23
22
     //    lookAt = new cVector(0.6,0.3,-0.6);
24
-        location = LA.newVector(3,2,2);
23
+        location = LA.newVector(6,2,4);
25
24
         lookAt = new cVector(0.0,0.5,0);
26
25
         direction = new cVector();
27
26
         toParent = LA.newMatrix();
..
..
@@ -53,7 +52,7 @@
53
52
             perspective = true;
54
53
             break;
55
54
         case 1: // '\001'
56
-            location = LA.newVector(0, 0, 4);
55
+            location = LA.newVector(0, 0, 4); // Needed for translation direction
57
56
             perspective = false;
58
57
             break;
59
58
         case 2: // '\002'
..
..
@@ -64,7 +63,7 @@
64
63
             //LA.matXRotate(fromScreen, LA.toRadians(90));
65
64
             break;
66
65
         case 3: // '\003'
67
-            location = LA.newVector(4, 0, 0);
66
+            location = LA.newVector(4, 0, 0); // Needed for translation direction
68
67
             //LA.matZRotate(toScreen, LA.toRadians(-90));
69
68
             //LA.matXRotate(toScreen, LA.toRadians(-90));
70
69
             //LA.matXRotate(fromScreen, LA.toRadians(90));
..
..
@@ -72,7 +71,7 @@
72
71
             perspective = false;
73
72
             break;
74
73
         case 4: // Default light
75
-            location = LA.newVector(10, 30, 20);
74
+            location = LA.newVector(-5, 15, 10);
76
75
             perspective = false;
77
76
             break;
78
77
         }
..
..
@@ -105,6 +104,15 @@
105
104
         focalLength = 1;
106
105
         setAspect(4, 3);
107
106
         background = LA.newVector(0.8, 0.8, 0.8);
107
+    }
108
+
109
+    void CreateMaterial(boolean multiply)
110
+    {
111
+        super.CreateMaterial(multiply);
112
+        
113
+        material.shift = 90;
114
+        material.cameralight = 0.2f;
115
+        material.shadowbias = 10;
108
116
     }
109
117
 
110
118
     void setAspect(int width, int height)
..
..
@@ -151,6 +159,11 @@
151
159
 	void RotatePosition(float dx, float dy)
152
160
 	{
153
161
         if(hAspect != 0) return;
162
+        
163
+        if (CameraPane.IMAGEFLIP)
164
+        {
165
+            dx = -dx;
166
+        }
154
167
         
155
168
         if (CameraPane.ROTATECAMERA)
156
169
         {
..
..
@@ -208,6 +221,11 @@
208
221
 	void Translate(float dx, float dy, float scale)
209
222
 	{
210
223
         if(hAspect != 0) return;
224
+        
225
+        if (CameraPane.IMAGEFLIP)
226
+        {
227
+            dx = -dx;
228
+        }
211
229
         
212
230
         if (CameraPane.ROTATECAMERA)
213
231
         {
..
..
@@ -268,24 +286,34 @@
268
286
                 if (scale == 0)
269
287
                 {
270
288
                     // Zoom
271
-                    LA.vecSub(location, lookAt, location);
272
-
273
-                    cVector p = location;
274
-
275
289
                     double factor = Math.exp(-dy/300.0); // (1 + dy/100);
276
290
 
277
-                    p.x *= factor;
278
-                    p.y *= factor;
279
-                    p.z *= factor;
291
+                    if (viewCode != 0)
292
+                    {
293
+                        LA.vecSub(location, lookAt, location);
280
294
 
281
-                    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
+                    }
282
310
                 }
283
311
                 else
284
312
                 {
285
313
                     LA.vecSub(location, lookAt, direction);
286
314
 
287
315
                     //scale /= Distance();
288
-                    scale /= shaper_fovy/20;
316
+           //         scale /= shaper_fovy/20;
289
317
 
290
318
                     location.x -= dy * direction.x / scale;
291
319
                     //location.y -= dy * direction.y / scale;
..
..
@@ -306,19 +334,29 @@
306
334
 	
307
335
 	void RotateInterest(float dx, float dy)
308
336
 	{
337
+            right.mul(-1);
338
+            
309
339
             cStatic.point1.set(location);
310
340
             location.set(lookAt);
311
341
             lookAt.set(cStatic.point1);
312
-            right.mul(-1);
342
+            
343
+            cStatic.point1.set(locationBuf);
344
+            locationBuf.set(lookAtBuf);
345
+            lookAtBuf.set(cStatic.point1);
313
346
          //   UP.mul(-1);
314
347
             
315
348
             RotatePosition(dx,-dy);
316
349
             
317
350
          //   UP.mul(-1);
318
351
             right.mul(-1);
352
+            
319
353
             cStatic.point1.set(location);
320
354
             location.set(lookAt);
321
355
             lookAt.set(cStatic.point1);
356
+            
357
+            cStatic.point1.set(locationBuf);
358
+            locationBuf.set(lookAtBuf);
359
+            lookAtBuf.set(cStatic.point1);
322
360
             
323
361
             computeTransform();
324
362
 	}
..
..
@@ -333,17 +371,52 @@
333
371
             fromScreen = LA.newMatrix();
334
372
         }
335
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
+        
336
408
         cVector up2 = up;
337
409
         cVector right2 = right;
338
410
         
339
-	up2.x = UP.x;
340
-	up2.y = UP.y;
341
-	up2.z = UP.z;
342
-        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);
343
415
         LA.vecNormalize(away);
344
416
         LA.vecCross(away, up2, right2);
345
417
 		if (right2.length2() < 0.0001)
346
418
 		{
419
+                    //System.out.println("right2.length2() < 0.0001");
347
420
 			// UP failed
348
421
 			up2.x = UP2.x;
349
422
 			up2.y = UP2.y;
..
..
@@ -353,6 +426,7 @@
353
426
 			LA.vecCross(away, up2, right2);
354
427
 			if (!(right2.length2() > 0))
355
428
                         {
429
+                    System.exit(0);
356
430
                             // old problem...
357
431
                             assert (right2.length2() <= 0 || right2.length2() > 0); // weirdest thing ever
358
432
                             up2.x = UP.x = 0;
..
..
@@ -382,23 +456,32 @@
382
456
 		}
383
457
 
384
458
         for (int i=0; i < 3; i++)
385
-            fromScreen[3][i] = location.get(i);
459
+            fromScreen[3][i] = locationBuf.get(i);
386
460
 
387
461
         for (int i=0; i < 3; i++)
388
-            temp[3][i] = -location.get(i);
462
+            temp[3][i] = -locationBuf.get(i);
389
463
 
390
464
         LA.matConcat(temp, toScreen, toScreen);
391
465
 
392
466
         if (CameraPane.ROTATECAMERA)
393
467
         {
394
468
             double[][] rotate = { { 0,1,0,0 }, { -1,0,0,0}, { 0,0,1,0}, { 0,0,0,1 } };
395
-            double[][] rotate_1 = { { 0,-1,0,0 }, { 1,0,0,0}, { 0,0,1,0}, { 0,0,0,1 } };
469
+            //double[][] rotate_1 = { { 0,-1,0,0 }, { 1,0,0,0}, { 0,0,1,0}, { 0,0,0,1 } };
396
470
         
397
-            LA.matConcat(rotate, fromScreen, fromScreen);
398
-            LA.matConcat(toScreen, rotate_1, toScreen);
471
+            LA.matConcat(fromScreen, rotate, fromScreen);
472
+            //LA.matConcat(toScreen, rotate_1, toScreen);
399
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
+        
400
482
 		//if (this == CameraPane.lightCamera)
401
483
 			//CameraPane.lighttouched = true;
484
+        LA.matInvert(fromScreen, toScreen);
402
485
     }
403
486
 
404
487
 //    void Draw(CameraPane display, Object3D /*Composite*/ root, boolean selected)
..
..
@@ -463,11 +546,20 @@
463
546
     static final int viewFront = 2;
464
547
     static final int viewSide = 3;
465
548
     int viewCode;
549
+    
466
550
     cVector location;
467
551
     cVector lookAt;
552
+    
553
+    transient cVector locationBuf;
554
+    transient cVector lookAtBuf;
555
+    transient cVector upBuf;
556
+    //transient cVector up2Buf;
557
+    
468
558
     cVector direction;
469
-    double toScreen[][];
470
-    double fromScreen[][];
559
+    
560
+    double[][] toScreen;
561
+    double[][] fromScreen;
562
+    
471
563
     boolean perspective;
472
564
     int hAspect = 0; // Free camera
473
565
     int vAspect;