diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2021-01-24 16:36:02 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2021-01-24 16:36:02 +0000 |
| commit | 1c3e7e81049efefe8b54e4d4a719feeda995b474 (patch) | |
| tree | 3a5474dfbc515c16589ae6863fba1116d7b83ec3 /gfx/gl/shaders | |
| parent | Big tidy up of shader wrapper (diff) | |
| download | ilt-1c3e7e81049efefe8b54e4d4a719feeda995b474.tar.bz2 ilt-1c3e7e81049efefe8b54e4d4a719feeda995b474.tar.xz ilt-1c3e7e81049efefe8b54e4d4a719feeda995b474.zip | |
Remove the weird view/model/camera connectedness
Diffstat (limited to 'gfx/gl/shaders')
| -rw-r--r-- | gfx/gl/shaders/basicShader.vs | 8 |
1 files changed, 4 insertions, 4 deletions
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;
}
|