anything over 1.2 disables fog

Kade-github · Apr 16, 2024 · b1f39ac · b1f39ac
1 parent 6568b80
commit b1f39ac
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/Assets/Shaders/frag.glsl b/Assets/Shaders/frag.glsl
@@ -29,5 +29,8 @@ void main()
     float d = distance(CameraPos, Position);
 	float fogFactor = getFogFactor(d);
 
-	FragColor = mix(color, vec4(FogColor, 1.0), fogFactor);
+    if (FogFar < 1000)
+	    FragColor = mix(color, vec4(FogColor, 1.0), fogFactor);
+    else
+		FragColor = color;
 }
diff --git a/src/Game/Scenes/Gameplay.cpp b/src/Game/Scenes/Gameplay.cpp
@@ -91,6 +91,9 @@ void Gameplay::Draw()
 
 	int fog = (camera->cameraFar / 2) * Settings::instance->fogDistance;
 
+	if (Settings::instance->fogDistance >= 1.19)
+		fog = 10000;
+
 	Game::instance->shader->SetUniform3f("CameraPos", camera->position.x, camera->position.y, camera->position.z);
 	Game::instance->shader->SetUniform3f("FogColor", LightingManager::GetInstance()->sun.color.x, LightingManager::GetInstance()->sun.color.y, LightingManager::GetInstance()->sun.color.z);
 	Game::instance->shader->SetUniform1f("FogFar", fog);

diff --git a/src/Game/Scenes/SettingsMenu.cpp b/src/Game/Scenes/SettingsMenu.cpp
@@ -74,7 +74,7 @@ void SettingsMenu::Create()
 
 	c2d->AddObject(renderDistance);
 
-	float fogDistancePerc = Settings::instance->fogDistance;
+	float fogDistancePerc = Settings::instance->fogDistance / 1.2f;
 
 	if (fogDistancePerc < 0.1f)
 		fogDistancePerc = 0.1f;
@@ -84,7 +84,7 @@ void SettingsMenu::Create()
 
 	fogDistance = new DragBar(glm::vec3(0, 0, 0), "Fog Distance", fogDistancePerc);
 
-	fogDistance->max = 1;
+	fogDistance->max = 1.2;
 
 	fogDistance->position = glm::vec3(c2d->_w / 2, c2d->_h / 2 - 200, 0);
 
@@ -124,7 +124,7 @@ void SettingsMenu::Draw()
 
 	Settings::instance->fov = fov->value * 140;
 	Settings::instance->renderDistance = renderDistance->value;
-	Settings::instance->fogDistance = fogDistance->value;
+	Settings::instance->fogDistance = fogDistance->value * 1.2;
 
 	Scene::Draw();
 }