Normand Briere
2018-07-01 89c1ad67bc65d24ceadfa9e95f8c5515283f1e97
Camera.java
....@@ -11,7 +11,7 @@
1111 /*static*/ float DECAL = 12; // 3;
1212 /*static*/ float SCALE = 1; // 0.5f;
1313
14
- float shaper_fovy = 60.0f;
14
+ float shaper_fovy = 25.0f;
1515 float shaper_zNear = 0.01f;
1616 float shaper_zFar = 1E5f; // 500.0f;
1717
....@@ -21,8 +21,8 @@
2121 //<-2.2,0.7,-2> and pointed it at <-0.61,0.3,-0.6>
2222 // location = LA.newVector(2,0.7,-2);
2323 // 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);
24
+ location = LA.newVector(3,2,2);
25
+ lookAt = new cVector(0.0,0.5,0);
2626 direction = new cVector();
2727 toParent = LA.newMatrix();
2828 fromParent = LA.newMatrix();
....@@ -392,13 +392,15 @@
392392 if (CameraPane.ROTATECAMERA)
393393 {
394394 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 } };
395
+ //double[][] rotate_1 = { { 0,-1,0,0 }, { 1,0,0,0}, { 0,0,1,0}, { 0,0,0,1 } };
396396
397
- LA.matConcat(rotate, fromScreen, fromScreen);
398
- LA.matConcat(toScreen, rotate_1, toScreen);
397
+ LA.matConcat(fromScreen, rotate, fromScreen);
398
+ //LA.matConcat(toScreen, rotate_1, toScreen);
399399 }
400400 //if (this == CameraPane.lightCamera)
401401 //CameraPane.lighttouched = true;
402
+
403
+ LA.matInvert(fromScreen, toScreen);
402404 }
403405
404406 // void Draw(CameraPane display, Object3D /*Composite*/ root, boolean selected)