add new bed with pillows, legs and duvet contexts,

problem: bed is not in the right place, translate() needed

cw 9/Debug/grk-cw9.exe.recipe

@@ -2,7 +2,7 @@
 <Project>
   <ProjectOutputs>
     <ProjectOutput>
-      <FullPath>C:\Users\arciom\Desktop\GRK_game_scene\Debug\grk-cw9.exe</FullPath>
+      <FullPath>C:\Users\prima\Documents\JAVA\GRK_game_scene\Debug\grk-cw9.exe</FullPath>
     </ProjectOutput>
   </ProjectOutputs>
   <ContentFiles />

cw 9/Debug/grk-cw9.log

@@ -1,49 +1,49 @@
   main.cpp
-C:\Program Files (x86)\Windows Kits\10\Include\10.0.22000.0\shared\minwindef.h(130,1): warning C4005: 'APIENTRY': macro redefinition
-C:\Users\arciom\Desktop\GRK_game_scene\dependencies\glfw-3.3.8.bin.WIN32\include\GLFW\glfw3.h(123): message : see previous definition of 'APIENTRY'
-C:\Users\arciom\Desktop\GRK_game_scene\cw 9\src\ex_9_1.hpp(100,30): warning C4305: 'initializing': truncation from 'double' to 'float'
-C:\Users\arciom\Desktop\GRK_game_scene\cw 9\src\ex_9_1.hpp(132,38): warning C4305: '=': truncation from 'double' to 'float'
-C:\Users\arciom\Desktop\GRK_game_scene\cw 9\src\ex_9_1.hpp(155,16): warning C4305: 'initializing': truncation from 'double' to 'float'
-C:\Users\arciom\Desktop\GRK_game_scene\cw 9\src\ex_9_1.hpp(221,13): warning C4244: 'initializing': conversion from 'double' to 'float', possible loss of data
-C:\Users\arciom\Desktop\GRK_game_scene\cw 9\src\ex_9_1.hpp(236,98): warning C4305: 'argument': truncation from 'double' to 'T'
+C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared\minwindef.h(130,1): warning C4005: 'APIENTRY': macro redefinition
+C:\Users\prima\Documents\JAVA\GRK_game_scene\dependencies\glfw-3.3.8.bin.WIN32\include\GLFW\glfw3.h(123): message : see previous definition of 'APIENTRY'
+C:\Users\prima\Documents\JAVA\GRK_game_scene\cw 9\src\ex_9_1.hpp(106,30): warning C4305: 'initializing': truncation from 'double' to 'float'
+C:\Users\prima\Documents\JAVA\GRK_game_scene\cw 9\src\ex_9_1.hpp(138,38): warning C4305: '=': truncation from 'double' to 'float'
+C:\Users\prima\Documents\JAVA\GRK_game_scene\cw 9\src\ex_9_1.hpp(161,16): warning C4305: 'initializing': truncation from 'double' to 'float'
+C:\Users\prima\Documents\JAVA\GRK_game_scene\cw 9\src\ex_9_1.hpp(227,13): warning C4244: 'initializing': conversion from 'double' to 'float', possible loss of data
+C:\Users\prima\Documents\JAVA\GRK_game_scene\cw 9\src\ex_9_1.hpp(242,98): warning C4305: 'argument': truncation from 'double' to 'T'
           with
           [
               T=float
           ]
-C:\Users\arciom\Desktop\GRK_game_scene\cw 9\src\ex_9_1.hpp(239,68): warning C4305: 'argument': truncation from 'double' to 'T'
+C:\Users\prima\Documents\JAVA\GRK_game_scene\cw 9\src\ex_9_1.hpp(245,68): warning C4305: 'argument': truncation from 'double' to 'T'
           with
           [
               T=float
           ]
