Refactoring.

[sixth-3d.git] / src / main / java / eu / svjatoslav / sixth / e3d / gui / humaninput / WorldNavigationTracker.java

diff --git a/src/main/java/eu/svjatoslav/sixth/e3d/gui/humaninput/WorldNavigationTracker.java b/src/main/java/eu/svjatoslav/sixth/e3d/gui/humaninput/WorldNavigationTracker.java
index 87c1d5e..28d485c 100644 (file)
--- a/src/main/java/eu/svjatoslav/sixth/e3d/gui/humaninput/WorldNavigationTracker.java
+++ b/src/main/java/eu/svjatoslav/sixth/e3d/gui/humaninput/WorldNavigationTracker.java
@@ -1,5 +1,5 @@
 /*
- * Sixth 3D engine. Copyright ©2012-2016, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
+ * Sixth 3D engine. Copyright ©2012-2018, 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,7 +10,7 @@
 package eu.svjatoslav.sixth.e3d.gui.humaninput;
 
 import eu.svjatoslav.sixth.e3d.gui.Avatar;
-import eu.svjatoslav.sixth.e3d.gui.ViewContext;
+import eu.svjatoslav.sixth.e3d.gui.ViewPanel;
 import eu.svjatoslav.sixth.e3d.gui.textEditorComponent.KeyboardHelper;
 
 import java.awt.event.KeyEvent;
@@ -18,34 +18,38 @@ import java.awt.event.KeyEvent;
 public class WorldNavigationTracker implements UserInputHandler {
 
     @Override
-    public boolean beforeViewUpdate(final ViewContext viewContext,
-                                    final int millisecondsSinceLastFrame) {
+    public boolean beforeRender(final ViewPanel viewPanel,
+                                final int millisecondsSinceLastFrame) {
 
-        trackKeys(millisecondsSinceLastFrame, viewContext);
+        trackKeys(millisecondsSinceLastFrame, viewPanel);
         return false;
     }
 
     @Override
-    public void focusLost(final ViewContext viewContext) {
+    public boolean focusLost(final ViewPanel viewPanel) {
+        return false;
     }
 
     @Override
-    public void focusReceived(final ViewContext viewContext) {
+    public boolean focusReceived(final ViewPanel viewContext) {
+        return false;
     }
 
     @Override
-    public void keyPressed(final KeyEvent event, final ViewContext viewContext) {
+    public boolean keyPressed(final KeyEvent event, final ViewPanel viewContext) {
+        return true;
     }
 
     @Override
-    public void keyReleased(final KeyEvent event, final ViewContext viewContext) {
+    public boolean keyReleased(final KeyEvent event, final ViewPanel viewContext) {
+        return true;
     }
 
     /**
      * interpret currently pressed keys
      */
     public void trackKeys(final long millisecondsSinceLastFrame,
-                          final ViewContext viewContext) {
+                          final ViewPanel viewContext) {
 
         final UserInputTracker inputTracker = viewContext.getUserInputTracker();
 
@@ -56,16 +60,16 @@ public class WorldNavigationTracker implements UserInputHandler {
                 * (1 + (avatar.getMovementSpeed() / 10));
 
         if (inputTracker.isKeyPressed(KeyboardHelper.UP))
-            avatar.getMovementDirection().z += actualAcceleration;
+            avatar.getMovementVector().z += actualAcceleration;
 
         if (inputTracker.isKeyPressed(KeyboardHelper.DOWN))
-            avatar.getMovementDirection().z -= actualAcceleration;
+            avatar.getMovementVector().z -= actualAcceleration;
 
         if (inputTracker.isKeyPressed(KeyboardHelper.RIGHT))
-            avatar.getMovementDirection().x += actualAcceleration;
+            avatar.getMovementVector().x += actualAcceleration;
 
         if (inputTracker.isKeyPressed(KeyboardHelper.LEFT))
-            avatar.getMovementDirection().x -= actualAcceleration;
+            avatar.getMovementVector().x -= actualAcceleration;
 
         avatar.enforceSpeedLimit();
     }