Merged master into NewAtmosphere.

This commit is contained in:
Jonathas Costa
2017-10-17 20:14:41 -04:00
216 changed files with 6167 additions and 1259 deletions
+2 -2
View File
@@ -24,7 +24,7 @@
#version __CONTEXT__
layout(location = 0) in vec4 in_position;
layout(location = 0) in vec2 in_position;
layout(location = 1) in vec2 in_st;
out vec2 vs_st;
@@ -36,6 +36,6 @@ uniform mat4 ViewProjectionMatrix;
void main() {
vs_st = in_st;
vs_position = ViewProjectionMatrix * ModelTransform * in_position;
vs_position = ViewProjectionMatrix * ModelTransform * vec4(in_position, 0.0, 1.0);
gl_Position = vec4(vs_position);
}