X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2Fstates.cpp;h=b9fc57a4c3c15ea179d4a83b34490c513c34ecc7;hb=cacc0641e5174d8b46e7a7086be6a45c87ab3642;hp=0298e0ce6b1a7eeb6e3b923beefe0d7eceb3e952;hpb=be413456f57da06e918ae7bf4c4f35e5198ff7ce;p=blobs.git

diff --git a/src/app/states.cpp b/src/app/states.cpp
index 0298e0c..b9fc57a 100644
--- a/src/app/states.cpp
+++ b/src/app/states.cpp
@@ -1,7 +1,9 @@
 #include "MasterState.hpp"
 
 #include "../world/Body.hpp"
+#include "../world/Planet.hpp"
 #include "../world/Simulation.hpp"
+#include "../world/Sun.hpp"
 
 #include <glm/gtx/transform.hpp>
 
@@ -13,11 +15,10 @@ MasterState::MasterState(Assets &assets, world::Simulation &sim) noexcept
 : State()
 , assets(assets)
 , sim(sim)
-, reference(&sim.Root())
-, cam()
+, cam(sim.Root())
 , remain(0)
-, thirds(0) {
-	cam.View(glm::translate(glm::vec3(-3.0f, -2.0f, -10.0f)));
+, thirds(0)
+, paused(false) {
 }
 
 MasterState::~MasterState() noexcept {
@@ -36,7 +37,9 @@ void MasterState::OnUpdate(int dt) {
 }
 
 void MasterState::Tick() {
-	sim.Tick();
+	if (!paused) {
+		sim.Tick();
+	}
 	remain -= FrameMS();
 	thirds = (thirds + 1) % 3;
 }
@@ -46,11 +49,32 @@ int MasterState::FrameMS() const noexcept {
 }
 
 
+void MasterState::OnKeyDown(const SDL_KeyboardEvent &e) {
+	if (e.keysym.sym == SDLK_p) {
+		paused = !paused;
+	}
+}
+
 void MasterState::OnRender(graphics::Viewport &viewport) {
+	glm::dmat4 ppos = cam.Model(**sim.Suns().begin());
 	assets.shaders.planet_surface.Activate();
-	assets.shaders.planet_surface.SetMVP(glm::mat4(1.0f), cam.View(), cam.Projection());
 	assets.shaders.planet_surface.SetTexture(assets.textures.tiles);
-	reference->Draw(assets, viewport);
+	assets.shaders.planet_surface.SetLight(glm::vec3(cam.View() * ppos[3]), glm::vec3(1.0f, 1.0f, 1.0f), 1.0e6f);
+
+	for (auto planet : sim.Planets()) {
+		assets.shaders.planet_surface.SetMVP(cam.Model(*planet), cam.View(), cam.Projection());
+		planet->Draw(assets, viewport);
+	}
+
+	assets.shaders.sun_surface.Activate();
+	for (auto sun : sim.Suns()) {
+		double sun_radius = sun->Radius();
+		assets.shaders.sun_surface.SetMVP(
+			cam.Model(*sun) * glm::scale(glm::vec3(sun_radius, sun_radius, sun_radius)),
+			cam.View(), cam.Projection());
+		assets.shaders.sun_surface.SetLight(glm::vec3(1.0f, 1.0f, 1.0f), 1.0e6f);
+		assets.shaders.sun_surface.Draw();
+	}
 }
 
 }