From 56b5a7c7debcc2c6b2603dd45b04a37ecbc59aac Mon Sep 17 00:00:00 2001 From: gradient Date: Mon, 29 May 2017 13:28:21 -0500 Subject: [PATCH] Rename calcLookAtMatrix => look_mat --- examples/test/shaders/test.frag | 2 +- examples/test/shaders/utils.glsl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/test/shaders/test.frag b/examples/test/shaders/test.frag index 1282bf8..ae49656 100644 --- a/examples/test/shaders/test.frag +++ b/examples/test/shaders/test.frag @@ -70,7 +70,7 @@ void main() { uv.x *= u_Resolution.x/u_Resolution.y; vec3 eye = vec3(0., 0., -5.); - mat3 lookAt = calcLookAtMatrix(eye, vec3(0., 0., 0.), u_Time); + mat3 lookAt = look_mat(eye, target, 0); vec3 dir = normalize(lookAt * ray_dir(FOV, uv)); color = vec4(0.); diff --git a/examples/test/shaders/utils.glsl b/examples/test/shaders/utils.glsl index 3c5d98d..1998de8 100644 --- a/examples/test/shaders/utils.glsl +++ b/examples/test/shaders/utils.glsl @@ -1,8 +1,8 @@ -mat3 calcLookAtMatrix(vec3 origin, vec3 target, float roll) { +mat3 look_mat(vec3 origin, vec3 target, float roll) { vec3 rr = vec3(sin(roll), cos(roll), 0.0); vec3 ww = normalize(target - origin); vec3 uu = normalize(cross(ww, rr)); vec3 vv = normalize(cross(uu, ww)); return mat3(uu, vv, ww); -} \ No newline at end of file +}