X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fworld%2Fworld.cpp;h=3f5740e21f75d8755d84003ef8882874c642828c;hb=52154f309e569c913520dd004e9fafcbc4671e6f;hp=4f73243c5d4ca61b87b0bd7ba92abca74c834287;hpb=8e9e2bb4b2dd5a4100f4531628ab58002fe253c1;p=blank.git

diff --git a/src/world/world.cpp b/src/world/world.cpp
index 4f73243..3f5740e 100644
--- a/src/world/world.cpp
+++ b/src/world/world.cpp
@@ -16,6 +16,7 @@
 #include <cmath>
 #include <iostream>
 #include <limits>
+#include <glm/gtx/euler_angles.hpp>
 #include <glm/gtx/io.hpp>
 #include <glm/gtx/quaternion.hpp>
 #include <glm/gtx/transform.hpp>
@@ -51,6 +52,10 @@ Entity::Entity(const Entity &other) noexcept
 , name(other.name)
 , bounds(other.bounds)
 , state(other.state)
+, model_transform(1.0f)
+, view_transform(1.0f)
+, speed(0.0f)
+, heading(0.0f, 0.0f, -1.0f)
 , max_vel(other.max_vel)
 , max_force(other.max_force)
 , ref_count(0)
@@ -109,13 +114,11 @@ void Entity::SetHead(float p, float y) noexcept {
 }
 
 glm::mat4 Entity::Transform(const glm::ivec3 &reference) const noexcept {
-	return state.Transform(reference);
+	return glm::translate(glm::vec3((state.chunk_pos - reference) * Chunk::Extent())) * model_transform;
 }
 
 glm::mat4 Entity::ViewTransform(const glm::ivec3 &reference) const noexcept {
-	glm::mat4 transform = view_local;
-	transform[3] += glm::vec4(state.RelativePosition(reference), 0.0f);
-	return transform;
+	return Transform(reference) * view_transform;
 }
 
 Ray Entity::Aim(const Chunk::Pos &chunk_offset) const noexcept {
@@ -138,30 +141,34 @@ void Entity::UpdateModel() noexcept {
 }
 
 void Entity::Update(float dt) {
-	UpdateView();
+	UpdateTransforms();
 	UpdateHeading();
 	if (HasController()) {
 		GetController().Update(*this, dt);
 	}
 }
 
-void Entity::UpdateView() noexcept {
-	// create local transform
-	view_local = Transform(ChunkCoords());
-	// clear the translation part
-	view_local[3] = glm::vec4(0.0f, 0.0f, 0.0f, 1.0f);
-	// add the model's eyes translation, if any
+void Entity::UpdateTransforms() noexcept {
+	// model transform is the one given by current state
+	model_transform = state.Transform(state.chunk_pos);
+	// view transform is either the model's eyes transform or,
+	// should the entity have no model, the pitch (yaw already is
+	// in model transform)
 	if (model) {
-		view_local *= model.EyesTransform();
+		view_transform = model.EyesTransform();
+	} else {
+		view_transform = glm::eulerAngleX(state.pitch);
 	}
 }
 
 void Entity::UpdateHeading() noexcept {
-	if (Moving()) {
-		heading = normalize(Velocity());
+	speed = length(Velocity());
+	if (speed > std::numeric_limits<float>::epsilon()) {
+		heading = Velocity() / speed;
 	} else {
+		speed = 0.0f;
 		// use -Z (forward axis) of local view transform
-		heading = -glm::vec3(view_local[2]);
+		heading = -glm::vec3(view_transform[2]);
 	}
 }
 
@@ -474,6 +481,15 @@ bool World::Intersection(const Entity &e, const EntityState &s, std::vector<Worl
 	AABB box = e.Bounds();
 	Chunk::Pos reference = s.chunk_pos;
 	glm::mat4 M = s.Transform(reference);
+	return Intersection(box, M, reference, col);
+}
+
+bool World::Intersection(
+	const AABB &box,
+	const glm::mat4 &M,
+	const glm::ivec3 &reference,
+	std::vector<WorldCollision> &col
+) {
 	bool any = false;
 	for (Chunk &cur_chunk : chunks) {
 		if (manhattan_radius(cur_chunk.Position() - reference) > 1) {
@@ -488,14 +504,13 @@ bool World::Intersection(const Entity &e, const EntityState &s, std::vector<Worl
 	return any;
 }
 
-
 void World::Update(int dt) {
 	float fdt(dt * 0.001f);
 	for (Entity &entity : entities) {
-		entity.Update(fdt);
+		Update(entity, fdt);
 	}
 	for (Entity &entity : entities) {
-		Update(entity, fdt);
+		entity.Update(fdt);
 	}
 	for (Player &player : players) {
 		player.Update(dt);