X-Git-Url: http://git.localhorst.tv/?p=blobs.git;a=blobdiff_plain;f=src%2Fgraphics%2Fviewport.cpp;h=51e8cddd046fe3fd55be684427023ede5fa93ea7;hp=ff19021f39c09eb9e2886b733569c8f707f9b58c;hb=0e061ce526fe46dd3e894223e5d646eb2e30f826;hpb=ee77237c575f255bb04cdae48c89956aa734c811

diff --git a/src/graphics/viewport.cpp b/src/graphics/viewport.cpp
index ff19021..51e8cdd 100644
--- a/src/graphics/viewport.cpp
+++ b/src/graphics/viewport.cpp
@@ -75,9 +75,9 @@ Camera &Camera::Radial(const creature::Creature &c, double distance, const glm::
 		Reference(s.GetPlanet());
 		track_orient = true;
 		up = s.GetPlanet().NormalAt(s.Position());
-		glm::dvec3 ref(normalize(cross(up, glm::dvec3(up.z, up.x, up.y))));
+		glm::dvec3 ref(glm::normalize(glm::cross(up, glm::dvec3(up.z, up.x, up.y))));
 		dir =
-			glm::dmat3(ref, up, cross(ref, up))
+			glm::dmat3(ref, up, glm::cross(ref, up))
 			* glm::dmat3(glm::eulerAngleYX(-angle.y, -angle.x))
 			* dir;
 	} else {
@@ -94,17 +94,17 @@ glm::mat4 Camera::Model(const world::Body &b) const noexcept {
 	if (&b == ref) {
 		return track_orient ? glm::mat4(1.0f) : glm::mat4(ref->LocalTransform());
 	} else if (b.HasParent() && &b.Parent() == ref) {
-		return track_orient
+		return glm::mat4(track_orient
 			? ref->InverseTransform() * b.FromParent() * b.LocalTransform()
-			: b.FromParent() * b.LocalTransform();
+			: b.FromParent() * b.LocalTransform());
 	} else if (ref->HasParent() && &ref->Parent() == &b) {
-		return track_orient
+		return glm::mat4(track_orient
 			? ref->InverseTransform() * ref->ToParent() * b.LocalTransform()
-			: ref->ToParent() * b.LocalTransform();
+			: ref->ToParent() * b.LocalTransform());
 	} else {
-		return track_orient
+		return glm::mat4(track_orient
 			? ref->InverseTransform() * ref->ToUniverse() * b.FromUniverse() * b.LocalTransform()
-			: ref->ToUniverse() * b.FromUniverse() * b.LocalTransform();
+			: ref->ToUniverse() * b.FromUniverse() * b.LocalTransform());
 	}
 }