From 8941bac5d0f895b349d1a3424537a9ababa2ecbe Mon Sep 17 00:00:00 2001 From: tovjemam Date: Sat, 4 Oct 2025 01:00:42 +0200 Subject: [PATCH] Add room005 --- src/app.cpp | 20 +++++++++++++++++--- src/game/sector.cpp | 2 +- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/app.cpp b/src/app.cpp index f598d00..b96cd0e 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -18,6 +18,7 @@ App::App() auto room002 = assets::SectorDef::LoadFromFile("data/room_002"); auto room003 = assets::SectorDef::LoadFromFile("data/room_003"); auto room004 = assets::SectorDef::LoadFromFile("data/room_004"); + auto room005 = assets::SectorDef::LoadFromFile("data/room_005"); // blue/red size_t s1i = world_.AddSector(room001); @@ -47,6 +48,12 @@ App::App() s5.AddLight(glm::vec3(0.0f, 0.0f, 3.5f), glm::vec3(1.0f, 0.5f, 0.5f), 3.0f); s5.AddLight(glm::vec3(3.5f, 0.0f, -0.5f), glm::vec3(1.0f, 1.5f, 0.0f), 5.0f); + // big room + size_t s6i = world_.AddSector(room005); + game::Sector& s6 = world_.GetSector(s6i); + s6.AddLight(glm::vec3(-4.0f, 0.0f, 4.0f), glm::vec3(1.0f, 0.8f, 0.7f), 8.0f); + s6.AddLight(glm::vec3(4.0f, 0.0f, 4.0f), glm::vec3(1.0f, 0.8f, 0.7f), 8.0f); + //world_.LinkPortals(s1i, "EDoor", s1i, "EDoor", 0); // blue/red to green/white @@ -66,11 +73,18 @@ App::App() world_.LinkPortals(s1i, "SDoor", s4i, "NDoor", 0); // bend hallway to purple - world_.LinkPortals(s4i, "EDoor", s5i, "Door1", 0); - world_.LinkPortals(s4i, "SDoor", s5i, "Door2", 0); + world_.LinkPortals(s4i, "SDoor", s5i, "Door1", 0); // purple to itself - world_.LinkPortals(s4i, "WDoor", s4i, "WDoor", 0); + //world_.LinkPortals(s4i, "WDoor", s4i, "WDoor", 0); + + // purple to big + world_.LinkPortals(s4i, "WDoor", s6i, "CenterDoor", 0); + + // big to bend + world_.LinkPortals(s6i, "SideDoor", s5i, "Door2", 0); + + world_.LinkPortals(s4i, "EDoor", s4i, "EDoor", 0); world_.Bake(); diff --git a/src/game/sector.cpp b/src/game/sector.cpp index cf986dc..39bc010 100644 --- a/src/game/sector.cpp +++ b/src/game/sector.cpp @@ -601,7 +601,7 @@ void game::Sector::GenerateAllLights() void game::Sector::BakeLightmap() { - const size_t lightmap_size = 128; + const size_t lightmap_size = 256; const float margin = 1.0f; std::span mesh_verts = mesh_->GetVertices();