X-Git-Url: http://www2.svjatoslav.eu/gitweb/?p=sixth-3d.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fsixth%2Fe3d%2Fgui%2FAvatar.java;h=050a14ec1757a34495815c0c308d89d03755f76f;hp=8dae30142ac07dd02a128a27714fa9d31f154190;hb=59baa428fb2d9e7f0fe5423f4cea47f2d6245914;hpb=8bceefbdb7316557ee77902cc6ac216f5c1ff160 diff --git a/src/main/java/eu/svjatoslav/sixth/e3d/gui/Avatar.java b/src/main/java/eu/svjatoslav/sixth/e3d/gui/Avatar.java index 8dae301..050a14e 100755 --- a/src/main/java/eu/svjatoslav/sixth/e3d/gui/Avatar.java +++ b/src/main/java/eu/svjatoslav/sixth/e3d/gui/Avatar.java @@ -1,5 +1,5 @@ /* - * Sixth 3D engine. Copyright ©2012-2018, 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 @@ -21,6 +21,10 @@ public class Avatar implements ViewRenderListener { * Just in case we want to adjust global speed for some reason. */ private static final double SPEED_MULTIPLIER = .02d; + /** + * Determines amount of friction user experiences every millisecond while moving around in space. + */ + private static final double MILLISECOND_FRICTION = 1.005; /** * Avatar movement speed, relative to avatar itself. When avatar coordinates * are updated within the world, avatar orientation relative to the world is @@ -32,23 +36,16 @@ public class Avatar implements ViewRenderListener { * Avatar location within the 3D world. */ private Point3D location = new Point3D(); - /** * Avatar orientation on the X-Z plane. It changes when turning left or * right. */ private double orientationXZ; - /** * Avatar orientation on the Y-Z plane. It changes when looking up or down. */ private double orientationYZ; - /** - * Determines amount of friction user experiences every millisecond while moving around in space. - */ - private static final double MILLISECOND_FRICTION = 1.005; - public Avatar() { } @@ -73,7 +70,7 @@ public class Avatar implements ViewRenderListener { public boolean beforeRender(final ViewPanel viewPanel, final int millisecondsSinceLastFrame) { final Point3D locationBeforeUpdate = new Point3D(location); - translateAvatarLocation(millisecondsSinceLastFrame); + translateAvatarLocationBasedOnMovementVector(millisecondsSinceLastFrame); applyFrictionToUserMovement(millisecondsSinceLastFrame); return isFrameRepaintNeeded(locationBeforeUpdate); } @@ -142,7 +139,7 @@ public class Avatar implements ViewRenderListener { * Therefore we take frame rendering time into account when translating * avatar between consecutive frames. */ - private void translateAvatarLocation(int millisecondsPassedSinceLastFrame) { + private void translateAvatarLocationBasedOnMovementVector(int millisecondsPassedSinceLastFrame) { location.x -= (float) sin(getAngleXZ()) * getMovementVector().z * SPEED_MULTIPLIER * millisecondsPassedSinceLastFrame;