From 1c3e7e81049efefe8b54e4d4a719feeda995b474 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Sun, 24 Jan 2021 16:36:02 +0000 Subject: Remove the weird view/model/camera connectedness --- gfx/gl/shaders/basicShader.vs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gfx/gl/shaders') diff --git a/gfx/gl/shaders/basicShader.vs b/gfx/gl/shaders/basicShader.vs index e673548..e697315 100644 --- a/gfx/gl/shaders/basicShader.vs +++ b/gfx/gl/shaders/basicShader.vs @@ -7,12 +7,12 @@ attribute vec3 normal; varying vec2 texCoord0; varying vec3 normal0; -uniform mat4 MVP; -uniform mat4 Normal; +uniform mat4 viewProjection; +uniform mat4 model; void main() { - gl_Position = MVP * vec4(position, 1.0); + gl_Position = viewProjection * model * vec4(position, 1.0); texCoord0 = texCoord; - normal0 = (Normal * vec4(normal, 0.0)).xyz; + normal0 = (model * vec4(normal, 0.0)).xyz; } -- cgit v1.2.3