fix some stuffer

Kade-github · May 24, 2024 · 15cfca2 · 15cfca2
1 parent 65ce41d
commit 15cfca2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/Assets/Shaders/frag.glsl b/Assets/Shaders/frag.glsl
@@ -68,11 +68,11 @@ void main()
 
     FragColor = mix(FragColor, vec4(1.0, 0.0, 0.0, FragColor.a), redness);
 
-    // Adjust brightness and contrast
+    // Adjust brightness
 
     FragColor = vec4(FragColor.rgb * brightness, FragColor.a);
 
     if (FogFar < 1000)
-	    FragColor = mix(FragColor, vec4(FogColor.rgb * brightness, FragColor.a), fogFactor);
+	    FragColor = mix(FragColor, vec4(FogColor.rgb, FragColor.a), fogFactor);
 
 }
diff --git a/src/Game/Objects/Base/Entity.cpp b/src/Game/Objects/Base/Entity.cpp
@@ -152,7 +152,7 @@ void Entity::CheckCollision(glm::vec3& motion, float down)
 
 			if (hit)
 			{
-				progress -= 25 * Game::instance->deltaTime;
+				progress -= 0.5f;
 				_lastX = rp.x + (diff.x * progress);
 				break;
 			}
@@ -187,7 +187,7 @@ void Entity::CheckCollision(glm::vec3& motion, float down)
 
 			if (hit)
 			{
-				progress -= 25 * Game::instance->deltaTime;
+				progress -= 0.5f;
 				_lastZ = rp.z + (diff.z * progress);
 				break;
 			}

diff --git a/src/Game/Objects/Base/Entity.h b/src/Game/Objects/Base/Entity.h
@@ -32,7 +32,7 @@ class Entity : public GameObject
 	bool inWater = false;
 
 	float gravity = 22.0f;
-	float jumpStrength = 7.8f;
+	float jumpStrength = 6.8f;
 	float speed = 9.0f;
 
 	bool tiny = false;

diff --git a/src/Game/Scenes/SettingsMenu.cpp b/src/Game/Scenes/SettingsMenu.cpp
@@ -24,23 +24,23 @@ void SettingsMenu::Create()
 
 	ambientDiffuse = new Bar(glm::vec3(0, 0, 0), "Ambient Diffusion: " + std::string(Settings::instance->useAmbientDiffuse ? "on" : "off"));
 
-	ambientDiffuse->position = glm::vec3(c2d->_w / 2, c2d->_h / 2 + 200, 0);
+	ambientDiffuse->position = glm::vec3(c2d->_w / 2, c2d->_h / 2 + 400, 0);
 
 	ambientDiffuse->position -= glm::vec3(ambientDiffuse->width / 2, 0, 0);
 
 	c2d->AddObject(ambientDiffuse);
 
 	vsync = new Bar(glm::vec3(0, 0, 0), "VSync: " + std::string(Settings::instance->vsync ? "on" : "off"));
 
-	vsync->position = glm::vec3(c2d->_w / 2, (c2d->_h / 2) + 100, 0);
+	vsync->position = glm::vec3(c2d->_w / 2, (c2d->_h / 2) + 300, 0);
 
 	vsync->position -= glm::vec3(vsync->width / 2, 0, 0);
 
 	c2d->AddObject(vsync);
 
 	fullscreen = new Bar(glm::vec3(0, 0, 0), "Fullscreen: " + std::string(Settings::instance->fullscreen ? "on" : "off"));
 
-	fullscreen->position = glm::vec3(c2d->_w / 2, c2d->_h / 2, 0);
+	fullscreen->position = glm::vec3(c2d->_w / 2, c2d->_h / 2 + 200, 0);
 
 	fullscreen->position -= glm::vec3(fullscreen->width / 2, 0, 0);