-C:\Users\arciom\Desktop\GRK_game_scene\cw 9\src\ex_9_1.hpp(273,13): warning C4244: 'initializing': conversion from 'double' to 'float', possible loss of data
-C:\Users\arciom\Desktop\GRK_game_scene\cw 9\src\ex_9_1.hpp(320,13): warning C4244: 'initializing': conversion from 'double' to 'float', possible loss of data
-C:\Users\arciom\Desktop\GRK_game_scene\cw 9\src\ex_9_1.hpp(329,108): warning C4305: 'argument': truncation from 'double' to 'T'
+C:\Users\prima\Documents\JAVA\GRK_game_scene\cw 9\src\ex_9_1.hpp(283,13): warning C4244: 'initializing': conversion from 'double' to 'float', possible loss of data
+C:\Users\prima\Documents\JAVA\GRK_game_scene\cw 9\src\ex_9_1.hpp(330,13): warning C4244: 'initializing': conversion from 'double' to 'float', possible loss of data
+C:\Users\prima\Documents\JAVA\GRK_game_scene\cw 9\src\ex_9_1.hpp(339,108): warning C4305: 'argument': truncation from 'double' to 'T'
           with
           [
               T=float
           ]
-C:\Users\arciom\Desktop\GRK_game_scene\cw 9\src\ex_9_1.hpp(337,87): warning C4305: 'argument': truncation from 'double' to 'T'
+C:\Users\prima\Documents\JAVA\GRK_game_scene\cw 9\src\ex_9_1.hpp(347,87): warning C4305: 'argument': truncation from 'double' to 'T'
           with
           [
               T=float
           ]
-C:\Users\arciom\Desktop\GRK_game_scene\cw 9\src\ex_9_1.hpp(337,223): warning C4305: 'argument': truncation from 'double' to 'float'
-C:\Users\arciom\Desktop\GRK_game_scene\cw 9\src\ex_9_1.hpp(340,59): warning C4305: 'argument': truncation from 'double' to 'T'
+C:\Users\prima\Documents\JAVA\GRK_game_scene\cw 9\src\ex_9_1.hpp(347,223): warning C4305: 'argument': truncation from 'double' to 'float'
+C:\Users\prima\Documents\JAVA\GRK_game_scene\cw 9\src\ex_9_1.hpp(350,59): warning C4305: 'argument': truncation from 'double' to 'T'
           with
           [
               T=float
           ]
-C:\Users\arciom\Desktop\GRK_game_scene\cw 9\src\ex_9_1.hpp(341,37): warning C4305: 'argument': truncation from 'double' to 'float'
-C:\Users\arciom\Desktop\GRK_game_scene\cw 9\src\ex_9_1.hpp(372,2): warning C4305: 'argument': truncation from 'double' to 'float'
-C:\Users\arciom\Desktop\GRK_game_scene\cw 9\src\ex_9_1.hpp(379,20): warning C4018: '<': signed/unsigned mismatch
-C:\Users\arciom\Desktop\GRK_game_scene\cw 9\src\ex_9_1.hpp(381,47): warning C4305: 'argument': truncation from 'double' to 'float'
-C:\Users\arciom\Desktop\GRK_game_scene\cw 9\src\ex_9_1.hpp(382,48): warning C4305: 'argument': truncation from 'double' to 'float'
-C:\Users\arciom\Desktop\GRK_game_scene\cw 9\src\ex_9_1.hpp(465,21): warning C4018: '<': signed/unsigned mismatch
-C:\Users\arciom\Desktop\GRK_game_scene\cw 9\src\ex_9_1.hpp(467,49): warning C4244: 'argument': conversion from 'double' to 'float', possible loss of data
-C:\Users\arciom\Desktop\GRK_game_scene\cw 9\src\ex_9_1.hpp(624,21): warning C4305: '-=': truncation from 'double' to 'float'
-C:\Users\arciom\Desktop\GRK_game_scene\cw 9\src\ex_9_1.hpp(626,21): warning C4305: '+=': truncation from 'double' to 'float'
-C:\Users\arciom\Desktop\GRK_game_scene\cw 9\src\ex_9_1.hpp(654,21): warning C4018: '<': signed/unsigned mismatch
-C:\Users\arciom\Desktop\GRK_game_scene\cw 9\src\ex_9_1.hpp(656,49): warning C4244: 'argument': conversion from 'double' to 'float', possible loss of data
+C:\Users\prima\Documents\JAVA\GRK_game_scene\cw 9\src\ex_9_1.hpp(351,37): warning C4305: 'argument': truncation from 'double' to 'float'
+C:\Users\prima\Documents\JAVA\GRK_game_scene\cw 9\src\ex_9_1.hpp(389,2): warning C4305: 'argument': truncation from 'double' to 'float'
+C:\Users\prima\Documents\JAVA\GRK_game_scene\cw 9\src\ex_9_1.hpp(396,20): warning C4018: '<': signed/unsigned mismatch
+C:\Users\prima\Documents\JAVA\GRK_game_scene\cw 9\src\ex_9_1.hpp(398,47): warning C4305: 'argument': truncation from 'double' to 'float'
+C:\Users\prima\Documents\JAVA\GRK_game_scene\cw 9\src\ex_9_1.hpp(399,48): warning C4305: 'argument': truncation from 'double' to 'float'
+C:\Users\prima\Documents\JAVA\GRK_game_scene\cw 9\src\ex_9_1.hpp(482,21): warning C4018: '<': signed/unsigned mismatch
+C:\Users\prima\Documents\JAVA\GRK_game_scene\cw 9\src\ex_9_1.hpp(484,49): warning C4244: 'argument': conversion from 'double' to 'float', possible loss of data
+C:\Users\prima\Documents\JAVA\GRK_game_scene\cw 9\src\ex_9_1.hpp(647,21): warning C4305: '-=': truncation from 'double' to 'float'
+C:\Users\prima\Documents\JAVA\GRK_game_scene\cw 9\src\ex_9_1.hpp(649,21): warning C4305: '+=': truncation from 'double' to 'float'
+C:\Users\prima\Documents\JAVA\GRK_game_scene\cw 9\src\ex_9_1.hpp(677,21): warning C4018: '<': signed/unsigned mismatch
+C:\Users\prima\Documents\JAVA\GRK_game_scene\cw 9\src\ex_9_1.hpp(679,49): warning C4244: 'argument': conversion from 'double' to 'float', possible loss of data
 Box.obj : warning LNK4075: ignoring '/EDITANDCONTINUE' due to '/INCREMENTAL:NO' specification
 LINK : warning LNK4098: defaultlib 'MSVCRT' conflicts with use of other libs; use /NODEFAULTLIB:library
