X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fsixth%2Fe3d%2Frenderer%2Foctree%2Fraytracer%2FCameraView.java;h=ce927871564b77b333cd75a73113090341658945;hb=cad5276b56cfbd0b194dbacb894fea20b9dd5b15;hp=b06f0c3dd4a0b29db85143ccd04b1c2c835391d9;hpb=ff13a51ec53b3d2ee1c9309152ed2b40366218b9;p=sixth-3d.git

diff --git a/src/main/java/eu/svjatoslav/sixth/e3d/renderer/octree/raytracer/CameraView.java b/src/main/java/eu/svjatoslav/sixth/e3d/renderer/octree/raytracer/CameraView.java
index b06f0c3..ce92787 100644
--- a/src/main/java/eu/svjatoslav/sixth/e3d/renderer/octree/raytracer/CameraView.java
+++ b/src/main/java/eu/svjatoslav/sixth/e3d/renderer/octree/raytracer/CameraView.java
@@ -9,21 +9,20 @@ import eu.svjatoslav.sixth.e3d.gui.Avatar;
 
 import static eu.svjatoslav.sixth.e3d.renderer.octree.raytracer.Camera.SIZE;
 
+/**
+ * Represents camera view. Used to compute direction of rays during ray tracing.
+ */
 public class CameraView {
 
-    Point3D cameraCenter;
-    Point3D topLeft;
-    Point3D topRight;
-    Point3D bottomLeft;
-    Point3D bottomRight;
+    /**
+     * Camera view coordinates.
+     */
+    Point3D cameraCenter, topLeft, topRight, bottomLeft, bottomRight;
 
     public CameraView(final Avatar avatar, final double zoom) {
-        computeCameraCoordinates(avatar, zoom);
-    }
-
-    private void computeCameraCoordinates(final Avatar avatar, final double zoom) {
-
+        // compute camera view coordinates as if camera is at (0,0,0) and look at (0,0,1)
         final float viewAngle = (float) .6;
+        cameraCenter = new Point3D();
         topLeft = new Point3D(0,0, SIZE).rotate(-viewAngle, -viewAngle);
         topRight = new Point3D(0,0, SIZE).rotate(viewAngle, -viewAngle);
         bottomLeft = new Point3D(0,0,SIZE).rotate(-viewAngle, viewAngle);
@@ -34,13 +33,8 @@ public class CameraView {
         bottomLeft.rotate(-avatar.getAngleXZ(), -avatar.getAngleYZ());
         bottomRight.rotate(-avatar.getAngleXZ(), -avatar.getAngleYZ());
 
-        // compute camera coordinates as if camera is at avatar's location and look
-        cameraCenter = new Point3D(avatar.getLocation()).scaleDown(zoom);
-        topLeft.add(cameraCenter);
-        topRight.add(cameraCenter);
-        bottomLeft.add(cameraCenter);
-        bottomRight.add(cameraCenter);
-
+        // place camera view at avatar location
+        avatar.getLocation().clone().scaleDown(zoom).addTo(cameraCenter, topLeft, topRight, bottomLeft, bottomRight);
     }
 
 }