added broken tvscreen, tv, books and vase1 textures

vase 2 removed

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

@@ -2,7 +2,7 @@
 <Project>
   <ProjectOutputs>
     <ProjectOutput>
-      <FullPath>C:\Users\arciom\Desktop\GRK_game_scene_new2\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,63 +1,63 @@
   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_new2\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_new2\cw 9\src\ex_9_1.hpp(175,30): warning C4305: 'initializing': truncation from 'double' to 'float'
-C:\Users\arciom\Desktop\GRK_game_scene_new2\cw 9\src\ex_9_1.hpp(250,38): warning C4305: '=': truncation from 'double' to 'float'
-C:\Users\arciom\Desktop\GRK_game_scene_new2\cw 9\src\ex_9_1.hpp(273,16): warning C4305: 'initializing': truncation from 'double' to 'float'
-C:\Users\arciom\Desktop\GRK_game_scene_new2\cw 9\src\ex_9_1.hpp(321,20): warning C4018: '<': signed/unsigned mismatch
-C:\Users\arciom\Desktop\GRK_game_scene_new2\cw 9\src\ex_9_1.hpp(390,20): warning C4018: '<': signed/unsigned mismatch
-C:\Users\arciom\Desktop\GRK_game_scene_new2\cw 9\src\ex_9_1.hpp(420,13): warning C4244: 'initializing': conversion from 'double' to 'float', possible loss of data
-C:\Users\arciom\Desktop\GRK_game_scene_new2\cw 9\src\ex_9_1.hpp(434,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(181,30): warning C4305: 'initializing': truncation from 'double' to 'float'
+C:\Users\prima\Documents\JAVA\GRK_game_scene\cw 9\src\ex_9_1.hpp(256,38): warning C4305: '=': truncation from 'double' to 'float'
+C:\Users\prima\Documents\JAVA\GRK_game_scene\cw 9\src\ex_9_1.hpp(279,16): warning C4305: 'initializing': truncation from 'double' to 'float'
+C:\Users\prima\Documents\JAVA\GRK_game_scene\cw 9\src\ex_9_1.hpp(327,20): warning C4018: '<': signed/unsigned mismatch
+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(426,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(440,98): warning C4305: 'argument': truncation from 'double' to 'T'
           with
           [
               T=float
           ]
-C:\Users\arciom\Desktop\GRK_game_scene_new2\cw 9\src\ex_9_1.hpp(437,68): warning C4305: 'argument': truncation from 'double' to 'T'
+C:\Users\prima\Documents\JAVA\GRK_game_scene\cw 9\src\ex_9_1.hpp(443,68): warning C4305: 'argument': truncation from 'double' to 'T'
           with
           [
               T=float
           ]
-C:\Users\arciom\Desktop\GRK_game_scene_new2\cw 9\src\ex_9_1.hpp(497,13): warning C4244: 'initializing': conversion from 'double' to 'float', possible loss of data
-C:\Users\arciom\Desktop\GRK_game_scene_new2\cw 9\src\ex_9_1.hpp(529,13): warning C4244: 'initializing': conversion from 'double' to 'float', possible loss of data
-C:\Users\arciom\Desktop\GRK_game_scene_new2\cw 9\src\ex_9_1.hpp(558,80): warning C4305: 'argument': truncation from 'double' to 'float'
-C:\Users\arciom\Desktop\GRK_game_scene_new2\cw 9\src\ex_9_1.hpp(567,80): warning C4305: 'argument': truncation from 'double' to 'float'
-C:\Users\arciom\Desktop\GRK_game_scene_new2\cw 9\src\ex_9_1.hpp(590,80): warning C4305: 'argument': truncation from 'double' to 'float'
-C:\Users\arciom\Desktop\GRK_game_scene_new2\cw 9\src\ex_9_1.hpp(696,13): warning C4244: 'initializing': conversion from 'double' to 'float', possible loss of data
-C:\Users\arciom\Desktop\GRK_game_scene_new2\cw 9\src\ex_9_1.hpp(708,108): warning C4305: 'argument': truncation from 'double' to 'T'
+C:\Users\prima\Documents\JAVA\GRK_game_scene\cw 9\src\ex_9_1.hpp(504,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(536,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(565,80): warning C4305: 'argument': truncation from 'double' to 'float'
+C:\Users\prima\Documents\JAVA\GRK_game_scene\cw 9\src\ex_9_1.hpp(574,80): warning C4305: 'argument': truncation from 'double' to 'float'
+C:\Users\prima\Documents\JAVA\GRK_game_scene\cw 9\src\ex_9_1.hpp(597,80): warning C4305: 'argument': truncation from 'double' to 'float'
+C:\Users\prima\Documents\JAVA\GRK_game_scene\cw 9\src\ex_9_1.hpp(703,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(715,108): warning C4305: 'argument': truncation from 'double' to 'T'
           with
           [
               T=float
           ]
-C:\Users\arciom\Desktop\GRK_game_scene_new2\cw 9\src\ex_9_1.hpp(716,87): warning C4305: 'argument': truncation from 'double' to 'T'
+C:\Users\prima\Documents\JAVA\GRK_game_scene\cw 9\src\ex_9_1.hpp(723,87): warning C4305: 'argument': truncation from 'double' to 'T'
           with
           [
               T=float
           ]
-C:\Users\arciom\Desktop\GRK_game_scene_new2\cw 9\src\ex_9_1.hpp(716,223): warning C4305: 'argument': truncation from 'double' to 'float'
-C:\Users\arciom\Desktop\GRK_game_scene_new2\cw 9\src\ex_9_1.hpp(719,59): warning C4305: 'argument': truncation from 'double' to 'T'
+C:\Users\prima\Documents\JAVA\GRK_game_scene\cw 9\src\ex_9_1.hpp(723,223): warning C4305: 'argument': truncation from 'double' to 'float'
+C:\Users\prima\Documents\JAVA\GRK_game_scene\cw 9\src\ex_9_1.hpp(726,59): warning C4305: 'argument': truncation from 'double' to 'T'
           with
           [
               T=float
           ]
-C:\Users\arciom\Desktop\GRK_game_scene_new2\cw 9\src\ex_9_1.hpp(720,37): warning C4305: 'argument': truncation from 'double' to 'float'
-C:\Users\arciom\Desktop\GRK_game_scene_new2\cw 9\src\ex_9_1.hpp(799,20): warning C4018: '<': signed/unsigned mismatch
-C:\Users\arciom\Desktop\GRK_game_scene_new2\cw 9\src\ex_9_1.hpp(804,50): warning C4305: 'argument': truncation from 'double' to 'float'
-C:\Users\arciom\Desktop\GRK_game_scene_new2\cw 9\src\ex_9_1.hpp(805,51): warning C4305: 'argument': truncation from 'double' to 'float'
-C:\Users\arciom\Desktop\GRK_game_scene_new2\cw 9\src\ex_9_1.hpp(867,21): warning C4018: '<': signed/unsigned mismatch
-C:\Users\arciom\Desktop\GRK_game_scene_new2\cw 9\src\ex_9_1.hpp(869,49): warning C4244: 'argument': conversion from 'double' to 'float', possible loss of data
-C:\Users\arciom\Desktop\GRK_game_scene_new2\cw 9\src\ex_9_1.hpp(892,17): warning C4101: 'data': unreferenced local variable
-C:\Users\arciom\Desktop\GRK_game_scene_new2\cw 9\src\ex_9_1.hpp(986,20): warning C4018: '<': signed/unsigned mismatch
-C:\Users\arciom\Desktop\GRK_game_scene_new2\cw 9\src\ex_9_1.hpp(1039,28): warning C4305: 'initializing': truncation from 'double' to 'float'
-C:\Users\arciom\Desktop\GRK_game_scene_new2\cw 9\src\ex_9_1.hpp(1040,28): warning C4305: 'initializing': truncation from 'double' to 'float'
-C:\Users\arciom\Desktop\GRK_game_scene_new2\cw 9\src\ex_9_1.hpp(1041,28): warning C4305: 'initializing': truncation from 'double' to 'float'
-C:\Users\arciom\Desktop\GRK_game_scene_new2\cw 9\src\ex_9_1.hpp(1065,32): warning C4305: 'initializing': truncation from 'double' to 'float'
-C:\Users\arciom\Desktop\GRK_game_scene_new2\cw 9\src\ex_9_1.hpp(1066,32): warning C4305: 'initializing': truncation from 'double' to 'float'
-C:\Users\arciom\Desktop\GRK_game_scene_new2\cw 9\src\ex_9_1.hpp(1067,32): warning C4305: 'initializing': truncation from 'double' to 'float'
-C:\Users\arciom\Desktop\GRK_game_scene_new2\cw 9\src\ex_9_1.hpp(1103,28): warning C4305: 'initializing': truncation from 'double' to 'float'
-C:\Users\arciom\Desktop\GRK_game_scene_new2\cw 9\src\ex_9_1.hpp(1104,28): warning C4305: 'initializing': truncation from 'double' to 'float'
-C:\Users\arciom\Desktop\GRK_game_scene_new2\cw 9\src\ex_9_1.hpp(1105,28): warning C4305: 'initializing': truncation from 'double' to 'float'
-C:\Users\arciom\Desktop\GRK_game_scene_new2\cw 9\src\ex_9_1.hpp(1281,21): warning C4305: '-=': truncation from 'double' to 'float'
-C:\Users\arciom\Desktop\GRK_game_scene_new2\cw 9\src\ex_9_1.hpp(1283,21): warning C4305: '+=': truncation from 'double' to 'float'
+C:\Users\prima\Documents\JAVA\GRK_game_scene\cw 9\src\ex_9_1.hpp(727,37): warning C4305: 'argument': truncation from 'double' to 'float'
+C:\Users\prima\Documents\JAVA\GRK_game_scene\cw 9\src\ex_9_1.hpp(810,20): warning C4018: '<': signed/unsigned mismatch
+C:\Users\prima\Documents\JAVA\GRK_game_scene\cw 9\src\ex_9_1.hpp(815,50): warning C4305: 'argument': truncation from 'double' to 'float'
+C:\Users\prima\Documents\JAVA\GRK_game_scene\cw 9\src\ex_9_1.hpp(816,51): warning C4305: 'argument': truncation from 'double' to 'float'
+C:\Users\prima\Documents\JAVA\GRK_game_scene\cw 9\src\ex_9_1.hpp(878,21): warning C4018: '<': signed/unsigned mismatch
+C:\Users\prima\Documents\JAVA\GRK_game_scene\cw 9\src\ex_9_1.hpp(880,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(903,17): warning C4101: 'data': unreferenced local variable
+C:\Users\prima\Documents\JAVA\GRK_game_scene\cw 9\src\ex_9_1.hpp(998,20): warning C4018: '<': signed/unsigned mismatch
+C:\Users\prima\Documents\JAVA\GRK_game_scene\cw 9\src\ex_9_1.hpp(1055,28): warning C4305: 'initializing': truncation from 'double' to 'float'
+C:\Users\prima\Documents\JAVA\GRK_game_scene\cw 9\src\ex_9_1.hpp(1056,28): warning C4305: 'initializing': truncation from 'double' to 'float'
+C:\Users\prima\Documents\JAVA\GRK_game_scene\cw 9\src\ex_9_1.hpp(1057,28): warning C4305: 'initializing': truncation from 'double' to 'float'
+C:\Users\prima\Documents\JAVA\GRK_game_scene\cw 9\src\ex_9_1.hpp(1081,32): warning C4305: 'initializing': truncation from 'double' to 'float'
+C:\Users\prima\Documents\JAVA\GRK_game_scene\cw 9\src\ex_9_1.hpp(1082,32): warning C4305: 'initializing': truncation from 'double' to 'float'
+C:\Users\prima\Documents\JAVA\GRK_game_scene\cw 9\src\ex_9_1.hpp(1083,32): warning C4305: 'initializing': truncation from 'double' to 'float'
+C:\Users\prima\Documents\JAVA\GRK_game_scene\cw 9\src\ex_9_1.hpp(1119,28): warning C4305: 'initializing': truncation from 'double' to 'float'
+C:\Users\prima\Documents\JAVA\GRK_game_scene\cw 9\src\ex_9_1.hpp(1120,28): warning C4305: 'initializing': truncation from 'double' to 'float'
+C:\Users\prima\Documents\JAVA\GRK_game_scene\cw 9\src\ex_9_1.hpp(1121,28): warning C4305: 'initializing': truncation from 'double' to 'float'
+C:\Users\prima\Documents\JAVA\GRK_game_scene\cw 9\src\ex_9_1.hpp(1297,21): warning C4305: '-=': truncation from 'double' to 'float'
+C:\Users\prima\Documents\JAVA\GRK_game_scene\cw 9\src\ex_9_1.hpp(1299,21): warning C4305: '+=': truncation from 'double' to 'float'
 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_new2\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_new2\|
+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/TV.mtl

@@ -0,0 +1,12 @@
+# Blender 3.4.1 MTL File: 'GrafikaScene.blend'
+# www.blender.org
+
+newmtl TVFrame
+Ns 0.000000
+Ka 1.000000 1.000000 1.000000
+Kd 0.800000 0.800000 0.800000
+Ks 0.000000 0.000000 0.000000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 1

cw 9/models/TVscreen.mtl

@@ -0,0 +1,12 @@
+# Blender 3.4.1 MTL File: 'GrafikaScene.blend'
+# www.blender.org
+
+newmtl TVScreen
+Ns 0.000000
+Ka 1.000000 1.000000 1.000000
+Kd 0.800000 0.800000 0.800000
+Ks 0.000000 0.000000 0.000000
+Ke 0.000000 0.000000 0.000000
+Ni 1.450000
+d 1.000000
+illum 1

cw 9/models/TVscreen.obj

@@ -0,0 +1,16 @@
+# Blender 3.4.1
+# www.blender.org
+mtllib TVscreen.mtl
+o Screen
+v -0.938166 0.555292 1.837577
+v -0.030847 0.555292 1.837577
+v -0.030847 1.070469 1.837577
+v -0.938166 1.070469 1.837577
+vn -0.0000 -0.0000 -1.0000
+vt 0.992587 0.434842
+vt 0.007413 0.434842
+vt 0.007413 0.992587
+vt 0.992587 0.992587
+s 0
+usemtl TVScreen
+f 1/1/1 4/4/1 3/3/1 2/2/1

cw 9/src/ex_9_1.hpp

@@ -47,6 +47,11 @@ namespace texture {
 	GLuint paintFace;
 	GLuint paintBack;
 	GLuint door;
+	GLuint books;
+	GLuint tvscreen;
+	GLuint vase1;
+	GLuint tv;
+
 
 	GLuint paintDiffuseMap;
 	GLuint paintNormalMap;
@@ -63,6 +68,7 @@ namespace models {
 	Core::RenderContext doorFrameContext;
 	//Core::RenderContext drawerContext;
 	Core::RenderContext tvContext;
+	Core::RenderContext tvScreen;
 	Core::RenderContext xThingContext;
 	Core::RenderContext planeContext;
 	Core::RenderContext roomOutsideContext;
@@ -437,13 +443,14 @@ void renderShadowapSun(GLuint depthMapFBO, glm::mat4 lightVP) {
 		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::vase1Context, lightVP, glm::mat4());
-	drawObjectDepth(models::vase2Context, lightVP, glm::mat4());
+	//drawObjectDepth(models::vase2Context, lightVP, glm::mat4());
 
 	drawObjectDepth(models::tvTableContext, lightVP, glm::mat4());
 	drawObjectDepth(models::tableContext, lightVP, glm::mat4());
 	drawObjectDepth(models::doorContext, lightVP, glm::mat4());
 	drawObjectDepth(models::doorFrameContext, lightVP, glm::mat4());
 	drawObjectDepth(models::tvContext, lightVP, glm::mat4());
+	drawObjectDepth(models::tvScreen, lightVP, glm::mat4());
 	drawObjectDepth(models::xThingContext, lightVP, glm::mat4());
 	drawObjectDepth(models::planeContext, lightVP, glm::mat4());
 	drawObjectDepth(models::roomInsideContext, lightVP, glm::mat4());
@@ -719,13 +726,13 @@ 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::booksContext, glm::mat4(), glm::vec3(0.420f, 0.212f, 0.089f), 0.2f, 0.0f);
+	//drawObjectPBR(models::booksContext, glm::mat4(), glm::vec3(0.420f, 0.212f, 0.089f), 0.2f, 0.0f);
 
-	drawObjectPBR(models::vase1Context, glm::mat4(), glm::vec3(0.320f, 0.11f, 0.131f), 0.2f, 0.0f);
-	drawObjectPBR(models::vase2Context, glm::mat4(), glm::vec3(0.4f, 0.2f, 0.1f), 0.2f, 0.0f);
+	//drawObjectPBR(models::vase1Context, glm::mat4(), glm::vec3(0.320f, 0.11f, 0.131f), 0.2f, 0.0f);
+	//drawObjectPBR(models::vase2Context, glm::mat4(), glm::vec3(0.4f, 0.2f, 0.1f), 0.2f, 0.0f);
 
 	//drawObjectPBR(models::roomOutsideContext, glm::mat4(), glm::vec3(0.9f, 0.9f, 0.9f), 0.8f, 0.0f);
-	drawObjectPBR(models::tvContext, glm::mat4(), glm::vec3(1.f, 1.f, 1.f), 0.5f, 1.0f);
+	//drawObjectPBR(models::tvContext, glm::mat4(), glm::vec3(1.f, 1.f, 1.f), 0.5f, 1.0f);
 
 	//FIGURES
 	switch (figuresCount)
@@ -761,6 +768,10 @@ void renderScene(GLFWwindow* window)
 	drawObjectTexture(models::doorFrameContext, glm::mat4(), texture::door, glm::vec3(0.9f, 0.9f, 0.9f), 0.2f, 0.0f);
 
 	drawObjectTexture(models::tvTableContext, glm::mat4(), texture::tvTable, glm::vec3(0.9f, 0.9f, 0.9f), 0.2f, 0.0f);
+	drawObjectTexture(models::tvScreen, glm::mat4(), texture::tvscreen, glm::vec3(0.9f, 0.9f, 0.9f), 0.2f, 0.0f);
+	drawObjectTexture(models::tvContext, glm::mat4(), texture::tv, glm::vec3(0.9f, 0.9f, 0.9f), 0.2f, 0.0f);
+	drawObjectTexture(models::booksContext, glm::mat4(), texture::books, glm::vec3(0.9f, 0.9f, 0.9f), 0.2f, 0.0f);
+	drawObjectTexture(models::vase1Context, glm::mat4(), texture::vase1, glm::vec3(0.9f, 0.9f, 0.9f), 0.2f, 0.0f);
 
 	drawObjectTexture(models::tableContext, glm::mat4(), texture::table, glm::vec3(0.9f, 0.9f, 0.9f), 0.2f, 0.0f);
 	drawObjectTexture(models::planeContext, glm::mat4(), texture::floor, glm::vec3(0.9f, 0.9f, 0.9f), 0.2f, 0.0f);
@@ -969,6 +980,7 @@ void init(GLFWwindow* window)
 	loadModelToContext("./models/vase2.obj", models::vase2Context);
 
 	loadModelToContext("./models/TV.obj", models::tvContext);
+	loadModelToContext("./models/TVscreen.obj", models::tvScreen);
 	loadModelToContext("./models/x.obj", models::xThingContext);
 	loadModelToContext("./models/plane.obj", models::planeContext);
 	loadModelToContext("./models/room.obj", models::roomInsideContext);
@@ -990,7 +1002,7 @@ void init(GLFWwindow* window)
 
 	texture::sofa = Core::LoadTexture("textures/sofa1.jpg");
 	texture::xThing = Core::LoadTexture("textures/xThing.png");
-	
+	texture::vase1 = Core::LoadTexture("textures/VaseColor.png");
 	
 	//texture::paintFace = Core::LoadTexture("textures/paintingFace.jpg");
 	texture::paintFace = Core::LoadTexture("parallax/paintingParallaxRes.jpg");
@@ -1009,6 +1021,10 @@ void init(GLFWwindow* window)
 	texture::ship = Core::LoadTexture("textures/ship.jpg");
 	//texture::roof = Core::LoadTexture("textures/roof.jpg");
 	texture::roof = Core::LoadTexture("textures/paintingFace.jpg");
+	texture::books = Core::LoadTexture("textures/floor.jpg");
+	texture::tvscreen = Core::LoadTexture("textures/tvscreen.jpg");
+	texture::tv = Core::LoadTexture("textures/tv.jpg");
+
 	
 	texture::skybox = LoadSkybox(new char* [6]{ "skybox/posx.jpg",  "skybox/negx.jpg", "skybox/posy.jpg","skybox/negy.jpg",  "skybox/posz.jpg", "skybox/negz.jpg" });