X-Git-Url: http://www2.svjatoslav.eu/gitweb/?p=sixth-3d.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fsixth%2Fe3d%2Fgui%2Fhumaninput%2FUserInputTracker.java;h=63bfd19eb58c2edcc53ba5e49e4ce7b7c3ad7796;hp=dedfd7820984668927af1f8c2219ef64ffb2fb0b;hb=8bceefbdb7316557ee77902cc6ac216f5c1ff160;hpb=2e7e46514dd35006e9dde07b1959540078292691

diff --git a/src/main/java/eu/svjatoslav/sixth/e3d/gui/humaninput/UserInputTracker.java b/src/main/java/eu/svjatoslav/sixth/e3d/gui/humaninput/UserInputTracker.java
index dedfd78..63bfd19 100755
--- a/src/main/java/eu/svjatoslav/sixth/e3d/gui/humaninput/UserInputTracker.java
+++ b/src/main/java/eu/svjatoslav/sixth/e3d/gui/humaninput/UserInputTracker.java
@@ -11,9 +11,8 @@ package eu.svjatoslav.sixth.e3d.gui.humaninput;
 
 import eu.svjatoslav.sixth.e3d.geometry.Point2D;
 import eu.svjatoslav.sixth.e3d.gui.Avatar;
-import eu.svjatoslav.sixth.e3d.gui.View;
-import eu.svjatoslav.sixth.e3d.gui.ViewContext;
-import eu.svjatoslav.sixth.e3d.gui.ViewUpdateListener;
+import eu.svjatoslav.sixth.e3d.gui.ViewPanel;
+import eu.svjatoslav.sixth.e3d.gui.ViewRenderListener;
 
 import javax.swing.*;
 import java.awt.event.*;
@@ -23,7 +22,7 @@ import java.util.List;
 import java.util.Map;
 
 public class UserInputTracker
