feat: level designer mode

tivect · Mar 31, 2024 · 2d11c6c · 2d11c6c
1 parent b557897
commit 2d11c6c
Show file tree

Hide file tree

Showing 11 changed files with 117 additions and 50 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -14,6 +14,7 @@ FetchContent_MakeAvailable(SFML)
 # TODO: glob?
 add_executable(PlatScifi
     src/main.cpp
+    src/constants.h
     src/renderdata.h
     src/worldobject.cpp
     src/worldobject.h

diff --git a/src/assets/level_0.csv b/src/assets/level_0.csv
@@ -1,5 +1,5 @@
 // Example level (level_0)
-nextLevelName level_1
+nextLevelName, level_1
 // Bottom colliders
 StaticCollider, 3, 25, 6, 2
 StaticCollider, 9, 27, 10, 2

diff --git a/src/assets/level_1.csv b/src/assets/level_1.csv
@@ -1,7 +1,17 @@
-// Example level (level_1)
-// Cycle back to the start
-nextLevelName level_0
-// Bottom collider
-StaticCollider, 2, 30, 30, 2
-// Next level
-LevelTp, 50, 29
+// First Level (level_1)
+nextLevelName, level_2
+// Bottom colliders
+StaticCollider, 3, 25, 6, 2
+StaticCollider, 9, 27, 10, 2
+StaticCollider, 19, 25, 6, 2
+// Vertical colliders
+StaticCollider, 0, 0, 2, 25
+StaticCollider, 25, 0, 2, 19
+// Extra blocks
+StaticCollider, 23, 29, 44, 19
+// Spike
+Spike, 28, 28
+// Static deadly section
+StaticDeadly, 33, 28, 5, 2
+// Ending teleporter
+LevelTp, 55, 28
diff --git a/src/assets/level_2.csv b/src/assets/level_2.csv
@@ -0,0 +1,7 @@
+// Second level (level_2)
+// Cycle back to the start
+nextLevelName, level_1
+// Bottom collider
+StaticCollider, 2, 30, 30, 2
+// Next level
+LevelTp, 50, 29
diff --git a/src/assets/level_design.csv b/src/assets/level_design.csv
@@ -0,0 +1,7 @@
+// Level Designer level (level_design)
+// Go back to the start
+nextLevelName, level_design
+// Bottom collider
+StaticCollider, 2, 30, 30, 2
+// Next level
+LevelTp, 50, 29
diff --git a/src/constants.h b/src/constants.h
@@ -0,0 +1,10 @@
+#pragma once
+
+#include <string>
+
+// The mode for level design (false)
+const bool LEVEL_DESIGN_MODE = false;
+
+// REM info
+const std::string RECENT_VERSION = "0.1.0";
+const std::string EDIT_DATE = "2024/03/31";
diff --git a/src/main.cpp b/src/main.cpp
@@ -1,6 +1,7 @@
 #include <SFML/Graphics.hpp>
 #include <iostream>
 #include <set>
+#include "constants.h"
 #include "assethandler.h"
 #include "renderer.h"
 #include "renderdata.h"
@@ -9,7 +10,7 @@
 #include "worldobject.h"
 #include "worldobjectincludes.h"
 
-// SFML Demo
+// Entry point
 int main() {
     auto window = sf::RenderWindow{ { 1920u, 1080u }, "PlatScifi" };
     window.setFramerateLimit(144);
@@ -27,8 +28,8 @@ int main() {
     Player* player = new Player(5, 10);
     gameState.spawnObject(player);
 
-    // Debug: load a basic level from a txt file
-    worldSpawner.spawnWorld(gameState, "level_0");
+    // Load the first level (depends on the mode)
+    worldSpawner.spawnWorld(gameState, LEVEL_DESIGN_MODE ? "level_design" : "level_1");
     /*// Example level (level_0.csv)
     // Bottom colliders
     gameState.spawnObject(new StaticCollider(3, 25, 6, 2));
@@ -67,7 +68,8 @@ int main() {
             keysPressed.find(sf::Keyboard::W) != keysPressed.end()
             || keysPressed.find(sf::Keyboard::Space) != keysPressed.end()
         ) {
-            player->jump();
+            if (LEVEL_DESIGN_MODE) player->accelerate(0, -0.05);
+            else player->jump();
         }
         if (keysPressed.find(sf::Keyboard::S) != keysPressed.end()) {
             player->accelerate(0, 0.05);
@@ -82,6 +84,10 @@ int main() {
             keysPressed.erase(sf::Keyboard::P);
         }
 
+        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) {

diff --git a/src/renderer.cpp b/src/renderer.cpp
@@ -1,7 +1,12 @@
 #include "renderer.h"
 
 Renderer::Renderer(sf::RenderWindow& window, AssetHandler& assetHandler)
-    : window(window), assetHandler(assetHandler) { }
+    : window(window), assetHandler(assetHandler) {
+        // Update the camera defaults if needed
+        if (LEVEL_DESIGN_MODE) {
+            screenPixPerWorld = 10; // Zoom out
+        }
+    }
 
 void Renderer::renderFromData(RenderData data) {
     // TODO: implement other types (like images)

diff --git a/src/renderer.h b/src/renderer.h
@@ -4,6 +4,7 @@
 #include "gamestate.h"
 #include "renderdata.h"
 #include "assethandler.h"
+#include "constants.h"
 
 // Render the world
 class Renderer {

diff --git a/src/worldobjects/player.h b/src/worldobjects/player.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "../worldobject.h"
+#include "../constants.h"
 
 // The data for the player
 class Player : public WorldObject {
@@ -46,7 +47,9 @@ class Player : public WorldObject {
 
     // Override update: gravity and acceleration
     UpdateResult update(WorldState& worldState, std::vector<WorldObject*>& objects) {
-        vely += worldState.getGravityStrength();
+        if (!LEVEL_DESIGN_MODE) {
+            vely += worldState.getGravityStrength();
+        }
         velx *= 0.88;
         vely *= 0.96;
         locx += velx;

diff --git a/src/worldspawner.cpp b/src/worldspawner.cpp
@@ -3,48 +3,65 @@
 void WorldSpawner::spawnWorld(GameState& gameState, std::string levelName) {
     // Load the file based on the level name
     // todo: error handling
-    std::ifstream file("assets/" + levelName + ".csv");
+    std::ifstream file;
     std::string line;
     std::string newNextLevelName = "level_0";
+    try {
+        file.open("assets/" + levelName + ".csv");
+    } catch (std::exception& e) {
+        // Failed
+        return;
+    }
     // Clear the world
     gameState.clear();
-    // Update
-    while (std::getline(file, line)) {
-        // Parse line
-        std::vector<std::string> parsed;
-        std::string thisitem = "";
-        for (char c : line) {
-            if (c == ',') {
-                parsed.push_back(thisitem);
-                thisitem = "";
-            } else if (c != ' ' && c != '\n') {
-                thisitem += c;
+    // Try to update the world
+    try {
+        while (std::getline(file, line)) {
+            // Parse line
+            std::vector<std::string> parsed;
+            std::string thisitem = "";
+            for (char c : line) {
+                if (c == ',') {
+                    parsed.push_back(thisitem);
+                    thisitem = "";
+                } else if (c != ' ' && c != '\n') {
+                    thisitem += c;
+                }
+            }
+            if (thisitem != "") parsed.push_back(thisitem);
+            // Process arguments
+            // todo: error handling with try catch
+            if (parsed[0].rfind("//", 0) == 0) {
+                // Comment: skip
+            } else if (parsed[0] == "nextLevelName") {
+                if (parsed.size() < 2) throw;
+                newNextLevelName = parsed[1];
+            } else if (parsed[0] == "StaticCollider") {
+                if (parsed.size() < 5) throw;
+                gameState.spawnObject(new StaticCollider(
+                    std::stoi(parsed[1]), std::stoi(parsed[2]), std::stoi(parsed[3]), std::stoi(parsed[4])
+                ));
+            } else if (parsed[0] == "Spike") {
+                if (parsed.size() < 3) throw;
+                gameState.spawnObject(new Spike(
+                    std::stoi(parsed[1]), std::stoi(parsed[2])
+                ));
+            } else if (parsed[0] == "StaticDeadly") {
+                if (parsed.size() < 5) throw;
+                gameState.spawnObject(new StaticDeadly(
+                    std::stoi(parsed[1]), std::stoi(parsed[2]), std::stoi(parsed[3]), std::stoi(parsed[4])
+                ));
+            } else if (parsed[0] == "LevelTp") {
+                if (parsed.size() < 3) throw;
+                gameState.spawnObject(new LevelTp(
+                    std::stoi(parsed[1]), std::stoi(parsed[2])
+                ));
             }
         }
-        if (thisitem != "") parsed.push_back(thisitem);
-        // Process arguments
-        // todo: error handling with try catch
-        if (parsed[0].rfind("//", 0) == 0) {
-            // Comment: skip
-        } else if (parsed[0] == "nextLevelName") {
-            newNextLevelName = parsed[1];
-        } else if (parsed[0] == "StaticCollider") {
-            gameState.spawnObject(new StaticCollider(
-                std::stoi(parsed[1]), std::stoi(parsed[2]), std::stoi(parsed[3]), std::stoi(parsed[4])
-            ));
-        } else if (parsed[0] == "Spike") {
-            gameState.spawnObject(new Spike(
-                std::stoi(parsed[1]), std::stoi(parsed[2])
-            ));
-        } else if (parsed[0] == "StaticDeadly") {
-            gameState.spawnObject(new StaticDeadly(
-                std::stoi(parsed[1]), std::stoi(parsed[2]), std::stoi(parsed[3]), std::stoi(parsed[4])
-            ));
-        } else if (parsed[0] == "LevelTp") {
-            gameState.spawnObject(new LevelTp(
-                std::stoi(parsed[1]), std::stoi(parsed[2])
-            ));
-        }
+    } catch (std::exception& e) {
+        // Failed: re-clear the world
+        gameState.clear();
+        return;
     }
     // Successful load: update the game state
     gameState.updateLevelNames(levelName, newNextLevelName);