diff --git a/src/ei/engine/input/MouseInput.java b/src/ei/engine/input/MouseInput.java index 0622b7e..543fb07 100644 --- a/src/ei/engine/input/MouseInput.java +++ b/src/ei/engine/input/MouseInput.java @@ -76,7 +76,7 @@ public abstract class MouseInput extends Input{ int mouseDW = Mouse.getDWheel(); if (mouseDX != 0 || mouseDY != 0 || mouseDW != 0) { cursorX += mouseDX; - cursorY += mouseDY; + cursorY -= mouseDY; if (cursorX < 0) { cursorX = 0; } @@ -102,8 +102,7 @@ public abstract class MouseInput extends Input{ } if(cursor != null){ - cursor.setLocation(new Vector2f(cursorX, - LWJGLGameWindow.getHeight()-cursorY)); + cursor.setLocation(new Vector2f(cursorX, cursorY)); } } diff --git a/src/ei/game/input/InGameMouseInput.java b/src/ei/game/input/InGameMouseInput.java index fde86eb..f823fbb 100644 --- a/src/ei/game/input/InGameMouseInput.java +++ b/src/ei/game/input/InGameMouseInput.java @@ -41,11 +41,11 @@ public class InGameMouseInput extends MouseInput{ } // mov cam upp if(y < CAMERA_MOVE_BORDER){ - LWJGLGameWindow.getCamera().getLocation().add(0,CAMERA_MOVE_SPEED,0); + LWJGLGameWindow.getCamera().getLocation().add(0,-CAMERA_MOVE_SPEED,0); } // mov cam down if(y > LWJGLGameWindow.getHeight()-CAMERA_MOVE_BORDER){ - LWJGLGameWindow.getCamera().getLocation().add(0,-CAMERA_MOVE_SPEED,0); + LWJGLGameWindow.getCamera().getLocation().add(0,CAMERA_MOVE_SPEED,0); } } @@ -54,7 +54,7 @@ public class InGameMouseInput extends MouseInput{ System.out.println("DOWN("+event+"): "+x+"-"+y); Vector2i pos = map.getPosByPixel( LWJGLGameWindow.getCamera().getLocation().getX()+x, - LWJGLGameWindow.getCamera().getLocation().getY()+(LWJGLGameWindow.getHeight()-y)); + LWJGLGameWindow.getCamera().getLocation().getY()+y); if(!map.isPosEmpty(pos.getX(), pos.getY())){ //map.printAllUnits(); selected.clear(); diff --git a/src/ei/game/scene/Map.java b/src/ei/game/scene/Map.java index 2f708ce..de30609 100644 --- a/src/ei/game/scene/Map.java +++ b/src/ei/game/scene/Map.java @@ -53,9 +53,9 @@ public class Map { * @return The coordinate of the pos */ public Vector2f getPixelByPos(int x, int y){ - x = (int)(POS_SIZE*x); - y = (int)(POS_SIZE*y); - return new Vector2f((int)x,(int)y); + float xf = (POS_SIZE*x); + float yf = (POS_SIZE*y); + return new Vector2f(xf,yf); } /**