The Dungeon Master

.gitignore

@@ -1,4 +1,5 @@
 build/
+out/
 .vscode/
 .vs/
 .cache/

config.json

@@ -2,7 +2,7 @@
     "game": {
       "maze": {
         "directory": "maps",
-        "procedural": false,
+        "procedural": true,
         "maze_file": "test/itemRoom.maze"
       }
     },
@@ -13,12 +13,12 @@
     "server": {
         "lobby_name": "Hope you're doing well!",
         "lobby_broadcast": true,
-        "max_players": 1
+        "max_players": 6
     },
     "client": {
         "default_name": "Conan O'Brien",
         "lobby_discovery": true,
-        "window_width": 1500,
+        "window_width": 2000,
         "draw_bboxes": false
     }
 }

include/client/camera.hpp

@@ -49,7 +49,7 @@ class Camera {
      * @param xpos New x-coordinate for the cursor.
      * @param ypos New y-coordinate for the cursor.
      */
-    void update(float xpos, float ypos);
+    virtual void update(float xpos, float ypos);
 
     /**
      * @brief Moves the camera based on the axis, direction, and speed. Factors in the current 
@@ -85,7 +85,11 @@ class Camera {
 
     glm::vec3 getPos();
 
-private:
+    glm::mat4 getProjection();
+
+    glm::mat4 getView();
+
+protected:
     // Perspective controls
     float FOV;       // Field of View Angle (degrees)
     float aspect;    // Aspect Ratio
@@ -110,5 +114,16 @@ class Camera {
     float speed;
 
     glm::mat4 viewProjMat;
+
+    glm::mat4 projection;
+    glm::mat4 view;
+};
+
+class DungeonMasterCamera : public Camera {
+public:
+    DungeonMasterCamera();
+    ~DungeonMasterCamera();
+
+    void update(float xpos, float ypos) override;
 };
 

include/client/client.hpp

@@ -162,6 +162,8 @@ class Client {
 
     AudioManager* getAudioManager();
 
+    void setWorldPos();
+
 private:
     /**
      * @brief Processes all data received from the server and updates the SharedGameState.
@@ -185,7 +187,8 @@ class Client {
     SharedGameState gameState;
 
     /* Shader objects for various */
-    std::shared_ptr<Shader> cube_shader; 
+    std::shared_ptr<Shader> cube_shader;
+    std::shared_ptr<Shader> dm_cube_shader;
     std::shared_ptr<Shader> model_shader;
     std::shared_ptr<Shader> light_source_shader;
     std::shared_ptr<Shader> solid_surface_shader;
@@ -225,6 +228,11 @@ class Client {
     bool is_held_left = false;
     bool is_held_space = false;
 
+    bool is_held_i = false;
+    bool is_held_o = false;
+
+    bool is_pressed_p = false;
+
     bool is_left_mouse_down = false;
 
     /* Mouse position coordinates */
@@ -241,6 +249,8 @@ class Client {
     basic_resolver_results<class boost::asio::ip::tcp> endpoints;
     std::shared_ptr<Session> session;
 
+    glm::vec3 world_pos; // stored world pause, calculated before the GUI is rendered
+
     std::array<boost::optional<SharedObject>, MAX_POINT_LIGHTS> closest_light_sources;
 };
 

include/client/cube.hpp

@@ -17,7 +17,7 @@ class Cube : public Renderable {
     explicit Cube(glm::vec3 newColor);
     ~Cube();
 
-    void draw(std::shared_ptr<Shader> shader,
+    void draw(Shader* shader,
             glm::mat4 viewProj,
             glm::vec3 camPos, 
             std::array<boost::optional<SharedObject>, MAX_POINT_LIGHTS> lightSources,

include/client/model.hpp

@@ -87,16 +87,19 @@ class Mesh : public Renderable {
      * @param modelView determines the scaling/rotation/translation of the 
      * mesh
      */
-    void draw(std::shared_ptr<Shader> shader,
+    void draw(Shader* shader,
             glm::mat4 viewProj,
             glm::vec3 camPos, 
             std::array<boost::optional<SharedObject>, MAX_POINT_LIGHTS> lightSources,
             bool fill) override;
+
+
+    std::optional<glm::vec3> solidColor;
+    Material material;
  private:
      std::vector<Vertex>       vertices;
      std::vector<unsigned int> indices;
      std::vector<Texture>      textures;
-     Material material;
 
     //  render data opengl needs
     GLuint VAO, VBO, EBO;
@@ -120,7 +123,7 @@ class Model : public Renderable {
      * @param Shader to use while drawing all the
      * meshes of the model
      */
-    void draw(std::shared_ptr<Shader> shader,
+    void draw(Shader* shader,
             glm::mat4 viewProj,
             glm::vec3 camPos, 
             std::array<boost::optional<SharedObject>, MAX_POINT_LIGHTS> lightSources,
@@ -217,6 +220,9 @@ class Model : public Renderable {
      * in that dimension
      */
     void setDimensions(const glm::vec3& dimensions);
+
+    void overrideSolidColor(std::optional<glm::vec3> color);
+
  private:
     std::vector<Mesh> meshes;
     Bbox bbox;

include/client/renderable.hpp

@@ -21,7 +21,7 @@ class Renderable {
      * meshes of the model
      * @param
      */
-    virtual void draw(std::shared_ptr<Shader> shader,
+    virtual void draw(Shader* shader,
             glm::mat4 viewProj,
             glm::vec3 camPos, 
             std::array<boost::optional<SharedObject>, MAX_POINT_LIGHTS> lightSources,

include/server/game/constants.hpp

@@ -21,6 +21,7 @@
 
 /*	GridCell Constants	*/
 #define DEFAULT_GRIDCELL_WIDTH	3
+#define DM_Z_DISCOUNT 0.2
 
 // Player Stat Constants
 #define INITIAL_HEALTH 100
@@ -70,4 +71,10 @@
 
 /* Default model sizes */
 #define BEAR_DIMENSIONS         glm::vec3(14.163582, 17.914591, 10.655818)
-#define FIRE_PLAYER_DIMENSIONS  glm::vec3(8.008834, 10.069769, 2.198592)
+#define FIRE_PLAYER_DIMENSIONS  glm::vec3(8.008834, 10.069769, 2.198592)
+
+/* DM Constants */
+#define MAX_TRAPS 10
+#define TRAP_INVENTORY_SIZE 10
+#define TRAP_TIME 10
+#define TRAP_COOL_DOWN 5

include/server/game/dungeonmaster.hpp

@@ -0,0 +1,23 @@
+#pragma once
+
+#include "server/game/constants.hpp"
+#include "server/game/object.hpp"
+#include "server/game/creature.hpp"
+#include "shared/game/sharedobject.hpp"
+
+
+class DungeonMaster : public Creature {
+public:
+	SharedTrapInventory sharedTrapInventory;
+
+	DungeonMaster(glm::vec3 corner, glm::vec3 facing);
+	~DungeonMaster();
+
+	virtual SharedObject toShared() override;
+
+	int getPlacedTraps();
+
+	void setPlacedTraps(int placedTraps);
+private:
+	int placedTraps;
+};

include/server/game/gridcell.hpp

@@ -1,44 +1,8 @@
 #pragma once
 
-enum class CellType {
-	Empty,
-	Wall,
-    Pillar,
-	Spawn,
-	Enemy,
-	SpikeTrap,
-	FireballTrap,
-	FloorSpikeHorizontal,
-	FloorSpikeVertical,
-	FloorSpikeFull,
-	FakeWall,
-	ArrowTrapUp,
-	ArrowTrapDown,
-	ArrowTrapLeft,
-	ArrowTrapRight,
-	HealthPotion,
-	NauseaPotion,
-	InvisibilityPotion,
-    TorchDown,
-    TorchUp,
-    TorchLeft,
-    TorchRight,
-	InvincibilityPotion,
-	FireSpell,
-	HealSpell,
-	TeleportSpell,
-	Dagger,
-	Sword,
-	Hammer,
-	RandomWeapon,
-	RandomPotion,
-	RandomSpell,
-	Orb,
-	OutsideTheMaze,
-	TeleporterTrap,
-	Exit,
-	Unknown
-};
+#include "shared/game/celltype.hpp"
+
+bool isWallLikeCell(CellType type);
 
 /**
  * @brief Returns CellType given a character (maps character representation to

include/server/game/object.hpp

@@ -39,7 +39,7 @@ struct Physics {
 		glm::vec3 corner, glm::vec3 facing,
 		glm::vec3 dimensions = glm::vec3(1.0f)):
 		shared{.corner=corner, .facing=facing, .dimensions=dimensions},
-		movable(movable), velocity(glm::vec3(0.0f)), velocityMultiplier(glm::vec3(1.0f)), nauseous(1.0f),
+		movable(movable), feels_gravity(true), velocity(glm::vec3(0.0f)), velocityMultiplier(glm::vec3(1.0f)), nauseous(1.0f),
 		collider(collider)
 	{}
 
@@ -55,6 +55,13 @@ struct Physics {
 	 */
 	bool movable;
 
+
+	/**
+	 * @brief true if the object that contains this Physics struct feels gravity and
+	 * false otherwise
+	 */
+	bool feels_gravity;
+
 	/**
 	 * @brief 3-D vector that denotes this object's current velocity.
 	 */
@@ -94,6 +101,12 @@ class Object {
 	 */
 	SpecificID typeID {};
 
+	/**
+	 * @brief Movable ID (used to index into the movable
+	 * objects vector in ServerGameState)
+	 */
+	MovableID movableID{};
+
 	/**
 	 * @brief Identifies this object's type (derived class)
 	 */

include/server/game/objectmanager.hpp

@@ -8,6 +8,7 @@
 #include "server/game/object.hpp"
 #include "server/game/player.hpp"
 #include "server/game/enemy.hpp"
+#include "server/game/dungeonmaster.hpp"
 #include "server/game/solidsurface.hpp"
 #include "server/game/torchlight.hpp"
 //#include "server/game/grid.hpp"
@@ -101,6 +102,12 @@ class ObjectManager {
 	 */
 	Player* getPlayer(SpecificID playerID);
 
+	/**
+	 * @brief Get the Dungeon Master pointer
+	 * @return A pointer to the Dungeon Master
+	 */
+	DungeonMaster* getDM();
+
 	/**
 	 * @brief Attempts to retrieve the Enemy with the given SpecificID.
 	 * @param enemyID SpecificID of the Enemy to retrieve
@@ -130,6 +137,14 @@ class ObjectManager {
 	 */
 	SmartVector<Object*> getObjects();
 
+	/**
+	 * @brief Get a list of all objects in this game instance at the current
+	 * timestep that are MOVABLE.
+	 * @return SmartVector of Object pointers of all objects in the game
+	 * instance that are MOVABLE.
+	 */
+	SmartVector<Object*> getMovableObjects();
+
 	/**
 	 * @brief Get a list of all items in this game instance at the current
 	 * timestep.
@@ -281,6 +296,16 @@ class ObjectManager {
 	 */
 	SmartVector<Object *> objects;
 
+	/**
+	 * @brief SmartVector of Object pointers to all objects in the current
+	 * timestep of this game instance that are MOVABLE.
+	 *
+	 * The objects smart vector is indexed by each Object's global EntityID;
+	 * that is, the Object pointer at index x points to the Object with global
+	 * EntityID x.
+	 */
+	SmartVector<Object*> movableObjects;
+
 	/*	Type-specific object smart vectors	*/
 
 	/**
@@ -340,4 +365,9 @@ class ObjectManager {
 	 * ObjectType::Exit.
 	 */
 	SmartVector<Exit*> exits;
+
+	/**
+	 * @brief The Dungeon Master
+	 */
+	DungeonMaster * dm; 
 };