added some objects in 3 room nut teksturka ne rabotaet
This commit is contained in:
1 parent
6784a29086
commit
4aa7545a7f
5 files changed
+6112
-1804
No files matched your search
Vendored
+62
-19
@@ -1,31 +1,74 @@
|
|||||||
{
|
{
|
||||||
"files.associations": {
|
"files.associations": {
|
||||||
"array": "cpp",
|
"array": "cpp",
|
||||||
|
"atomic": "cpp",
|
||||||
|
"bit": "cpp",
|
||||||
|
"*.tcc": "cpp",
|
||||||
"bitset": "cpp",
|
"bitset": "cpp",
|
||||||
"string_view": "cpp",
|
"cctype": "cpp",
|
||||||
"hash_map": "cpp",
|
"charconv": "cpp",
|
||||||
"hash_set": "cpp",
|
"chrono": "cpp",
|
||||||
"initializer_list": "cpp",
|
"clocale": "cpp",
|
||||||
"span": "cpp",
|
"cmath": "cpp",
|
||||||
"regex": "cpp",
|
"compare": "cpp",
|
||||||
"valarray": "cpp",
|
"concepts": "cpp",
|
||||||
"__hash_table": "cpp",
|
"condition_variable": "cpp",
|
||||||
"__split_buffer": "cpp",
|
"cstdarg": "cpp",
|
||||||
"__tree": "cpp",
|
"cstddef": "cpp",
|
||||||
"deque": "cpp",
|
"cstdint": "cpp",
|
||||||
|
"cstdio": "cpp",
|
||||||
|
"cstdlib": "cpp",
|
||||||
|
"cstring": "cpp",
|
||||||
|
"ctime": "cpp",
|
||||||
|
"cwchar": "cpp",
|
||||||
|
"cwctype": "cpp",
|
||||||
|
"forward_list": "cpp",
|
||||||
"list": "cpp",
|
"list": "cpp",
|
||||||
"map": "cpp",
|
|
||||||
"queue": "cpp",
|
|
||||||
"set": "cpp",
|
|
||||||
"stack": "cpp",
|
|
||||||
"string": "cpp",
|
"string": "cpp",
|
||||||
"unordered_map": "cpp",
|
"unordered_map": "cpp",
|
||||||
"unordered_set": "cpp",
|
|
||||||
"vector": "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",
|
"text_encoding": "cpp",
|
||||||
"typeindex": "cpp",
|
"thread": "cpp",
|
||||||
|
"cinttypes": "cpp",
|
||||||
"typeinfo": "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"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -69,7 +69,7 @@ void GameObjectManager::initialize() {
|
|||||||
preloadedRoomMeshArr[1].Move(Vector3f{ 0, 93, 0 });
|
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].Scale(10);
|
||||||
preloadedRoomMeshArr[2].Move(Vector3f{ 0, 93, 0 });
|
preloadedRoomMeshArr[2].Move(Vector3f{ 0, 93, 0 });
|
||||||
|
|
||||||
@@ -252,11 +252,11 @@ void GameObjectManager::initialize() {
|
|||||||
|
|
||||||
|
|
||||||
Room room_3;
|
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.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 = createRoom1Logic();
|
||||||
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);
|
||||||
|
|||||||
Binary file not shown.
|
After Width: | Height: | Size: 4.0 MiB |
+1782
-1782
File diff suppressed because it is too large.
Load diff
+4265
File diff suppressed because it is too large.
Load diff
Reference in new issue
Block a user