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

@@ -2,7 +2,7 @@
 <Project>
   <ProjectOutputs>
     <ProjectOutput>
-      <FullPath>C:\Users\jedrz\Desktop\grafika\GRK_Project\Release\grk-cw9.exe</FullPath>
+      <FullPath>C:\Users\jedrz\Desktop\graf\GRK_Project\Release\grk-cw9.exe</FullPath>
     </ProjectOutput>
   </ProjectOutputs>
   <ContentFiles />

cw 9/Release/grk-cw9.log

@@ -1,60 +1,58 @@
   main.cpp
 C:\Program Files (x86)\Windows Kits\10\Include\10.0.19041.0\shared\minwindef.h(130,1): warning C4005: "APIENTRY": ponowna definicja makra
-C:\Users\jedrz\Desktop\grafika\GRK_Project\dependencies\glfw-3.3.8.bin.WIN32\include\GLFW\glfw3.h(123): message : zobacz poprzednią definicję „APIENTRY”
-C:\Users\jedrz\Desktop\grafika\GRK_Project\cw 9\src\Collision_System.cpp(87,16): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych
-C:\Users\jedrz\Desktop\grafika\GRK_Project\cw 9\src\Collision_System.cpp(88,14): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych
-C:\Users\jedrz\Desktop\grafika\GRK_Project\cw 9\src\Collision_System.cpp(90,17): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych
-C:\Users\jedrz\Desktop\grafika\GRK_Project\cw 9\src\Collision_System.cpp(91,15): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych
-C:\Users\jedrz\Desktop\grafika\GRK_Project\cw 9\src\Collision_System.cpp(100,9): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych
-C:\Users\jedrz\Desktop\grafika\GRK_Project\cw 9\src\Collision_System.cpp(101,9): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych
-C:\Users\jedrz\Desktop\grafika\GRK_Project\cw 9\src\Collision_System.cpp(111,29): warning C4244: "return": konwersja z "int" do "float", możliwa utrata danych
-C:\Users\jedrz\Desktop\grafika\GRK_Project\cw 9\src\Collision_System.cpp(115,29): warning C4244: "return": konwersja z "int" do "float", możliwa utrata danych
-C:\Users\jedrz\Desktop\grafika\GRK_Project\cw 9\src\ex_9_1.hpp(127,30): warning C4305: "inicjowanie": obcięcie z "double" do "float"
-C:\Users\jedrz\Desktop\grafika\GRK_Project\cw 9\src\ex_9_1.hpp(141,17): warning C4101: "data": lokalna zmienna, do której nie istnieje odwołanie
-C:\Users\jedrz\Desktop\grafika\GRK_Project\cw 9\src\ex_9_1.hpp(166,38): warning C4305: "=": obcięcie z "double" do "float"
-C:\Users\jedrz\Desktop\grafika\GRK_Project\cw 9\src\ex_9_1.hpp(195,16): warning C4305: "inicjowanie": obcięcie z "double" do "float"
-C:\Users\jedrz\Desktop\grafika\GRK_Project\cw 9\src\ex_9_1.hpp(372,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych
-C:\Users\jedrz\Desktop\grafika\GRK_Project\cw 9\src\ex_9_1.hpp(388,98): warning C4305: "argument": obcięcie z "double" do "T"
+C:\Users\jedrz\Desktop\graf\GRK_Project\dependencies\glfw-3.3.8.bin.WIN32\include\GLFW\glfw3.h(123): message : zobacz poprzednią definicję „APIENTRY”
+C:\Users\jedrz\Desktop\graf\GRK_Project\cw 9\src\Collision_System.cpp(87,16): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych
+C:\Users\jedrz\Desktop\graf\GRK_Project\cw 9\src\Collision_System.cpp(88,14): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych
+C:\Users\jedrz\Desktop\graf\GRK_Project\cw 9\src\Collision_System.cpp(90,17): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych
+C:\Users\jedrz\Desktop\graf\GRK_Project\cw 9\src\Collision_System.cpp(91,15): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych
+C:\Users\jedrz\Desktop\graf\GRK_Project\cw 9\src\Collision_System.cpp(100,9): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych
+C:\Users\jedrz\Desktop\graf\GRK_Project\cw 9\src\Collision_System.cpp(101,9): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych
+C:\Users\jedrz\Desktop\graf\GRK_Project\cw 9\src\Collision_System.cpp(111,29): warning C4244: "return": konwersja z "int" do "float", możliwa utrata danych
+C:\Users\jedrz\Desktop\graf\GRK_Project\cw 9\src\Collision_System.cpp(115,29): warning C4244: "return": konwersja z "int" do "float", możliwa utrata danych
+C:\Users\jedrz\Desktop\graf\GRK_Project\cw 9\src\ex_9_1.hpp(234,30): warning C4305: "inicjowanie": obcięcie z "double" do "float"
+C:\Users\jedrz\Desktop\graf\GRK_Project\cw 9\src\ex_9_1.hpp(248,17): warning C4101: "data": lokalna zmienna, do której nie istnieje odwołanie
+C:\Users\jedrz\Desktop\graf\GRK_Project\cw 9\src\ex_9_1.hpp(273,38): warning C4305: "=": obcięcie z "double" do "float"
+C:\Users\jedrz\Desktop\graf\GRK_Project\cw 9\src\ex_9_1.hpp(302,16): warning C4305: "inicjowanie": obcięcie z "double" do "float"
+C:\Users\jedrz\Desktop\graf\GRK_Project\cw 9\src\ex_9_1.hpp(479,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych
+C:\Users\jedrz\Desktop\graf\GRK_Project\cw 9\src\ex_9_1.hpp(495,98): warning C4305: "argument": obcięcie z "double" do "T"
           with
           [
               T=float
           ]
-C:\Users\jedrz\Desktop\grafika\GRK_Project\cw 9\src\ex_9_1.hpp(391,68): warning C4305: "argument": obcięcie z "double" do "T"
+C:\Users\jedrz\Desktop\graf\GRK_Project\cw 9\src\ex_9_1.hpp(498,68): warning C4305: "argument": obcięcie z "double" do "T"
           with
           [
               T=float
           ]
-C:\Users\jedrz\Desktop\grafika\GRK_Project\cw 9\src\ex_9_1.hpp(452,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych
-C:\Users\jedrz\Desktop\grafika\GRK_Project\cw 9\src\ex_9_1.hpp(460,108): warning C4305: "argument": obcięcie z "double" do "T"
+C:\Users\jedrz\Desktop\graf\GRK_Project\cw 9\src\ex_9_1.hpp(591,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych
+C:\Users\jedrz\Desktop\graf\GRK_Project\cw 9\src\ex_9_1.hpp(599,108): warning C4305: "argument": obcięcie z "double" do "T"
           with
           [
               T=float
           ]
-C:\Users\jedrz\Desktop\grafika\GRK_Project\cw 9\src\ex_9_1.hpp(468,87): warning C4305: "argument": obcięcie z "double" do "T"
+C:\Users\jedrz\Desktop\graf\GRK_Project\cw 9\src\ex_9_1.hpp(607,87): warning C4305: "argument": obcięcie z "double" do "T"
           with
           [
               T=float
           ]
-C:\Users\jedrz\Desktop\grafika\GRK_Project\cw 9\src\ex_9_1.hpp(468,223): warning C4305: "argument": obcięcie z "double" do "float"
-C:\Users\jedrz\Desktop\grafika\GRK_Project\cw 9\src\ex_9_1.hpp(471,59): warning C4305: "argument": obcięcie z "double" do "T"
+C:\Users\jedrz\Desktop\graf\GRK_Project\cw 9\src\ex_9_1.hpp(607,223): warning C4305: "argument": obcięcie z "double" do "float"
+C:\Users\jedrz\Desktop\graf\GRK_Project\cw 9\src\ex_9_1.hpp(610,59): warning C4305: "argument": obcięcie z "double" do "T"
           with
           [
               T=float
           ]
-C:\Users\jedrz\Desktop\grafika\GRK_Project\cw 9\src\ex_9_1.hpp(472,37): warning C4305: "argument": obcięcie z "double" do "float"
-C:\Users\jedrz\Desktop\grafika\GRK_Project\cw 9\src\ex_9_1.hpp(504,2): warning C4305: "argument": obcięcie z "double" do "float"
-C:\Users\jedrz\Desktop\grafika\GRK_Project\cw 9\src\ex_9_1.hpp(510,116): warning C4305: "argument": obcięcie z "double" do "float"
-C:\Users\jedrz\Desktop\grafika\GRK_Project\cw 9\src\ex_9_1.hpp(511,115): warning C4305: "argument": obcięcie z "double" do "float"
-C:\Users\jedrz\Desktop\grafika\GRK_Project\cw 9\src\ex_9_1.hpp(568,108): warning C4305: "argument": obcięcie z "double" do "T"
+C:\Users\jedrz\Desktop\graf\GRK_Project\cw 9\src\ex_9_1.hpp(611,37): warning C4305: "argument": obcięcie z "double" do "float"
+C:\Users\jedrz\Desktop\graf\GRK_Project\cw 9\src\ex_9_1.hpp(643,2): warning C4305: "argument": obcięcie z "double" do "float"
+C:\Users\jedrz\Desktop\graf\GRK_Project\cw 9\src\ex_9_1.hpp(738,108): warning C4305: "argument": obcięcie z "double" do "T"
           with
           [
               T=float
           ]
-C:\Users\jedrz\Desktop\grafika\GRK_Project\cw 9\src\ex_9_1.hpp(684,21): warning C4305: "-=": obcięcie z "double" do "float"
-C:\Users\jedrz\Desktop\grafika\GRK_Project\cw 9\src\ex_9_1.hpp(686,21): warning C4305: "+=": obcięcie z "double" do "float"
+C:\Users\jedrz\Desktop\graf\GRK_Project\cw 9\src\ex_9_1.hpp(961,21): warning C4305: "-=": obcięcie z "double" do "float"
+C:\Users\jedrz\Desktop\graf\GRK_Project\cw 9\src\ex_9_1.hpp(963,21): warning C4305: "+=": obcięcie z "double" do "float"
   Trwa generowanie kodu
-  1 of 656 functions ( 0.2%) were compiled, the rest were copied from previous compilation.
+  1 of 676 functions ( 0.1%) were compiled, the rest were copied from previous compilation.
     0 functions were new in current compilation
     7 functions had inline decision re-evaluated but remain unchanged
   Zakończono generowanie kodu
-  grk-cw9.vcxproj -> C:\Users\jedrz\Desktop\grafika\GRK_Project\Release\grk-cw9.exe
+  grk-cw9.vcxproj -> C:\Users\jedrz\Desktop\graf\GRK_Project\Release\grk-cw9.exe

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

@@ -1,2 +1,2 @@
 PlatformToolSet=v143:VCToolArchitecture=Native32Bit:VCToolsVersion=14.33.31629:TargetPlatformVersion=10.0.19041.0:
-Release|Win32|C:\Users\jedrz\Desktop\grafika\GRK_Project\|
+Release|Win32|C:\Users\jedrz\Desktop\graf\GRK_Project\|

cw 9/src/ex_9_1.hpp

@@ -70,7 +70,8 @@ namespace models {
 	Core::RenderContext couchContext;
 	Core::RenderContext vaseContext;
 
-
+	Core::RenderContext laptopContext;
+	Core::RenderContext screenContext;
 
 }
 
@@ -178,6 +179,13 @@ namespace texture {
 	GLuint vase_albedo;
 	GLuint vase_arm;
 	GLuint vase_normal;
+
+	GLuint laptop_albedo;
+	GLuint laptop_metallic;
+	GLuint laptop_roughness;
+	GLuint laptop_ao;
+	GLuint laptop_normal;
+
 }
 
 GLuint depthMapFBO;
@@ -201,7 +209,7 @@ Core::RenderContext shipContext;
 Core::RenderContext sphereContext;
 TriangleSoup water;
 
-glm::vec3 sunPos = glm::vec3(-4.740971f, 2.149999f, 0.369280f);
+glm::vec3 sunPos = glm::vec3(-4.740971f, 2.149999f, -0.069280f);
 glm::vec3 sunDir = glm::vec3(-0.93633f, 0.351106, 0.003226f);
 glm::vec3 sunColor = glm::vec3(0.9f, 0.9f, 0.7f) * 5;
 
@@ -489,18 +497,48 @@ void renderShadowapSun() {
 	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)));
 
+	/*
+	drawObjectTexPBR(models::bedContext, glm::mat4(), texture::wood_roughness, texture::wood_metallic, texture::wood_albedo, texture::wood_normal, texture::wood_ao);
+	drawObjectTexPBR(models::mattressContext, glm::mat4(), texture::sheets_roughness, texture::sheets_metallic, texture::sheets_albedo, texture::sheets_normal, texture::sheets_ao);
+	drawObjectTexPBR(models::bed_pillowContext, glm::mat4(), texture::sheets_roughness, texture::sheets_metallic, texture::sheets_albedo, texture::sheets_normal, texture::sheets_ao);
+	drawObjectTexPBR(models::floorContext, glm::mat4(), texture::floor_roughness, texture::floor_metallic, texture::floor_albedo, texture::floor_normal, texture::floor_ao);
+	drawObjectTexPBR(models::desk_topContext, glm::mat4(), texture::wood_roughness, texture::wood_metallic, texture::wood_albedo, texture::wood_normal, texture::wood_ao);
+	drawObjectTexPBR(models::desk_bottomContext, glm::mat4(), texture::black_metal_roughness, texture::black_metal_metallic, texture::black_metal_albedo, texture::black_metal_normal, texture::black_metal_ao);
+	drawObjectTexPBR(models::framesContext, glm::mat4(), texture::wood_roughness, texture::wood_metallic, texture::wood_albedo, texture::wood_normal, texture::wood_ao);
+	drawObjectTexPBR(models::wallContext, glm::mat4(), texture::white_paint_roughness, texture::white_paint_metallic, texture::white_paint_albedo, texture::white_paint_normal, texture::white_paint_ao);
+	drawObjectTexPBR(models::foldingContext, glm::mat4(), texture::bamboo_roughness, texture::bamboo_metallic, texture::bamboo_albedo, texture::bamboo_normal, texture::bamboo_ao);
+	drawObjectTexPBR(models::couchContext, glm::mat4(), texture::couch_roughness, texture::couch_metallic, texture::couch_albedo, texture::couch_normal, texture::couch_ao);
+	drawObjectTexPBR(models::doorContext, glm::mat4(), texture::wood_roughness, texture::wood_metallic, texture::wood_albedo, texture::wood_normal, texture::wood_ao);
+	drawObjectTexPBR(models::chairContext, glm::mat4(), texture::wood_roughness, texture::wood_metallic, texture::wood_albedo, texture::wood_normal, texture::wood_ao);
+	drawObjectTexPBR_ARM(models::roofContext, glm::mat4(), texture::wall_albedo, texture::wall_normal, texture::wall_arm);
+	drawObjectTexPBR_ARM(models::blanketContext, glm::mat4(), texture::blanket_albedo, texture::blanket_normal, texture::blanket_arm);
+	drawObjectTexPBR_ARM(models::drawerContext, glm::mat4(), texture::drawer_albedo, texture::drawer_normal, texture::drawer_arm);
+	drawObjectTexPBR_ARM(models::clockContext, glm::mat4(), texture::clock_albedo, texture::clock_normal, texture::clock_arm);
+	drawObjectTexPBR_ARM(models::plantContext, glm::mat4(), texture::plant_albedo, texture::clock_normal, texture::plant_arm);
+	drawObjectTexPBR_ARM(models::c_tableContext, glm::mat4(), texture::c_table_albedo, texture::c_table_normal, texture::c_table_arm);
+	drawObjectTexPBR_ARM(models::vaseContext, glm::mat4(), texture::vase_albedo, texture::vase_normal, texture::vase_arm);
+	*/
+
 	drawObjectDepth(models::bedContext, lightVP, glm::mat4());
-	drawObjectDepth(models::chairContext, lightVP, glm::mat4());
-	drawObjectDepth(models::deskContext, lightVP, glm::mat4());
+	drawObjectDepth(models::mattressContext, lightVP, glm::mat4());
+	drawObjectDepth(models::bed_pillowContext, lightVP, glm::mat4());
+	drawObjectDepth(models::floorContext, lightVP, glm::mat4());
+	drawObjectDepth(models::desk_topContext, lightVP, glm::mat4());
+	drawObjectDepth(models::desk_bottomContext, lightVP, glm::mat4());
+	drawObjectDepth(models::framesContext, lightVP, glm::mat4());
+	drawObjectDepth(models::wallContext, lightVP, glm::mat4());
+	drawObjectDepth(models::foldingContext, lightVP, glm::mat4());
+	drawObjectDepth(models::couchContext, lightVP, glm::mat4());
+	drawObjectDepth(models::laptopContext, lightVP, glm::mat4());
 	drawObjectDepth(models::doorContext, lightVP, glm::mat4());
+	drawObjectDepth(models::chairContext, lightVP, glm::mat4());
+	drawObjectDepth(models::roofContext, lightVP, glm::mat4());
+	drawObjectDepth(models::blanketContext, lightVP, glm::mat4());
 	drawObjectDepth(models::drawerContext, lightVP, glm::mat4());
-	drawObjectDepth(models::marbleBustContext, lightVP, glm::translate(glm::mat4(), glm::vec3(0, 0, -0.2)));
-	drawObjectDepth(models::marbleBustContext, lightVP, glm::translate(glm::mat4(), glm::vec3(0, 0, 0.2)));
-	drawObjectDepth(models::materaceContext, lightVP, glm::mat4());
-	drawObjectDepth(models::pencilsContext, lightVP, glm::mat4());
-	drawObjectDepth(models::planeContext, lightVP, glm::mat4());
-	drawObjectDepth(models::roomContext, lightVP, glm::mat4());
-	drawObjectDepth(models::windowContext, lightVP, glm::mat4());
+	drawObjectDepth(models::clockContext, lightVP, glm::mat4());
+	drawObjectDepth(models::plantContext, lightVP, glm::mat4());
+	drawObjectDepth(models::c_tableContext, lightVP, glm::mat4());
+	drawObjectDepth(models::foldingContext, lightVP, glm::mat4());
 
 
 
@@ -611,6 +649,7 @@ void renderScene(GLFWwindow* window)
 	//drawObjectTex(models::marbleBustContext, glm::translate(glm::mat4(), glm::vec3(0, 0, -0.2)), 0.2, 0, texture::rust);
 	//drawObjectTex(models::marbleBustContext, glm::translate(glm::mat4(), glm::vec3(0, 0, 0.2)), 0, 0.2, texture::rust);
 	//drawObjectTex(models::doorContext, glm::mat4(), 0, 0, texture::screen);
+	drawObjectTex(models::screenContext, glm::mat4(), 0, 0, texture::screen);
 
 	glUseProgram(programTexPBR);
 	//drawObjectTexPBR(models::deskContext, glm::mat4(), texture::table_roughness, texture::table_metallic, texture::table_albedo, texture::table_normal, texture::table_ao);
@@ -627,6 +666,7 @@ void renderScene(GLFWwindow* window)
 	drawObjectTexPBR(models::couchContext, glm::mat4(), texture::couch_roughness, texture::couch_metallic, texture::couch_albedo, texture::couch_normal, texture::couch_ao);
 	drawObjectTexPBR(models::doorContext, glm::mat4(), texture::wood_roughness, texture::wood_metallic, texture::wood_albedo, texture::wood_normal, texture::wood_ao);
 	drawObjectTexPBR(models::chairContext, glm::mat4(), texture::wood_roughness, texture::wood_metallic, texture::wood_albedo, texture::wood_normal, texture::wood_ao);
+	drawObjectTexPBR(models::laptopContext, glm::mat4(), texture::laptop_roughness, texture::laptop_metallic, texture::laptop_albedo, texture::laptop_normal, texture::laptop_ao);
 
 
 
@@ -647,18 +687,6 @@ void renderScene(GLFWwindow* window)
 	drawObjectTexPBR_ARM(models::vaseContext, glm::mat4(), texture::vase_albedo, texture::vase_normal, texture::vase_arm);
 
 
-
-
-
-
-
-
-
-
-
-
-
-
 	glUseProgram(programWater);
 	//drawObjectColorWater(waterContext, glm::translate(glm::mat4(1.0), glm::vec3(0.0, -1.0, 0.0)) * glm::scale(glm::vec3(30.0)), glm::vec3(0.1, 0.1, 0.95), time, texture::water);
 	drawObjectColorWater(waterContext, glm::translate(glm::mat4(1.0), glm::vec3(0.0f, -1.7f, 0.0f)), glm::vec4(0.1, 0.1, 0.95, 0.5), time, texture::water);
@@ -820,7 +848,12 @@ void init(GLFWwindow* window)
 	texture::vase_arm = Core::LoadTexture("textures/vase/arm.png");
 	texture::vase_normal = Core::LoadTexture("textures/vase/normal.png");
 
-
+	texture::laptop_albedo = Core::LoadTexture("textures/laptop/albedo.png");
+	texture::laptop_metallic = Core::LoadTexture("textures/laptop/metallic.png");
+	texture::laptop_roughness = Core::LoadTexture("textures/laptop/roughness.png");
+	texture::laptop_ao = Core::LoadTexture("textures/laptop/ao.png");
+	texture::laptop_normal = Core::LoadTexture("textures/laptop/normal.png");
+	texture::screen = Core::LoadTexture("textures/visual.png");
 
 	loadModelToContext("./models/sphere.obj", sphereContext, false);
 	loadModelToContext("./models/spaceship.obj", shipContext, false);
@@ -840,18 +873,18 @@ void init(GLFWwindow* window)
 	loadModelToContext("./models/test.obj", models::testContext, false);
 	loadModelToContext("./models/cube.obj", models::cubeContext, false);
 	//loadModelToContext("./models/table.obj", models::tableContext, false);
-	loadModelToContext("./models/wall.obj", models::wallContext, true);
-	loadModelToContext("./models/roof.obj", models::roofContext, true);
+	loadModelToContext("./models/wall.obj", models::wallContext, false);
+	loadModelToContext("./models/roof.obj", models::roofContext, false);
 	loadModelToContext("./models/window.obj", models::windowContext, true);
 	loadModelToContext("./models/ground.obj", models::floorContext, false);
 	loadModelToContext("./models/ground_001.obj", models::ceilingContext, false);
-	loadModelToContext("./models/bed_frame.obj", models::bedContext, false);
-	loadModelToContext("./models/bed_mattress.obj", models::mattressContext, false);
+	loadModelToContext("./models/bed_frame.obj", models::bedContext, true);
+	loadModelToContext("./models/bed_mattress.obj", models::mattressContext, true);
 	loadModelToContext("./models/bed_pillow.obj", models::bed_pillowContext, false);
 	loadModelToContext("./models/paplan.obj", models::blanketContext, true);
 
-	loadModelToContext("./models/PC_desk_bake_003.obj", models::desk_topContext, false);
-	loadModelToContext("./models/PC_desk_bake_004.obj", models::desk_bottomContext, false);
+	loadModelToContext("./models/PC_desk_bake_003.obj", models::desk_topContext, true);
+	loadModelToContext("./models/PC_desk_bake_004.obj", models::desk_bottomContext, true);
 	loadModelToContext("./models/Cube_002.obj", models::paper_stack2Context, false);
 	loadModelToContext("./models/Cube_009.obj", models::paper_stack3Context, false);
 	loadModelToContext("./models/windows_v.obj", models::framesContext, false);
@@ -860,12 +893,14 @@ void init(GLFWwindow* window)
 	loadModelToContext("./models/alarm_clock_01.obj", models::clockContext, true);
 	loadModelToContext("./models/potted_plant_04.obj", models::plantContext, true);
 	loadModelToContext("./models/modern_coffee_table_01.obj", models::c_tableContext, true);
-	loadModelToContext("./models/20848_Folding_Screen_v3.obj", models::foldingContext, false);
+	loadModelToContext("./models/20848_Folding_Screen_v3.obj", models::foldingContext, true);
 	loadModelToContext("./models/Foot_Rest_001.obj", models::couchContext, false);
-	loadModelToContext("./models/dor.obj", models::doorContext, false);
+	loadModelToContext("./models/dor.obj", models::doorContext, true);
 	loadModelToContext("./models/uploads_files_1938755_KAUSTBY.obj", models::chairContext, false);
 	loadModelToContext("./models/ceramic_vase_01.obj", models::vaseContext, true);
-	//collisionSystem.calculateSceneBounding();
+	loadModelToContext("./models/laptop.obj", models::laptopContext, false);
+	loadModelToContext("./models/screen.obj", models::screenContext, false);
+	collisionSystem.calculateSceneBounding();
 
 	skyboxTexture = loadSkybox(faces);
 	//drawSkybox(models::cubeContext, transformation, skyboxTexture);