From e4992123a807f171db7bab3045b7a2e04d8fc01f Mon Sep 17 00:00:00 2001 From: MrDev023 Date: Sat, 21 Jan 2017 04:57:05 +0100 Subject: [PATCH] Bug fixes and add wall --- .classpath | 6 ++++- .../org.eclipse.ltk.core.refactoring.prefs | 2 ++ out/production/.gitignore | 1 + src/globalgamejam/Main.java | 2 +- src/globalgamejam/game/MainGame.java | 1 - src/globalgamejam/render/DisplayManager.java | 8 +++--- src/globalgamejam/tiles/Mur.java | 16 +++++++++++ src/globalgamejam/tiles/TestTile.java | 16 ----------- src/globalgamejam/world/MainWorld.java | 27 ++++++++++--------- 9 files changed, 44 insertions(+), 35 deletions(-) create mode 100644 .settings/org.eclipse.ltk.core.refactoring.prefs create mode 100644 out/production/.gitignore create mode 100644 src/globalgamejam/tiles/Mur.java delete mode 100644 src/globalgamejam/tiles/TestTile.java diff --git a/.classpath b/.classpath index c248576..cd2e911 100644 --- a/.classpath +++ b/.classpath @@ -4,6 +4,10 @@ - + + + + + diff --git a/.settings/org.eclipse.ltk.core.refactoring.prefs b/.settings/org.eclipse.ltk.core.refactoring.prefs new file mode 100644 index 0000000..b196c64 --- /dev/null +++ b/.settings/org.eclipse.ltk.core.refactoring.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false diff --git a/out/production/.gitignore b/out/production/.gitignore new file mode 100644 index 0000000..8a641e7 --- /dev/null +++ b/out/production/.gitignore @@ -0,0 +1 @@ +/Global-Gam-Jam-2017/ diff --git a/src/globalgamejam/Main.java b/src/globalgamejam/Main.java index 7b23914..4ac2dd9 100644 --- a/src/globalgamejam/Main.java +++ b/src/globalgamejam/Main.java @@ -71,7 +71,7 @@ public class Main { //initialisation //------------------------------------------------------------------------------------ - glEnable(GL_MULTISAMPLE);//Activation du MSAA + //glEnable(GL_MULTISAMPLE);//Activation du MSAA Input.init(); game = new MainGame(); diff --git a/src/globalgamejam/game/MainGame.java b/src/globalgamejam/game/MainGame.java index 74045a5..2f40e5c 100644 --- a/src/globalgamejam/game/MainGame.java +++ b/src/globalgamejam/game/MainGame.java @@ -15,7 +15,6 @@ import globalgamejam.gui.GUILabel; import globalgamejam.render.Camera; import globalgamejam.tiles.Fond; import globalgamejam.tiles.Objet; -import globalgamejam.tiles.TestTile; import globalgamejam.tiles.Tile; diff --git a/src/globalgamejam/render/DisplayManager.java b/src/globalgamejam/render/DisplayManager.java index 2c02eaf..f87cdd3 100644 --- a/src/globalgamejam/render/DisplayManager.java +++ b/src/globalgamejam/render/DisplayManager.java @@ -20,8 +20,8 @@ public class DisplayManager { projection.loadIdentity(); // projection.Ortho2D(-Main.WIDTH/2.0f, Main.WIDTH/2.0f, -Main.HEIGHT/2.0f, Main.HEIGHT/2.0f, -1, 1); projection.Ortho2D(0, Main.WIDTH, 0, Main.HEIGHT, -1, 1); - glEnable(GL_DEPTH_TEST); - glDepthFunc(GL_LESS); + //glEnable(GL_DEPTH_TEST); + //glDepthFunc(GL_LESS); glEnable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); } @@ -30,8 +30,8 @@ public class DisplayManager { projection.loadIdentity(); //Permet de centrer la camera au centre de l'ecran projection.Ortho2D(0, Main.WIDTH, Main.HEIGHT, 0, -1, 1); - glEnable(GL_DEPTH_TEST); - glDepthFunc(GL_LESS); + //glEnable(GL_DEPTH_TEST); + //glDepthFunc(GL_LESS); glEnable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); } diff --git a/src/globalgamejam/tiles/Mur.java b/src/globalgamejam/tiles/Mur.java new file mode 100644 index 0000000..ea10fdf --- /dev/null +++ b/src/globalgamejam/tiles/Mur.java @@ -0,0 +1,16 @@ +package globalgamejam.tiles; + +import globalgamejam.math.Color4f; +import globalgamejam.math.Vector2f; + +public class Mur extends Tile{ + + public Mur(int x,int y,int scaleX,int scaleY){ + super(); + super.setColor(Color4f.BLACK); + super.setPosition(new Vector2f(x, y)); + super.setScale(new Vector2f(scaleX, scaleY)); + super.applyTransform(); + } + +} diff --git a/src/globalgamejam/tiles/TestTile.java b/src/globalgamejam/tiles/TestTile.java deleted file mode 100644 index bb3553d..0000000 --- a/src/globalgamejam/tiles/TestTile.java +++ /dev/null @@ -1,16 +0,0 @@ -package globalgamejam.tiles; - - -import globalgamejam.math.Color4f; - -/** - * Created by MrDev023 on 14/01/2017. - */ -public class TestTile extends Tile { - - public TestTile(){ - super(); - super.setColor(Color4f.RED); - } - -} diff --git a/src/globalgamejam/world/MainWorld.java b/src/globalgamejam/world/MainWorld.java index 8d0b5bc..c2c3026 100644 --- a/src/globalgamejam/world/MainWorld.java +++ b/src/globalgamejam/world/MainWorld.java @@ -1,23 +1,18 @@ package globalgamejam.world; +import java.util.ArrayList; + +import org.lwjgl.glfw.GLFW; + import globalgamejam.Main; import globalgamejam.game.MainGame; import globalgamejam.game.Player; -import globalgamejam.gui.ActionGUI; -import globalgamejam.gui.GUI; -import globalgamejam.gui.GUILabel; import globalgamejam.input.Input; import globalgamejam.tiles.Fond; +import globalgamejam.tiles.Mur; import globalgamejam.tiles.Objet; -import globalgamejam.tiles.TestTile; import globalgamejam.tiles.Tile; -import java.awt.Color; -import java.util.ArrayList; -import java.util.Random; - -import org.lwjgl.glfw.GLFW; - /** * Created by trexr on 20/01/2017. */ @@ -28,6 +23,7 @@ public class MainWorld { private MainGame game; private Player player1,player2; + private Mur mur1,mur2,mur3; public MainWorld(MainGame game){ this.game = game; @@ -43,10 +39,17 @@ public class MainWorld { Fond fond = new Fond("res/textures/fond.png"); fond.getTransform().translate(Main.WIDTH/2, Main.HEIGHT/2, 0); fond.getTransform().scale(Main.WIDTH,Main.HEIGHT, 0); + + this.mur1 = new Mur(Main.WIDTH/2-10, Main.HEIGHT - 50, 20, 150); + this.mur2 = new Mur(Main.WIDTH/2-10, Main.HEIGHT - 250, 20, 50); + this.mur3 = new Mur(Main.WIDTH/2-10, Main.HEIGHT - 400, 20, 150); tiles.add(fond); tiles.add(player1.getTile()); tiles.add(player2.getTile()); + tiles.add(this.mur1); + tiles.add(this.mur2); + tiles.add(this.mur3); generateEntity(3); } @@ -114,11 +117,11 @@ public class MainWorld { } public void render(){ - for(int i = tiles.size() - 1;i >= 0 ;i--) - tiles.get(i).render(); + for(Tile t : tiles)t.render(); } public void destroy(){ + for(Tile t : tiles)t.destroy(); tiles.clear(); }