tovjemam/PortalGame
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add room005

Browse Source
This commit is contained in:
tovjemam 2025-10-04 01:00:42 +02:00
parent d2333c14cc
commit 8941bac5d0
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/app.cpp
View File

@ -18,6 +18,7 @@ App::App()
auto room002 = assets::SectorDef::LoadFromFile("data/room_002"); auto room002 = assets::SectorDef::LoadFromFile("data/room_002");
auto room003 = assets::SectorDef::LoadFromFile("data/room_003"); auto room003 = assets::SectorDef::LoadFromFile("data/room_003");
auto room004 = assets::SectorDef::LoadFromFile("data/room_004"); auto room004 = assets::SectorDef::LoadFromFile("data/room_004");
auto room005 = assets::SectorDef::LoadFromFile("data/room_005");
// blue/red // blue/red
size_t s1i = world_.AddSector(room001); 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(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); 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); //world_.LinkPortals(s1i, "EDoor", s1i, "EDoor", 0);
// blue/red to green/white // blue/red to green/white
@ -66,11 +73,18 @@ App::App()
world_.LinkPortals(s1i, "SDoor", s4i, "NDoor", 0); world_.LinkPortals(s1i, "SDoor", s4i, "NDoor", 0);
// bend hallway to purple // bend hallway to purple
world_.LinkPortals(s4i, "EDoor", s5i, "Door1", 0); world_.LinkPortals(s4i, "SDoor", s5i, "Door1", 0);
world_.LinkPortals(s4i, "SDoor", s5i, "Door2", 0);
// purple to itself // 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(); world_.Bake();

2
src/game/sector.cpp
View File

@ -601,7 +601,7 @@ void game::Sector::GenerateAllLights()
void game::Sector::BakeLightmap() void game::Sector::BakeLightmap()
{ {
const size_t lightmap_size = 128; const size_t lightmap_size = 256;
const float margin = 1.0f; const float margin = 1.0f;
std::span<const assets::MeshVertex> mesh_verts = mesh_->GetVertices(); std::span<const assets::MeshVertex> mesh_verts = mesh_->GetVertices();