diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..a30d2f5 Binary files /dev/null and b/.DS_Store differ diff --git a/.classpath b/.classpath index cd2e911..f084893 100644 --- a/.classpath +++ b/.classpath @@ -1,13 +1,25 @@ - - - - + + + + + + + + + + + - + + + + + + diff --git a/.gitignore b/.gitignore index 3e3f64e..44dd2a0 100644 --- a/.gitignore +++ b/.gitignore @@ -18,4 +18,6 @@ bin/* .classpath *.eml -*.userlibraries \ No newline at end of file +*.userlibraries +/target/ +/Global-Gam-Jam-2017/ diff --git a/.project b/.project index 2e5874d..7331bc6 100644 --- a/.project +++ b/.project @@ -1,15 +1,23 @@ Global-Gam-Jam-2017 - - + + + org.eclipse.jdt.core.javabuilder - + + + + + org.eclipse.m2e.core.maven2Builder + + + org.eclipse.m2e.core.maven2Nature org.eclipse.jdt.core.javanature diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..b8947ec --- /dev/null +++ b/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,6 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f897a7f --- /dev/null +++ b/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/README.md b/README.md new file mode 100755 index 0000000..7ecb63d --- /dev/null +++ b/README.md @@ -0,0 +1,15 @@ +# GGL 2017 + +Ce projet a été créé durant la Global Game Jam de 2016 à Limoges. + +## Comment compiler + +``` +$ mvn package assembly:single +``` + +## RUN + +``` +$ java -XstartOnFirstThread -jar target/GGL2017.jar +``` diff --git a/libs/OpenAL.dll b/libs/OpenAL.dll deleted file mode 100644 index f29c3ce..0000000 Binary files a/libs/OpenAL.dll and /dev/null differ diff --git a/libs/OpenAL32.dll b/libs/OpenAL32.dll deleted file mode 100644 index 31d639d..0000000 Binary files a/libs/OpenAL32.dll and /dev/null differ diff --git a/libs/glfw.dll b/libs/glfw.dll deleted file mode 100644 index f8c3dc7..0000000 Binary files a/libs/glfw.dll and /dev/null differ diff --git a/libs/glfw32.dll b/libs/glfw32.dll deleted file mode 100644 index 3291dce..0000000 Binary files a/libs/glfw32.dll and /dev/null differ diff --git a/libs/jemalloc.dll b/libs/jemalloc.dll deleted file mode 100644 index c71efc1..0000000 Binary files a/libs/jemalloc.dll and /dev/null differ diff --git a/libs/jemalloc32.dll b/libs/jemalloc32.dll deleted file mode 100644 index 6bea0b3..0000000 Binary files a/libs/jemalloc32.dll and /dev/null differ diff --git a/libs/libglfw.dylib b/libs/libglfw.dylib deleted file mode 100644 index 905c1bd..0000000 Binary files a/libs/libglfw.dylib and /dev/null differ diff --git a/libs/libglfw.so b/libs/libglfw.so deleted file mode 100644 index e97463b..0000000 Binary files a/libs/libglfw.so and /dev/null differ diff --git a/libs/libjemalloc.dylib b/libs/libjemalloc.dylib deleted file mode 100644 index 1d7cc79..0000000 Binary files a/libs/libjemalloc.dylib and /dev/null differ diff --git a/libs/libjemalloc.so b/libs/libjemalloc.so deleted file mode 100644 index dc95c65..0000000 Binary files a/libs/libjemalloc.so and /dev/null differ diff --git a/libs/liblwjgl.dylib b/libs/liblwjgl.dylib deleted file mode 100644 index aeda823..0000000 Binary files a/libs/liblwjgl.dylib and /dev/null differ diff --git a/libs/liblwjgl.so b/libs/liblwjgl.so deleted file mode 100644 index 229b3c9..0000000 Binary files a/libs/liblwjgl.so and /dev/null differ diff --git a/libs/libopenal.dylib b/libs/libopenal.dylib deleted file mode 100644 index 7f0047b..0000000 Binary files a/libs/libopenal.dylib and /dev/null differ diff --git a/libs/libopenal.so b/libs/libopenal.so deleted file mode 100644 index 0c8e888..0000000 Binary files a/libs/libopenal.so and /dev/null differ diff --git a/libs/lwjgl.dll b/libs/lwjgl.dll deleted file mode 100644 index 8f385e5..0000000 Binary files a/libs/lwjgl.dll and /dev/null differ diff --git a/libs/lwjgl.jar b/libs/lwjgl.jar deleted file mode 100644 index 185260c..0000000 Binary files a/libs/lwjgl.jar and /dev/null differ diff --git a/libs/lwjgl32.dll b/libs/lwjgl32.dll deleted file mode 100644 index 6177778..0000000 Binary files a/libs/lwjgl32.dll and /dev/null differ diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..8fa4f9d --- /dev/null +++ b/pom.xml @@ -0,0 +1,160 @@ + + + + 4.0.0 + + fr.mrdev023 + GGL2017 + 0.0.1-SNAPSHOT + jar + + GGL2017 + http://maven.apache.org + + + UTF-8 + 1.8 + 1.8 + 3.1.2 + + + + + + maven-assembly-plugin + + + + globalgamejam.Main + + + + jar-with-dependencies + + false + GGL2017 + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.0 + + ${maven.compiler.source} + ${maven.compiler.target} + ${project.build.sourceEncoding} + + + + + + + + lwjgl-natives-linux + + unix + + + natives-linux + + + + lwjgl-natives-macos + + mac + + + natives-macos + + + + lwjgl-natives-windows + + windows + + + natives-windows + + + + + + + junit + junit + 3.8.1 + test + + + org.lwjgl + lwjgl-stb + ${lwjgl.version} + + + org.lwjgl + lwjgl + ${lwjgl.version} + + + org.lwjgl + lwjgl-glfw + ${lwjgl.version} + + + org.lwjgl + lwjgl-openal + ${lwjgl.version} + + + org.lwjgl + lwjgl-opengl + ${lwjgl.version} + + + org.lwjgl + lwjgl + ${lwjgl.version} + ${lwjgl.natives} + runtime + + + org.lwjgl + lwjgl-glfw + ${lwjgl.version} + ${lwjgl.natives} + runtime + + + org.lwjgl + lwjgl-openal + ${lwjgl.version} + ${lwjgl.natives} + runtime + + + org.lwjgl + lwjgl-opengl + ${lwjgl.version} + ${lwjgl.natives} + runtime + + + \ No newline at end of file diff --git a/src/.DS_Store b/src/.DS_Store new file mode 100644 index 0000000..308a068 Binary files /dev/null and b/src/.DS_Store differ diff --git a/src/main/.DS_Store b/src/main/.DS_Store new file mode 100644 index 0000000..a8456c3 Binary files /dev/null and b/src/main/.DS_Store differ diff --git a/src/main/java/.DS_Store b/src/main/java/.DS_Store new file mode 100644 index 0000000..a0bdec5 Binary files /dev/null and b/src/main/java/.DS_Store differ diff --git a/src/globalgamejam/Main.java b/src/main/java/globalgamejam/Main.java similarity index 98% rename from src/globalgamejam/Main.java rename to src/main/java/globalgamejam/Main.java index 2457df7..e06d818 100644 --- a/src/globalgamejam/Main.java +++ b/src/main/java/globalgamejam/Main.java @@ -60,7 +60,7 @@ public class Main { public static boolean isDestroy = false; public static void main(String[] args) throws Exception { - System.setProperty("org.lwjgl.librarypath", new File("libs").getAbsolutePath()); + // System.setProperty("org.lwjgl.librarypath", new File("libs").getAbsolutePath()); //Creation de la fenetre //------------------------------------------------------------------------------------ errorCallback = new GLFWErrorCallback() { diff --git a/src/globalgamejam/audio/Audio.java b/src/main/java/globalgamejam/audio/Audio.java similarity index 100% rename from src/globalgamejam/audio/Audio.java rename to src/main/java/globalgamejam/audio/Audio.java diff --git a/src/globalgamejam/game/Coffre.java b/src/main/java/globalgamejam/game/Coffre.java similarity index 100% rename from src/globalgamejam/game/Coffre.java rename to src/main/java/globalgamejam/game/Coffre.java diff --git a/src/globalgamejam/game/EObjetType.java b/src/main/java/globalgamejam/game/EObjetType.java similarity index 100% rename from src/globalgamejam/game/EObjetType.java rename to src/main/java/globalgamejam/game/EObjetType.java diff --git a/src/globalgamejam/game/EffectEnum.java b/src/main/java/globalgamejam/game/EffectEnum.java similarity index 100% rename from src/globalgamejam/game/EffectEnum.java rename to src/main/java/globalgamejam/game/EffectEnum.java diff --git a/src/globalgamejam/game/Game.java b/src/main/java/globalgamejam/game/Game.java similarity index 100% rename from src/globalgamejam/game/Game.java rename to src/main/java/globalgamejam/game/Game.java diff --git a/src/globalgamejam/game/HighScore.java b/src/main/java/globalgamejam/game/HighScore.java similarity index 100% rename from src/globalgamejam/game/HighScore.java rename to src/main/java/globalgamejam/game/HighScore.java diff --git a/src/globalgamejam/game/MainGame.java b/src/main/java/globalgamejam/game/MainGame.java similarity index 100% rename from src/globalgamejam/game/MainGame.java rename to src/main/java/globalgamejam/game/MainGame.java diff --git a/src/globalgamejam/game/MainMenuGame.java b/src/main/java/globalgamejam/game/MainMenuGame.java similarity index 100% rename from src/globalgamejam/game/MainMenuGame.java rename to src/main/java/globalgamejam/game/MainMenuGame.java diff --git a/src/globalgamejam/game/Mur.java b/src/main/java/globalgamejam/game/Mur.java similarity index 100% rename from src/globalgamejam/game/Mur.java rename to src/main/java/globalgamejam/game/Mur.java diff --git a/src/globalgamejam/game/Objet.java b/src/main/java/globalgamejam/game/Objet.java similarity index 100% rename from src/globalgamejam/game/Objet.java rename to src/main/java/globalgamejam/game/Objet.java diff --git a/src/globalgamejam/game/Player.java b/src/main/java/globalgamejam/game/Player.java similarity index 100% rename from src/globalgamejam/game/Player.java rename to src/main/java/globalgamejam/game/Player.java diff --git a/src/globalgamejam/gui/ActionGUI.java b/src/main/java/globalgamejam/gui/ActionGUI.java similarity index 100% rename from src/globalgamejam/gui/ActionGUI.java rename to src/main/java/globalgamejam/gui/ActionGUI.java diff --git a/src/globalgamejam/gui/GUI.java b/src/main/java/globalgamejam/gui/GUI.java similarity index 100% rename from src/globalgamejam/gui/GUI.java rename to src/main/java/globalgamejam/gui/GUI.java diff --git a/src/globalgamejam/gui/GUILabel.java b/src/main/java/globalgamejam/gui/GUILabel.java similarity index 100% rename from src/globalgamejam/gui/GUILabel.java rename to src/main/java/globalgamejam/gui/GUILabel.java diff --git a/src/globalgamejam/gui/IActionGUI.java b/src/main/java/globalgamejam/gui/IActionGUI.java similarity index 100% rename from src/globalgamejam/gui/IActionGUI.java rename to src/main/java/globalgamejam/gui/IActionGUI.java diff --git a/src/globalgamejam/input/IO.java b/src/main/java/globalgamejam/input/IO.java similarity index 100% rename from src/globalgamejam/input/IO.java rename to src/main/java/globalgamejam/input/IO.java diff --git a/src/globalgamejam/input/Input.java b/src/main/java/globalgamejam/input/Input.java similarity index 100% rename from src/globalgamejam/input/Input.java rename to src/main/java/globalgamejam/input/Input.java diff --git a/src/globalgamejam/interfaces/MainInterfaces.java b/src/main/java/globalgamejam/interfaces/MainInterfaces.java similarity index 100% rename from src/globalgamejam/interfaces/MainInterfaces.java rename to src/main/java/globalgamejam/interfaces/MainInterfaces.java diff --git a/src/globalgamejam/math/Color4f.java b/src/main/java/globalgamejam/math/Color4f.java similarity index 100% rename from src/globalgamejam/math/Color4f.java rename to src/main/java/globalgamejam/math/Color4f.java diff --git a/src/globalgamejam/math/Mathf.java b/src/main/java/globalgamejam/math/Mathf.java similarity index 100% rename from src/globalgamejam/math/Mathf.java rename to src/main/java/globalgamejam/math/Mathf.java diff --git a/src/globalgamejam/math/Matrix4f.java b/src/main/java/globalgamejam/math/Matrix4f.java similarity index 100% rename from src/globalgamejam/math/Matrix4f.java rename to src/main/java/globalgamejam/math/Matrix4f.java diff --git a/src/globalgamejam/math/Quaternion.java b/src/main/java/globalgamejam/math/Quaternion.java similarity index 100% rename from src/globalgamejam/math/Quaternion.java rename to src/main/java/globalgamejam/math/Quaternion.java diff --git a/src/globalgamejam/math/Vector2f.java b/src/main/java/globalgamejam/math/Vector2f.java similarity index 100% rename from src/globalgamejam/math/Vector2f.java rename to src/main/java/globalgamejam/math/Vector2f.java diff --git a/src/globalgamejam/math/Vector3f.java b/src/main/java/globalgamejam/math/Vector3f.java similarity index 100% rename from src/globalgamejam/math/Vector3f.java rename to src/main/java/globalgamejam/math/Vector3f.java diff --git a/src/globalgamejam/math/Vector4f.java b/src/main/java/globalgamejam/math/Vector4f.java similarity index 100% rename from src/globalgamejam/math/Vector4f.java rename to src/main/java/globalgamejam/math/Vector4f.java diff --git a/src/globalgamejam/physics/PhysicalEntity.java b/src/main/java/globalgamejam/physics/PhysicalEntity.java similarity index 91% rename from src/globalgamejam/physics/PhysicalEntity.java rename to src/main/java/globalgamejam/physics/PhysicalEntity.java index 29b5e21..ad36c6d 100644 --- a/src/globalgamejam/physics/PhysicalEntity.java +++ b/src/main/java/globalgamejam/physics/PhysicalEntity.java @@ -66,7 +66,7 @@ public class PhysicalEntity { public boolean collideWithSquareHitBox(PhysicalEntity entity){ - // on teste une collision avec une hitbox carré + // on teste une collision avec une hitbox carré return (this.x + this.sizeX / 2 >= entity.x - entity.sizeX / 2 && this.x - this.sizeX / 2 <= entity.x + entity.sizeX / 2 && this.y + this.sizeY / 2 >= entity.y - entity.sizeY / 2 @@ -90,22 +90,22 @@ public class PhysicalEntity { if(entity instanceof Mur){ - // on a touché le bas du Mur + // on a touché le bas du Mur if(this.y <= entity.y - entity.sizeY / 2 && this.yVelocity > 0){ this.yVelocity *= -1; } - // on a touché le haut du Mur + // on a touché le haut du Mur if(this.y >= entity.y + entity.sizeY / 2 && this.yVelocity < 0){ this.yVelocity *= -1; } - // on a touché le coté gauche du Mur + // on a touché le coté gauche du Mur if(this.x <= entity.x - entity.sizeX / 2 && this.xVelocity > 0){ this.xVelocity *= -1; } - // on a touché le coté droit du Mur + // on a touché le coté droit du Mur if(this.x >= entity.x + entity.sizeX / 2 && this.xVelocity < 0){ this.xVelocity *= -1; } @@ -120,7 +120,7 @@ public class PhysicalEntity { } /** - * Déplace l'entity et actualise ça vélocité + * Déplace l'entity et actualise ça vélocité */ public void move(){ this.x += this.xVelocity; diff --git a/src/globalgamejam/render/Camera.java b/src/main/java/globalgamejam/render/Camera.java similarity index 100% rename from src/globalgamejam/render/Camera.java rename to src/main/java/globalgamejam/render/Camera.java diff --git a/src/globalgamejam/render/DisplayManager.java b/src/main/java/globalgamejam/render/DisplayManager.java similarity index 100% rename from src/globalgamejam/render/DisplayManager.java rename to src/main/java/globalgamejam/render/DisplayManager.java diff --git a/src/globalgamejam/render/FrameBufferObject.java b/src/main/java/globalgamejam/render/FrameBufferObject.java similarity index 100% rename from src/globalgamejam/render/FrameBufferObject.java rename to src/main/java/globalgamejam/render/FrameBufferObject.java diff --git a/src/globalgamejam/render/Shaders.java b/src/main/java/globalgamejam/render/Shaders.java similarity index 100% rename from src/globalgamejam/render/Shaders.java rename to src/main/java/globalgamejam/render/Shaders.java diff --git a/src/globalgamejam/render/Texture.java b/src/main/java/globalgamejam/render/Texture.java similarity index 100% rename from src/globalgamejam/render/Texture.java rename to src/main/java/globalgamejam/render/Texture.java diff --git a/src/globalgamejam/tiles/CoffreTile.java b/src/main/java/globalgamejam/tiles/CoffreTile.java similarity index 100% rename from src/globalgamejam/tiles/CoffreTile.java rename to src/main/java/globalgamejam/tiles/CoffreTile.java diff --git a/src/globalgamejam/tiles/EffectTile.java b/src/main/java/globalgamejam/tiles/EffectTile.java similarity index 100% rename from src/globalgamejam/tiles/EffectTile.java rename to src/main/java/globalgamejam/tiles/EffectTile.java diff --git a/src/globalgamejam/tiles/Fond.java b/src/main/java/globalgamejam/tiles/Fond.java similarity index 100% rename from src/globalgamejam/tiles/Fond.java rename to src/main/java/globalgamejam/tiles/Fond.java diff --git a/src/globalgamejam/tiles/MurTile.java b/src/main/java/globalgamejam/tiles/MurTile.java similarity index 100% rename from src/globalgamejam/tiles/MurTile.java rename to src/main/java/globalgamejam/tiles/MurTile.java diff --git a/src/globalgamejam/tiles/ObjetTile.java b/src/main/java/globalgamejam/tiles/ObjetTile.java similarity index 100% rename from src/globalgamejam/tiles/ObjetTile.java rename to src/main/java/globalgamejam/tiles/ObjetTile.java diff --git a/src/globalgamejam/tiles/PlayerTile.java b/src/main/java/globalgamejam/tiles/PlayerTile.java similarity index 100% rename from src/globalgamejam/tiles/PlayerTile.java rename to src/main/java/globalgamejam/tiles/PlayerTile.java diff --git a/src/globalgamejam/tiles/Tile.java b/src/main/java/globalgamejam/tiles/Tile.java similarity index 100% rename from src/globalgamejam/tiles/Tile.java rename to src/main/java/globalgamejam/tiles/Tile.java diff --git a/src/globalgamejam/tiles/VaguesTile.java b/src/main/java/globalgamejam/tiles/VaguesTile.java similarity index 100% rename from src/globalgamejam/tiles/VaguesTile.java rename to src/main/java/globalgamejam/tiles/VaguesTile.java diff --git a/src/globalgamejam/world/MainWorld.java b/src/main/java/globalgamejam/world/MainWorld.java similarity index 99% rename from src/globalgamejam/world/MainWorld.java rename to src/main/java/globalgamejam/world/MainWorld.java index 4dc67e2..b2e0d30 100644 --- a/src/globalgamejam/world/MainWorld.java +++ b/src/main/java/globalgamejam/world/MainWorld.java @@ -94,8 +94,8 @@ public class MainWorld { vagues.getTransform().translate(Main.WIDTH/2, -Main.HEIGHT/2, 0); vagues.getTransform().scale(Main.WIDTH,Main.HEIGHT, 0); - this.murGauche = new Mur(0,Main.HEIGHT/2+40,"res/textures/murcoté.png"); - this.murDroit = new Mur(Main.WIDTH,Main.HEIGHT/2+40,"res/textures/murcoté.png"); + this.murGauche = new Mur(0,Main.HEIGHT/2+40,"res/textures/murcoté.png"); + this.murDroit = new Mur(Main.WIDTH,Main.HEIGHT/2+40,"res/textures/murcoté.png"); this.murHaut = new Mur(Main.WIDTH/2,Main.HEIGHT+10,"res/textures/murhauteur.png"); this.murBas = new Mur(Main.WIDTH/2,80,"res/textures/murbas.png"); this.mur1 = new Mur(Main.WIDTH/2,Main.HEIGHT-20,"res/textures/murmilieuhaut.png");