fixed mouse position with graphics scale

spynetS · spynetS · commit 0690c1cc424c · 2022-08-12T13:00:40.000+02:00
diff --git a/out/artifacts/JavaGameEngine_jar/JavaGameEngine.jar b/out/artifacts/JavaGameEngine_jar/JavaGameEngine.jar
diff --git a/src/Testing/Main.java b/src/Testing/Main.java
@@ -2,6 +2,7 @@
 
 import javagameengine.backend.Scene;
 import javagameengine.backend.UpdateThread;
+import javagameengine.backend.input.Input;
 import javagameengine.components.Component;
 import javagameengine.components.colliders.SquareCollider;
 import javagameengine.components.GameObject;
@@ -109,11 +110,21 @@ public Level1(){
 
            // add(mainPanel);
 
-            Player s = new Player(new Vector2(-100,-110));
+           /* Player s = new Player(new Vector2(-100,-110));
             components.add(s);
             components.add(new Goal(new Vector2(100,-100)));
-            components.add(new Ground(new Vector2(0,0)));
+            components.add(new Ground(new Vector2(0,0)));*/
+
+            GameObject g = new GameObject(){
+                @Override
+                public void draw(Graphics g) {
+                    super.draw(g);
+                    g.fillOval((int) Input.getMouseWorldPosition().getX(), (int) Input.getMouseWorldPosition().getY(),10,10);
+                }
+            };
+            g.addChild(new GameObject());
 
+            add(g);
 
 
         }
diff --git a/src/Testing/Player.java b/src/Testing/Player.java
@@ -58,7 +58,7 @@ public Player(Vector2 pos) {
 
         addChild(physicsBody);
         setTag("player");
-        SquareCollider s = new SquareCollider();
+        SquareCollider s = new SquareCollider(true);
         s.setLocalScale(new Vector2(-20,0));
         addChild(s);
         addChild(new PlayerMovement());
diff --git a/src/javagameengine/JavaGameEngine.java b/src/javagameengine/JavaGameEngine.java
@@ -2,7 +2,6 @@
 import javagameengine.backend.GameWorld;
 import javagameengine.backend.Scene;
 import javagameengine.backend.UpdateThread;
-import javagameengine.msc.Debug;
 import javagameengine.msc.Vector2;
 
 import java.util.LinkedList;
@@ -85,8 +84,12 @@ private void startGame(){
         calcThread.start();
         mainClass = this;
     }
+    boolean started = false;
     public void update(){
-
+        if(!started && getWindowSize().getX()>0){
+            started = true;
+            getScene().startScene();
+        }
     }
 
 }
diff --git a/src/javagameengine/backend/GameWorld.java b/src/javagameengine/backend/GameWorld.java
@@ -110,5 +110,4 @@ public void setCurrentScene(Scene currentScene) {
     public Scene getCurrentScene() {
         return currentScene;
     }
-
 }
diff --git a/src/javagameengine/backend/Scene.java b/src/javagameengine/backend/Scene.java
@@ -1,16 +1,12 @@
 package javagameengine.backend;
 
-import Testing.Main;
 import javagameengine.JavaGameEngine;
-import javagameengine.backend.input.Input;
 import javagameengine.components.Camera;
 import javagameengine.components.Component;
-import javagameengine.msc.Debug;
 import javagameengine.msc.Vector2;
 
 import javax.swing.*;
 import java.awt.*;
