diff options
Diffstat (limited to 'source/blender/draw/modes/shaders/object_empty_image_vert.glsl')
-rw-r--r-- | source/blender/draw/modes/shaders/object_empty_image_vert.glsl | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/source/blender/draw/modes/shaders/object_empty_image_vert.glsl b/source/blender/draw/modes/shaders/object_empty_image_vert.glsl index c1a957f0640..3469e37358e 100644 --- a/source/blender/draw/modes/shaders/object_empty_image_vert.glsl +++ b/source/blender/draw/modes/shaders/object_empty_image_vert.glsl @@ -1,21 +1,16 @@ - -uniform mat4 ViewProjectionMatrix; -uniform vec2 aspect; - -/* ---- Instantiated Attribs ---- */ -in vec2 texCoord; -in vec2 pos; -/* ---- Per instance Attribs ---- */ -in mat4 InstanceModelMatrix; - +uniform mat4 ModelViewProjectionMatrix; +uniform float aspectX; +uniform float aspectY; +uniform float size; +uniform vec2 offset; #ifdef USE_WIRE -in vec3 color; +uniform vec3 color; #else -in vec4 objectColor; +uniform vec4 objectColor; #endif -in float size; -in vec2 offset; +in vec2 texCoord; +in vec2 pos; flat out vec4 finalColor; @@ -25,9 +20,8 @@ out vec2 texCoord_interp; void main() { - gl_Position = ViewProjectionMatrix * InstanceModelMatrix * vec4( - (pos[0] + offset[0]) * (size * aspect[0]), - (pos[1] + offset[1]) * (size * aspect[1]), + gl_Position = ModelViewProjectionMatrix * vec4( + (pos + offset) * (size * vec2(aspectX, aspectY)), 0.0, 1.0); #ifdef USE_WIRE finalColor = vec4(color, 1.0); |