-        implements MouseMotionListener, KeyListener, MouseListener, MouseWheelListener, ViewUpdateListener {
+        implements MouseMotionListener, KeyListener, MouseListener, MouseWheelListener, ViewRenderListener {
 
     /**
      * <pre>
@@ -36,36 +35,38 @@ public class UserInputTracker
     private final Map<Integer, Long> pressedKeysToPressedTimeMap = new HashMap<>();
     private final List<MouseClick> detectedMouseClicks = new ArrayList<>();
     private final List<KeyEvent> detectedKeyEvents = new ArrayList<>();
-    public int wheelMovedDirection = 0;
-    Point2D mouseDraggedDirection = new Point2D();
-    Point2D oldMouseCoordinatesWhenDragging;
-    ViewContext viewContext;
-    Point2D currentMouseLocation;
-    boolean mouseMoved;
+    private int wheelMovedDirection = 0;
+    private Point2D mouseDraggedDirection = new Point2D();
+    private Point2D oldMouseCoordinatesWhenDragging;
+    private ViewPanel viewPanel;
+    private Point2D currentMouseLocation;
+    private boolean mouseMoved;
     private boolean mouseWithinWindow = false;
 
-    public UserInputTracker(final ViewContext viewContext) {
-        this.viewContext = viewContext;
+    public UserInputTracker(final ViewPanel viewPanel) {
+        this.viewPanel = viewPanel;
+        bind(viewPanel);
     }
 
     /**
      * {@inheritDoc}
      */
     @Override
-    public boolean beforeViewUpdate(final ViewContext viewContext, final int millisecondsSinceLastFrame) {
+    public boolean beforeRender(final ViewPanel viewPanel, final int millisecondsSinceLastFrame) {
 
-        boolean viewUpdateNeeded = handleDetectedMouseClicks(viewContext.getView());
+        boolean viewUpdateNeeded = handleDetectedMouseClicks(viewPanel);
 
         viewUpdateNeeded |= handleDetectedKeyEvents();
 
-        viewContext.getKeyboardFocusTracker().getCurrentFocusOwner().beforeViewUpdate(viewContext,
+        viewPanel.getKeyboardFocusTracker().getCurrentFocusOwner().beforeRender(viewPanel,
                 millisecondsSinceLastFrame);
+
         viewUpdateNeeded |= trackMouse();
 
         return viewUpdateNeeded;
     }
 
-    public void bind(final JPanel panel) {
+    private void bind(final JPanel panel) {
         panel.addMouseMotionListener(this);
 
         panel.addKeyListener(this);
@@ -75,10 +76,10 @@ public class UserInputTracker
         panel.addMouseWheelListener(this);
     }
 
-    public boolean handleDetectedKeyEvents() {
+    private boolean handleDetectedKeyEvents() {
         boolean keyEventsHandled = false;
 
-        final UserInputHandler currentFocusOwner = viewContext.getKeyboardFocusTracker().getCurrentFocusOwner();
+        final UserInputHandler currentFocusOwner = viewPanel.getKeyboardFocusTracker().getCurrentFocusOwner();
 
         synchronized (detectedKeyEvents) {
             if (currentFocusOwner == null) {
@@ -91,12 +92,12 @@ public class UserInputTracker
 
                 switch (keyEvent.getID()) {
                     case KeyEvent.KEY_PRESSED:
-                        currentFocusOwner.keyPressed(keyEvent, viewContext);
+                        currentFocusOwner.keyPressed(keyEvent, viewPanel);
                         keyEventsHandled = true;
                         break;
 
                     case KeyEvent.KEY_RELEASED:
-                        currentFocusOwner.keyReleased(keyEvent, viewContext);
+                        currentFocusOwner.keyReleased(keyEvent, viewPanel);
                         keyEventsHandled = true;
                         break;
                 }
@@ -107,14 +108,13 @@ public class UserInputTracker
     }
 
     /**
-     * Returns <code>true</code> if mouse events are detected and view needs to
-     * be repainted.
+     * @return <code>true</code> if view needs to be repainted.
      */
-    public synchronized boolean handleDetectedMouseClicks(final View view) {
+    private synchronized boolean handleDetectedMouseClicks(final ViewPanel viewPanel) {
         if (detectedMouseClicks.isEmpty()) {
 
             if (currentMouseLocation != null)
-                view.getRenderingContext().mouseClick = new MouseClick(currentMouseLocation, 0);
+                viewPanel.getRenderingContext().mouseClick = new MouseClick(currentMouseLocation, 0);
 
             if (mouseMoved) {
                 mouseMoved = false;
@@ -123,12 +123,12 @@ public class UserInputTracker
                 return false;
         }
 
-        view.getRenderingContext().mouseClick = detectedMouseClicks.remove(0);
+        viewPanel.getRenderingContext().mouseClick = detectedMouseClicks.remove(0);
 
         return true;
     }
 
-    public boolean isKeyPressed(final int keyCode) {
+    boolean isKeyPressed(final int keyCode) {
         return pressedKeysToPressedTimeMap.containsKey(keyCode);
     }
 
@@ -137,7 +137,7 @@ public class UserInputTracker
         synchronized (detectedKeyEvents) {
             pressedKeysToPressedTimeMap.put(evt.getKeyCode(), System.currentTimeMillis());
             detectedKeyEvents.add(evt);
-            viewContext.getView().repaintDuringNextViewUpdate();
+            viewPanel.repaintDuringNextViewUpdate();
         }
     }
 
@@ -146,7 +146,7 @@ public class UserInputTracker
         synchronized (detectedKeyEvents) {
             pressedKeysToPressedTimeMap.remove(evt.getKeyCode());
             detectedKeyEvents.add(evt);
-            viewContext.getView().repaintDuringNextViewUpdate();
+            viewPanel.repaintDuringNextViewUpdate();
         }
     }
 
@@ -209,11 +209,27 @@ public class UserInputTracker
     /**
      * Interpret mouse movement
      */
-    public boolean trackMouse() {
-        final Avatar avatar = viewContext.getAvatar();
+    private boolean trackMouse() {
+        final Avatar avatar = viewPanel.getAvatar();
+        trackDragging(avatar);
+        trackVerticalScrolling(avatar);
+
+        boolean repaintNeeded = !mouseDraggedDirection.isZero() || (wheelMovedDirection != 0);
 
-        // track mouse dragging
+        // reset movement counters
+        wheelMovedDirection = 0;
+        mouseDraggedDirection.zero();
+
+        return repaintNeeded;
+    }
+
+    private void trackVerticalScrolling(Avatar avatar) {
+        final double actualAcceleration = 50 * avatar.avatarAcceleration * (1 + (avatar.getMovementSpeed() / 10));
+        avatar.getMovementVector().y += (wheelMovedDirection * actualAcceleration);
+        avatar.enforceSpeedLimit();
+    }
 
+    private void trackDragging(Avatar avatar) {
         // TODO: need to detect whether user moved mouse or touch screen
 
         // for mouse
@@ -225,22 +241,6 @@ public class UserInputTracker
         // mouseDraggedDirection.x / 50));
         // avatar.setAngleYZ(avatar.getAngleYZ() + ((float)
         // mouseDraggedDirection.y / 50));
-
-        // track mouse wheel movements
-        final double actualAcceleration = 50 * avatar.avatarAcceleration * (1 + (avatar.getMovementSpeed() / 10));
-
-        avatar.getMovementVector().y += (wheelMovedDirection * actualAcceleration);
-        avatar.enforceSpeedLimit();
-
-        // check if view shall be repainted
-        boolean repaintNeeded;
-        repaintNeeded = (mouseDraggedDirection.x != 0) || (mouseDraggedDirection.y != 0) || (wheelMovedDirection != 0);
-
-        // reset movement counters
-        wheelMovedDirection = 0;
-        mouseDraggedDirection.zero();
-
-        return repaintNeeded;
     }
 
 }