-  grk-cw9.vcxproj -> C:\Users\arciom\Desktop\GRK_game_scene\Debug\grk-cw9.exe
+  grk-cw9.vcxproj -> C:\Users\prima\Documents\JAVA\GRK_game_scene\Debug\grk-cw9.exe

cw 9/Debug/grk-cw9.tlog/grk-cw9.lastbuildstate

@@ -1,2 +1,2 @@
-PlatformToolSet=v142:VCToolArchitecture=Native32Bit:VCToolsVersion=14.29.30133:VCServicingVersionMFC=14.29.30136:VCServicingVersionCrtHeaders=14.29.30136:TargetPlatformVersion=10.0.22000.0:
-Debug|Win32|C:\Users\arciom\Desktop\GRK_game_scene\|
+PlatformToolSet=v142:VCToolArchitecture=Native32Bit:VCToolsVersion=14.29.30133:TargetPlatformVersion=10.0.19041.0:
+Debug|Win32|C:\Users\prima\Documents\JAVA\GRK_game_scene\|

cw 9/models/bedd.mtl

@@ -0,0 +1,33 @@
+# Blender 3.4.1 MTL File: 'bed.blend11'
+# www.blender.org
+
+newmtl Material.002
+Ks 0.968182 0.968182 0.968182
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+Pr 0.968182
+Pm 0.000000
+Ps 1.000000
+Pc 0.000000
+Pcr 0.030000
+aniso 0.000000
+anisor 0.000000
+map_Kd C:/Users/prima/Documents/JAVA/textures/bed/bed_col_2k.png
+map_Bump -bm 1.300000 C:/Users/prima/Downloads/bed/bed_bump_4k.png
+
+newmtl Material.033
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+Pr 0.722727
+Pm 0.000000
+Ps 0.000000
+Pc 1.000000
+Pcr 0.361818
+aniso 0.000000
+anisor 0.000000
+map_Kd C:/Users/prima/Documents/JAVA/textures/legs/legs_col_2k.png

cw 9/models/bedlegs.mtl

@@ -0,0 +1,17 @@
+# Blender 3.4.1 MTL File: 'bed.blend11'
+# www.blender.org
+
+newmtl Material.033
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+Pr 0.722727
+Pm 0.000000
+Ps 0.000000
+Pc 1.000000
+Pcr 0.361818
+aniso 0.000000
+anisor 0.000000
+map_Kd C:/Users/prima/Documents/JAVA/textures/legs/legs_col_2k.png

