From 5175c9be92046b88eb57cb015a08c7b43fdd9952 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Thu, 16 Nov 2023 10:53:34 +0300
Subject: [PATCH] Minor refactor and fixes

---
 src/frontend/screens.cpp      | 10 +++-------
 src/frontend/world_render.cpp |  7 ++++---
 src/window/Camera.cpp         |  4 ++++
 src/window/Camera.h           |  1 +
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/frontend/screens.cpp b/src/frontend/screens.cpp
index 9086af36..23aea554 100644
--- a/src/frontend/screens.cpp
+++ b/src/frontend/screens.cpp
@@ -72,7 +72,6 @@ MenuScreen::MenuScreen(Engine* engine_) : Screen(engine_) {
         });
         panel->add(shared_ptr<UINode>(button));
     }
-
     this->panel = shared_ptr<UINode>(panel);
     engine->getGUI()->add(this->panel);
 }
@@ -100,15 +99,12 @@ LevelScreen::~LevelScreen() {
     delete hud;
     delete worldRenderer;
 
-
+	std::cout << "-- writing world" << std::endl;
     World* world = level->world;
-
-	std::cout << "-- saving world" << std::endl;
 	world->write(level, !engine->getSettings().debug.generatorTestMode);
 
-	delete world;
     delete level;
-
+	delete world;
 }
 
 void LevelScreen::updateHotkeys() {
@@ -151,4 +147,4 @@ void LevelScreen::draw(float delta) {
     if (level->player->debug) {
         hud->drawDebug( 1 / delta, occlusion);
     }
-}
\ No newline at end of file
+}
diff --git a/src/frontend/world_render.cpp b/src/frontend/world_render.cpp
index fa4b68cb..5810c705 100644
--- a/src/frontend/world_render.cpp
+++ b/src/frontend/world_render.cpp
@@ -94,10 +94,11 @@ void WorldRenderer::draw(Camera* camera, bool occlusion, float fogFactor, float
 	shader->uniform3f("u_cameraPos", camera->position.x,camera->position.y,camera->position.z);
 
 	Block* cblock = Block::blocks[level->player->choosenBlock];
+	float multiplier = 0.2f;
 	shader->uniform3f("u_torchlightColor",
-			cblock->emission[0] / 15.0f,
-			cblock->emission[1] / 15.0f,
-			cblock->emission[2] / 15.0f);
+			cblock->emission[0] / 15.0f * multiplier,
+			cblock->emission[1] / 15.0f * multiplier,
+			cblock->emission[2] / 15.0f * multiplier);
 	shader->uniform1f("u_torchlightDistance", 6.0f);
 	texture->bind();
 
diff --git a/src/window/Camera.cpp b/src/window/Camera.cpp
index 2cebfa35..a309eb6c 100644
--- a/src/window/Camera.cpp
+++ b/src/window/Camera.cpp
@@ -48,3 +48,7 @@ mat4 Camera::getView(){
 	else
 		return glm::translate(glm::mat4(1.0f), position);
 }
+
+mat4 Camera::getProjView(){
+	return getProjection()*getView();
+}
\ No newline at end of file
diff --git a/src/window/Camera.h b/src/window/Camera.h
index 3e82bac3..2ece43b5 100644
--- a/src/window/Camera.h
+++ b/src/window/Camera.h
@@ -25,6 +25,7 @@ public:
 
 	mat4 getProjection();
 	mat4 getView();
+	mat4 getProjView();
 };
 
 #endif /* WINDOW_CAMERA_H_ */