Normand Briere
2019-08-06 b3ae4e889872ca0b9ca76f1d17b2f0b961226729
Camera.java
....@@ -3,7 +3,6 @@
33 // Decompiler options: packimports(3)
44 // Source File Name: Camera.java
55
6
-
76 class Camera extends Object3D
87 {
98 static final long serialVersionUID = 4754289789178680517L;
....@@ -11,7 +10,7 @@
1110 /*static*/ float DECAL = 12; // 3;
1211 /*static*/ float SCALE = 1; // 0.5f;
1312
14
- float shaper_fovy = 60.0f;
13
+ float shaper_fovy = 25.0f;
1514 float shaper_zNear = 0.01f;
1615 float shaper_zFar = 1E5f; // 500.0f;
1716
....@@ -21,8 +20,8 @@
2120 //<-2.2,0.7,-2> and pointed it at <-0.61,0.3,-0.6>
2221 // location = LA.newVector(2,0.7,-2);
2322 // lookAt = new cVector(0.6,0.3,-0.6);
24
- location = LA.newVector(2,0.7,2);
25
- lookAt = new cVector(0.0,0.3,0);
23
+ location = LA.newVector(6,2,4);
24
+ lookAt = new cVector(0.0,0.5,0);
2625 direction = new cVector();
2726 toParent = LA.newMatrix();
2827 fromParent = LA.newMatrix();
....@@ -392,13 +391,15 @@
392391 if (CameraPane.ROTATECAMERA)
393392 {
394393 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 } };
394
+ //double[][] rotate_1 = { { 0,-1,0,0 }, { 1,0,0,0}, { 0,0,1,0}, { 0,0,0,1 } };
396395
397
- LA.matConcat(rotate, fromScreen, fromScreen);
398
- LA.matConcat(toScreen, rotate_1, toScreen);
396
+ LA.matConcat(fromScreen, rotate, fromScreen);
397
+ //LA.matConcat(toScreen, rotate_1, toScreen);
399398 }
400399 //if (this == CameraPane.lightCamera)
401400 //CameraPane.lighttouched = true;
401
+
402
+ LA.matInvert(fromScreen, toScreen);
402403 }
403404
404405 // void Draw(CameraPane display, Object3D /*Composite*/ root, boolean selected)