diff --git a/.gitignore b/.gitignore index 44dd2a0..7e8379c 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,5 @@ bin/* *.userlibraries /target/ /Global-Gam-Jam-2017/ +out/ +.settings/ diff --git a/.idea/description.html b/.idea/description.html deleted file mode 100644 index db5f129..0000000 --- a/.idea/description.html +++ /dev/null @@ -1 +0,0 @@ -Simple Java application that includes a class with main() method \ No newline at end of file diff --git a/.idea/libraries/lwjgl.xml b/.idea/libraries/lwjgl.xml deleted file mode 100644 index d8302f5..0000000 --- a/.idea/libraries/lwjgl.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 5d75313..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 9f51c46..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/project-template.xml b/.idea/project-template.xml deleted file mode 100644 index 1f08b88..0000000 --- a/.idea/project-template.xml +++ /dev/null @@ -1,3 +0,0 @@ - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index 2e15310..0000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,1145 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - fr.technicalgames - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1484336005441 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - No facets are configured - - - - - - - - - - - - - - - 1.8 - - - - - - - - Global-Gam-Jam-2017 - - - - - - - - lwjgl - - - - - - - - \ No newline at end of file diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index b8947ec..0000000 --- a/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,6 +0,0 @@ -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.ltk.core.refactoring.prefs b/.settings/org.eclipse.ltk.core.refactoring.prefs deleted file mode 100644 index b196c64..0000000 --- a/.settings/org.eclipse.ltk.core.refactoring.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f..0000000 --- a/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/out/production/.gitignore b/out/production/.gitignore deleted file mode 100644 index 8a641e7..0000000 --- a/out/production/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/Global-Gam-Jam-2017/ diff --git a/out/production/Global-Gam-Jam-2017/OpenAL.dll b/out/production/Global-Gam-Jam-2017/OpenAL.dll deleted file mode 100644 index f29c3ce..0000000 Binary files a/out/production/Global-Gam-Jam-2017/OpenAL.dll and /dev/null differ diff --git a/out/production/Global-Gam-Jam-2017/OpenAL32.dll b/out/production/Global-Gam-Jam-2017/OpenAL32.dll deleted file mode 100644 index 31d639d..0000000 Binary files a/out/production/Global-Gam-Jam-2017/OpenAL32.dll and /dev/null differ diff --git a/out/production/Global-Gam-Jam-2017/glfw.dll b/out/production/Global-Gam-Jam-2017/glfw.dll deleted file mode 100644 index f8c3dc7..0000000 Binary files a/out/production/Global-Gam-Jam-2017/glfw.dll and /dev/null differ diff --git a/out/production/Global-Gam-Jam-2017/glfw32.dll b/out/production/Global-Gam-Jam-2017/glfw32.dll deleted file mode 100644 index 3291dce..0000000 Binary files a/out/production/Global-Gam-Jam-2017/glfw32.dll and /dev/null differ diff --git a/out/production/Global-Gam-Jam-2017/jemalloc.dll b/out/production/Global-Gam-Jam-2017/jemalloc.dll deleted file mode 100644 index c71efc1..0000000 Binary files a/out/production/Global-Gam-Jam-2017/jemalloc.dll and /dev/null differ diff --git a/out/production/Global-Gam-Jam-2017/jemalloc32.dll b/out/production/Global-Gam-Jam-2017/jemalloc32.dll deleted file mode 100644 index 6bea0b3..0000000 Binary files a/out/production/Global-Gam-Jam-2017/jemalloc32.dll and /dev/null differ diff --git a/out/production/Global-Gam-Jam-2017/libglfw.dylib b/out/production/Global-Gam-Jam-2017/libglfw.dylib deleted file mode 100644 index 905c1bd..0000000 Binary files a/out/production/Global-Gam-Jam-2017/libglfw.dylib and /dev/null differ diff --git a/out/production/Global-Gam-Jam-2017/libglfw.so b/out/production/Global-Gam-Jam-2017/libglfw.so deleted file mode 100644 index e97463b..0000000 Binary files a/out/production/Global-Gam-Jam-2017/libglfw.so and /dev/null differ diff --git a/out/production/Global-Gam-Jam-2017/libjemalloc.dylib b/out/production/Global-Gam-Jam-2017/libjemalloc.dylib deleted file mode 100644 index 1d7cc79..0000000 Binary files a/out/production/Global-Gam-Jam-2017/libjemalloc.dylib and /dev/null differ diff --git a/out/production/Global-Gam-Jam-2017/libjemalloc.so b/out/production/Global-Gam-Jam-2017/libjemalloc.so deleted file mode 100644 index dc95c65..0000000 Binary files a/out/production/Global-Gam-Jam-2017/libjemalloc.so and /dev/null differ diff --git a/out/production/Global-Gam-Jam-2017/liblwjgl.dylib b/out/production/Global-Gam-Jam-2017/liblwjgl.dylib deleted file mode 100644 index aeda823..0000000 Binary files a/out/production/Global-Gam-Jam-2017/liblwjgl.dylib and /dev/null differ diff --git a/out/production/Global-Gam-Jam-2017/liblwjgl.so b/out/production/Global-Gam-Jam-2017/liblwjgl.so deleted file mode 100644 index 229b3c9..0000000 Binary files a/out/production/Global-Gam-Jam-2017/liblwjgl.so and /dev/null differ diff --git a/out/production/Global-Gam-Jam-2017/libopenal.dylib b/out/production/Global-Gam-Jam-2017/libopenal.dylib deleted file mode 100644 index 7f0047b..0000000 Binary files a/out/production/Global-Gam-Jam-2017/libopenal.dylib and /dev/null differ diff --git a/out/production/Global-Gam-Jam-2017/libopenal.so b/out/production/Global-Gam-Jam-2017/libopenal.so deleted file mode 100644 index 0c8e888..0000000 Binary files a/out/production/Global-Gam-Jam-2017/libopenal.so and /dev/null differ diff --git a/out/production/Global-Gam-Jam-2017/lwjgl.dll b/out/production/Global-Gam-Jam-2017/lwjgl.dll deleted file mode 100644 index 8f385e5..0000000 Binary files a/out/production/Global-Gam-Jam-2017/lwjgl.dll and /dev/null differ diff --git a/out/production/Global-Gam-Jam-2017/lwjgl.jar b/out/production/Global-Gam-Jam-2017/lwjgl.jar deleted file mode 100644 index 185260c..0000000 Binary files a/out/production/Global-Gam-Jam-2017/lwjgl.jar and /dev/null differ diff --git a/out/production/Global-Gam-Jam-2017/lwjgl32.dll b/out/production/Global-Gam-Jam-2017/lwjgl32.dll deleted file mode 100644 index 6177778..0000000 Binary files a/out/production/Global-Gam-Jam-2017/lwjgl32.dll and /dev/null differ diff --git a/out/production/Global-Gam-Jam-2017/shaders/fbo.frag b/out/production/Global-Gam-Jam-2017/shaders/fbo.frag deleted file mode 100644 index a1db2af..0000000 --- a/out/production/Global-Gam-Jam-2017/shaders/fbo.frag +++ /dev/null @@ -1,12 +0,0 @@ -#version 150 -//Il n’y a pas de layout(location=i) dans OpenGL < 3.3, mais tu peux utiliser glFragData[i] = myvalue à la place. -uniform sampler2D materialTex; - -in vec2 fragTexCoord; -in vec3 fragVert; - -out vec4 finalColor; - -void main() { - finalColor = texture(materialTex, fragTexCoord); -} \ No newline at end of file diff --git a/out/production/Global-Gam-Jam-2017/shaders/fbo.vert b/out/production/Global-Gam-Jam-2017/shaders/fbo.vert deleted file mode 100644 index 50af87c..0000000 --- a/out/production/Global-Gam-Jam-2017/shaders/fbo.vert +++ /dev/null @@ -1,18 +0,0 @@ -#version 150 - -uniform mat4 projection; - -in vec3 vert; -in vec2 vertTexCoord; - -out vec3 fragVert; -out vec2 fragTexCoord; - -void main() { - // Pass some variables to the fragment shader - fragTexCoord = vertTexCoord; - fragVert = vert; - - // Apply all matrix transformations to vert - gl_Position = projection * vec4(vert, 1); -} \ No newline at end of file diff --git a/out/production/Global-Gam-Jam-2017/shaders/main.frag b/out/production/Global-Gam-Jam-2017/shaders/main.frag deleted file mode 100644 index a0c0b6e..0000000 --- a/out/production/Global-Gam-Jam-2017/shaders/main.frag +++ /dev/null @@ -1,16 +0,0 @@ -#version 150 -//Il n’y a pas de layout(location=i) dans OpenGL < 3.3, mais tu peux utiliser glFragData[i] = myvalue à la place. -uniform sampler2D materialTex; -uniform vec4 color; - -in vec2 fragTexCoord; -in vec3 fragVert; - -out vec4 finalColor; - -//layout(location = 0) out vec4 finalColor; -// https://learnopengl.com/#!Lighting/Multiple-lights pour le lighing en cas de besoin - -void main() { - finalColor = texture(materialTex, fragTexCoord) * color; -} \ No newline at end of file diff --git a/out/production/Global-Gam-Jam-2017/shaders/main.vert b/out/production/Global-Gam-Jam-2017/shaders/main.vert deleted file mode 100644 index 6fba7bb..0000000 --- a/out/production/Global-Gam-Jam-2017/shaders/main.vert +++ /dev/null @@ -1,20 +0,0 @@ -#version 150 - -uniform mat4 projection; -uniform mat4 camera; -uniform mat4 transform; - -in vec3 vert; -in vec2 vertTexCoord; - -out vec3 fragVert; -out vec2 fragTexCoord; - -void main() { - // Pass some variables to the fragment shader - fragTexCoord = vertTexCoord; - fragVert = vert; - - // Apply all matrix transformations to vert - gl_Position = projection * camera * transform * vec4(vert, 1); -} \ No newline at end of file diff --git a/out/production/Global-Gam-Jam-2017/textures/default.png b/out/production/Global-Gam-Jam-2017/textures/default.png deleted file mode 100644 index b7b6ab4..0000000 Binary files a/out/production/Global-Gam-Jam-2017/textures/default.png and /dev/null differ diff --git a/out/production/Global-Gam-Jam-2017/textures/fond.png b/out/production/Global-Gam-Jam-2017/textures/fond.png deleted file mode 100644 index 71a3059..0000000 Binary files a/out/production/Global-Gam-Jam-2017/textures/fond.png and /dev/null differ diff --git a/out/production/Global-Gam-Jam-2017/textures/perso.png b/out/production/Global-Gam-Jam-2017/textures/perso.png deleted file mode 100644 index dea56b8..0000000 Binary files a/out/production/Global-Gam-Jam-2017/textures/perso.png and /dev/null differ