fix: bottom corner collisions

tivect · Apr 3, 2024 · 6eb86ab · 6eb86ab
1 parent d18e6ff
commit 6eb86ab
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 14 deletions.
diff --git a/src/main.cpp b/src/main.cpp
@@ -13,6 +13,7 @@
 // Entry point
 int main() {
     auto window = sf::RenderWindow{ { 1920u, 1080u }, "PlatScifi" };
+    // TODO: better framerate limit ?
     window.setFramerateLimit(144);
 
     // TODO: build not working on Linux?
@@ -84,22 +85,24 @@ int main() {
             keysPressed.erase(sf::Keyboard::P);
         }
 
+	// Update the game and world
         if (LEVEL_DESIGN_MODE) {
             // Level Design Mode: keep reloading the world without updating it
             worldSpawner.spawnWorld(gameState, gameState.getLevelName());
         }
-        // Update the game and world
         UpdateResult updateResult = gameState.update();
         if (updateResult == UpdateResult::NextLevel) {
             // Load the next level, if possible
             // TODO: impl better
             worldSpawner.spawnWorld(gameState, gameState.getNextLevelName());
         }
 
+	// Render
+	window.clear(sf::Color(0, 0, 0));
         // Render the game and world
-        window.clear(sf::Color(111, 201, 252));
         renderer.setCamera(player->getLocx(), player->getLocy(), 0.8);
-        renderer.renderWorldObjects(gameState);
+        renderer.renderWorld(gameState);
+	// Update
         window.display();
     }
 }
diff --git a/src/renderer.cpp b/src/renderer.cpp
@@ -73,9 +73,13 @@ void Renderer::setCamera(double newWorldCameraCenterX, double newWorldCameraCent
     worldCameraCenterY = worldCameraCenterY * percentEasing + newWorldCameraCenterY * (1 - percentEasing);
 }
 
-void Renderer::renderWorldObjects(GameState& gameState) {
-    // todo: fix on mac/linux
+void Renderer::renderWorld(GameState& gameState) {
+	// Clear/render sky
+	window.clear(sf::Color(111, 201, 252));
+	// Render world objects
     for (std::vector<WorldObject*>::iterator it = gameState.objectsBegin(); it != gameState.objectsEnd(); it++) {
         renderFromData((*it)->getRenderData());
     }
+	// TODO: Render UI
+
 }
diff --git a/src/renderer.h b/src/renderer.h
@@ -26,5 +26,5 @@ class Renderer {
     void setCamera(double newWorldCameraCenterX, double newWorldCameraCenterY, double percentEasing = 0.0);
 
     // Render the entire world
-    void renderWorldObjects(GameState& worldState);
+    void renderWorld(GameState& worldState);
 };
diff --git a/src/worldobjects/player.h b/src/worldobjects/player.h
@@ -67,7 +67,7 @@ class Player : public WorldObject {
 	        bool overlapped = false;
             if (object->hasAttribute(ObjectAttribute::Collision)) {
                 // X movement pushout
-                // todo: better way of doing the 0.1 thing
+                // todo: better way of doing the 0.1 thing (subtract velocity instead?)
                 if (locy + height - 0.1 >= object->getLocy() && locy + 0.1 < object->getLocy() + object->getHeight()) {
                     // Within the y
                     if (locx + width > object->getLocx() && locx < object->getLocx() + object->getWidth()) {
@@ -81,13 +81,26 @@ class Player : public WorldObject {
                 if (locx + width >= object->getLocx() && locx < object->getLocx() + object->getWidth()) {
                     // Within the x
                     if (locy + height > object->getLocy() && locy < object->getLocy() + object->getHeight()) {
-                        // Floor/ceiling
-                        locy -= vely;
-                        vely = 0;
-                        collided = true;
-			            overlapped = true;
-                        // todo: should not be on ground on a bottom corner
-                        onGround = true;
+						if (locy > object->getLocy() + object->getHeight() / 2.0) {
+							// Ceiling
+							if (vely >= 0) {
+								// Already traveling down: do nothing
+							} else {
+								// Traveling up: stop
+								locy -= vely;
+								vely = 0;
+							}
+							collided = true;
+							overlapped = true;
+						} else {
+							// Floor
+							locy -= vely;
+							vely = 0;
+							collided = true;
+							overlapped = true;
+							// todo: should not be on ground on a bottom corner
+							onGround = true;
+						}
                     }
                 }
             }