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%2FHIDInputTracker.java;h=303f195ee9fe82b1a5e5095d89ad2a6aaed676a5;hp=ee625d5079f4216ee10a3bd3a2b97826b46395db;hb=0590faa0f0434ebb29955a711299f8ad5ac226d6;hpb=4bb8945294848559aab76e248207781c6e097714

diff --git a/src/main/java/eu/svjatoslav/sixth/e3d/gui/humaninput/HIDInputTracker.java b/src/main/java/eu/svjatoslav/sixth/e3d/gui/humaninput/HIDInputTracker.java
index ee625d5..303f195 100755
--- a/src/main/java/eu/svjatoslav/sixth/e3d/gui/humaninput/HIDInputTracker.java
+++ b/src/main/java/eu/svjatoslav/sixth/e3d/gui/humaninput/HIDInputTracker.java
@@ -11,7 +11,6 @@ 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.RenderingContext;
 import eu.svjatoslav.sixth.e3d.gui.ViewPanel;
 import eu.svjatoslav.sixth.e3d.gui.ViewRenderListener;
 
@@ -34,7 +33,7 @@ public class HIDInputTracker implements
      * </pre>
      */
     private final Map<Integer, Long> pressedKeysToPressedTimeMap = new HashMap<>();
-    private final List<MouseClick> detectedMouseClicks = new ArrayList<>();
+    private final List<MouseEvent> detectedMouseEvents = new ArrayList<>();
     private final List<KeyEvent> detectedKeyEvents = new ArrayList<>();
     private int wheelMovedDirection = 0;
     private Point2D mouseDraggedDirection = new Point2D();
@@ -118,37 +117,39 @@ public class HIDInputTracker implements
      * @return <code>true</code> if view needs to be repainted.
      */
     private synchronized boolean handleMouseClicksAndHover(final ViewPanel viewPanel) {
-        MouseClick unprocessedMouseClick = findUnprocessedMouseClick();
+        boolean rerenderNeeded = false;
+        MouseEvent event = findClickLocationToTrace();
+        if (event != null){
+            // process mouse clicks as a first priority
+            rerenderNeeded = true;
+        } else {
+            // when there are no mouse clicks, process mouse hovering
+
+            if (mouseMoved) {
+                mouseMoved = false;
+                // we would like to re-render frame when user moved mouse, to see what objects mouse is hovering over
+                rerenderNeeded = true;
+            }
+
+            if (currentMouseLocation != null) {
+                // mouse click with button 0 amounts to mouse hovering event
+                event = new MouseEvent(currentMouseLocation, 0);
+            }
+        }
+
+        if (viewPanel.getRenderingContext() != null)
+            viewPanel.getRenderingContext().setMouseEvent(event);
 
-        if (unprocessedMouseClick != null) {
-            viewPanel.getRenderingContext().mouseClick = unprocessedMouseClick;
-            return false;
-        } else
-            return handleMouseHovering(viewPanel);
+        return rerenderNeeded;
     }
 
-    private MouseClick findUnprocessedMouseClick() {
-        synchronized (detectedMouseClicks) {
-            if (detectedMouseClicks.isEmpty())
+    private MouseEvent findClickLocationToTrace() {
+        synchronized (detectedMouseEvents) {
+            if (detectedMouseEvents.isEmpty())
                 return null;
 
-            return detectedMouseClicks.remove(0);
-        }
-    }
-
-    private boolean handleMouseHovering(ViewPanel viewPanel) {
-        if (currentMouseLocation != null) {
-            RenderingContext renderingContext = viewPanel.getRenderingContext();
-            if (renderingContext != null)
-               renderingContext.mouseClick = new MouseClick(currentMouseLocation, 0);
-            // mouse click with button 0 amounts to mouse hovering event
+            return detectedMouseEvents.remove(0);
         }
-
-        if (mouseMoved) {
-            mouseMoved = false;
-            return true;
-        } else
-            return false;
     }
 
     boolean isKeyPressed(final int keyCode) {
@@ -176,9 +177,9 @@ public class HIDInputTracker implements
     }
 
     @Override
-    public void mouseClicked(final MouseEvent e) {
-        synchronized (detectedMouseClicks) {
-            detectedMouseClicks.add(new MouseClick(e.getX(), e.getY(), e.getButton()));
+    public void mouseClicked(final java.awt.event.MouseEvent e) {
+        synchronized (detectedMouseEvents) {
+            detectedMouseEvents.add(new MouseEvent(e.getX(), e.getY(), e.getButton()));
         }
     }
 
@@ -197,24 +198,24 @@ public class HIDInputTracker implements
     }
 
     @Override
-    public void mouseEntered(final MouseEvent e) {
+    public void mouseEntered(final java.awt.event.MouseEvent e) {
         mouseWithinWindow = true;
     }
 
     @Override
-    public synchronized void mouseExited(final MouseEvent e) {
+    public synchronized void mouseExited(final java.awt.event.MouseEvent e) {
         mouseWithinWindow = false;
         currentMouseLocation = null;
     }
 
     @Override
-    public synchronized void mouseMoved(final MouseEvent e) {
+    public synchronized void mouseMoved(final java.awt.event.MouseEvent e) {
         currentMouseLocation = new Point2D(e.getX(), e.getY());
         mouseMoved = true;
     }
 
     @Override
-    public void mousePressed(final MouseEvent e) {
+    public void mousePressed(final java.awt.event.MouseEvent e) {
     }
 
     @Override