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=1dd6f7a3f54a1a9349ea68dde8e86277e0125c65;hp=105a5824539fda115773f6fed8f997538193bf0a;hb=96f76bab30b47db83a1c9061b8916c69657f1e13;hpb=baab2e2c2ad89695293f3136311c585c9a5afed1 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 105a582..1dd6f7a 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,7 +11,7 @@ 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.ViewPanel; import eu.svjatoslav.sixth.e3d.gui.ViewContext; import eu.svjatoslav.sixth.e3d.gui.ViewRenderListener; @@ -54,7 +54,7 @@ public class UserInputTracker @Override public boolean beforeRender(final ViewContext viewContext, final int millisecondsSinceLastFrame) { - boolean viewUpdateNeeded = handleDetectedMouseClicks(viewContext.getView()); + boolean viewUpdateNeeded = handleDetectedMouseClicks(viewContext.getViewPanel()); viewUpdateNeeded |= handleDetectedKeyEvents(); @@ -110,11 +110,11 @@ public class UserInputTracker /** * @return true if view needs to be repainted. */ - private 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,7 +123,7 @@ public class UserInputTracker return false; } - view.getRenderingContext().mouseClick = detectedMouseClicks.remove(0); + viewPanel.getRenderingContext().mouseClick = detectedMouseClicks.remove(0); return true; } @@ -137,7 +137,7 @@ public class UserInputTracker synchronized (detectedKeyEvents) { pressedKeysToPressedTimeMap.put(evt.getKeyCode(), System.currentTimeMillis()); detectedKeyEvents.add(evt); - viewContext.getView().repaintDuringNextViewUpdate(); + viewContext.getViewPanel().repaintDuringNextViewUpdate(); } } @@ -146,7 +146,7 @@ public class UserInputTracker synchronized (detectedKeyEvents) { pressedKeysToPressedTimeMap.remove(evt.getKeyCode()); detectedKeyEvents.add(evt); - viewContext.getView().repaintDuringNextViewUpdate(); + viewContext.getViewPanel().repaintDuringNextViewUpdate(); } }