From d98d9ece8b3a1f1e00526a386afaa3164f889fe1 Mon Sep 17 00:00:00 2001 From: James <150948866+jameslaight@users.noreply.github.com> Date: Sat, 20 Apr 2024 16:57:59 +0100 Subject: [PATCH] remove redundant code --- core/src/com/monjaro/gamejam/Die.java | 10 +--------- core/src/com/monjaro/gamejam/Face.java | 5 ++--- core/src/com/monjaro/gamejam/Game.java | 5 ----- 3 files changed, 3 insertions(+), 17 deletions(-) diff --git a/core/src/com/monjaro/gamejam/Die.java b/core/src/com/monjaro/gamejam/Die.java index 2e7db70..b73e40a 100644 --- a/core/src/com/monjaro/gamejam/Die.java +++ b/core/src/com/monjaro/gamejam/Die.java @@ -9,26 +9,18 @@ import java.util.Random; public class Die extends Actor { private final Rectangle shape; + /* 0 1 2 3 4 5 */ - private final Face[] faces = new Face[6]; private int faceIndex = 3; private boolean locked = false; private final Random random = new Random(); //TODO use central random - public Die() { - int[] pips = {4, 6, 5, 1, 2, 3}; - for (int i = 0; i < faces.length; i++) { - faces[i] = new Face(pips[i]); - } - shape = new Rectangle(); - } - public Die(float x, float y, float width, float height) { int[] pips = {4, 6, 5, 1, 2, 3}; for (int i = 0; i < faces.length; i++) { diff --git a/core/src/com/monjaro/gamejam/Face.java b/core/src/com/monjaro/gamejam/Face.java index e7e853d..4261db3 100644 --- a/core/src/com/monjaro/gamejam/Face.java +++ b/core/src/com/monjaro/gamejam/Face.java @@ -1,7 +1,7 @@ package com.monjaro.gamejam; + import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.g2d.SpriteBatch; -import com.badlogic.gdx.graphics.glutils.ShapeRenderer; import com.badlogic.gdx.math.Rectangle; import com.badlogic.gdx.math.Vector2; @@ -10,10 +10,9 @@ import java.util.Collections; import java.util.List; import java.util.Random; - public class Face extends Actor{ - private Rectangle shape = new Rectangle(); + private final Rectangle shape = new Rectangle(); private final List pips = new ArrayList<>(); diff --git a/core/src/com/monjaro/gamejam/Game.java b/core/src/com/monjaro/gamejam/Game.java index 616304e..f457a32 100644 --- a/core/src/com/monjaro/gamejam/Game.java +++ b/core/src/com/monjaro/gamejam/Game.java @@ -3,9 +3,7 @@ package com.monjaro.gamejam; import com.badlogic.gdx.ApplicationAdapter; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Input; -import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.Texture; -import com.badlogic.gdx.graphics.g2d.BitmapFont; import com.badlogic.gdx.graphics.g2d.SpriteBatch; import com.badlogic.gdx.utils.ScreenUtils; @@ -21,7 +19,6 @@ public class Game extends ApplicationAdapter { private final List dice = new ArrayList<>(); private SpriteBatch batch; - private BitmapFont font; private Texture img; private final static int TICKS_PER_SECOND = 60; @@ -30,7 +27,6 @@ public class Game extends ApplicationAdapter { @Override public void create() { batch = new SpriteBatch(); - font = new BitmapFont(); img = new Texture("badlogic.jpg"); Face.setBlankFaceSprite(new Texture("blank_die_face.png")); @@ -78,7 +74,6 @@ public class Game extends ApplicationAdapter { actors.forEach(a -> a.render(batch)); //TODO debug - int x = 100; for (Die die : dice) { die.render(batch); }