X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2Fstates.cpp;h=92879b4683bc724a5cbd23e35d1bc973cdbb9d0c;hb=cd80d7cfcac3c58d601db2ab4e0381dd77c06f44;hp=e45356b5a29f6779a878ca07a6d4c490d44c591f;hpb=475f28f06c9e14912bab8119264e247ef466513d;p=blobs.git

diff --git a/src/app/states.cpp b/src/app/states.cpp
index e45356b..92879b4 100644
--- a/src/app/states.cpp
+++ b/src/app/states.cpp
@@ -24,6 +24,8 @@ MasterState::MasterState(Assets &assets, world::Simulation &sim) noexcept
 , cam_orient(PI * 0.375, PI * 0.25, 0.0)
 , cam_dragging(false)
 , cp(assets)
+, rp(sim)
+, tp(sim)
 , remain(0)
 , thirds(0)
 , paused(false) {
@@ -50,8 +52,15 @@ void MasterState::OnResize(int w, int h) {
 
 void MasterState::OnUpdate(int dt) {
 	remain += dt;
-	while (remain >= FrameMS()) {
+#ifdef NDEBUG
+	int max_tick = 10;
+#else
+	// one tick per frame when debugging so pausing execution doesn't result in more ticks
+	int max_tick = 1;
+#endif
+	while (remain >= FrameMS() && max_tick > 0) {
 		Tick();
+		--max_tick;
 	}
 }
 
@@ -100,7 +109,7 @@ void MasterState::OnMouseMotion(const SDL_MouseMotionEvent &e) {
 	constexpr double pitch_scale = PI * 0.001;
 	constexpr double yaw_scale = PI * 0.002;
 	if (cam_dragging) {
-		cam_orient.x = glm::clamp(cam_orient.x + double(e.yrel) * pitch_scale, 0.0, PI * 0.5);
+		cam_orient.x = glm::clamp(cam_orient.x + double(e.yrel) * pitch_scale, 0.0, PI * 0.499);
 		cam_orient.y = std::fmod(cam_orient.y + double(e.xrel) * yaw_scale, PI * 2.0);
 	}
 }
@@ -185,7 +194,9 @@ void MasterState::OnRender(graphics::Viewport &viewport) {
 	}
 
 	viewport.ClearDepth();
-	cp.Draw(assets, viewport);
+	cp.Draw(viewport);
+	rp.Draw(viewport);
+	tp.Draw(viewport);
 }
 
 }