-import java.awt.geom.AffineTransform;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.LinkedList;
@@ -55,13 +51,21 @@ public boolean isActive() {
     /**
         Start the scene. Sets som default values
      */
-    public void start(){
+    public void startScene(){
 
         setActive(true);
         setBackground(new Color(44, 157, 228));
         getCamera().setPosition(new Vector2(0,0));
 
     }
+
+    /**
+     * This method is called when the frame has been initialized
+     */
+    public void start(){
+
+    }
+
     public void starts(){
         for(Component a : components){
             a.start();
diff --git a/src/javagameengine/backend/UpdateThread.java b/src/javagameengine/backend/UpdateThread.java
@@ -2,8 +2,6 @@
 
 import javagameengine.components.Component;
 import javagameengine.JavaGameEngine;
-import javagameengine.msc.Debug;
-import javagameengine.msc.Vector2;
 
 import java.awt.*;
 import java.util.LinkedList;
@@ -51,7 +49,8 @@ public void Update() {
             JavaGameEngine.getScene().components=(UpdateObjects());
             if(UpdateThread.newObjects.size()>0) {
                 for (Component o : UpdateThread.newObjects) {
-                    o.setPosition(o.getPosition().add(JavaGameEngine.origin));
+                    o.localOrigin = JavaGameEngine.origin;
+                    o.setPosition(o.getPosition());
                     JavaGameEngine.getScene().components.add(o);
                 }
                 newObjects.clear();
@@ -98,7 +97,7 @@ public void run() {
             JavaGameEngine.gameWorld.validate();
             JavaGameEngine.gameWorld.repaint();
             if(JavaGameEngine.startNewScene){
-                JavaGameEngine.gameWorld.getCurrentScene().start();
+                JavaGameEngine.gameWorld.getCurrentScene().startScene();
                 JavaGameEngine.startNewScene = false;
             }
 
diff --git a/src/javagameengine/backend/input/Input.java b/src/javagameengine/backend/input/Input.java
@@ -3,6 +3,7 @@
 import Testing.Main;
 import javagameengine.JavaGameEngine;
 import javagameengine.backend.UpdateThread;
+import javagameengine.msc.Debug;
 import javagameengine.msc.Vector2;
 
 import java.awt.event.KeyEvent;
@@ -21,7 +22,12 @@ public static Vector2 getMousePosition() {
         return mousePosition;
     }
     public static Vector2 getMouseWorldPosition(){
-        return Input.getMousePosition().add(Main.getScene().getCamera().getPosition().add(0).subtract(JavaGameEngine.getWindowSize().devide(2)));
+        Vector2 scale = JavaGameEngine.getWindowSize().devide(new Vector2(1920,1080));
+        scale = scale.multiply(JavaGameEngine.getScene().getCamera().getScale());
+
+        Vector2 pos = Input.getMousePosition().devide(scale).add(JavaGameEngine.getWindowSize().subtract(new Vector2(1920,1080)).devide(2));
+
+        return pos;
     }
     public static void setScrollValue(float scrollValue1){
         scrollValue = scrollValue1;
@@ -46,11 +52,13 @@ public static void removeMouseButton(MouseEvent e) {
         if(isMouseDown(e.getButton()))
             mouseButtonDowns.remove(new Integer(e.getButton()));
     }
+    public static LinkedList<Integer> getMouseDown(){
+        return mouseButtonDowns;
+    }
     public static boolean isMouseDown(int mouseButtonDown)
     {
         return(mouseButtonDowns.contains(mouseButtonDown));
     }
-
     public static boolean isMouseDown() {
         return mouseButtonDowns.size() > 0;
     }
diff --git a/src/javagameengine/components/Component.java b/src/javagameengine/components/Component.java
@@ -140,8 +140,8 @@ public void setPosition(Vector2 position) {
      *
      */
     public Vector2 getSpritePosition(){
-        float x = (getPosition().subtract(Main.getScene().getCamera().getPosition()).getX()-((getScale().getX()/2)));
-        float y = (getPosition().subtract(Main.getScene().getCamera().getPosition()).getY()-((getScale().getY()/2)));
+        float x = (getPosition().subtract(Main.getScene().getCamera().getPosition()).getX());
+        float y = (getPosition().subtract(Main.getScene().getCamera().getPosition()).getY());
 
         return new Vector2(x,y);
     }
@@ -301,13 +301,14 @@ public void update() {
             setMouseInside(false);
         }
         if (isMouseInside() && Input.isMousePressed() && isEnabled()) {
+            onMousePressed(Input.getMouseDown());
             onMousePressed();
             if (getParent() != null) getParent().onMousePressed();
         }
 
         if(parent!=null) {
-            float x = (parent.getPosition().getX())-scale.getX()/2;
-            float y = (parent.getPosition().getY())-scale.getY()/2;
+            float x = (parent.getPosition().getX());
+            float y = (parent.getPosition().getY());
 
             setPosition(new Vector2(x,y).add(getLocalPosition())); // we get the parents position and we add our localPosition
             // update this in the setScale and setRotation instead
@@ -446,10 +447,10 @@ public Vector2 movePosition(Vector2 add) {
         return add;
     }
 
+    public void onMousePressed(LinkedList<Integer> mouseKeys) {
+    }
     public void onMousePressed() {
-        Debug.log("pressed on "+this+" :/");
     }
-
     public void onMouseEntered() {
         //Debug.log("entered "+this);
     }
diff --git a/src/javagameengine/components/colliders/SquareCollider.java b/src/javagameengine/components/colliders/SquareCollider.java
@@ -156,7 +156,7 @@ public void draw(Graphics g) {
 
         if(isVisible()){
             g.setColor(Color.GREEN);
-            g.drawRect((int) ((int) getSpritePosition().getX()+getScale().getX()/2), (int) ((int) getSpritePosition().getY()+getScale().getY()/2), (int) getScale().getX(), (int) getScale().getY());
+            g.drawRect((int) ((int) getSpritePosition().getX()), (int) ((int) getSpritePosition().getY()), (int) getScale().getX(), (int) getScale().getY());
             g.setColor(Color.darkGray);
         }
         /*
diff --git a/src/javagameengine/components/sprites/Sprite.java b/src/javagameengine/components/sprites/Sprite.java
@@ -149,7 +149,7 @@ public BufferedImage getAnimation(){
     @Override
     public void draw(Graphics g) {
         super.draw(g);
-        g.drawImage((Image) getAnimation(), (int) ((int) getSpritePosition().getX()), (int) ((int) getSpritePosition().getY()), (int) getScale().getX(), (int) getScale().getY(),null);
+        g.drawImage(getAnimation(), ((int) getSpritePosition().getX()), ((int) getSpritePosition().getY()), (int) getScale().getX()+1, (int) getScale().getY(),null);
     }
 
     public static BufferedImage resize(BufferedImage img, Vector2 scale) {

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`	`import javagameengine.backend.GameWorld;`
`3`	`3`	`import javagameengine.backend.Scene;`
`4`	`4`	`import javagameengine.backend.UpdateThread;`
`5`		`-import javagameengine.msc.Debug;`
`6`	`5`	`import javagameengine.msc.Vector2;`
`7`	`6`
`8`	`7`	`import java.util.LinkedList;`
`@@ -85,8 +84,12 @@ private void startGame(){`
`85`	`84`	`calcThread.start();`
`86`	`85`	`mainClass = this;`
`87`	`86`	`}`
	`87`	`+ boolean started = false;`
`88`	`88`	`public void update(){`
`89`		`-`
	`89`	`+ if(!started && getWindowSize().getX()>0){`
	`90`	`+ started = true;`
	`91`	`+ getScene().startScene();`
	`92`	`+ }`
`90`	`93`	`}`
`91`	`94`
`92`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -110,5 +110,4 @@ public void setCurrentScene(Scene currentScene) {`
`110`	`110`	`public Scene getCurrentScene() {`
`111`	`111`	`return currentScene;`
`112`	`112`	`}`
`113`		`-`
`114`	`113`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`import Testing.Main;`
`4`	`4`	`import javagameengine.JavaGameEngine;`
`5`	`5`	`import javagameengine.backend.UpdateThread;`
	`6`	`+import javagameengine.msc.Debug;`
`6`	`7`	`import javagameengine.msc.Vector2;`
`7`	`8`
`8`	`9`	`import java.awt.event.KeyEvent;`
`@@ -21,7 +22,12 @@ public static Vector2 getMousePosition() {`
`21`	`22`	`return mousePosition;`
`22`	`23`	`}`
`23`	`24`	`public static Vector2 getMouseWorldPosition(){`
`24`		`- return Input.getMousePosition().add(Main.getScene().getCamera().getPosition().add(0).subtract(JavaGameEngine.getWindowSize().devide(2)));`
	`25`	`+ Vector2 scale = JavaGameEngine.getWindowSize().devide(new Vector2(1920,1080));`
	`26`	`+ scale = scale.multiply(JavaGameEngine.getScene().getCamera().getScale());`
	`27`	`+`
	`28`	`+ Vector2 pos = Input.getMousePosition().devide(scale).add(JavaGameEngine.getWindowSize().subtract(new Vector2(1920,1080)).devide(2));`
	`29`	`+`
	`30`	`+ return pos;`
`25`	`31`	`}`
`26`	`32`	`public static void setScrollValue(float scrollValue1){`
`27`	`33`	`scrollValue = scrollValue1;`
`@@ -46,11 +52,13 @@ public static void removeMouseButton(MouseEvent e) {`
`46`	`52`	`if(isMouseDown(e.getButton()))`
`47`	`53`	`mouseButtonDowns.remove(new Integer(e.getButton()));`
`48`	`54`	`}`
	`55`	`+ public static LinkedList<Integer> getMouseDown(){`
	`56`	`+ return mouseButtonDowns;`
	`57`	`+ }`
`49`	`58`	`public static boolean isMouseDown(int mouseButtonDown)`
`50`	`59`	`{`
`51`	`60`	`return(mouseButtonDowns.contains(mouseButtonDown));`
`52`	`61`	`}`
`53`		`-`
`54`	`62`	`public static boolean isMouseDown() {`
`55`	`63`	`return mouseButtonDowns.size() > 0;`
`56`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -140,8 +140,8 @@ public void setPosition(Vector2 position) {`
`140`	`140`	`*`
`141`	`141`	`*/`
`142`	`142`	`public Vector2 getSpritePosition(){`
`143`		`- float x = (getPosition().subtract(Main.getScene().getCamera().getPosition()).getX()-((getScale().getX()/2)));`
`144`		`- float y = (getPosition().subtract(Main.getScene().getCamera().getPosition()).getY()-((getScale().getY()/2)));`
	`143`	`+ float x = (getPosition().subtract(Main.getScene().getCamera().getPosition()).getX());`
	`144`	`+ float y = (getPosition().subtract(Main.getScene().getCamera().getPosition()).getY());`
`145`	`145`
`146`	`146`	`return new Vector2(x,y);`
`147`	`147`	`}`
`@@ -301,13 +301,14 @@ public void update() {`
`301`	`301`	`setMouseInside(false);`
`302`	`302`	`}`
`303`	`303`	`if (isMouseInside() && Input.isMousePressed() && isEnabled()) {`
	`304`	`+ onMousePressed(Input.getMouseDown());`
`304`	`305`	`onMousePressed();`
`305`	`306`	`if (getParent() != null) getParent().onMousePressed();`
`306`	`307`	`}`
`307`	`308`
`308`	`309`	`if(parent!=null) {`
`309`		`- float x = (parent.getPosition().getX())-scale.getX()/2;`
`310`		`- float y = (parent.getPosition().getY())-scale.getY()/2;`
	`310`	`+ float x = (parent.getPosition().getX());`
	`311`	`+ float y = (parent.getPosition().getY());`
`311`	`312`
`312`	`313`	`setPosition(new Vector2(x,y).add(getLocalPosition())); // we get the parents position and we add our localPosition`
`313`	`314`	`// update this in the setScale and setRotation instead`
`@@ -446,10 +447,10 @@ public Vector2 movePosition(Vector2 add) {`
`446`	`447`	`return add;`
`447`	`448`	`}`
`448`	`449`
	`450`	`+ public void onMousePressed(LinkedList<Integer> mouseKeys) {`
	`451`	`+ }`
`449`	`452`	`public void onMousePressed() {`
`450`		`- Debug.log("pressed on "+this+" :/");`
`451`	`453`	`}`
`452`		`-`
`453`	`454`	`public void onMouseEntered() {`
`454`	`455`	`//Debug.log("entered "+this);`
`455`	`456`	`}`
Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ public void draw(Graphics g) {`
`156`	`156`
`157`	`157`	`if(isVisible()){`
`158`	`158`	`g.setColor(Color.GREEN);`
`159`		`- g.drawRect((int) ((int) getSpritePosition().getX()+getScale().getX()/2), (int) ((int) getSpritePosition().getY()+getScale().getY()/2), (int) getScale().getX(), (int) getScale().getY());`
	`159`	`+ g.drawRect((int) ((int) getSpritePosition().getX()), (int) ((int) getSpritePosition().getY()), (int) getScale().getX(), (int) getScale().getY());`
`160`	`160`	`g.setColor(Color.darkGray);`
`161`	`161`	`}`
`162`	`162`	`/*`