Merge branch 'salmon' into pavel

GameObjectManager.cpp

@@ -97,6 +97,60 @@ void GameObjectManager::initialize() {
             ao1.inventoryIconTexturePtr = std::make_shared<Texture>(CreateTextureDataFromBmp32("./textures/inventory_objects/cubic_T_icon.bmp32"));
 
 
+
+            ActiveObject cubeForFirstRoomT;
+            cubeForFirstRoomT.name = "cubeT";
+            cubeForFirstRoomT.activeObjectMesh = ZL::LoadFromTextFile("./cube001.txt");
+            cubeForFirstRoomT.activeObjectMesh.RotateByMatrix(QuatToMatrix(QuatFromRotateAroundZ(M_PI * 0.5)));
+            cubeForFirstRoomT.activeObjectMesh.Scale(10);
+            cubeForFirstRoomT.activeObjectMeshMutable.AssignFrom(cubeForFirstRoomT.activeObjectMesh);
+            cubeForFirstRoomT.activeObjectMeshMutable.RefreshVBO();
+            cubeForFirstRoomT.objectPos = Vector3f{ -190, 90 , 280 };
+            cubeForFirstRoomT.activeObjectTexturePtr = std::make_shared<Texture>(CreateTextureDataFromBmp24("./Material_Base_color_1001-_2_.bmp"));
+            cubeForFirstRoomT.activeObjectScreenTexturePtr = std::make_shared<Texture>(CreateTextureDataFromBmp24("./aoscreen01.bmp"));
+            cubeForFirstRoomT.activeObjectScreenMesh = CreateRect2D({ 0.f, 0.f }, { 64.f, 64.f }, 0.5);
+            cubeForFirstRoomT.activeObjectScreenMeshMutable.AssignFrom(cubeForFirstRoomT.activeObjectScreenMesh);
+            cubeForFirstRoomT.activeObjectScreenMeshMutable.RefreshVBO();
+
+
+
+
+
+
+
+            ActiveObject cubeForFirstRoomO;
+            cubeForFirstRoomO.name = "cubeO";
+            cubeForFirstRoomO.activeObjectMesh = ZL::LoadFromTextFile("./cube001.txt");
+            cubeForFirstRoomO.activeObjectMesh.RotateByMatrix(QuatToMatrix(QuatFromRotateAroundZ(M_PI * 0.5)));
+            cubeForFirstRoomO.activeObjectMesh.RotateByMatrix(QuatToMatrix(QuatFromRotateAroundX(M_PI * 1.5)));
+            cubeForFirstRoomO.activeObjectMesh.Scale(10);
+            cubeForFirstRoomO.activeObjectMeshMutable.AssignFrom(cubeForFirstRoomO.activeObjectMesh);
+            cubeForFirstRoomO.activeObjectMeshMutable.RefreshVBO();
+            cubeForFirstRoomO.objectPos = Vector3f{ 185, 90 , -365 };
+            cubeForFirstRoomO.activeObjectTexturePtr = std::make_shared<Texture>(CreateTextureDataFromBmp24("./Material_Base_color_1001-_3.bmp"));
+            cubeForFirstRoomO.activeObjectScreenTexturePtr = std::make_shared<Texture>(CreateTextureDataFromBmp24("./aoscreen01.bmp"));
+            cubeForFirstRoomO.activeObjectScreenMesh = CreateRect2D({ 0.f, 0.f }, { 64.f, 64.f }, 0.5);
+            cubeForFirstRoomO.activeObjectScreenMeshMutable.AssignFrom(cubeForFirstRoomO.activeObjectScreenMesh);
+            cubeForFirstRoomO.activeObjectScreenMeshMutable.RefreshVBO();
+           
+
+            ActiveObject cubeForFirstRoomM;
+            cubeForFirstRoomM.name = "cubeM";
+            cubeForFirstRoomM.activeObjectMesh = ZL::LoadFromTextFile("./cube001.txt");
+            cubeForFirstRoomO.activeObjectMesh.RotateByMatrix(QuatToMatrix(QuatFromRotateAroundZ(M_PI * 0.5)));
+            cubeForFirstRoomO.activeObjectMesh.RotateByMatrix(QuatToMatrix(QuatFromRotateAroundX(M_PI)));
+
+            cubeForFirstRoomM.activeObjectMesh.Scale(10);
+            cubeForFirstRoomM.activeObjectMeshMutable.AssignFrom(cubeForFirstRoomO.activeObjectMesh);
+            cubeForFirstRoomM.activeObjectMeshMutable.RefreshVBO();
+            cubeForFirstRoomM.objectPos = Vector3f{ 280, 95 , 235 };
+            cubeForFirstRoomM.activeObjectTexturePtr = std::make_shared<Texture>(CreateTextureDataFromBmp24("./Material_Base_color_1001_4.bmp"));
+            cubeForFirstRoomM.activeObjectScreenTexturePtr = std::make_shared<Texture>(CreateTextureDataFromBmp24("./aoscreen01.bmp"));
+            cubeForFirstRoomM.activeObjectScreenMesh = CreateRect2D({ 0.f, 0.f }, { 64.f, 64.f }, 0.5);
+            cubeForFirstRoomM.activeObjectScreenMeshMutable.AssignFrom(cubeForFirstRoomO.activeObjectScreenMesh);
+            cubeForFirstRoomM.activeObjectScreenMeshMutable.RefreshVBO();
+
+
             ActiveObject ao2;
             ao2.name = "book";
             ao2.activeObjectMesh = ZL::LoadFromTextFile("./book001.txt");  // Add ZL:: namespace
@@ -116,6 +170,9 @@ void GameObjectManager::initialize() {
             Room room_1;
             room_1.roomTexture = std::make_shared<Texture>(CreateTextureDataFromBmp24("./Material_Base_color_1001.bmp"));
             room_1.objects.push_back(ao1);
+            room_1.objects.push_back(cubeForFirstRoomT);
+            room_1.objects.push_back(cubeForFirstRoomO);
+            room_1.objects.push_back(cubeForFirstRoomM);
             room_1.sound_name = "Symphony No.6 (1st movement).ogg";
             room_1.roomLogic = createRoom1Logic();
             room_1.textMesh = preloadedRoomMeshArr[0];

cube001.txt

@@ -0,0 +1,93 @@
+===Vertices: 8
+Vertex 0: <Vector (1.0000, 1.0000, 1.0000)>
+Vertex 1: <Vector (1.0000, 1.0000, -1.0000)>
+Vertex 2: <Vector (1.0000, -1.0000, 1.0000)>
+Vertex 3: <Vector (1.0000, -1.0000, -1.0000)>
+Vertex 4: <Vector (-1.0000, 1.0000, 1.0000)>
+Vertex 5: <Vector (-1.0000, 1.0000, -1.0000)>
+Vertex 6: <Vector (-1.0000, -1.0000, 1.0000)>
+Vertex 7: <Vector (-1.0000, -1.0000, -1.0000)>
+===UV Coordinates:
+Face count: 12
+Face 0
+UV Count: 3
+  UV <Vector (0.8750, 0.5000)>
+  UV <Vector (0.6250, 0.7500)>
+  UV <Vector (0.6250, 0.5000)>
+Face 1
+UV Count: 3
+  UV <Vector (0.6250, 0.7500)>
+  UV <Vector (0.3750, 1.0000)>
+  UV <Vector (0.3750, 0.7500)>
+Face 2
+UV Count: 3
+  UV <Vector (0.6250, 0.0000)>
+  UV <Vector (0.3750, 0.2500)>
+  UV <Vector (0.3750, 0.0000)>
+Face 3
+UV Count: 3
+  UV <Vector (0.3750, 0.5000)>
+  UV <Vector (0.1250, 0.7500)>
+  UV <Vector (0.1250, 0.5000)>
+Face 4
+UV Count: 3
+  UV <Vector (0.6250, 0.5000)>
+  UV <Vector (0.3750, 0.7500)>
+  UV <Vector (0.3750, 0.5000)>
+Face 5
+UV Count: 3
+  UV <Vector (0.6250, 0.2500)>
+  UV <Vector (0.3750, 0.5000)>
+  UV <Vector (0.3750, 0.2500)>
+Face 6
+UV Count: 3
+  UV <Vector (0.8750, 0.5000)>
+  UV <Vector (0.8750, 0.7500)>
+  UV <Vector (0.6250, 0.7500)>
+Face 7
+UV Count: 3
+  UV <Vector (0.6250, 0.7500)>
+  UV <Vector (0.6250, 1.0000)>
+  UV <Vector (0.3750, 1.0000)>
+Face 8
+UV Count: 3
+  UV <Vector (0.6250, 0.0000)>
+  UV <Vector (0.6250, 0.2500)>
+  UV <Vector (0.3750, 0.2500)>
+Face 9
+UV Count: 3
+  UV <Vector (0.3750, 0.5000)>
+  UV <Vector (0.3750, 0.7500)>
+  UV <Vector (0.1250, 0.7500)>
+Face 10
+UV Count: 3
+  UV <Vector (0.6250, 0.5000)>
+  UV <Vector (0.6250, 0.7500)>
+  UV <Vector (0.3750, 0.7500)>
+Face 11
+UV Count: 3
+  UV <Vector (0.6250, 0.2500)>
+  UV <Vector (0.6250, 0.5000)>
+  UV <Vector (0.3750, 0.5000)>
+===Normals:
+Vertex 0: Normal <Vector (0.5774, 0.5773, 0.5773)>
+Vertex 1: Normal <Vector (0.5773, 0.5774, -0.5774)>
+Vertex 2: Normal <Vector (0.5773, -0.5774, 0.5774)>
+Vertex 3: Normal <Vector (0.5774, -0.5773, -0.5773)>
+Vertex 4: Normal <Vector (-0.5773, 0.5774, 0.5774)>
+Vertex 5: Normal <Vector (-0.5774, 0.5773, -0.5773)>
+Vertex 6: Normal <Vector (-0.5774, -0.5773, 0.5773)>
+Vertex 7: Normal <Vector (-0.5773, -0.5774, -0.5774)>
+===Triangles: 12
+Triangle: [4, 2, 0]
+Triangle: [2, 7, 3]
+Triangle: [6, 5, 7]
+Triangle: [1, 7, 5]
+Triangle: [0, 3, 1]
+Triangle: [4, 1, 5]
+Triangle: [4, 6, 2]
+Triangle: [2, 6, 7]
+Triangle: [6, 4, 5]
+Triangle: [1, 3, 7]
+Triangle: [0, 2, 3]
+Triangle: [4, 0, 1]