Clean project + Implement Maven (not gradle)
This commit is contained in:
Florian RICHER (MrDev023)
parent
b7bd35c153
commit
34bcd3187e
36 changed files with 2 additions and 1264 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
|
@ -21,3 +21,5 @@ bin/*
|
|||
*.userlibraries
|
||||
/target/
|
||||
/Global-Gam-Jam-2017/
|
||||
out/
|
||||
.settings/
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
<html>Simple <b>Java</b> application that includes a class with <code>main()</code> method</html>
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
<component name="libraryTable">
|
||||
<library name="lwjgl">
|
||||
<CLASSES>
|
||||
<root url="jar://$PROJECT_DIR$/libs/lwjgl.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES />
|
||||
</library>
|
||||
</component>
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="EntryPointsManager">
|
||||
<entry_points version="2.0" />
|
||||
</component>
|
||||
<component name="ProjectKey">
|
||||
<option name="state" value="project://e2804f05-5315-4fc6-a121-c522a6c26470" />
|
||||
</component>
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
|
||||
<output url="file://$PROJECT_DIR$/out" />
|
||||
</component>
|
||||
</project>
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ProjectModuleManager">
|
||||
<modules>
|
||||
<module fileurl="file://$PROJECT_DIR$/GGL-2017.iml" filepath="$PROJECT_DIR$/GGL-2017.iml" />
|
||||
<module fileurl="file://$PROJECT_DIR$/.idea/Global-Gam-Jam-2017.iml" filepath="$PROJECT_DIR$/.idea/Global-Gam-Jam-2017.iml" />
|
||||
</modules>
|
||||
</component>
|
||||
</project>
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
<template>
|
||||
<input-field default="com.company">IJ_BASE_PACKAGE</input-field>
|
||||
</template>
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="VcsDirectoryMappings">
|
||||
<mapping directory="" vcs="Git" />
|
||||
</component>
|
||||
</project>
|
||||
1145
.idea/workspace.xml
1145
.idea/workspace.xml
File diff suppressed because it is too large
Load diff
|
|
@ -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
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
eclipse.preferences.version=1
|
||||
org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
activeProfiles=
|
||||
eclipse.preferences.version=1
|
||||
resolveWorkspaceProjects=true
|
||||
version=1
|
||||
1
out/production/.gitignore
vendored
1
out/production/.gitignore
vendored
|
|
@ -1 +0,0 @@
|
|||
/Global-Gam-Jam-2017/
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -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);
|
||||
}
|
||||
|
|
@ -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);
|
||||
}
|
||||
|
|
@ -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;
|
||||
}
|
||||
|
|
@ -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);
|
||||
}
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 195 B |
Binary file not shown.
|
Before Width: | Height: | Size: 531 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.6 KiB |
Reference in a new issue