From 77103858cdc598acaeddbd92f70d111c828c689b Mon Sep 17 00:00:00 2001 From: GammelJAN Date: Sat, 19 Dec 2020 21:39:26 +0100 Subject: [PATCH] still wrong commit -.- --- .../com/trs/main/{MapObject.java => MapCollisionObject.java} | 4 ++-- core/src/com/trs/main/Player.java | 3 ++- core/src/com/trs/main/view/screens/GameScreen.java | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) rename core/src/com/trs/main/{MapObject.java => MapCollisionObject.java} (88%) diff --git a/core/src/com/trs/main/MapObject.java b/core/src/com/trs/main/MapCollisionObject.java similarity index 88% rename from core/src/com/trs/main/MapObject.java rename to core/src/com/trs/main/MapCollisionObject.java index cad783c..a6fbff0 100644 --- a/core/src/com/trs/main/MapObject.java +++ b/core/src/com/trs/main/MapCollisionObject.java @@ -13,11 +13,11 @@ import com.badlogic.gdx.scenes.scene2d.Actor; * * @author Jan */ -public class MapObject extends Actor{ +public class MapCollisionObject extends Actor{ Rectangle r; - public MapObject(int x, int y, int width, int height){ + public MapCollisionObject(int x, int y, int width, int height){ setName("mapobject"); r = new Rectangle(x, y, width, height); setBounds(x, y, width, height); diff --git a/core/src/com/trs/main/Player.java b/core/src/com/trs/main/Player.java index 05ca1a0..ffc66b0 100644 --- a/core/src/com/trs/main/Player.java +++ b/core/src/com/trs/main/Player.java @@ -25,6 +25,7 @@ public class Player extends Actor{ private AnimatedSprite playerSprite; float movementX = 0; float movementY = 0; + float speed = 2f; public Player(int xPos, int yPos){ @@ -46,7 +47,7 @@ public class Player extends Actor{ @Override public void act(float delta) { if(Gdx.input.isKeyPressed(Input.Keys.D)){ - + movementX = speed; } if(Gdx.input.isKeyPressed(Input.Keys.A)){ setX(getX()-5); diff --git a/core/src/com/trs/main/view/screens/GameScreen.java b/core/src/com/trs/main/view/screens/GameScreen.java index bf98e96..cb9c35b 100644 --- a/core/src/com/trs/main/view/screens/GameScreen.java +++ b/core/src/com/trs/main/view/screens/GameScreen.java @@ -50,7 +50,7 @@ public class GameScreen extends AbstractScreen{ for(MapObject object : map.getLayers().get(2).getObjects().getByType(RectangleMapObject.class)){ Rectangle rect = ((RectangleMapObject) object).getRectangle(); - stage.addActor(new com.trs.main.MapObject((int)rect.getX(), (int)rect.getY(), (int)rect.getWidth(), (int)rect.getHeight())); + stage.addActor(new com.trs.main.MapCollisionObject((int)rect.getX(), (int)rect.getY(), (int)rect.getWidth(), (int)rect.getHeight())); } }