Merge branch 'salmon' into pavel

.vscode/settings.json

@@ -1,31 +1,74 @@
 {
     "files.associations": {
         "array": "cpp",
+        "atomic": "cpp",
+        "bit": "cpp",
+        "*.tcc": "cpp",
         "bitset": "cpp",
-        "string_view": "cpp",
-        "hash_map": "cpp",
-        "hash_set": "cpp",
-        "initializer_list": "cpp",
-        "span": "cpp",
-        "regex": "cpp",
-        "valarray": "cpp",
-        "__hash_table": "cpp",
-        "__split_buffer": "cpp",
-        "__tree": "cpp",
-        "deque": "cpp",
+        "cctype": "cpp",
+        "charconv": "cpp",
+        "chrono": "cpp",
+        "clocale": "cpp",
+        "cmath": "cpp",
+        "compare": "cpp",
+        "concepts": "cpp",
+        "condition_variable": "cpp",
+        "cstdarg": "cpp",
+        "cstddef": "cpp",
+        "cstdint": "cpp",
+        "cstdio": "cpp",
+        "cstdlib": "cpp",
+        "cstring": "cpp",
+        "ctime": "cpp",
+        "cwchar": "cpp",
+        "cwctype": "cpp",
+        "forward_list": "cpp",
         "list": "cpp",
-        "map": "cpp",
-        "queue": "cpp",
-        "set": "cpp",
-        "stack": "cpp",
         "string": "cpp",
         "unordered_map": "cpp",
-        "unordered_set": "cpp",
         "vector": "cpp",
-        "chrono": "cpp",
+        "deque": "cpp",
+        "exception": "cpp",
+        "algorithm": "cpp",
+        "functional": "cpp",
+        "iterator": "cpp",
+        "memory": "cpp",
+        "memory_resource": "cpp",
+        "optional": "cpp",
+        "random": "cpp",
+        "ratio": "cpp",
+        "string_view": "cpp",
+        "system_error": "cpp",
+        "tuple": "cpp",
+        "type_traits": "cpp",
+        "utility": "cpp",
+        "format": "cpp",
+        "initializer_list": "cpp",
+        "iomanip": "cpp",
+        "iosfwd": "cpp",
+        "istream": "cpp",
+        "limits": "cpp",
+        "mutex": "cpp",
+        "new": "cpp",
+        "ostream": "cpp",
+        "print": "cpp",
+        "span": "cpp",
+        "sstream": "cpp",
+        "stdexcept": "cpp",
+        "streambuf": "cpp",
         "text_encoding": "cpp",
-        "typeindex": "cpp",
+        "thread": "cpp",
+        "cinttypes": "cpp",
         "typeinfo": "cpp",
-        "*.inc": "cpp"
+        "variant": "cpp",
+        "__bit_reference": "cpp",
+        "__locale": "cpp",
+        "__split_buffer": "cpp",
+        "__verbose_abort": "cpp",
+        "execution": "cpp",
+        "ios": "cpp",
+        "locale": "cpp",
+        "queue": "cpp",
+        "stack": "cpp"
     }
 }

GameObjectManager.cpp

@@ -69,7 +69,7 @@ void GameObjectManager::initialize() {
         preloadedRoomMeshArr[1].Move(Vector3f{ 0, 93, 0 });
 
 
-        preloadedRoomMeshArr[2] = ZL::LoadFromTextFile("./thirdroom.txt");
+        preloadedRoomMeshArr[2] = ZL::LoadFromTextFile("./thirdroom1.txt");
         preloadedRoomMeshArr[2].Scale(10);
         preloadedRoomMeshArr[2].Move(Vector3f{ 0, 93, 0 });
 
@@ -252,7 +252,7 @@ void GameObjectManager::initialize() {
 
 
             Room room_3;
-            room_3.roomTexture = std::make_shared<Texture>(CreateTextureDataFromBmp24("./seconroom.bmp"));
+            room_3.roomTexture = std::make_shared<Texture>(CreateTextureDataFromBmp24("./photo_2025-03-03_07-51-53.bmp"));
             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(door);