diff --git a/src/main/java/inf112/skeleton/app/GameLauncher.java b/src/main/java/inf112/fiasko/roborally/GameLauncher.java similarity index 93% rename from src/main/java/inf112/skeleton/app/GameLauncher.java rename to src/main/java/inf112/fiasko/roborally/GameLauncher.java index 3946f71..f5bcdc4 100644 --- a/src/main/java/inf112/skeleton/app/GameLauncher.java +++ b/src/main/java/inf112/fiasko/roborally/GameLauncher.java @@ -1,4 +1,4 @@ -package inf112.skeleton.app; +package inf112.fiasko.roborally; import com.badlogic.gdx.ApplicationAdapter; import com.badlogic.gdx.Gdx; @@ -6,6 +6,10 @@ import com.badlogic.gdx.graphics.GL20; import com.badlogic.gdx.graphics.OrthographicCamera; import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.g2d.SpriteBatch; +import inf112.fiasko.roborally.abstractions.GameTexture; +import inf112.fiasko.roborally.game.Game; +import inf112.fiasko.roborally.game.IDrawableGame; +import inf112.fiasko.roborally.objects.IDrawableObject; /** * This class renders a game using libgdx diff --git a/src/main/java/inf112/skeleton/app/Main.java b/src/main/java/inf112/fiasko/roborally/Main.java similarity index 85% rename from src/main/java/inf112/skeleton/app/Main.java rename to src/main/java/inf112/fiasko/roborally/Main.java index 196b6b2..dd56c12 100644 --- a/src/main/java/inf112/skeleton/app/Main.java +++ b/src/main/java/inf112/fiasko/roborally/Main.java @@ -1,8 +1,7 @@ -package inf112.skeleton.app; +package inf112.fiasko.roborally; import com.badlogic.gdx.backends.lwjgl.LwjglApplication; import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration; -import inf112.skeleton.app.demo.GameBoard; public class Main { diff --git a/src/main/java/inf112/skeleton/app/GameTexture.java b/src/main/java/inf112/fiasko/roborally/abstractions/GameTexture.java similarity index 78% rename from src/main/java/inf112/skeleton/app/GameTexture.java rename to src/main/java/inf112/fiasko/roborally/abstractions/GameTexture.java index 05cc5bd..526361e 100644 --- a/src/main/java/inf112/skeleton/app/GameTexture.java +++ b/src/main/java/inf112/fiasko/roborally/abstractions/GameTexture.java @@ -1,4 +1,4 @@ -package inf112.skeleton.app; +package inf112.fiasko.roborally.abstractions; /** * This enum represents a drawable texture diff --git a/src/main/java/inf112/skeleton/app/Game.java b/src/main/java/inf112/fiasko/roborally/game/Game.java similarity index 84% rename from src/main/java/inf112/skeleton/app/Game.java rename to src/main/java/inf112/fiasko/roborally/game/Game.java index 6e8dd75..0f900c0 100644 --- a/src/main/java/inf112/skeleton/app/Game.java +++ b/src/main/java/inf112/fiasko/roborally/game/Game.java @@ -1,4 +1,8 @@ -package inf112.skeleton.app; +package inf112.fiasko.roborally.game; + +import inf112.fiasko.roborally.abstractions.GameTexture; +import inf112.fiasko.roborally.objects.DrawableObject; +import inf112.fiasko.roborally.objects.IDrawableObject; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/inf112/skeleton/app/IDrawableGame.java b/src/main/java/inf112/fiasko/roborally/game/IDrawableGame.java similarity index 85% rename from src/main/java/inf112/skeleton/app/IDrawableGame.java rename to src/main/java/inf112/fiasko/roborally/game/IDrawableGame.java index 0cc8101..45456a4 100644 --- a/src/main/java/inf112/skeleton/app/IDrawableGame.java +++ b/src/main/java/inf112/fiasko/roborally/game/IDrawableGame.java @@ -1,4 +1,6 @@ -package inf112.skeleton.app; +package inf112.fiasko.roborally.game; + +import inf112.fiasko.roborally.objects.IDrawableObject; import java.util.List; diff --git a/src/main/java/inf112/skeleton/app/DrawableObject.java b/src/main/java/inf112/fiasko/roborally/objects/DrawableObject.java similarity index 95% rename from src/main/java/inf112/skeleton/app/DrawableObject.java rename to src/main/java/inf112/fiasko/roborally/objects/DrawableObject.java index 72de09c..53531bd 100644 --- a/src/main/java/inf112/skeleton/app/DrawableObject.java +++ b/src/main/java/inf112/fiasko/roborally/objects/DrawableObject.java @@ -1,4 +1,6 @@ -package inf112.skeleton.app; +package inf112.fiasko.roborally.objects; + +import inf112.fiasko.roborally.abstractions.GameTexture; /** * This class represents an object that can be drawn using libgdx diff --git a/src/main/java/inf112/skeleton/app/IDrawableObject.java b/src/main/java/inf112/fiasko/roborally/objects/IDrawableObject.java similarity index 94% rename from src/main/java/inf112/skeleton/app/IDrawableObject.java rename to src/main/java/inf112/fiasko/roborally/objects/IDrawableObject.java index 7359ebc..f6d2816 100644 --- a/src/main/java/inf112/skeleton/app/IDrawableObject.java +++ b/src/main/java/inf112/fiasko/roborally/objects/IDrawableObject.java @@ -1,4 +1,6 @@ -package inf112.skeleton.app; +package inf112.fiasko.roborally.objects; + +import inf112.fiasko.roborally.abstractions.GameTexture; /** * This interface describes an object drawable using libgdx diff --git a/src/main/java/inf112/skeleton/app/demo/GameBoard.java b/src/main/java/inf112/skeleton/app/demo/GameBoard.java deleted file mode 100644 index ed4c7f3..0000000 --- a/src/main/java/inf112/skeleton/app/demo/GameBoard.java +++ /dev/null @@ -1,67 +0,0 @@ -package inf112.skeleton.app.demo; - -import com.badlogic.gdx.ApplicationAdapter; -import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.Input; -import com.badlogic.gdx.graphics.GL20; -import com.badlogic.gdx.graphics.OrthographicCamera; -import com.badlogic.gdx.graphics.Texture; -import com.badlogic.gdx.graphics.g2d.SpriteBatch; -import com.badlogic.gdx.math.Rectangle; - -public class GameBoard extends ApplicationAdapter { - private OrthographicCamera camera; - private SpriteBatch batch; - - private Texture robotTexture; - private Texture tileTexture; - - private Rectangle robot; - - @Override - public void create() { - //Loads some textures - robotTexture = new Texture(Gdx.files.internal("assets/Robot.png")); - tileTexture = new Texture(Gdx.files.internal("assets/Tile.png")); - - robot = new Rectangle((float)768/2,(float)768/2,64,64); - camera = new OrthographicCamera(); - camera.setToOrtho(false, 768, 768); - batch = new SpriteBatch(); - } - - /** - * Renders all textures necessary to display a game - */ - public void render() { - Gdx.gl.glClearColor(0,0,0.2f,1); - Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT); - camera.update(); - batch.setProjectionMatrix(camera.combined); - batch.begin(); - for (int i = 0; i < 12; i++) { - for (int j = 0; j < 12; j++) { - batch.draw(tileTexture, i * 64, j * 64); - } - } - batch.draw(robotTexture, robot.x, robot.y); - batch.end(); - if (Gdx.input.isKeyJustPressed(Input.Keys.RIGHT) && robot.x < 768-64) { - robot.x += 64; - } - if (Gdx.input.isKeyJustPressed(Input.Keys.LEFT) && robot.x > 0) { - robot.x -= 64; - } - if (Gdx.input.isKeyJustPressed(Input.Keys.UP) && robot.y < 768-64) { - robot.y += 64; - } - if (Gdx.input.isKeyJustPressed(Input.Keys.DOWN) && robot.y > 0) { - robot.y -= 64; - } - } - - @Override - public void dispose() { - batch.dispose(); - } -} \ No newline at end of file diff --git a/src/main/java/inf112/skeleton/app/demo/HelloWorld.java b/src/main/java/inf112/skeleton/app/demo/HelloWorld.java deleted file mode 100644 index e5c3fdc..0000000 --- a/src/main/java/inf112/skeleton/app/demo/HelloWorld.java +++ /dev/null @@ -1,48 +0,0 @@ -package inf112.skeleton.app.demo; - -import com.badlogic.gdx.ApplicationListener; -import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.graphics.Color; -import com.badlogic.gdx.graphics.GL20; -import com.badlogic.gdx.graphics.g2d.BitmapFont; -import com.badlogic.gdx.graphics.g2d.SpriteBatch; - -public class HelloWorld implements ApplicationListener { - private SpriteBatch batch; - private BitmapFont font; - - @Override - public void create() { - batch = new SpriteBatch(); - font = new BitmapFont(); - font.setColor(Color.RED); - } - - @Override - public void dispose() { - batch.dispose(); - font.dispose(); - } - - @Override - public void render() { - Gdx.gl.glClearColor(1, 1, 1, 1); - Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT); - - batch.begin(); - font.draw(batch, "Hello World", 200, 200); - batch.end(); - } - - @Override - public void resize(int width, int height) { - } - - @Override - public void pause() { - } - - @Override - public void resume() { - } -} diff --git a/src/test/java/inf112/skeleton/app/DrawableObjectTest.java b/src/test/java/inf112/fiasko/roborally/DrawableObjectTest.java similarity index 93% rename from src/test/java/inf112/skeleton/app/DrawableObjectTest.java rename to src/test/java/inf112/fiasko/roborally/DrawableObjectTest.java index 7a1821c..f9e95ef 100644 --- a/src/test/java/inf112/skeleton/app/DrawableObjectTest.java +++ b/src/test/java/inf112/fiasko/roborally/DrawableObjectTest.java @@ -1,5 +1,7 @@ -package inf112.skeleton.app; +package inf112.fiasko.roborally; +import inf112.fiasko.roborally.objects.DrawableObject; +import inf112.fiasko.roborally.abstractions.GameTexture; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/inf112/skeleton/app/GameTest.java b/src/test/java/inf112/fiasko/roborally/GameTest.java similarity index 86% rename from src/test/java/inf112/skeleton/app/GameTest.java rename to src/test/java/inf112/fiasko/roborally/GameTest.java index 237fc8d..dabcdc7 100644 --- a/src/test/java/inf112/skeleton/app/GameTest.java +++ b/src/test/java/inf112/fiasko/roborally/GameTest.java @@ -1,8 +1,10 @@ -package inf112.skeleton.app; +package inf112.fiasko.roborally; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import inf112.fiasko.roborally.game.Game; +import inf112.fiasko.roborally.game.IDrawableGame; import org.junit.Before; import org.junit.Test; diff --git a/src/test/java/inf112/skeleton/app/AppTest.java b/src/test/java/inf112/skeleton/app/AppTest.java deleted file mode 100644 index fedfe2a..0000000 --- a/src/test/java/inf112/skeleton/app/AppTest.java +++ /dev/null @@ -1,19 +0,0 @@ -package inf112.skeleton.app; - -import static org.junit.Assert.assertTrue; -import org.junit.Test; - -/** - * Unit test for simple App. - */ -public class AppTest -{ - /** - * Rigorous Test :-) - */ - @Test - public void shouldAnswerWithTrue() - { - assertTrue( true ); - } -}