From 3a1f84935b2da7c442668d5d090d33cad2faf8a3 Mon Sep 17 00:00:00 2001 From: Andrew Guschin Date: Sat, 28 Nov 2020 22:50:53 +0400 Subject: =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=20Tran?= =?UTF-8?q?sform.h?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- task06/Guschin/Transform.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'task06') diff --git a/task06/Guschin/Transform.h b/task06/Guschin/Transform.h index 9c3b662..beec791 100644 --- a/task06/Guschin/Transform.h +++ b/task06/Guschin/Transform.h @@ -52,15 +52,14 @@ mat4 rotate(float theta, vec3 n) { n = norm(n); mat3 nCross = crossM(n); - mat3 id = mat3(1.f); - mat3 m1 = id + nCross * sin(theta); + mat3 m1 = mat3(1.f) + nCross * sin(theta); mat3 m2 = nCross * (nCross * (1.f - cos(theta))); mat3 m = m1 + m2; return mat4(vec4(m[0], 0.f), vec4(m[1], 0.f), vec4(m[2], 0.f), - vec4(0.f, 0.f, 0.f, 0.f)); + vec4(0.f, 0.f, 0.f, 1.f)); } mat4 rotateP(float theta, vec3 n, vec3 P) { -- cgit v1.2.3