Feature/cleanup (#1608)

* Revert screenlog back to showing Info and above messages
 * Various code cleanup
This commit is contained in:
Alexander Bock
2021-05-25 14:08:33 +02:00
committed by GitHub
parent 53d0b49f6b
commit c3ba532bdb
183 changed files with 4267 additions and 6072 deletions
@@ -30,26 +30,20 @@ layout(location = 0) in vec4 in_position;
layout(location = 1) in vec2 in_st;
layout(location = 2) in vec3 in_normal;
out vec4 vs_position;
out vec4 vs_normal;
out vec2 vs_uv;
out vec4 vs_ndc;
out vec4 vs_normal;
uniform mat4 ProjectorMatrix;
uniform mat4 ModelTransform;
uniform mat4 meshTransform;
uniform mat4 meshNormalTransform;
uniform vec3 boresight;
void main() {
vec4 raw_pos = psc_to_meter((meshTransform * in_position), vec2(1.0, 0.0));
vs_position = ProjectorMatrix * ModelTransform * raw_pos;
vs_normal = normalize(ModelTransform * meshNormalTransform * vec4(in_normal,0));
vs_ndc = vs_position / vs_position.w;
vec4 raw_pos = psc_to_meter(meshTransform * in_position, vec2(1.0, 0.0));
vec4 position = ProjectorMatrix * ModelTransform * raw_pos;
vs_normal = normalize(ModelTransform * meshNormalTransform * vec4(in_normal, 0.0));
vs_ndc = position / position.w;
//match clipping plane
vec2 texco = (in_st * 2) - 1;
vs_uv = texco;
gl_Position = vec4(texco, 0.0, 1.0);
vec2 texco = (in_st * 2.0) - 1.0;
gl_Position = vec4(texco, 0.0, 1.0);
}