Merge pull request 'dodanie_obiektów' (#3) from dodanie_obiektów into master

Reviewed-on: #3

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

@@ -2,7 +2,7 @@
 <Project>
   <ProjectOutputs>
     <ProjectOutput>
-      <FullPath>C:\Users\jedrz\Desktop\grafika\GRK_Project\Debug\grk-cw9.exe</FullPath>
+      <FullPath>C:\Users\Anna Niczyporuk\source\repos\GRK_Projectnew\Debug\grk-cw9.exe</FullPath>
     </ProjectOutput>
   </ProjectOutputs>
   <ContentFiles />

cw 9/Debug/grk-cw9.log

@@ -1,57 +1 @@
-  main.cpp
+  grk-cw9.vcxproj -> C:\Users\Anna Niczyporuk\source\repos\GRK_Projectnew\Debug\grk-cw9.exe
-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"
-          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"
-          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"
-          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"
-          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"
-          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(567,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(679,21): warning C4305: "-=": obcięcie z "double" do "float"
-C:\Users\jedrz\Desktop\grafika\GRK_Project\cw 9\src\ex_9_1.hpp(681,21): warning C4305: "+=": obcięcie z "double" do "float"
-Box.obj : warning LNK4075: zignorowano opcję „/EDITANDCONTINUE” z powodu określenia opcji „/INCREMENTAL:NO”
-LINK : warning LNK4098: domyślna biblioteka „MSVCRT” powoduje konflikt z innymi bibliotekami; użyj opcji /NODEFAULTLIB:biblioteka
-  grk-cw9.vcxproj -> C:\Users\jedrz\Desktop\grafika\GRK_Project\Debug\grk-cw9.exe

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

@@ -1,2 +1,2 @@
 PlatformToolSet=v143:VCToolArchitecture=Native32Bit:VCToolsVersion=14.33.31629:TargetPlatformVersion=10.0.19041.0:
-Debug|Win32|C:\Users\jedrz\Desktop\grafika\GRK_Project\|
+Debug|Win32|C:\Users\Anna Niczyporuk\source\repos\GRK_Projectnew\|

cw 9/src/ex_9_1.hpp

@@ -25,11 +25,11 @@ int WIDTH = 500, HEIGHT = 500;
 CollisionSystem collisionSystem;
 
 namespace models {
-	Core::RenderContext bedContext;
+	//Core::RenderContext bedContext;
 	Core::RenderContext chairContext;
 	Core::RenderContext deskContext;
 	Core::RenderContext doorContext;
-	Core::RenderContext drawerContext;
+	//Core::RenderContext drawerContext;
 	Core::RenderContext marbleBustContext;
 	Core::RenderContext materaceContext;
 	Core::RenderContext pencilsContext;
@@ -37,10 +37,41 @@ namespace models {
 	Core::RenderContext roomContext;
 	Core::RenderContext spaceshipContext;
 	Core::RenderContext sphereContext;
-	Core::RenderContext windowContext;
+	//Core::RenderContext windowContext;
 	Core::RenderContext testContext;
 	Core::RenderContext cubeContext;
 	Core::RenderContext tableContext;
+	Core::RenderContext wallContext;
+
+	Core::RenderContext roofContext;
+	Core::RenderContext windowContext;
+	Core::RenderContext floorContext;
+	Core::RenderContext ceilingContext;
+
+	Core::RenderContext bedContext;
+	Core::RenderContext mattressContext;
+	Core::RenderContext bed_pillowContext;
+	Core::RenderContext blanketContext;
+
+	Core::RenderContext desk_topContext;
+	Core::RenderContext desk_bottomContext;
+	Core::RenderContext paper_stack2Context;
+	Core::RenderContext paper_stack3Context;
+
+	Core::RenderContext framesContext;
+	Core::RenderContext trashcanContext;
+
+	Core::RenderContext drawerContext;
+	Core::RenderContext clockContext;
+	Core::RenderContext plantContext;
+	Core::RenderContext c_tableContext;
+
+	Core::RenderContext foldingContext;
+	Core::RenderContext couchContext;
+	Core::RenderContext vaseContext;
+
+
+
 }
 
 std::vector<std::string> faces = {
@@ -79,6 +110,74 @@ namespace texture {
 	GLuint rock_albedo;
 	GLuint rock_arm;
 	GLuint rock_normal;
+	GLuint wall_albedo;
+	GLuint wall_arm;
+	GLuint wall_normal;
+	GLuint ceiling_normal;
+	GLuint ceiling_arm;
+	GLuint ceiling_albedo;
+	GLuint ceiling_roughness;
+	GLuint ceiling_metallic;
+	GLuint ceiling_ao;
+
+	GLuint sheets_albedo;
+	GLuint sheets_metallic;
+	GLuint sheets_roughness;
+	GLuint sheets_ao;
+	GLuint sheets_normal;
+	GLuint blanket_albedo;
+	GLuint blanket_arm;
+	GLuint blanket_normal;
+
+	GLuint floor_albedo;
+	GLuint floor_metallic;
+	GLuint floor_roughness;
+	GLuint floor_ao;
+	GLuint floor_normal;
+	GLuint floor_arm;
+
+	GLuint black_metal_albedo;
+	GLuint black_metal_metallic;
+	GLuint black_metal_roughness;
+	GLuint black_metal_ao;
+	GLuint black_metal_normal;
+
+	GLuint paper_stack;
+	GLuint white_paint_albedo;
+	GLuint white_paint_metallic;
+	GLuint white_paint_roughness;
+	GLuint white_paint_ao;
+	GLuint white_paint_normal;
+
+	GLuint drawer_albedo;
+	GLuint drawer_arm;
+	GLuint drawer_normal;
+	GLuint clock_albedo;
+	GLuint clock_arm;
+	GLuint clock_normal;
+	GLuint plant_albedo;
+	GLuint plant_arm;
+	GLuint plant_normal;
+
+	GLuint c_table_albedo;
+	GLuint c_table_arm;
+	GLuint c_table_normal;
+
+	GLuint bamboo_albedo;
+	GLuint bamboo_metallic;
+	GLuint bamboo_roughness;
+	GLuint bamboo_ao;
+	GLuint bamboo_normal;
+
+	GLuint couch_albedo;
+	GLuint couch_metallic;
+	GLuint couch_roughness;
+	GLuint couch_ao;
+	GLuint couch_normal;
+
+	GLuint vase_albedo;
+	GLuint vase_arm;
+	GLuint vase_normal;
 }
 
 GLuint depthMapFBO;
@@ -238,7 +337,7 @@ void drawObjectPBR(Core::RenderContext& context, glm::mat4 modelMatrix, glm::vec
 
 	glm::mat4 lightVP = glm::ortho(-3.f, 2.3f, -1.3f, 3.f, -1.0f, 40.0f) * glm::lookAt(sunPos, sunPos - sunDir, glm::vec3(0, 1, 0));
 	glUniformMatrix4fv(glGetUniformLocation(program, "LightVP"), 1, GL_FALSE, (float*)&lightVP);
-	Core::SetActiveTexture(depthMap, "depthMap",program, 0);
+	Core::SetActiveTexture(depthMap, "depthMap", program, 0);
 
 	Core::DrawContext(context);
 }
@@ -404,6 +503,8 @@ void renderShadowapSun() {
 	drawObjectDepth(models::windowContext, lightVP, glm::mat4());
 
 
+
+
 	glBindFramebuffer(GL_FRAMEBUFFER, 0);
 	glViewport(0, 0, WIDTH, HEIGHT);
 }
@@ -471,17 +572,17 @@ 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);
+	//drawObjectPBR(models::bedContext, glm::mat4(), glm::vec3(0.03f, 0.03f, 0.03f), 0.2f, 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::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::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::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::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::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);
+	//drawObjectPBR(models::windowContext, glm::mat4(), glm::vec3(0.402978f, 0.120509f, 0.057729f), 0.2f, 0.0f);
 
 	glm::vec3 spaceshipSide = glm::normalize(glm::cross(spaceshipDir, glm::vec3(0.f, 1.f, 0.f)));
 	glm::vec3 spaceshipUp = glm::normalize(glm::cross(spaceshipSide, spaceshipDir));
@@ -507,15 +608,56 @@ void renderScene(GLFWwindow* window)
 	spotlightConeDir = spaceshipDir;
 
 	glUseProgram(programTex);
-	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.2, 0, texture::rust);
-	drawObjectTex(models::marbleBustContext, glm::translate(glm::mat4(), glm::vec3(0, 0, 0.2)), 0, 0.2, 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::doorContext, 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);
+	//drawObjectTexPBR(models::deskContext, glm::mat4(), texture::table_roughness, texture::table_metallic, texture::table_albedo, texture::table_normal, texture::table_ao);
+	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::ceilingContext, glm::mat4(), texture::ceiling_roughness, texture::ceiling_metallic, texture::ceiling_albedo, texture::ceiling_normal, texture::ceiling_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);
+
+
+
 
 	glUseProgram(programTexPBR_ARM);
-	drawObjectTexPBR_ARM(models::chairContext, glm::mat4(), texture::rock_albedo, texture::rock_normal, texture::rock_arm);
+	//drawObjectTexPBR_ARM(models::chairContext, glm::mat4(), texture::rock_albedo, texture::rock_normal, texture::rock_arm);
+	//drawObjectTexPBR_ARM(models::wallContext, glm::mat4(), texture::wall_albedo, texture::wall_normal, texture::wall_arm);
+	drawObjectTexPBR_ARM(models::roofContext, glm::mat4(), texture::wall_albedo, texture::wall_normal, texture::wall_arm);
+	//drawObjectTexPBR_ARM(models::windowContext, glm::mat4(), texture::wall_albedo, texture::wall_normal, texture::wall_arm);
+	//drawObjectTexPBR_ARM(models::floorContext, glm::mat4(), texture::floor_albedo, texture::floor_normal, texture::floor_arm);
+	//drawObjectTexPBR_ARM(models::floorContext, glm::mat4(), texture::wall_albedo, texture::wall_normal, texture::wall_arm);
+	//drawObjectTexPBR_ARM(models::groundContext, glm::mat4(), texture::ceiling_albedo, texture::ceiling_normal, texture::ceiling_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);
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 	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);
@@ -605,13 +747,88 @@ void init(GLFWwindow* window)
 	texture::rock_albedo = Core::LoadTexture("textures/rock_albedo.png");
 	texture::rock_arm = Core::LoadTexture("textures/rock_arm.png");
 	texture::rock_normal = Core::LoadTexture("textures/rock_normal.png");
