remove commented code left from collision change

[blank.git] / src / standalone / MasterState.cpp

diff --git a/src/standalone/MasterState.cpp b/src/standalone/MasterState.cpp
index 5ade4f1ed89a3f6009d19e54adb407c2d2c77a1e..6d457385d3f6d5074a2757bdbf4d2088db766980 100644 (file)
--- a/src/standalone/MasterState.cpp
+++ b/src/standalone/MasterState.cpp
@@ -3,6 +3,7 @@
 #include "../app/Config.hpp"
 #include "../app/Environment.hpp"
 #include "../app/init.hpp"
+#include "../geometry/distance.hpp"
 #include "../io/WorldSave.hpp"
 
 #include <SDL.h>
@@ -53,8 +54,6 @@ MasterState::MasterState(
        chunk_renderer.FogDensity(wc.fog_density);
        if (save.Exists(player)) {
                save.Read(player);
-               glm::vec3 orient(glm::eulerAngles(player.GetEntity().Orientation()));
-               input.TurnHead(orient.x, orient.y);
        } else {
                spawn_player = true;
        }
@@ -158,12 +157,13 @@ void MasterState::Update(int dt) {
 }
 
 void MasterState::Render(Viewport &viewport) {
-       viewport.WorldPosition(
-               player.GetEntity().Transform(player.GetEntity().ChunkCoords())
-               * player.GetEntity().GetModel().EyesTransform());
+       viewport.WorldPosition(player.GetEntity().ViewTransform(player.GetEntity().ChunkCoords()));
        if (config.video.world) {
                chunk_renderer.Render(viewport);
                world.Render(viewport);
+               if (config.video.debug) {
+                       world.RenderDebug(viewport);
+               }
                sky.Render(viewport);
        }
        hud.Render(viewport);
@@ -206,6 +206,14 @@ void MasterState::SetDebug(bool b) {
        }
 }
 
+void MasterState::NextCamera() {
+       if (iszero(env.viewport.CameraOffset())) {
+               env.viewport.OffsetCamera(glm::vec3(0.0f, 0.0f, -5.0f));
+       } else {
+               env.viewport.OffsetCamera(glm::vec3(0.0f, 0.0f, 0.0f));
+       }
+}
+
 void MasterState::Exit() {
        save.Write(player);
        env.state.Switch(&unload);