diff --git a/GameObjectManager.cpp b/GameObjectManager.cpp index 7defb3a..42d9e27 100644 --- a/GameObjectManager.cpp +++ b/GameObjectManager.cpp @@ -132,13 +132,13 @@ void GameObjectManager::initialize() { cubeForFirstRoomM.inventoryIconTexturePtr = std::make_shared(CreateTextureDataFromBmp32("./textures/inventory_objects/cubic_M_icon.bmp32")); ActiveObject ao2; - ao2.name = "book"; - ao2.activeObjectMesh = ZL::LoadFromTextFile("./book001.txt"); // Add ZL:: namespace - ao2.activeObjectMesh.Scale(4); + ao2.name = "lighter"; + ao2.activeObjectMesh = ZL::LoadFromTextFile("./lighter.txt"); // Add ZL:: namespace + ao2.activeObjectMesh.Scale(7); ao2.activeObjectMeshMutable.AssignFrom(ao2.activeObjectMesh); ao2.activeObjectMeshMutable.RefreshVBO(); - ao2.objectPos = Vector3f{ 85, 0, 43 }; - ao2.activeObjectTexturePtr = std::make_shared(CreateTextureDataFromBmp24("./book03.bmp")); + ao2.objectPos = Vector3f{ 85, 30, 43 }; + ao2.activeObjectTexturePtr = std::make_shared(CreateTextureDataFromBmp24("./temno.bmp")); ao2.activeObjectScreenTexturePtr = std::make_shared(CreateTextureDataFromBmp24("./aoscreen01.bmp")); ao2.activeObjectScreenMesh = CreateRect2D({ 0.f, 0.f }, { 64.f, 64.f }, 0.5); ao2.activeObjectScreenMeshMutable.AssignFrom(ao2.activeObjectScreenMesh); @@ -150,10 +150,10 @@ void GameObjectManager::initialize() { ActiveObject carToy; carToy.name = "carToy"; carToy.activeObjectMesh = ZL::LoadFromTextFile("./car.txt"); // Add ZL:: namespace - carToy.activeObjectMesh.Scale(13); + carToy.activeObjectMesh.Scale(12); carToy.activeObjectMeshMutable.AssignFrom(carToy.activeObjectMesh); carToy.activeObjectMeshMutable.RefreshVBO(); - carToy.objectPos = Vector3f{ 291, 0, 315 }; + carToy.objectPos = Vector3f{ 300, 0, 315 }; carToy.activeObjectTexturePtr = std::make_shared(CreateTextureDataFromBmp24("./Material.001_Base_color_1001_5.bmp")); carToy.activeObjectScreenTexturePtr = std::make_shared(CreateTextureDataFromBmp24("./aoscreen01.bmp")); carToy.activeObjectScreenMesh = CreateRect2D({ 0.f, 0.f }, { 64.f, 64.f }, 0.5); @@ -162,6 +162,9 @@ void GameObjectManager::initialize() { carToy.inventoryIconTexturePtr = std::make_shared(CreateTextureDataFromBmp32("./textures/inventory_objects/cubic_T_icon.bmp32")); + + + Room room_1; diff --git a/lighter.txt b/lighter.txt new file mode 100644 index 0000000..522dd11 --- /dev/null +++ b/lighter.txt @@ -0,0 +1,261 @@ +===Vertices: 20 +Vertex 0: +Vertex 1: +Vertex 2: +Vertex 3: +Vertex 4: +Vertex 5: +Vertex 6: +Vertex 7: +Vertex 8: +Vertex 9: +Vertex 10: +Vertex 11: +Vertex 12: +Vertex 13: +Vertex 14: +Vertex 15: +Vertex 16: +Vertex 17: +Vertex 18: +Vertex 19: +===UV Coordinates: +Face count: 36 +Face 0 +UV Count: 3 + UV + UV + UV +Face 1 +UV Count: 3 + UV + UV + UV +Face 2 +UV Count: 3 + UV + UV + UV +Face 3 +UV Count: 3 + UV + UV + UV +Face 4 +UV Count: 3 + UV + UV + UV +Face 5 +UV Count: 3 + UV + UV + UV +Face 6 +UV Count: 3 + UV + UV + UV +Face 7 +UV Count: 3 + UV + UV + UV +Face 8 +UV Count: 3 + UV + UV + UV +Face 9 +UV Count: 3 + UV + UV + UV +Face 10 +UV Count: 3 + UV + UV + UV +Face 11 +UV Count: 3 + UV + UV + UV +Face 12 +UV Count: 3 + UV + UV + UV +Face 13 +UV Count: 3 + UV + UV + UV +Face 14 +UV Count: 3 + UV + UV + UV +Face 15 +UV Count: 3 + UV + UV + UV +Face 16 +UV Count: 3 + UV + UV + UV +Face 17 +UV Count: 3 + UV + UV + UV +Face 18 +UV Count: 3 + UV + UV + UV +Face 19 +UV Count: 3 + UV + UV + UV +Face 20 +UV Count: 3 + UV + UV + UV +Face 21 +UV Count: 3 + UV + UV + UV +Face 22 +UV Count: 3 + UV + UV + UV +Face 23 +UV Count: 3 + UV + UV + UV +Face 24 +UV Count: 3 + UV + UV + UV +Face 25 +UV Count: 3 + UV + UV + UV +Face 26 +UV Count: 3 + UV + UV + UV +Face 27 +UV Count: 3 + UV + UV + UV +Face 28 +UV Count: 3 + UV + UV + UV +Face 29 +UV Count: 3 + UV + UV + UV +Face 30 +UV Count: 3 + UV + UV + UV +Face 31 +UV Count: 3 + UV + UV + UV +Face 32 +UV Count: 3 + UV + UV + UV +Face 33 +UV Count: 3 + UV + UV + UV +Face 34 +UV Count: 3 + UV + UV + UV +Face 35 +UV Count: 3 + UV + UV + UV +===Normals: +Vertex 0: Normal +Vertex 1: Normal +Vertex 2: Normal +Vertex 3: Normal +Vertex 4: Normal +Vertex 5: Normal +Vertex 6: Normal +Vertex 7: Normal +Vertex 8: Normal +Vertex 9: Normal +Vertex 10: Normal +Vertex 11: Normal +Vertex 12: Normal +Vertex 13: Normal +Vertex 14: Normal +Vertex 15: Normal +Vertex 16: Normal +Vertex 17: Normal +Vertex 18: Normal +Vertex 19: Normal +===Triangles: 36 +Triangle: [0, 1, 10] +Triangle: [12, 13, 10] +Triangle: [5, 1, 7] +Triangle: [3, 7, 2] +Triangle: [3, 8, 9] +Triangle: [5, 3, 1] +Triangle: [9, 8, 15] +Triangle: [15, 18, 19] +Triangle: [12, 16, 17] +Triangle: [6, 17, 4] +Triangle: [6, 4, 18] +Triangle: [15, 3, 9] +Triangle: [19, 4, 15] +Triangle: [16, 12, 4] +Triangle: [11, 1, 12] +Triangle: [12, 1, 4] +Triangle: [1, 3, 4] +Triangle: [3, 15, 4] +Triangle: [10, 13, 0] +Triangle: [10, 11, 12] +Triangle: [15, 8, 14] +Triangle: [18, 15, 14] +Triangle: [17, 13, 12] +Triangle: [17, 16, 4] +Triangle: [10, 1, 11] +Triangle: [18, 4, 19] +Triangle: [7, 1, 0] +Triangle: [7, 3, 5] +Triangle: [8, 3, 2] +Triangle: [7, 0, 2] +Triangle: [8, 2, 14] +Triangle: [18, 14, 6] +Triangle: [17, 6, 13] +Triangle: [13, 6, 0] +Triangle: [14, 2, 6] +Triangle: [2, 0, 6] diff --git a/sounds/unseen-danger-fss-no-copyright-music-252588--online-audio-convert.com.ogg b/sounds/unseen-danger-fss-no-copyright-music-252588--online-audio-convert.com.ogg new file mode 100644 index 0000000..0d71678 Binary files /dev/null and b/sounds/unseen-danger-fss-no-copyright-music-252588--online-audio-convert.com.ogg differ diff --git a/temno.bmp b/temno.bmp new file mode 100644 index 0000000..b1c99b3 Binary files /dev/null and b/temno.bmp differ