From 56bde9124cbfd46f1b420c11fa610e1e2270fec0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laure=CE=B7t?= Date: Fri, 9 Apr 2021 15:03:24 +0200 Subject: [PATCH] feat: modifed GameScreen according to last commits --- core/src/sagittarius/view/GameScreen.java | 34 +++++++++++++++++------ 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/core/src/sagittarius/view/GameScreen.java b/core/src/sagittarius/view/GameScreen.java index 4a3b927..b5fcb62 100644 --- a/core/src/sagittarius/view/GameScreen.java +++ b/core/src/sagittarius/view/GameScreen.java @@ -1,10 +1,9 @@ package sagittarius.view; +import com.badlogic.gdx.Gdx; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.math.Vector2; -import com.badlogic.gdx.scenes.scene2d.InputEvent; -import com.badlogic.gdx.scenes.scene2d.InputListener; -import com.badlogic.gdx.scenes.scene2d.Stage; +import com.badlogic.gdx.math.Vector3; import sagittarius.model.*; @@ -15,26 +14,43 @@ public class GameScreen extends BaseScreen { // Constants public static final int G = 100; + // Cursors + public static Vector2 screenCursor; + private static Vector3 unprojectedCursor; + public static Vector2 worldCursor; + + // ---------- METHODs ---------- @Override public void initialize() { - mainStage = new Stage(); - - Planet planet1 = new Planet(new Vector2(400, 400), 1000, 200, Color.WHITE); - planet1.setDebug(true); + mainStage.setDebugAll(true); // TODO: disable later + + Planet planet1 = new Planet(new Vector2(400, 400), 1000, 50, Color.BLUE); mainStage.addActor(planet1); + Planet planet2 = new Planet(new Vector2(1400, 700), 1000, 100, Color.ORANGE); + mainStage.addActor(planet2); + Player player1 = new Player(planet1, Color.WHITE); - player1.setDebug(true); mainStage.addActor(player1); + + FPS fpsCounter = new FPS(); + uiStage.addActor(fpsCounter); + + MouseInfo mouseInfo = new MouseInfo(); + uiStage.addActor(mouseInfo); } @Override public void update(float dt) { - // todo ? + + screenCursor = new Vector2(Gdx.input.getX(), Gdx.input.getY()); + unprojectedCursor = mainStage.getCamera().unproject(new Vector3(screenCursor, 0)); + worldCursor = new Vector2(unprojectedCursor.x, unprojectedCursor.y); + } }