+	texture::wall_albedo = Core::LoadTexture("textures/wall/albedo.png");
+	texture::wall_arm = Core::LoadTexture("textures/wall/arm.png");
+	texture::wall_normal = Core::LoadTexture("textures/wall/normal.png");
+
+	texture::ceiling_albedo = Core::LoadTexture("textures/ceiling/albedo.png");
+	texture::ceiling_arm = Core::LoadTexture("textures/ceiling/arm.png");
+	texture::ceiling_normal = Core::LoadTexture("textures/ceiling/normal.png");
+
+	texture::sheets_albedo = Core::LoadTexture("textures/bed/albedo.png");
+	texture::sheets_metallic = Core::LoadTexture("textures/bed/metallic.png");
+	texture::sheets_roughness = Core::LoadTexture("textures/bed/roughness.png");
+	texture::sheets_ao = Core::LoadTexture("textures/bed/ao.png");
+	texture::sheets_normal = Core::LoadTexture("textures/bed/normal.png");
+
+	texture::blanket_albedo = Core::LoadTexture("textures/blanket/albedo.png");
+	texture::blanket_arm = Core::LoadTexture("textures/blanket/arm.png");
+	texture::blanket_normal = Core::LoadTexture("textures/blanket/normal.png");
+
+
+	texture::floor_albedo = Core::LoadTexture("textures/floor2/albedo.png");
+	//texture::floor_metallic = Core::LoadTexture("textures/floor/metallic.png");
+	//texture::floor_roughness = Core::LoadTexture("textures/floor/roughness.png");
+	//texture::floor_ao = Core::LoadTexture("textures/floor/ao.png");
+	texture::floor_arm = Core::LoadTexture("textures/floor2/arm.png");
+	texture::floor_normal = Core::LoadTexture("textures/floor2/normal.png");
+
+	texture::black_metal_albedo = Core::LoadTexture("textures/black_metal/albedo.png");
+	texture::black_metal_metallic = Core::LoadTexture("textures/black_metal/metallic.png");
+	texture::black_metal_roughness = Core::LoadTexture("textures/black_metal/roughness.png");
+	texture::black_metal_ao = Core::LoadTexture("textures/black_metal/ao.png");
+	texture::black_metal_normal = Core::LoadTexture("textures/black_metal/normal.png");
+	texture::paper_stack = Core::LoadTexture("textures/paperstack.png");
+
+
+	texture::white_paint_albedo = Core::LoadTexture("textures/white_paint/albedo.png");
+	texture::white_paint_metallic = Core::LoadTexture("textures/white_paint/metallic.png");
+	texture::white_paint_roughness = Core::LoadTexture("textures/white_paint/roughness.png");
+	texture::white_paint_ao = Core::LoadTexture("textures/white_paint/ao.png");
+	texture::white_paint_normal = Core::LoadTexture("textures/white_paint/normal.png");
+
+	texture::drawer_albedo = Core::LoadTexture("textures/drawer/albedo.png");
+	texture::drawer_arm = Core::LoadTexture("textures/drawer/arm.png");
+	texture::drawer_normal = Core::LoadTexture("textures/drawer/normal.png");
+
+	texture::clock_albedo = Core::LoadTexture("textures/clock/albedo.png");
+	texture::clock_arm = Core::LoadTexture("textures/clock/arm.png");
+	texture::clock_normal = Core::LoadTexture("textures/clock/normal.png");
+
+	texture::plant_albedo = Core::LoadTexture("textures/plant/albedo.png");
+	texture::plant_arm = Core::LoadTexture("textures/plant/arm.png");
+	texture::plant_normal = Core::LoadTexture("textures/plant/normal.png");
+
+	texture::c_table_albedo = Core::LoadTexture("textures/c_table/albedo.png");
+	texture::c_table_arm = Core::LoadTexture("textures/c_table/arm.png");
+	texture::c_table_normal = Core::LoadTexture("textures/c_table/normal.png");
+
+
+	texture::bamboo_albedo = Core::LoadTexture("textures/bamboo/albedo.png");
+	texture::bamboo_metallic = Core::LoadTexture("textures/bamboo/metallic.png");
+	texture::bamboo_roughness = Core::LoadTexture("textures/bamboo/roughness.png");
+	texture::bamboo_ao = Core::LoadTexture("textures/bamboo/ao.png");
+	texture::bamboo_normal = Core::LoadTexture("textures/bamboo/normal.png");
+
+	texture::couch_albedo = Core::LoadTexture("textures/couch/albedo.png");
+	texture::couch_metallic = Core::LoadTexture("textures/couch/metallic.png");
+	texture::couch_roughness = Core::LoadTexture("textures/couch/roughness.png");
+	texture::couch_ao = Core::LoadTexture("textures/couch/ao.png");
+	texture::couch_normal = Core::LoadTexture("textures/couch/normal.png");
+
+	texture::vase_albedo = Core::LoadTexture("textures/vase/albedo.png");
+	texture::vase_arm = Core::LoadTexture("textures/vase/arm.png");
+	texture::vase_normal = Core::LoadTexture("textures/vase/normal.png");
+
+
+
 	loadModelToContext("./models/sphere.obj", sphereContext, false);
 	loadModelToContext("./models/spaceship.obj", shipContext, false);
