summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gmail.com>2012-12-11 12:16:25 -0800
committerMatt Turner <mattst88@gmail.com>2012-12-11 12:16:25 -0800
commite6045f59cd2a56f3004e7a906b31bf1f8743a5ed (patch)
tree3b9422945fb4becad670a6ffb75c0d01d1e0bc95 /data
parent156741f3e9f251bd873db5bf37a94f52fec7bf1d (diff)
Blend the transformed locationsHEADmaster
Diffstat (limited to 'data')
-rw-r--r--data/simple.vert4
1 files changed, 1 insertions, 3 deletions
diff --git a/data/simple.vert b/data/simple.vert
index d9cebc2..db532be 100644
--- a/data/simple.vert
+++ b/data/simple.vert
@@ -24,9 +24,7 @@ void main(void)
vec4 px_ws = m[int(weight.x)] * position;
vec4 py_ws = m[int(weight.y)] * position;
- /* FINISME: Blend the transformed locations.
- */
- vec4 p_ws = px_ws;
+ vec4 p_ws = mix(py_ws, px_ws, weight.z);
/* Transform the final world-space position to camera-space and