cw 9/models/duvet.mtl

@@ -0,0 +1,12 @@
+# Blender 3.4.1 MTL File: 'bed.blend11'
+# www.blender.org
+
+newmtl Material.052
+Ns 45.640484
+Ka 1.000000 1.000000 1.000000
+Ks 0.640909 0.640909 0.640909
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+map_Kd C:/Users/prima/Documents/JAVA/textures/pillow_duvet/pillow_col_2k.png

cw 9/models/matrace1.mtl

@@ -0,0 +1,17 @@
+# Blender 3.4.1 MTL File: 'bed.blend11'
+# www.blender.org
+
+newmtl Material.001
+Ks 0.500000 0.500000 0.500000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+Pr 0.500000
+Pm 0.000000
+Ps 0.000000
+Pc 0.000000
+Pcr 0.030000
+aniso 0.000000
+anisor 0.000000
+map_Kd C:/Users/prima/Documents/JAVA/textures/mattress/mattress_col_2k.png

cw 9/models/pillows.mtl

@@ -0,0 +1,12 @@
+# Blender 3.4.1 MTL File: 'bed.blend11'
+# www.blender.org
+
+newmtl Material.051
+Ns 45.640484
+Ka 1.000000 1.000000 1.000000
+Ks 0.640909 0.640909 0.640909
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 2
+map_Kd C:/Users/prima/Documents/JAVA/textures/pillow_duvet/pillow_col_2k.png

cw 9/src/ex_9_1.hpp