-	loadModelToContext("./models/bed.obj", models::bedContext, true);
+	//loadModelToContext("./models/bed.obj", models::bedContext, true);
-	loadModelToContext("./models/chair.obj", models::chairContext, true);
+	//loadModelToContext("./models/chair.obj", models::chairContext, true);
 	loadModelToContext("./models/desk.obj", models::deskContext, true);
-	loadModelToContext("./models/door.obj", models::doorContext, false);
+	//loadModelToContext("./models/door.obj", models::doorContext, false);
-	loadModelToContext("./models/drawer.obj", models::drawerContext, false);
+	//loadModelToContext("./models/drawer.obj", models::drawerContext, false);
 	loadModelToContext("./models/marbleBust.obj", models::marbleBustContext, false);
 	loadModelToContext("./models/materace.obj", models::materaceContext, false);
 	loadModelToContext("./models/pencils.obj", models::pencilsContext, false);
@@ -619,11 +836,36 @@ void init(GLFWwindow* window)
 	loadModelToContext("./models/room.obj", models::roomContext, false);
 	loadModelToContext("./models/spaceship.obj", models::spaceshipContext, false);
 	loadModelToContext("./models/sphere.obj", models::sphereContext, false);
-	loadModelToContext("./models/window.obj", models::windowContext, true);
+	//loadModelToContext("./models/window.obj", models::windowContext, true);
 	loadModelToContext("./models/test.obj", models::testContext, false);
 	loadModelToContext("./models/cube.obj", models::cubeContext, false);
