1 files changed, 25 insertions, 29 deletions

diff --git a/src/RendererWorld.cpp b/src/RendererWorld.cpp
index 7f7c850..bcb6f92 100644
--- a/src/RendererWorld.cpp
+++ b/src/RendererWorld.cpp
@@ -12,6 +12,7 @@
 #include "GameState.hpp"
 #include "Section.hpp"
 #include "RendererSectionData.hpp"
+#include "Game.hpp"
 
 void RendererWorld::WorkerFunction(size_t workerId) {
     EventListener tasksListener;
@@ -52,13 +53,13 @@ void RendererWorld::ParseQueueUpdate() {
 			vec.y -= 4500;
 		}
 		
-		parsing[id].data.section = gs->GetWorld().GetSection(vec);
-		parsing[id].data.north = gs->GetWorld().GetSection(vec + Vector(0, 0, 1));
-		parsing[id].data.south = gs->GetWorld().GetSection(vec + Vector(0, 0, -1));
-		parsing[id].data.west = gs->GetWorld().GetSection(vec + Vector(1, 0, 0));
-		parsing[id].data.east = gs->GetWorld().GetSection(vec + Vector(-1, 0, 0));
-		parsing[id].data.bottom = gs->GetWorld().GetSection(vec + Vector(0, -1, 0));
-		parsing[id].data.top = gs->GetWorld().GetSection(vec + Vector(0, 1, 0));
+		parsing[id].data.section = GetGameState()->GetWorld().GetSection(vec);
+		parsing[id].data.north = GetGameState()->GetWorld().GetSection(vec + Vector(0, 0, 1));
+		parsing[id].data.south = GetGameState()->GetWorld().GetSection(vec + Vector(0, 0, -1));
+		parsing[id].data.west = GetGameState()->GetWorld().GetSection(vec + Vector(1, 0, 0));
+		parsing[id].data.east = GetGameState()->GetWorld().GetSection(vec + Vector(-1, 0, 0));
+		parsing[id].data.bottom = GetGameState()->GetWorld().GetSection(vec + Vector(0, -1, 0));
+		parsing[id].data.top = GetGameState()->GetWorld().GetSection(vec + Vector(0, 1, 0));
 
 		parsing[id].parsing = true;
 
@@ -86,7 +87,7 @@ void RendererWorld::ParseQeueueRemoveUnnecessary() {
 		if (std::find(elements.begin(), elements.end(), vec) != elements.end())
 			continue;
 				
-		const Section& section = gs->GetWorld().GetSection(vec);
+		const Section& section = GetGameState()->GetWorld().GetSection(vec);
 
 		bool skip = false;
 
@@ -112,10 +113,10 @@ void RendererWorld::ParseQeueueRemoveUnnecessary() {
 }
 
 void RendererWorld::UpdateAllSections(VectorF playerPos) {
-    Vector playerChunk(std::floor(gs->GetPlayer()->pos.x / 16), 0, std::floor(gs->GetPlayer()->pos.z / 16));
+    Vector playerChunk(std::floor(GetGameState()->GetPlayer()->pos.x / 16), 0, std::floor(GetGameState()->GetPlayer()->pos.z / 16));
 
     std::vector<Vector> suitableChunks;
-    auto chunks = gs->GetWorld().GetSectionsList();
+    auto chunks = GetGameState()->GetWorld().GetSectionsList();
     for (auto& it : chunks) {
         double distance = (Vector(it.x, 0, it.z) - playerChunk).GetLength();
         if (distance > MaxRenderingDistance)
@@ -134,7 +135,7 @@ void RendererWorld::UpdateAllSections(VectorF playerPos) {
 		PUSH_EVENT("DeleteSectionRender", it);
     }
 
-    playerChunk.y = std::floor(gs->GetPlayer()->pos.y / 16.0);
+    playerChunk.y = std::floor(GetGameState()->GetPlayer()->pos.y / 16.0);
     std::sort(suitableChunks.begin(), suitableChunks.end(), [playerChunk](Vector lhs, Vector rhs) {
         double leftLengthToPlayer = (playerChunk - lhs).GetLength();
         double rightLengthToPlayer = (playerChunk - rhs).GetLength();
@@ -146,8 +147,7 @@ void RendererWorld::UpdateAllSections(VectorF playerPos) {
     }	
 }
 
-RendererWorld::RendererWorld(std::shared_ptr<GameState> ptr) {
-    gs = ptr;
+RendererWorld::RendererWorld() {
     MaxRenderingDistance = 2;
     numOfWorkers = _max(1, (signed int) std::thread::hardware_concurrency() - 2);
 
@@ -186,7 +186,7 @@ RendererWorld::RendererWorld(std::shared_ptr<GameState> ptr) {
     
     listener->RegisterHandler("EntityChanged", [this](const Event& eventData) {
 		auto data = eventData.get<unsigned int>();
-        for (unsigned int entityId : gs->GetWorld().GetEntitiesList()) {
+        for (unsigned int entityId : GetGameState()->GetWorld().GetEntitiesList()) {
             if (entityId == data) {
                 entities.push_back(RendererEntity(entityId));
             }
@@ -198,7 +198,7 @@ RendererWorld::RendererWorld(std::shared_ptr<GameState> ptr) {
 		if (vec == Vector())
 			return;
 
-        Vector playerChunk(std::floor(gs->GetPlayer()->pos.x / 16), 0, std::floor(gs->GetPlayer()->pos.z / 16));
+        Vector playerChunk(std::floor(GetGameState()->GetPlayer()->pos.x / 16), 0, std::floor(GetGameState()->GetPlayer()->pos.z / 16));
 
         double distanceToChunk = (Vector(vec.x, 0, vec.z) - playerChunk).GetLength();
         if (MaxRenderingDistance != 1000 && distanceToChunk > MaxRenderingDistance) {
@@ -215,7 +215,7 @@ RendererWorld::RendererWorld(std::shared_ptr<GameState> ptr) {
 		if (vec == Vector())
 			return;
 
-		Vector playerChunk(std::floor(gs->GetPlayer()->pos.x / 16), 0, std::floor(gs->GetPlayer()->pos.z / 16));
+		Vector playerChunk(std::floor(GetGameState()->GetPlayer()->pos.x / 16), 0, std::floor(GetGameState()->GetPlayer()->pos.z / 16));
 
 		double distanceToChunk = (Vector(vec.x, 0, vec.z) - playerChunk).GetLength();
 		if (MaxRenderingDistance != 1000 && distanceToChunk > MaxRenderingDistance) {
@@ -230,7 +230,7 @@ RendererWorld::RendererWorld(std::shared_ptr<GameState> ptr) {
 	});
 
     listener->RegisterHandler("UpdateSectionsRender", [this](const Event&) {
-        UpdateAllSections(gs->GetPlayer()->pos);
+        UpdateAllSections(GetGameState()->GetPlayer()->pos);
     });
 
     listener->RegisterHandler("PlayerPosChanged", [this](const Event& eventData) {
@@ -276,7 +276,7 @@ void RendererWorld::Render(RenderState & renderState) {
         glm::radians(70.0f), (float) renderState.WindowWidth / (float) renderState.WindowHeight,
         0.1f, 10000000.0f
     );
-    glm::mat4 view = gs->GetViewMatrix();
+    glm::mat4 view = GetGameState()->GetViewMatrix();
     glm::mat4 projView = projection * view;
 
     //Render Entities
@@ -289,11 +289,11 @@ void RendererWorld::Render(RenderState & renderState) {
 
     renderState.SetActiveVao(RendererEntity::GetVao());
     for (auto& it : entities) {
-        it.Render(renderState, &gs->GetWorld());
+        it.Render(renderState, &GetGameState()->GetWorld());
     }
 
     //Render selected block
-    Vector selectedBlock = gs->GetSelectionStatus().selectedBlock;
+    Vector selectedBlock = GetGameState()->GetSelectionStatus().selectedBlock;
     if (selectedBlock != Vector()) {
         glLineWidth(2.0f);
         {
@@ -311,7 +311,7 @@ void RendererWorld::Render(RenderState & renderState) {
     //Render raycast hit
     const bool renderHit = false;
     if (renderHit) {
-    VectorF hit = gs->GetSelectionStatus().raycastHit;
+    VectorF hit = GetGameState()->GetSelectionStatus().raycastHit;
         glLineWidth(2.0f);
         {
             glm::mat4 model;
@@ -331,16 +331,16 @@ void RendererWorld::Render(RenderState & renderState) {
 	glCheckError();
 
 	//Render sky
-	renderState.TimeOfDay = gs->GetTimeStatus().timeOfDay;
+	renderState.TimeOfDay = GetGameState()->GetTimeStatus().timeOfDay;
 	Shader *skyShader = AssetManager::GetAsset<AssetShader>("/altcraft/shaders/sky")->shader.get();
 	skyShader->Activate();
 	skyShader->SetUniform("projection", projection);
 	skyShader->SetUniform("view", view);
 	glm::mat4 model = glm::mat4(1.0);
-	model = glm::translate(model, gs->GetPlayer()->pos.glm());
+	model = glm::translate(model, GetGameState()->GetPlayer()->pos.glm());
 	const float scale = 1000000.0f;
 	model = glm::scale(model, glm::vec3(scale, scale, scale));
-	float shift = gs->GetTimeStatus().interpolatedTimeOfDay / 24000.0f;
+	float shift = GetGameState()->GetTimeStatus().interpolatedTimeOfDay / 24000.0f;
 	if (shift < 0)
 		shift *= -1.0f;
 	model = glm::rotate(model, glm::radians(90.0f), glm::vec3(0, 1.0f, 0.0f));
@@ -357,7 +357,7 @@ void RendererWorld::Render(RenderState & renderState) {
 	const float moonriseLength = moonriseMax - moonriseMin;
 
 	float mixLevel = 0;
-	float dayTime = gs->GetTimeStatus().interpolatedTimeOfDay;
+	float dayTime = GetGameState()->GetTimeStatus().interpolatedTimeOfDay;
 	if (dayTime < 0)
 		dayTime *= -1;
 	while (dayTime > 24000)
@@ -451,7 +451,3 @@ void RendererWorld::Update(double timeToUpdate) {
 	DebugInfo::readyRenderer = parseQueue.size();
 	DebugInfo::renderSections = sections.size();
 }
-
-GameState* RendererWorld::GameStatePtr() {
-    return gs.get();
-}