diff options
| author | Andrew Guschin <saintruler@gmail.com> | 2020-11-28 22:50:53 +0400 |
|---|---|---|
| committer | Andrew Guschin <saintruler@gmail.com> | 2020-11-28 22:50:53 +0400 |
| commit | 3a1f84935b2da7c442668d5d090d33cad2faf8a3 (patch) | |
| tree | 6da283f4077e894ad9996ec3b876c4d934859850 | |
| parent | 83a6ab41fbdeff8586cfc19bdd31cf0784e992c1 (diff) | |
Исправил Transform.h
| -rw-r--r-- | task06/Guschin/Transform.h | 5 |
1 files changed, 2 insertions, 3 deletions
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) { |