treat head pitch and yaw as entity state

[blank.git] / src / world / world.cpp

diff --git a/src/world/world.cpp b/src/world/world.cpp
index 8f22f0c091645486c99913cfa4925bdc1533e5be..a852038664a05410292a2e7bdd58ecfb0183f2de 100644 (file)
--- a/src/world/world.cpp
+++ b/src/world/world.cpp
@@ -45,6 +45,17 @@ void Entity::Position(const glm::vec3 &pos) noexcept {
        state.AdjustPosition();
 }
 
+void Entity::TurnHead(float dp, float dy) noexcept {
+       SetHead(state.pitch + dp, state.yaw + dy);
+}
+
+void Entity::SetHead(float p, float y) noexcept {
+       state.pitch = p;
+       state.yaw = y;
+       // TODO: I feel like this could be delayed
+       UpdateModel();
+}
+
 glm::mat4 Entity::Transform(const glm::ivec3 &reference) const noexcept {
        return state.Transform(reference);
 }
@@ -66,13 +77,28 @@ Ray Entity::Aim(const Chunk::Pos &chunk_offset) const noexcept {
        return Ray{ glm::vec3(from), glm::normalize(glm::vec3(to - from)) };
 }
 
+void Entity::UpdateModel() noexcept {
+       state.AdjustHeading();
+       if (model) {
+               Part::State &body_state = model.BodyState();
+               Part::State &eyes_state = model.EyesState();
+               if (&body_state != &eyes_state) {
+                       body_state.orientation = glm::quat(glm::vec3(0.0f, state.yaw, 0.0f));
+                       eyes_state.orientation = glm::quat(glm::vec3(state.pitch, 0.0f, 0.0f));
+               } else {
+                       eyes_state.orientation = glm::quat(glm::vec3(state.pitch, state.yaw, 0.0f));
+               }
+       }
+}
+
 
 EntityState::EntityState()
 : chunk_pos(0)
 , block_pos(0.0f)
 , velocity(0.0f)
 , orient(1.0f, 0.0f, 0.0f, 0.0f)
-, ang_vel(0.0f) {
+, pitch(0.0f)
+, yaw(0.0f) {
 
 }
 
@@ -103,6 +129,21 @@ void EntityState::AdjustPosition() noexcept {
        }
 }
 
+void EntityState::AdjustHeading() noexcept {
+       while (pitch > PI / 2) {
+               pitch = PI / 2;
+       }
+       while (pitch < -PI / 2) {
+               pitch = -PI / 2;
+       }
+       while (yaw > PI) {
+               yaw -= PI * 2;
+       }
+       while (yaw < -PI) {
+               yaw += PI * 2;
+       }
+}
+
 glm::mat4 EntityState::Transform(const glm::ivec3 &reference) const noexcept {
        const glm::vec3 translation = RelativePosition(reference);
        glm::mat4 transform(toMat4(orient));
@@ -166,7 +207,7 @@ Player *World::AddPlayer(const std::string &name) {
        }
        Entity &entity = AddEntity();
        entity.Name(name);
-       entity.Bounds({ { -0.5f, -0.5f, -0.5f }, { 0.5f, 0.5f, 0.5f } });
+       entity.Bounds({ { -0.4f, -0.9f, -0.4f }, { 0.4f, 0.9f, 0.4f } });
        entity.WorldCollidable(true);
        ChunkIndex &index = chunks.MakeIndex(entity.ChunkCoords(), 6);
        players.emplace_back(entity, index);
@@ -184,7 +225,7 @@ Player *World::AddPlayer(const std::string &name, std::uint32_t id) {
                return nullptr;
        }
        entity->Name(name);
-       entity->Bounds({ { -0.5f, -0.5f, -0.5f }, { 0.5f, 0.5f, 0.5f } });
+       entity->Bounds({ { -0.4f, -0.9f, -0.4f }, { 0.4f, 0.9f, 0.4f } });
        entity->WorldCollidable(true);
        ChunkIndex &index = chunks.MakeIndex(entity->ChunkCoords(), 6);
        players.emplace_back(*entity, index);
@@ -370,21 +411,6 @@ void World::Update(int dt) {
        }
 }
 
-namespace {
-
-glm::quat delta_rot(const glm::vec3 &av, float dt) {
-       glm::vec3 half(av * dt * 0.5f);
-       float mag = length(half);
-       if (mag > 0.0f) {
-               float smag = std::sin(mag) / mag;
-               return glm::quat(std::cos(mag), half * smag);
-       } else {
-               return glm::quat(1.0f, 0.0f, 0.0f, 0.0f);
-       }
-}
-
-}
-
 void World::Update(Entity &entity, float dt) {
        EntityState state(entity.GetState());
 
@@ -397,11 +423,9 @@ void World::Update(Entity &entity, float dt) {
        constexpr float sixth = 1.0f / 6.0f;
        f.position = sixth * ((a.position + 2.0f * (b.position + c.position)) + d.position);
        f.velocity = sixth * ((a.velocity + 2.0f * (b.velocity + c.velocity)) + d.velocity);
-       f.orient = sixth * ((a.orient + 2.0f * (b.orient + c.orient)) + d.orient);
 
        state.block_pos += f.position * dt;
        state.velocity += f.velocity * dt;
-       state.orient = delta_rot(f.orient, dt) * state.orient;
        state.AdjustPosition();
 
        entity.SetState(state);
@@ -416,7 +440,6 @@ EntityDerivative World::CalculateStep(
        EntityState next(cur);
        next.block_pos += delta.position * dt;
        next.velocity += delta.velocity * dt;
-       next.orient = delta_rot(cur.ang_vel, dt) * cur.orient;
        next.AdjustPosition();
 
        EntityDerivative out;