-	loadModelToContext("./models/table.obj", models::tableContext, false);
+	//loadModelToContext("./models/table.obj", models::tableContext, false);
-	collisionSystem.calculateSceneBounding();
+	loadModelToContext("./models/wall.obj", models::wallContext, true);
+	loadModelToContext("./models/roof.obj", models::roofContext, true);
+	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_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/Cube_002.obj", models::paper_stack2Context, false);
+	loadModelToContext("./models/Cube_009.obj", models::paper_stack3Context, false);
+	loadModelToContext("./models/windows_v.obj", models::framesContext, false);
+	loadModelToContext("./models/Cylinder.obj", models::trashcanContext, true);
+	loadModelToContext("./models/drawer_cabinet.obj", models::drawerContext, true);
+	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/Foot_Rest_001.obj", models::couchContext, false);
+	loadModelToContext("./models/dor.obj", models::doorContext, false);
+	loadModelToContext("./models/uploads_files_1938755_KAUSTBY.obj", models::chairContext, false);
+	loadModelToContext("./models/ceramic_vase_01.obj", models::vaseContext, true);
+	//collisionSystem.calculateSceneBounding();
 
 	skyboxTexture = loadSkybox(faces);
 	//drawSkybox(models::cubeContext, transformation, skyboxTexture);