EpicKnarvik97/Fiasko
EpicKnarvik97/Fiasko
1
0
Fork 0
mirror of https://github.com/inf112-v20/Fiasko.git synced 2025-01-31 23:29:36 +01:00
Code Issues Projects Releases Wiki Activity

Legger til tekstur for robot 2

Browse Source 
Legger til flere steg i game loop demoen
This commit is contained in:
Kristian Knarvik 2020-02-24 23:35:58 +01:00
parent 97c9059901
commit 6c49fd0e9c
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/inf112/fiasko/roborally/game/Game.java
View File

@ -24,6 +24,7 @@ public class Game implements IDrawableGame {
try { try {
List<Robot> robots = new ArrayList<>(); List<Robot> robots = new ArrayList<>();
robots.add(new Robot(RobotID.ROBOT_1, new Position(1, 1))); robots.add(new Robot(RobotID.ROBOT_1, new Position(1, 1)));
robots.add(new Robot(RobotID.ROBOT_2, new Position(1, 2)));
gameBoard = BoardLoaderUtil.loadBoard("boards/Checkmate.txt", robots); gameBoard = BoardLoaderUtil.loadBoard("boards/Checkmate.txt", robots);
new Thread(() -> { new Thread(() -> {
try { try {
@ -57,6 +58,14 @@ public class Game implements IDrawableGame {
gameBoard.rotateRobotRight(RobotID.ROBOT_1); gameBoard.rotateRobotRight(RobotID.ROBOT_1);
TimeUnit.SECONDS.sleep(1); TimeUnit.SECONDS.sleep(1);
gameBoard.moveRobot(RobotID.ROBOT_1, Direction.SOUTH); gameBoard.moveRobot(RobotID.ROBOT_1, Direction.SOUTH);
TimeUnit.SECONDS.sleep(1);
gameBoard.moveRobot(RobotID.ROBOT_2, Direction.EAST);
TimeUnit.SECONDS.sleep(1);
gameBoard.moveRobot(RobotID.ROBOT_2, Direction.WEST);
TimeUnit.SECONDS.sleep(1);
gameBoard.moveRobot(RobotID.ROBOT_2, Direction.EAST);
TimeUnit.SECONDS.sleep(1);
gameBoard.moveRobot(RobotID.ROBOT_2, Direction.EAST);
} }
@Override @Override

7
src/main/java/inf112/fiasko/roborally/utility/TextureConverterUtil.java
View File

@ -23,7 +23,8 @@ import java.util.Map;
*/ */
public final class TextureConverterUtil { public final class TextureConverterUtil {
private static final Texture textureSheet = new Texture(Gdx.files.internal("assets/tiles.png")); private static final Texture textureSheet = new Texture(Gdx.files.internal("assets/tiles.png"));
private static final Texture robotTexture = new Texture(Gdx.files.internal("assets/Robot.png")); private static final Texture robot1Texture = new Texture(Gdx.files.internal("assets/Robot.png"));
private static final Texture robot2Texture = new Texture(Gdx.files.internal("assets/Robot2.png"));
private static Map<TileType, TextureConverterContainer> tileSheetTileTextureMappings; private static Map<TileType, TextureConverterContainer> tileSheetTileTextureMappings;
private static Map<TileType, Boolean> tileSheetTileHasRotatedTextureMappings; private static Map<TileType, Boolean> tileSheetTileHasRotatedTextureMappings;
private static Map<WallType, TextureConverterContainer> tileSheetWallTextureMappings; private static Map<WallType, TextureConverterContainer> tileSheetWallTextureMappings;
@ -83,7 +84,9 @@ public final class TextureConverterUtil {
public static TextureRegion convertElement(Robot robot) { public static TextureRegion convertElement(Robot robot) {
if (robot.getRobotId() == RobotID.ROBOT_1) { if (robot.getRobotId() == RobotID.ROBOT_1) {
return new TextureRegion(robotTexture, 0, 0, 64, 64); return new TextureRegion(robot1Texture, 0, 0, 64, 64);
} else if (robot.getRobotId() == RobotID.ROBOT_2) {
return new TextureRegion(robot2Texture, 0, 0, 64, 64);
} }
throw new IllegalArgumentException("Robot has no drawable texture."); throw new IllegalArgumentException("Robot has no drawable texture.");
} }

BIN
src/main/resources/assets/Robot2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 743 B