X-Git-Url: http://www2.svjatoslav.eu/gitweb/?p=sixth-3d.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fsixth%2Fe3d%2Frenderer%2Foctree%2Fraytracer%2FCamera.java;h=a16eb96bd6f119f1cf5509e41e30c253a1e230b9;hp=b76235203d2c7fa38553f1ccc3668d2f70b9ed35;hb=59baa428fb2d9e7f0fe5423f4cea47f2d6245914;hpb=03447008b8ee26a6463d2cd03005dc26464863db diff --git a/src/main/java/eu/svjatoslav/sixth/e3d/renderer/octree/raytracer/Camera.java b/src/main/java/eu/svjatoslav/sixth/e3d/renderer/octree/raytracer/Camera.java index b762352..a16eb96 100755 --- a/src/main/java/eu/svjatoslav/sixth/e3d/renderer/octree/raytracer/Camera.java +++ b/src/main/java/eu/svjatoslav/sixth/e3d/renderer/octree/raytracer/Camera.java @@ -1,5 +1,5 @@ /* - * Sixth 3D engine. Copyright ©2012-2016, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu + * Sixth 3D engine. Copyright ©2012-2019, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu * * This program is free software; you can redistribute it and/or * modify it under the terms of version 3 of the GNU Lesser General Public License @@ -10,8 +10,8 @@ package eu.svjatoslav.sixth.e3d.renderer.octree.raytracer; import eu.svjatoslav.sixth.e3d.geometry.Point3D; -import eu.svjatoslav.sixth.e3d.geometry.Transform; import eu.svjatoslav.sixth.e3d.gui.Avatar; +import eu.svjatoslav.sixth.e3d.math.Transform; import eu.svjatoslav.sixth.e3d.renderer.raster.Color; import eu.svjatoslav.sixth.e3d.renderer.raster.shapes.basic.line.LineAppearance; import eu.svjatoslav.sixth.e3d.renderer.raster.shapes.composite.TexturedRectangle; @@ -58,7 +58,7 @@ public class Camera extends TexturedRectangle { private void computeCameraCoordinates(final Avatar avatar) { initialize(CAMERA_SIZE, CAMERA_SIZE, IMAGE_SIZE, IMAGE_SIZE, 3); - camCenter = Point3D.ZERO.clone(); + camCenter = new Point3D(); topLeft.setValues(camCenter.x, camCenter.y, camCenter.z + CAMERA_SIZE); @@ -75,10 +75,8 @@ public class Camera extends TexturedRectangle { topLeft.rotate(camCenter, -avatar.getAngleXZ(), -avatar.getAngleYZ()); topRight.rotate(camCenter, -avatar.getAngleXZ(), -avatar.getAngleYZ()); - bottomLeft - .rotate(camCenter, -avatar.getAngleXZ(), -avatar.getAngleYZ()); - bottomRight.rotate(camCenter, -avatar.getAngleXZ(), - -avatar.getAngleYZ()); + bottomLeft.rotate(camCenter, -avatar.getAngleXZ(), -avatar.getAngleYZ()); + bottomRight.rotate(camCenter, -avatar.getAngleXZ(), -avatar.getAngleYZ()); final Color cameraColor = new Color(255, 255, 0, 255); final LineAppearance appearance = new LineAppearance(2, cameraColor);