Restructered project and better building

This commit is contained in:
Julian Nießner
2019-01-13 13:01:22 +01:00
parent e0b8242dcc
commit 3de9a77a3e
52 changed files with 573 additions and 13 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 119 B

BIN
resources/assets/Ak 47 .png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 372 B

BIN
resources/assets/Grass.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 696 B

BIN
resources/assets/Heart.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 147 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 671 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 594 B

BIN
resources/assets/Knife.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 319 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 407 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
resources/assets/Rock.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 982 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 607 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
resources/assets/barrel.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 747 B

BIN
resources/assets/bush.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 952 B

BIN
resources/assets/bush2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
resources/assets/door 2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 803 B

BIN
resources/assets/door.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 812 B

BIN
resources/assets/edge.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 149 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 167 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 147 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 167 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 149 B

BIN
resources/assets/logo.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 196 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 811 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 167 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 183 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

BIN
resources/assets/tree.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 642 B

BIN
resources/fonts/arial.ttf Normal file

Binary file not shown.

View File

@@ -0,0 +1,14 @@
#version 300 es
precision mediump float;
in vec2 TexCoords;
out vec4 color;
uniform sampler2D text;
uniform vec3 textColor;
void main() {
vec4 sampled = vec4(1.0, 1.0, 1.0, texture(text, TexCoords).r);
color = vec4(textColor, 1.0) * sampled;
}

View File

@@ -0,0 +1,10 @@
#version 300 es
layout (location = 0) in vec4 vertex; // <vec2 pos, vec2 tex>
out vec2 TexCoords;
uniform mat4 projection;
void main() {
gl_Position = projection * vec4(vertex.xy,0.0,1.0);
TexCoords = vertex.zw;
}

View File

@@ -0,0 +1,13 @@
#version 300 es
precision mediump float;
in vec2 TexCoord;
out vec4 FragColor;
uniform sampler2D theTexture;
void main() {
//FragColor = vec4(1.f, 0.5f, 0.2f, 1.0f);
FragColor = texture(theTexture, TexCoord);
}

View File

@@ -0,0 +1,13 @@
#version 300 es
layout (location = 0) in vec2 aPos;
layout (location = 1) in vec2 texCoord;
uniform mat4 MVP;
out vec2 TexCoord;
void main() {
gl_Position = MVP * vec4(aPos.xy,0.0,1.0);
TexCoord = texCoord;
}