salmon-engine-projects/space-game001
14
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added 3 room and button to move to next rom

Browse Source
This commit is contained in:
Альберт Гадиев 2025-03-03 06:52:20 +06:00
parent 3453c9780e
commit 7951e6ab80
2 changed files with 4299 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
GameObjectManager.cpp
View File

@ -58,7 +58,7 @@ void GameObjectManager::initialize() {
loadingThread = std::thread([this]() {
preloadedRoomMeshArr.resize(2);
preloadedRoomMeshArr.resize(3);
preloadedRoomMeshArr[0] = ZL::LoadFromTextFile("./oneroom001.txt");
preloadedRoomMeshArr[0].Scale(10);
@ -69,6 +69,12 @@ void GameObjectManager::initialize() {
preloadedRoomMeshArr[1].Move(Vector3f{ 0, 93, 0 });
preloadedRoomMeshArr[2] = ZL::LoadFromTextFile("./thirdroom.txt");
preloadedRoomMeshArr[2].Scale(10);
preloadedRoomMeshArr[2].Move(Vector3f{ 0, 93, 0 });
//violaIdleModel.LoadFromFile("./idleviola001.txt");
violaIdleModel.LoadFromFile("./idleviola008.txt");
@ -205,6 +211,24 @@ void GameObjectManager::initialize() {
activeObjects = rooms[current_room_index].objects;
Room room_3;
room_3.roomTexture = std::make_shared<Texture>(CreateTextureDataFromBmp24("./seconroom.bmp"));
room_3.sound_name = "unseen-danger-fss-no-copyright-music-252588--online-audio-convert.com.ogg";
room_3.roomLogic = createRoom2Logic();
room_3.textMesh = preloadedRoomMeshArr[2];
room_3.textMeshMutable.AssignFrom(room_3.textMesh);
room_3.collisionMgr.setRoomBoundary(790, 790);
room_3.collisionMgr.addCollider(std::make_shared<RectangleCollider>(Vector3f{ -227, 0, -166 }, Vector3f{ 398, 0, -154 }));
room_3.collisionMgr.addCollider(std::make_shared<RectangleCollider>(Vector3f{ -328, 0, 182 }, Vector3f{ -216, 0, 332 }));
room_3.collisionMgr.addCollider(std::make_shared<RectangleCollider>(Vector3f{ -227, 0, -400 }, Vector3f{ -208, 0, -165}));
room_3.collisionMgr.addCollider(std::make_shared<RectangleCollider>(Vector3f{ 263, 0, 295 }, Vector3f{ 303, 0, 335 }));
rooms.push_back(room_3);
activeObjects = rooms[current_room_index].objects;
// Initialize audio
/*
audioPlayer = std::make_unique<AudioPlayer>();
@ -467,7 +491,15 @@ void GameObjectManager::handleEvent(const SDL_Event& event) {
}
}
break;
// ...handle other keys...
case SDLK_RSHIFT:
case SDLK_LSHIFT: {
// Switch to next room
int nextRoom = current_room_index + 1;
if (nextRoom < rooms.size()) {
switch_room(nextRoom);
}
break;
}
}
}
else if (event.type == SDL_KEYUP) {

4265
thirdroom.txt Normal file
View File

File diff suppressed because it is too large Load Diff