.. | .. |
---|
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 | 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(); |
---|
.. | .. |
---|
72 | 71 | perspective = false; |
---|
73 | 72 | break; |
---|
74 | 73 | case 4: // Default light |
---|
75 | | - location = LA.newVector(10, 30, 20); |
---|
| 74 | + location = LA.newVector(-10, 30, 20); |
---|
76 | 75 | perspective = false; |
---|
77 | 76 | break; |
---|
78 | 77 | } |
---|
.. | .. |
---|
320 | 319 | location.set(lookAt); |
---|
321 | 320 | lookAt.set(cStatic.point1); |
---|
322 | 321 | |
---|
323 | | - computeTransform(); |
---|
| 322 | + //computeTransform(); |
---|
324 | 323 | } |
---|
325 | 324 | |
---|
326 | 325 | //synchronized // june 2014 |
---|
.. | .. |
---|
392 | 391 | if (CameraPane.ROTATECAMERA) |
---|
393 | 392 | { |
---|
394 | 393 | 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 } }; |
---|
396 | 395 | |
---|
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); |
---|
399 | 398 | } |
---|
400 | 399 | //if (this == CameraPane.lightCamera) |
---|
401 | 400 | //CameraPane.lighttouched = true; |
---|
| 401 | + |
---|
| 402 | + LA.matInvert(fromScreen, toScreen); |
---|
402 | 403 | } |
---|
403 | 404 | |
---|
404 | 405 | // void Draw(CameraPane display, Object3D /*Composite*/ root, boolean selected) |
---|