diff --git a/config.json b/config.json index 525bdad1..b64fbc6d 100644 --- a/config.json +++ b/config.json @@ -3,8 +3,8 @@ "game": { "maze": { "directory": "maps", - "procedural": true, - "maze_file": "test/itemRoom.maze" + "procedural": false, + "maze_file": "test/orb_drop.maze" }, "disable_enemies": true }, @@ -16,13 +16,13 @@ "lobby_name": "Hope you're doing well!", "lobby_broadcast": true, "max_players": 1, - "disable_dm": false, + "disable_dm": true, "skip_intro": true }, "client": { "default_name": "Conan O'Brien", "lobby_discovery": true, - "fullscreen": true, + "fullscreen": false, "draw_bboxes": false, "fps_counter": true, "presentation": false diff --git a/maps/test/orb_drop.maze b/maps/test/orb_drop.maze index 72f480bc..8a1e87df 100644 --- a/maps/test/orb_drop.maze +++ b/maps/test/orb_drop.maze @@ -1,209 +1,5 @@ -###### -#|#[## -#@*.|# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -#....# -###### \ No newline at end of file +############### +#|####........# +#@*.|#........# +#....}........# +############### \ No newline at end of file diff --git a/src/client/client.cpp b/src/client/client.cpp index edc7f639..0b378f74 100644 --- a/src/client/client.cpp +++ b/src/client/client.cpp @@ -247,8 +247,8 @@ bool Client::init() { auto arrow_trap_model_path = env_models_dir / "Arrow trap" / "levelout_21.obj"; this->arrow_trap_model = std::make_unique(arrow_trap_model_path.string(), false); - auto orb_model_path = item_models_dir / "orb.obj"; - this->orb_model = std::make_unique(orb_model_path.string(), true); + auto orb_model_path = item_models_dir / "orb_final/Orb 1.obj"; + this->orb_model = std::make_unique(orb_model_path.string(), false); auto exit_model_path = env_models_dir / "exit.obj"; this->exit_model = std::make_unique(exit_model_path.string(), true); @@ -1307,6 +1307,7 @@ void Client::lightingPass() { if (!curr_source.has_value()) { continue; } + SharedPointLightInfo& properties = curr_source->pointLightInfo.value(); glm::vec3 pos = curr_source->physics.getCenterPosition(); diff --git a/src/server/game/object.cpp b/src/server/game/object.cpp index de4297a3..d3f73eb0 100644 --- a/src/server/game/object.cpp +++ b/src/server/game/object.cpp @@ -56,6 +56,7 @@ std::unordered_map Object::models ({ {ModelType::FloorSpikeHorizontal, FLOOR_SPIKE_DIMENSIONS}, {ModelType::FloorSpikeVertical, FLOOR_SPIKE_DIMENSIONS}, {ModelType::Lightning, glm::vec3(3.0f, 100.0f, 3.0f)}, + {ModelType::Orb, glm::vec3(0.887116, 0.941508, 0.950092)} }); /* SharedGameState generation */ diff --git a/src/server/game/orb.cpp b/src/server/game/orb.cpp index b91ea894..3454c062 100644 --- a/src/server/game/orb.cpp +++ b/src/server/game/orb.cpp @@ -6,7 +6,7 @@ #include "shared/audio/constants.hpp" #include -Orb::Orb(glm::vec3 corner, glm::vec3 dimensions, const PointLightProperties& properties) : Item(ObjectType::Orb, true, corner, ModelType::Cube, dimensions), +Orb::Orb(glm::vec3 corner, glm::vec3 dimensions, const PointLightProperties& properties) : Item(ObjectType::Orb, true, corner, ModelType::Orb, dimensions), properties(properties) { this->modelType = ModelType::Orb; }