final room version

cw 9/Release/grk-cw9.log

@@ -9,76 +9,77 @@ C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\Collision_System.cpp(100,9): warni
 C:\Users\jedrz\Desktop\g\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\g\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\g\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\g\GRK_Project\cw 9\src\ex_9_1.hpp(314,30): warning C4305: "inicjowanie": obcięcie z "double" do "float"
+C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(338,30): warning C4305: "inicjowanie": obcięcie z "double" do "float"
-C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(331,17): warning C4101: "data": lokalna zmienna, do której nie istnieje odwołanie
+C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(355,17): warning C4101: "data": lokalna zmienna, do której nie istnieje odwołanie
-C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(356,38): warning C4305: "=": obcięcie z "double" do "float"
+C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(380,38): warning C4305: "=": obcięcie z "double" do "float"
-C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(385,16): warning C4305: "inicjowanie": obcięcie z "double" do "float"
+C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(409,16): warning C4305: "inicjowanie": obcięcie z "double" do "float"
-C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(590,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych
+C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(614,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych
-C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(598,73): warning C4244: "argument": konwersja z "int" do "GLfloat", możliwa utrata danych
+C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(622,73): warning C4244: "argument": konwersja z "int" do "GLfloat", możliwa utrata danych
-C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(598,66): warning C4244: "argument": konwersja z "int" do "GLfloat", możliwa utrata danych
+C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(622,66): warning C4244: "argument": konwersja z "int" do "GLfloat", możliwa utrata danych
-C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(613,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych
+C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(637,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych
-C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(631,98): warning C4305: "argument": obcięcie z "double" do "T"
+C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(655,98): warning C4305: "argument": obcięcie z "double" do "T"
           with
           [
               T=float
           ]
-C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(634,68): warning C4305: "argument": obcięcie z "double" do "T"
+C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(658,68): warning C4305: "argument": obcięcie z "double" do "T"
           with
           [
               T=float
           ]
-C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(673,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych
+C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(702,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych
-C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(687,99): warning C4305: "argument": obcięcie z "double" do "T"
+C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(716,99): warning C4305: "argument": obcięcie z "double" do "T"
           with
           [
               T=float
           ]
-C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(690,69): warning C4305: "argument": obcięcie z "double" do "T"
+C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(719,69): warning C4305: "argument": obcięcie z "double" do "T"
           with
           [
               T=float
           ]
-C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(790,8): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych
+C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(822,8): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych
-C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(791,8): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych
+C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(823,8): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych
-C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(792,8): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych
+C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(824,8): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych
-C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(795,31): warning C4305: "inicjowanie": obcięcie z "double" do "float"
+C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(827,31): warning C4305: "inicjowanie": obcięcie z "double" do "float"
-C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(796,25): warning C4305: "inicjowanie": obcięcie z "double" do "float"
+C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(828,25): warning C4305: "inicjowanie": obcięcie z "double" do "float"
-C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(852,8): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych
+C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(884,8): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych
-C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(853,8): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych
+C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(885,8): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych
-C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(854,8): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych
+C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(886,8): warning C4244: "inicjowanie": konwersja z "float" do "int", możliwa utrata danych
-C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(857,31): warning C4305: "inicjowanie": obcięcie z "double" do "float"
+C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(889,31): warning C4305: "inicjowanie": obcięcie z "double" do "float"
-C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(858,25): warning C4305: "inicjowanie": obcięcie z "double" do "float"
+C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(890,25): warning C4305: "inicjowanie": obcięcie z "double" do "float"
-C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(964,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych
+C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(996,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych
-C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(977,108): warning C4305: "argument": obcięcie z "double" do "T"
+C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(1009,108): warning C4305: "argument": obcięcie z "double" do "T"
           with
           [
               T=float
           ]
-C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(986,87): warning C4305: "argument": obcięcie z "double" do "T"
+C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(1018,87): warning C4305: "argument": obcięcie z "double" do "T"
           with
           [
               T=float
           ]
-C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(986,223): warning C4305: "argument": obcięcie z "double" do "float"
+C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(1018,223): warning C4305: "argument": obcięcie z "double" do "float"
-C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(1009,2): warning C4305: "argument": obcięcie z "double" do "float"
+C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(1047,73): warning C4305: "argument": obcięcie z "double" do "float"
-C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(1019,73): warning C4305: "argument": obcięcie z "double" do "float"
+C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(1051,81): warning C4305: "argument": obcięcie z "double" do "float"
-C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(1023,81): warning C4305: "argument": obcięcie z "double" do "float"
+C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(1052,93): warning C4305: "argument": obcięcie z "double" do "float"
-C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(1024,93): warning C4305: "argument": obcięcie z "double" do "float"
+C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(1053,83): warning C4305: "argument": obcięcie z "double" do "float"
-C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(1115,108): warning C4305: "argument": obcięcie z "double" do "T"
+C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(1054,83): warning C4305: "argument": obcięcie z "double" do "float"
+C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(1149,108): warning C4305: "argument": obcięcie z "double" do "T"
           with
           [
               T=float
           ]
-C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(1412,66): warning C4244: "=": konwersja z "double" do "T", możliwa utrata danych
+C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(1470,66): warning C4244: "=": konwersja z "double" do "T", możliwa utrata danych
           with
           [
               T=float
           ]
-C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(1429,21): warning C4305: "-=": obcięcie z "double" do "float"
+C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(1487,21): warning C4305: "-=": obcięcie z "double" do "float"
-C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(1431,21): warning C4305: "+=": obcięcie z "double" do "float"
+C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(1489,21): warning C4305: "+=": obcięcie z "double" do "float"
   Trwa generowanie kodu
-  2 of 713 functions ( 0.3%) were compiled, the rest were copied from previous compilation.
+  1 of 717 functions ( 0.1%) were compiled, the rest were copied from previous compilation.
     0 functions were new in current compilation
-    9 functions had inline decision re-evaluated but remain unchanged
+    7 functions had inline decision re-evaluated but remain unchanged
   Zakończono generowanie kodu
   grk-cw9.vcxproj -> C:\Users\jedrz\Desktop\g\GRK_Project\Release\grk-cw9.exe

cw 9/shaders/shader_water.frag

@@ -207,7 +207,7 @@ void main () {
 	//vec4 light = vec4(1.0, 10.0, 0.0, 0.1);
 	vec4 light = vec4(lightPos, 1);
 	//light = light*rotMat;
-	vec3 colorBlue = vec3(0.0,0.1,0.3);
+	vec3 colorBlue = vec3(0.0,0.1,0.2);
 	vec3 colorLightBlue = vec3(0.0, 0.04, 0.2);
 	vec3 colorWhite = vec3(0.9, 0.9, 0.9);
 

cw 9/src/ex_9_1.hpp

@@ -88,6 +88,10 @@ namespace models {
 	Core::RenderContext pillow1Context;
 	Core::RenderContext pillow2Context;
 	Core::RenderContext pillow3Context;
+	Core::RenderContext painting1Context;
+	Core::RenderContext painting2Context;
+	Core::RenderContext mug2Context;
+	Core::RenderContext bookContext;
 }
 
 std::vector<std::string> faces = {
@@ -239,6 +243,26 @@ namespace texture {
 	GLuint pillow2;
 	GLuint pillow3;
 
+	GLuint painting1;
+	GLuint painting2;
+
+	GLuint mug2_albedo;
+	GLuint mug2_metallic;
+	GLuint mug2_roughness;
+	GLuint mug2_ao;
+	GLuint mug2_normal;
+
+	GLuint book_albedo;
+	GLuint book_metallic;
+	GLuint book_roughness;
+	GLuint book_ao;
+	GLuint book_normal;
+
+	GLuint spray_albedo;
+	GLuint spray_metallic;
+	GLuint spray_roughness;
+	GLuint spray_ao;
+	GLuint spray_normal;
 }
 
 GLuint depthMapFBO;
@@ -665,6 +689,11 @@ void renderShadowapSun(float angle) {
 	drawObjectDepth(models::pillow1Context, lightVP, glm::mat4());
 	drawObjectDepth(models::pillow2Context, lightVP, glm::mat4());
 	drawObjectDepth(models::pillow3Context, lightVP, glm::mat4());
+	drawObjectDepth(models::painting1Context, lightVP, glm::mat4());
+	drawObjectDepth(models::painting2Context, lightVP, glm::mat4());
+	drawObjectDepth(models::mug2Context, lightVP, glm::mat4());
+	drawObjectDepth(models::bookContext, lightVP, glm::mat4());
+
 	glBindFramebuffer(GL_FRAMEBUFFER, 0);
 	glViewport(0, 0, WIDTH, HEIGHT);
 }
@@ -721,7 +750,10 @@ void renderShadowapSun2() {
 	drawObjectDepth(models::pillow1Context, lightVP2, glm::mat4());
 	drawObjectDepth(models::pillow2Context, lightVP2, glm::mat4());
 	drawObjectDepth(models::pillow3Context, lightVP2, glm::mat4());
-
+	drawObjectDepth(models::painting1Context, lightVP2, glm::mat4());
+	drawObjectDepth(models::painting2Context, lightVP2, glm::mat4());
+	drawObjectDepth(models::mug2Context, lightVP2, glm::mat4());
+	drawObjectDepth(models::bookContext, lightVP2, glm::mat4());
 
 	glBindFramebuffer(GL_FRAMEBUFFER, 0);
 	glViewport(0, 0, WIDTH, HEIGHT);
@@ -1002,11 +1034,7 @@ void renderScene(GLFWwindow* window)
 	//	glm::translate(cameraPos + 1.5 * cameraDir + cameraUp * -0.5f) * inveseCameraRotrationMatrix * glm::eulerAngleY(glm::pi<float>()),
 	//	glm::vec3(0.3, 0.3, 0.5)
 	//	);
-	drawObjectPBR(shipContext,
+	
-		glm::translate(spaceshipPos) * specshipCameraRotrationMatrix * glm::eulerAngleY(glm::pi<float>()) * glm::scale(glm::vec3(0.03f)),
-		glm::vec3(0.3, 0.3, 0.3),
-		0.2, 1.0
-	);
 
 	spotlightPos = spaceshipPos + 0.2 * spaceshipDir;
 	spotlightConeDir = spaceshipDir;
@@ -1022,6 +1050,8 @@ void renderScene(GLFWwindow* window)
 	drawObjectTex(models::pillow3Context, glm::mat4(), 0.5, 0, texture::pillow3);
 	drawObjectTex(models::fanContext, glm::mat4(), 0.1, 0.2, texture::panels_albedo);
 	drawObjectTex(models::fanTopContext, glm::mat4() * rotate, 0.1, 0.2, texture::panels_albedo);
+	drawObjectTex(models::painting1Context, glm::mat4(), 0.5, 0.3, texture::painting1);
+	drawObjectTex(models::painting2Context, glm::mat4(), 0.5, 0.3, texture::painting2);
 
 	glUseProgram(programTexPBR);
 	drawObjectTexPBR(models::tableContext, glm::mat4(), texture::table_roughness, texture::table_metallic, texture::table_albedo, texture::table_normal, texture::table_ao);
@@ -1044,8 +1074,12 @@ void renderScene(GLFWwindow* window)
 	drawObjectTexPBR(models::cactusContext, glm::mat4(), texture::cactus_roughness, texture::cactus_metallic, texture::cactus_albedo, texture::cactus_normal, texture::cactus_ao);
 	drawObjectTexPBR(models::books1Context, glm::mat4(), texture::books_roughness, texture::books_metallic, texture::books_albedo, texture::books_normal, texture::books_ao);
 	drawObjectTexPBR(models::books2Context, glm::mat4(), texture::books_roughness, texture::books_metallic, texture::books_albedo, texture::books_normal, texture::books_ao);
-
+	drawObjectTexPBR(models::mug2Context, glm::mat4(), texture::mug2_roughness, texture::mug2_metallic, texture::mug2_albedo, texture::mug2_normal, texture::mug2_ao);
-
+	drawObjectTexPBR(models::bookContext, glm::mat4(), texture::book_roughness, texture::book_metallic, texture::book_albedo, texture::book_normal, texture::book_ao);
+	drawObjectTexPBR(shipContext,
+		glm::translate(spaceshipPos) * specshipCameraRotrationMatrix * glm::eulerAngleY(glm::pi<float>()) * glm::scale(glm::vec3(0.03f)),
+		texture::spray_roughness, texture::spray_metallic, texture::spray_albedo, texture::spray_normal, texture::spray_ao
+	);
 
 	glUseProgram(programTexPBR_ARM);
 	//drawObjectTexPBR_ARM(models::chairContext, glm::mat4(), texture::rock_albedo, texture::rock_normal, texture::rock_arm);
@@ -1263,11 +1297,32 @@ void init(GLFWwindow* window)
 	texture::pillow2 = Core::LoadTexture("textures/pillow/white.png");
 	texture::pillow3 = Core::LoadTexture("textures/pillow/yellow.png");
 
+	texture::painting1 = Core::LoadTexture("textures/painting1.png");
+	texture::painting2 = Core::LoadTexture("textures/painting2.png");
+
+	texture::mug2_albedo = Core::LoadTexture("textures/mug2/albedo.png");
+	texture::mug2_metallic = Core::LoadTexture("textures/mug2/metallic.png");
+	texture::mug2_roughness = Core::LoadTexture("textures/mug2/roughness.png");
+	texture::mug2_ao = Core::LoadTexture("textures/mug2/ao.png");
+	texture::mug2_normal = Core::LoadTexture("textures/mug2/normal.png");
+
+	texture::book_albedo = Core::LoadTexture("textures/book/albedo.png");
+	texture::book_metallic = Core::LoadTexture("textures/book/metallic.png");
+	texture::book_roughness = Core::LoadTexture("textures/book/roughness.png");
+	texture::book_ao = Core::LoadTexture("textures/book/ao.png");
+	texture::book_normal = Core::LoadTexture("textures/book/normal.png");
+
+	texture::spray_albedo = Core::LoadTexture("textures/spray/albedo.png");
+	texture::spray_metallic = Core::LoadTexture("textures/spray/metallic.png");
+	texture::spray_roughness = Core::LoadTexture("textures/spray/roughness.png");
+	texture::spray_ao = Core::LoadTexture("textures/spray/ao.png");
+	texture::spray_normal = Core::LoadTexture("textures/spray/normal.png");
+
 
 	texture::metal = Core::LoadTexture("textures/metal.png");
 	loadModelToContext("models/bubble.obj", bubbleContext, false);
 	loadModelToContext("./models/sphere.obj", sphereContext, false);
-	loadModelToContext("./models/spaceship.obj", shipContext, false);
+	loadModelToContext("./models/spray.obj", shipContext, false);
 	//loadModelToContext("./models/bed.obj", models::bedContext, true);
 	//loadModelToContext("./models/chair.obj", models::chairContext, true);
 	loadModelToContext("./models/desk.obj", models::deskContext, true);
@@ -1283,14 +1338,14 @@ void init(GLFWwindow* window)
 	//loadModelToContext("./models/window.obj", models::windowContext, true);
 	loadModelToContext("./models/test.obj", models::testContext, false);
 	loadModelToContext("./models/cube.obj", models::cubeContext, false);
-	loadModelToContext("./models/tab.obj", models::tableContext, false);
+	loadModelToContext("./models/tab.obj", models::tableContext, true);
 	loadModelToContext("./models/wall.obj", models::wallContext, false);
 	loadModelToContext("./models/roof.obj", models::roofContext, false);
-	loadModelToContext("./models/window.obj", models::windowContext, true);
+	loadModelToContext("./models/window.obj", models::windowContext, false);
 	loadModelToContext("./models/ground.obj", models::floorContext, false);
 	loadModelToContext("./models/ground_001.obj", models::ceilingContext, false);
 	loadModelToContext("./models/bed_frame.obj", models::bedContext, true);
-	loadModelToContext("./models/bed_mattress.obj", models::mattressContext, true);
+	loadModelToContext("./models/bed_mattress.obj", models::mattressContext, false);
 	loadModelToContext("./models/bed_pillow.obj", models::bed_pillowContext, false);
 	loadModelToContext("./models/paplan.obj", models::blanketContext, false);
 
@@ -1305,7 +1360,7 @@ void init(GLFWwindow* window)
 	loadModelToContext("./models/potted_plant_04.obj", models::plantContext, false);
 	loadModelToContext("./models/modern_coffee_table_01.obj", models::c_tableContext, false);
 	loadModelToContext("./models/20848_Folding_Screen_v3.obj", models::foldingContext, true);
-	loadModelToContext("./models/Foot_Rest_001.obj", models::couchContext, false);
+	loadModelToContext("./models/Foot_Rest_001.obj", models::couchContext, true);
 	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, false);
@@ -1326,7 +1381,10 @@ void init(GLFWwindow* window)
 	loadModelToContext("./models/pillow1.obj", models::pillow1Context, false);
 	loadModelToContext("./models/pillow2.obj", models::pillow2Context, false);
 	loadModelToContext("./models/pillow3.obj", models::pillow3Context, false);
-
+	loadModelToContext("./models/painting1.obj", models::painting1Context, false);
+	loadModelToContext("./models/painting2.obj", models::painting2Context, false);
+	loadModelToContext("./models/mug2.obj", models::mug2Context, false);
+	loadModelToContext("./models/book.obj", models::bookContext, false);
 
 
 	collisionSystem.calculateSceneBounding();
@@ -1375,15 +1433,15 @@ void processInput(GLFWwindow* window)
 		spaceshipDir = glm::vec3(glm::eulerAngleY(-angleSpeed) * glm::vec4(spaceshipDir, 0));
 	if (glfwGetKey(window, GLFW_KEY_H) == GLFW_PRESS) {
 		texture::screen = Core::LoadTexture("textures/main.jpg");
-		PlaySound(TEXT("sound/main.wav"), NULL, SND_ASYNC);
+		PlaySound(TEXT("sound/main.wav"), NULL, SND_ASYNC | SND_LOOP);
 	}
 	if (glfwGetKey(window, GLFW_KEY_J) == GLFW_PRESS) {
 		texture::screen = Core::LoadTexture("textures/heroes.jpg");
-		PlaySound(TEXT("sound/grass.wav"), NULL, SND_ASYNC);
+		PlaySound(TEXT("sound/grass.wav"), NULL, SND_ASYNC | SND_LOOP);
 	}
 	if (glfwGetKey(window, GLFW_KEY_K) == GLFW_PRESS) {
 		texture::screen = Core::LoadTexture("textures/necro.png");
-		PlaySound(TEXT("sound/necro.wav"), NULL, SND_ASYNC);
+		PlaySound(TEXT("sound/necro.wav"), NULL, SND_ASYNC | SND_LOOP);
 	}
 	if (glfwGetKey(window, GLFW_KEY_L) == GLFW_PRESS) {
 		texture::screen = Core::LoadTexture("textures/visual.png");