X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fgraphics%2Fviewport.cpp;h=c3727738861648a914b97021f36305b6698a7bdd;hb=ffda75aa10f772b706c2466e96a2250c89f05120;hp=398eb42ef1b786d3d57581a9b9f4e6a8244cf5ee;hpb=e0180e01f4c659c97973f585fea5eb3344254ce0;p=blobs.git

diff --git a/src/graphics/viewport.cpp b/src/graphics/viewport.cpp
index 398eb42..c372773 100644
--- a/src/graphics/viewport.cpp
+++ b/src/graphics/viewport.cpp
@@ -8,6 +8,8 @@
 
 #include <cmath>
 #include <GL/glew.h>
+#include <glm/gtx/euler_angles.hpp>
+#include <glm/gtx/rotate_vector.hpp>
 #include <glm/gtx/transform.hpp>
 
 
@@ -15,11 +17,11 @@ namespace blobs {
 namespace graphics {
 
 Camera::Camera(const world::Body &r) noexcept
-: fov(PI_0p25)
+: fov(PI * 0.25)
 , aspect(1.0f)
 , near(0.1f)
 , far(12560.0f)
-, projection(glm::perspective(fov, aspect, near, far))
+, projection(glm::infinitePerspective(fov, aspect, near))
 , view(1.0f)
 , ref(&r)
 , track_orient(false) {
@@ -58,65 +60,33 @@ Camera &Camera::Reference(const world::Body &r) noexcept {
 	return *this;
 }
 
-Camera &Camera::FirstPerson(int srf, const glm::vec3 &pos, const glm::vec3 &at) noexcept {
-	track_orient = true;
-
-	float dir = srf < 3 ? 1.0f : -1.0f;
-
-	glm::vec3 position;
-	position[(srf + 0) % 3] = pos.x;
-	position[(srf + 1) % 3] = pos.y;
-	position[(srf + 2) % 3] = dir * (pos.z + Reference().Radius());
-
-	glm::vec3 up(0.0f);
-	up[(srf + 2) % 3] = dir;
-
-	glm::vec3 target;
-	target[(srf + 0) % 3] = at.x;
-	target[(srf + 1) % 3] = at.y;
-	target[(srf + 2) % 3] = dir * (at.z + Reference().Radius());
-
-	view = glm::lookAt(position, target, up);
-
-	return *this;
-}
-
-Camera &Camera::MapView(int srf, const glm::vec3 &pos, float roll) noexcept {
-	track_orient = true;
-
-	float dir = srf < 3 ? 1.0f : -1.0f;
-
-	glm::vec3 up(0.0f);
-	up[(srf + 0) % 3] = std::sin(roll);
-	up[(srf + 1) % 3] = std::cos(roll);
-	up[(srf + 2) % 3] = 0.0f;
-
-	glm::vec3 target = pos;
-	target[(srf + 2) % 3] -= dir;
-
-	view = glm::lookAt(pos, target, up);
-
+Camera &Camera::Orbital(const glm::vec3 &pos) noexcept {
+	track_orient = false;
+	view = glm::lookAt(pos, glm::vec3(0.0f), glm::vec3(0.0f, 1.0f, 0.0f));
 	return *this;
 }
 
-Camera &Camera::TopDown(const creature::Creature &c, float distance, float roll) {
+Camera &Camera::Radial(const creature::Creature &c, double distance, const glm::dvec3 &angle) {
 	const creature::Situation &s = c.GetSituation();
-	if (s.OnPlanet()) {
-		int srf = s.Surface();
-		glm::vec3 pos(s.Position());
-		pos[(srf + 2) % 3] += srf < 3 ? distance : -distance;
+	glm::dvec3 pos(s.Position());
+	glm::dvec3 up(0.0);
+	glm::dvec3 dir(0.0, 0.0, -distance);
+	if (s.OnSurface()) {
 		Reference(s.GetPlanet());
-		return MapView(srf, pos, roll);
+		track_orient = true;
+		up = s.GetPlanet().NormalAt(s.Position());
+		glm::dvec3 ref(glm::normalize(glm::cross(up, glm::dvec3(up.z, up.x, up.y))));
+		dir =
+			glm::dmat3(ref, up, glm::cross(ref, up))
+			* glm::dmat3(glm::eulerAngleYX(-angle.y, -angle.x))
+			* dir;
 	} else {
-		glm::vec3 pos(s.Position());
-		pos += glm::normalize(pos) * distance;
-		return Orbital(pos);
+		up.y = 1.0;
+		dir = glm::dmat3(glm::eulerAngleYX(-angle.y, -angle.x)) * dir;
 	}
-}
-
-Camera &Camera::Orbital(const glm::vec3 &pos) noexcept {
-	track_orient = false;
-	view = glm::lookAt(pos, glm::vec3(0.0f), glm::vec3(0.0f, 1.0f, 0.0f));
+	pos += up * (c.Size() * 0.5);
+	up = glm::rotate(up, angle.z, glm::normalize(-dir));
+	view = glm::lookAt(pos - dir, pos, up);
 	return *this;
 }
 
@@ -124,22 +94,22 @@ 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());
 	}
 }
 
 void Camera::UpdateProjection() noexcept {
-	projection = glm::perspective(fov, aspect, near, far);
+	projection = glm::infinitePerspective(fov, aspect, near);
 }