@@ -23,7 +23,13 @@ const unsigned int SHADOW_WIDTH = 1024, SHADOW_HEIGHT = 1024;
 int WIDTH = 500, HEIGHT = 500;
 
 namespace models {
+	//bed
+	Core::RenderContext duvetContext;
+	Core::RenderContext pillowsContext;
 	Core::RenderContext bedContext;
+	Core::RenderContext bedLegsContext;
+
+
 	Core::RenderContext chairContext;
 	Core::RenderContext deskContext;
 	Core::RenderContext doorContext;
@@ -238,7 +244,6 @@ void renderShadowapSun(GLuint depthMapFBO, glm::mat4 lightVP) {
 	drawObjectDepth(sphereContext,
 		lightVP, glm::translate(pointlightPos) * glm::scale(glm::vec3(0.1)) * glm::eulerAngleY(time / 3) * glm::translate(glm::vec3(4.f, 0, 0)) * glm::eulerAngleY(time) * glm::translate(glm::vec3(1.f, 0, 0)) * glm::scale(glm::vec3(0.1f)));
 
-	drawObjectDepth(models::bedContext, lightVP, glm::mat4());
 	drawObjectDepth(models::chairContext, lightVP, glm::mat4());
 	drawObjectDepth(models::deskContext, lightVP, glm::mat4());
 	drawObjectDepth(models::doorContext, lightVP, glm::mat4());
@@ -250,6 +255,11 @@ void renderShadowapSun(GLuint depthMapFBO, glm::mat4 lightVP) {
 	drawObjectDepth(models::roomContext, lightVP, glm::mat4());
 	drawObjectDepth(models::windowContext, lightVP, glm::mat4());
 
+	drawObjectDepth(models::bedLegsContext, lightVP, glm::mat4());
+	drawObjectDepth(models::bedContext, lightVP, glm::mat4());
+	drawObjectDepth(models::duvetContext , lightVP, glm::mat4());
+	drawObjectDepth(models::pillowsContext, lightVP, glm::mat4());
+
 	glm::vec3 spaceshipSide = glm::normalize(glm::cross(spaceShip.getSpaceShipDir(), glm::vec3(0.f, 1.f, 0.f)));
 	glm::vec3 spaceshipUp = glm::normalize(glm::cross(spaceshipSide, spaceShip.getSpaceShipDir()));
 	glm::mat4 specshipCameraRotrationMatrix = glm::mat4({
@@ -340,17 +350,24 @@ void renderScene(GLFWwindow* window)
 		glm::translate(pointlightPos) * glm::scale(glm::vec3(0.1)) * glm::eulerAngleY(time / 3) * glm::translate(glm::vec3(4.f, 0, 0)) * glm::eulerAngleY(time) * glm::translate(glm::vec3(1.f, 0, 0)) * glm::scale(glm::vec3(0.1f)),
 		glm::vec3(0.5, 0.5, 0.5), 0.7, 0.0);
 
-	drawObjectPBR(models::bedContext, glm::mat4(), glm::vec3(0.03f, 0.03f, 0.03f), 0.2f, 0.0f);
+	//new bed object
+	drawObjectPBR(models::bedContext, glm::mat4(), glm::vec3(0.620f, 0.313f, 0.131f), 0.2f, 0.0f);
+	drawObjectPBR(models::bedLegsContext, glm::mat4(), glm::vec3(0.420f, 0.212f, 0.089f), 0.2f, 0.0f);
+	drawObjectPBR(models::materaceContext, glm::mat4(), glm::vec3(0.529f, 0.509f, 0.560f), 0.2f, 0.0f);
+	drawObjectPBR(models::duvetContext, glm::mat4(), glm::vec3(0.9f, 0.9f, 0.9f), 0.8f, 0.0f);
+	drawObjectPBR(models::pillowsContext, glm::mat4(), glm::vec3(0.9f, 0.9f, 0.9f), 0.8f, 0.0f);
+
 	drawObjectPBR(models::chairContext, glm::mat4(), glm::vec3(0.195239f, 0.37728f, 0.8f), 0.4f, 0.0f);
 	drawObjectPBR(models::deskContext, glm::mat4(), glm::vec3(0.428691f, 0.08022f, 0.036889f), 0.2f, 0.0f);
 	drawObjectPBR(models::doorContext, glm::mat4(), glm::vec3(0.402978f, 0.120509f, 0.057729f), 0.2f, 0.0f);
 	drawObjectPBR(models::drawerContext, glm::mat4(), glm::vec3(0.428691f, 0.08022f, 0.036889f), 0.2f, 0.0f);
 	drawObjectPBR(models::marbleBustContext, glm::mat4(), glm::vec3(1.f, 1.f, 1.f), 0.5f, 1.0f);
-	drawObjectPBR(models::materaceContext, glm::mat4(), glm::vec3(0.9f, 0.9f, 0.9f), 0.8f, 0.0f);
 	drawObjectPBR(models::pencilsContext, glm::mat4(), glm::vec3(0.10039f, 0.018356f, 0.001935f), 0.1f, 0.0f);
 	drawObjectPBR(models::planeContext, glm::mat4(), glm::vec3(0.402978f, 0.120509f, 0.057729f), 0.2f, 0.0f);
 	drawObjectPBR(models::roomContext, glm::mat4(), glm::vec3(0.9f, 0.9f, 0.9f), 0.8f, 0.0f);
 	drawObjectPBR(models::windowContext, glm::mat4(), glm::vec3(0.402978f, 0.120509f, 0.057729f), 0.2f, 0.0f);
+
+	
 	
 	glm::vec3 spaceshipSide = glm::normalize(glm::cross(spaceShip.getSpaceShipDir(), glm::vec3(0.f, 1.f, 0.f)));
 	glm::vec3 spaceshipUp = glm::normalize(glm::cross(spaceshipSide, spaceShip.getSpaceShipDir()));
@@ -507,13 +524,19 @@ void init(GLFWwindow* window)
 	loadModelToContext("./models/spaceship.obj", shipContext);
 
 
-	loadModelToContext("./models/bed.obj", models::bedContext);
+	loadModelToContext("./models/duvet.obj", models::duvetContext);
+	loadModelToContext("./models/pillows.obj", models::pillowsContext);
+	loadModelToContext("./models/matrace1.obj", models::materaceContext);
+	loadModelToContext("./models/bedlegs.obj", models::bedLegsContext);
+
+
+
+	loadModelToContext("./models/bedd.obj", models::bedContext);
 	loadModelToContext("./models/chair.obj", models::chairContext);
 	loadModelToContext("./models/desk.obj", models::deskContext);
 	loadModelToContext("./models/door.obj", models::doorContext);
 	loadModelToContext("./models/drawer.obj", models::drawerContext);
 	loadModelToContext("./models/marbleBust.obj", models::marbleBustContext);
-	loadModelToContext("./models/materace.obj", models::materaceContext);
 	loadModelToContext("./models/pencils.obj", models::pencilsContext);
 	loadModelToContext("./models/plane.obj", models::planeContext);
 	loadModelToContext("./models/room.obj", models::roomContext);