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

super fucking final commit fulll nahui worked version

Browse Source
This commit is contained in:
maka70vv 2025-03-03 08:03:11 +06:00
parent 4afecc431c
commit a43b6ee04a
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
GameObjectManager.cpp
View File

@ -175,7 +175,7 @@ void GameObjectManager::initialize() {
ActiveObject lock; ActiveObject lock;
lock.name = "lock"; lock.name = "lockFriend";
lock.activeObjectMesh = ZL::LoadFromTextFile("./lock.txt"); // Add ZL:: namespace lock.activeObjectMesh = ZL::LoadFromTextFile("./lock.txt"); // Add ZL:: namespace
lock.activeObjectMesh.Scale(2); lock.activeObjectMesh.Scale(2);
lock.activeObjectMeshMutable.AssignFrom(lock.activeObjectMesh); lock.activeObjectMeshMutable.AssignFrom(lock.activeObjectMesh);
@ -191,7 +191,7 @@ void GameObjectManager::initialize() {
ActiveObject door; ActiveObject door;
door.name = "door"; door.name = "doorGlory";
door.activeObjectMesh = ZL::LoadFromTextFile("./door.txt"); // Add ZL:: namespace door.activeObjectMesh = ZL::LoadFromTextFile("./door.txt"); // Add ZL:: namespace
door.activeObjectMesh.Scale(60); door.activeObjectMesh.Scale(60);
// cubeForFirstRoomO.activeObjectMesh.RotateByMatrix(QuatToMatrix(QuatFromRotateAroundZ(M_PI * 0.5))); // cubeForFirstRoomO.activeObjectMesh.RotateByMatrix(QuatToMatrix(QuatFromRotateAroundZ(M_PI * 0.5)));
@ -256,7 +256,7 @@ void GameObjectManager::initialize() {
room_3.sound_name = "unseen-danger-fss-no-copyright-music-252588--online-audio-convert.com.ogg"; room_3.sound_name = "unseen-danger-fss-no-copyright-music-252588--online-audio-convert.com.ogg";
room_3.objects.push_back(lock); room_3.objects.push_back(lock);
room_3.objects.push_back(door); room_3.objects.push_back(door);
room_3.roomLogic = null; room_3.roomLogic = createRoom3Logic();
room_3.textMesh = preloadedRoomMeshArr[2]; room_3.textMesh = preloadedRoomMeshArr[2];
room_3.textMeshMutable.AssignFrom(room_3.textMesh); room_3.textMeshMutable.AssignFrom(room_3.textMesh);
room_3.collisionMgr.setRoomBoundary(790, 790); room_3.collisionMgr.setRoomBoundary(790, 790);

10
QuestScripts.cpp
View File

@ -44,4 +44,14 @@ namespace ZL
}; };
} }
std::function<void(GameObjectManager&, size_t)> createRoom3Logic()
{
return [](GameObjectManager& gom, size_t ms)
// Simple test logic
{
};
}
} }

1
QuestScripts.h
View File

@ -6,5 +6,6 @@ namespace ZL {
std::function<void(GameObjectManager&, size_t)> createRoom1Logic(); std::function<void(GameObjectManager&, size_t)> createRoom1Logic();
std::function<void(GameObjectManager&, size_t)> createRoom2Logic(); std::function<void(GameObjectManager&, size_t)> createRoom2Logic();
std::function<void(GameObjectManager&, size_t)> createRoom3Logic();
} }