diff --git a/Release/grk-cw9.exe b/Release/grk-cw9.exe index 4cf0a24..19147a3 100644 Binary files a/Release/grk-cw9.exe and b/Release/grk-cw9.exe differ diff --git a/Release/grk-cw9.pdb b/Release/grk-cw9.pdb index 2a2453a..a9e3c6c 100644 Binary files a/Release/grk-cw9.pdb and b/Release/grk-cw9.pdb differ diff --git a/cw 9/Release/grk-cw9.iobj b/cw 9/Release/grk-cw9.iobj index c0a0aee..ff08e0b 100644 Binary files a/cw 9/Release/grk-cw9.iobj and b/cw 9/Release/grk-cw9.iobj differ diff --git a/cw 9/Release/grk-cw9.ipdb b/cw 9/Release/grk-cw9.ipdb index 9a03267..92b2d6f 100644 Binary files a/cw 9/Release/grk-cw9.ipdb and b/cw 9/Release/grk-cw9.ipdb differ diff --git a/cw 9/Release/grk-cw9.log b/cw 9/Release/grk-cw9.log index 36dd9d3..1f4596e 100644 --- a/cw 9/Release/grk-cw9.log +++ b/cw 9/Release/grk-cw9.log @@ -9,75 +9,76 @@ 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(302,30): warning C4305: "inicjowanie": obcięcie z "double" do "float" -C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(319,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(344,38): warning C4305: "=": obcięcie z "double" do "float" -C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(373,16): warning C4305: "inicjowanie": obcięcie z "double" do "float" -C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(578,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(586,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(586,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(601,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(619,98): warning C4305: "argument": obcięcie z "double" do "T" +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(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(356,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(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(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(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(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(631,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(622,68): warning C4305: "argument": obcięcie z "double" do "T" +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" with [ T=float ] -C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(657,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(671,99): warning C4305: "argument": obcięcie z "double" do "T" +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(687,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(674,69): warning C4305: "argument": obcięcie z "double" do "T" +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" with [ T=float ] -C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(770,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(771,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(772,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(775,31): warning C4305: "inicjowanie": obcięcie z "double" do "float" -C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(776,25): warning C4305: "inicjowanie": obcięcie z "double" do "float" -C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(832,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(833,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(834,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(837,31): warning C4305: "inicjowanie": obcięcie z "double" do "float" -C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(838,25): warning C4305: "inicjowanie": obcięcie z "double" do "float" -C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(944,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(957,108): warning C4305: "argument": obcięcie z "double" do "T" +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(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(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(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(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(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(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(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(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(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(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(977,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(966,87): warning C4305: "argument": obcięcie z "double" do "T" +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" with [ T=float ] -C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(966,223): warning C4305: "argument": obcięcie z "double" do "float" -C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(967,86): warning C4305: "argument": obcięcie z "double" do "float" -C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(968,96): warning C4305: "argument": obcięcie z "double" do "float" -C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(988,2): warning C4305: "argument": obcięcie z "double" do "float" -C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(1088,108): warning C4305: "argument": obcięcie z "double" do "T" +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(987,86): warning C4305: "argument": obcięcie z "double" do "float" +C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(988,96): 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(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(1114,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(1371,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(1411,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(1388,21): warning C4305: "-=": obcięcie z "double" do "float" -C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(1390,21): warning C4305: "+=": obcięcie z "double" do "float" +C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(1428,21): warning C4305: "-=": obcięcie z "double" do "float" +C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(1430,21): warning C4305: "+=": obcięcie z "double" do "float" Trwa generowanie kodu - 2 of 705 functions ( 0.3%) were compiled, the rest were copied from previous compilation. + 89 of 713 functions (12.5%) were compiled, the rest were copied from previous compilation. 0 functions were new in current compilation - 8 functions had inline decision re-evaluated but remain unchanged + 13 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 diff --git a/cw 9/Release/main.obj b/cw 9/Release/main.obj index dea5e7e..6c8900a 100644 Binary files a/cw 9/Release/main.obj and b/cw 9/Release/main.obj differ diff --git a/cw 9/shaders/shader_9_1.frag b/cw 9/shaders/shader_9_1.frag index 76aa573..49b6abe 100644 --- a/cw 9/shaders/shader_9_1.frag +++ b/cw 9/shaders/shader_9_1.frag @@ -1,6 +1,6 @@ #version 430 core -float AMBIENT = 0.03; +float AMBIENT = 0.5; float PI = 3.14; uniform sampler2D depthMap; diff --git a/cw 9/shaders/shader_tex.frag b/cw 9/shaders/shader_tex.frag index 0b9b88c..e3098fb 100644 --- a/cw 9/shaders/shader_tex.frag +++ b/cw 9/shaders/shader_tex.frag @@ -1,6 +1,6 @@ #version 430 core -float AMBIENT = 0.03; +float AMBIENT = 0.5; float PI = 3.14; uniform sampler2D depthMap; diff --git a/cw 9/shaders/shader_tex_pbr.frag b/cw 9/shaders/shader_tex_pbr.frag index ae5561e..305f6d1 100644 --- a/cw 9/shaders/shader_tex_pbr.frag +++ b/cw 9/shaders/shader_tex_pbr.frag @@ -1,6 +1,6 @@ #version 430 core -float AMBIENT = 0.03; +float AMBIENT = 0.5; float PI = 3.14; @@ -151,8 +151,8 @@ void main() vec3 lightDir = normalize(lightDirTS); //vec3 lightDir = normalize(lightPos-worldPos); - - vec3 ambient = texture2D(aoTexture, vecTex).xyz*color; + vec3 ao = texture2D(aoTexture, vecTex).xyz; + vec3 ambient = AMBIENT*ao*color; vec3 attenuatedlightColor = lightColor/pow(length(lightPos-worldPos),2); vec3 ilumination; ilumination = ambient+PBRLight(lightDir,attenuatedlightColor,normal,viewDir); diff --git a/cw 9/shaders/shader_tex_pbr_arm.frag b/cw 9/shaders/shader_tex_pbr_arm.frag index bf8dfbf..46c925c 100644 --- a/cw 9/shaders/shader_tex_pbr_arm.frag +++ b/cw 9/shaders/shader_tex_pbr_arm.frag @@ -1,6 +1,6 @@ #version 430 core -float AMBIENT = 0.03; +float AMBIENT = 0.5; float PI = 3.14; @@ -149,8 +149,8 @@ void main() vec3 lightDir = normalize(lightDirTS); //vec3 lightDir = normalize(lightPos-worldPos); - - vec3 ambient = texture2D(armTexture, vecTex).x*color; + float ao = texture2D(armTexture, vecTex).x; + vec3 ambient = AMBIENT*ao*color; vec3 attenuatedlightColor = lightColor/pow(length(lightPos-worldPos),2); vec3 ilumination; ilumination = ambient+PBRLight(lightDir,attenuatedlightColor,normal,viewDir); diff --git a/cw 9/src/ex_9_1.hpp b/cw 9/src/ex_9_1.hpp index daee783..ff77d46 100644 --- a/cw 9/src/ex_9_1.hpp +++ b/cw 9/src/ex_9_1.hpp @@ -80,6 +80,14 @@ namespace models { Core::RenderContext cactusContext; Core::RenderContext fanContext; Core::RenderContext fanTopContext; + Core::RenderContext colission1Context; + Core::RenderContext colission2Context; + Core::RenderContext colission3Context; + Core::RenderContext colission4Context; + Core::RenderContext handleContext; + Core::RenderContext pillow1Context; + Core::RenderContext pillow2Context; + Core::RenderContext pillow3Context; } std::vector faces = { @@ -227,6 +235,10 @@ namespace texture { GLuint cactus_normal; GLuint metal; + GLuint pillow1; + GLuint pillow2; + GLuint pillow3; + } GLuint depthMapFBO; @@ -649,6 +661,10 @@ void renderShadowapSun(float angle) { drawObjectDepth(models::fanContext, lightVP,glm::mat4()); drawObjectDepth(models::fanTopContext, lightVP, glm::mat4()*rotate); drawObjectDepth(models::tableContext, lightVP, glm::mat4()); + drawObjectDepth(models::handleContext, lightVP, glm::mat4()); + drawObjectDepth(models::pillow1Context, lightVP, glm::mat4()); + drawObjectDepth(models::pillow2Context, lightVP, glm::mat4()); + drawObjectDepth(models::pillow3Context, lightVP, glm::mat4()); glBindFramebuffer(GL_FRAMEBUFFER, 0); glViewport(0, 0, WIDTH, HEIGHT); } @@ -701,6 +717,10 @@ void renderShadowapSun2() { drawObjectDepth(models::fanContext, lightVP2, glm::mat4()); drawObjectDepth(models::fanTopContext, lightVP2, glm::mat4()); drawObjectDepth(models::tableContext, lightVP2, glm::mat4()); + drawObjectDepth(models::handleContext, lightVP, glm::mat4()); + drawObjectDepth(models::pillow1Context, lightVP2, glm::mat4()); + drawObjectDepth(models::pillow2Context, lightVP2, glm::mat4()); + drawObjectDepth(models::pillow3Context, lightVP2, glm::mat4()); glBindFramebuffer(GL_FRAMEBUFFER, 0); @@ -966,6 +986,7 @@ void renderScene(GLFWwindow* window) drawObjectPBR(sphereContext, glm::translate(pointlightPos) * glm::scale(glm::vec3(0.1)) * glm::eulerAngleY(time / 3) * glm::translate(glm::vec3(4.f, 0, 0)) * glm::scale(glm::vec3(0.3f)), glm::vec3(0.2, 0.7, 0.3), 0.3, 0.0); drawObjectPBR(models::fanContext, glm::mat4(), glm::vec3(0.01, 0.01, 0.01), 0.1, 0.2); drawObjectPBR(models::fanTopContext, glm::mat4()*rotate, glm::vec3(0.01, 0.01, 0.01), 0.1, 0.2); + drawObjectPBR(models::ceilingContext, glm::mat4(), glm::vec3(1,1,1), 0.5, 0); 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)); @@ -983,7 +1004,7 @@ void renderScene(GLFWwindow* window) // ); drawObjectPBR(shipContext, glm::translate(spaceshipPos) * specshipCameraRotrationMatrix * glm::eulerAngleY(glm::pi()) * glm::scale(glm::vec3(0.03f)), - glm::vec3(0.3, 0.3, 0.5), + glm::vec3(1, 1, 1), 0.2, 1.0 ); @@ -995,6 +1016,11 @@ void renderScene(GLFWwindow* window) //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); + drawObjectTex(models::handleContext, glm::mat4(), 0, 0.2, texture::rust); + drawObjectTex(models::pillow1Context, glm::mat4(), 0.5, 0, texture::pillow1); + drawObjectTex(models::pillow2Context, glm::mat4(), 0.5, 0, texture::pillow2); + drawObjectTex(models::pillow3Context, glm::mat4(), 0.5, 0, texture::pillow3); + glUseProgram(programTexPBR); drawObjectTexPBR(models::tableContext, glm::mat4(), texture::table_roughness, texture::table_metallic, texture::table_albedo, texture::table_normal, texture::table_ao); @@ -1163,11 +1189,11 @@ void init(GLFWwindow* window) 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::white_paint_albedo = Core::LoadTexture("textures/white_wall/albedo.png"); + texture::white_paint_metallic = Core::LoadTexture("textures/white_wall/metallic.png"); + texture::white_paint_roughness = Core::LoadTexture("textures/white_wall/roughness.png"); + texture::white_paint_ao = Core::LoadTexture("textures/white_wall/ao.png"); + texture::white_paint_normal = Core::LoadTexture("textures/white_wall/normal.png"); texture::drawer_albedo = Core::LoadTexture("textures/drawer/albedo.png"); texture::drawer_arm = Core::LoadTexture("textures/drawer/arm.png"); @@ -1232,6 +1258,10 @@ void init(GLFWwindow* window) texture::cactus_roughness = Core::LoadTexture("textures/cactus/roughness.png"); texture::cactus_ao = Core::LoadTexture("textures/cactus/ao.png"); texture::cactus_normal = Core::LoadTexture("textures/cactus/normal.png"); + texture::pillow1 = Core::LoadTexture("textures/pillow/black.png"); + texture::pillow2 = Core::LoadTexture("textures/pillow/white.png"); + texture::pillow3 = Core::LoadTexture("textures/pillow/yellow.png"); + texture::metal = Core::LoadTexture("textures/metal.png"); loadModelToContext("models/bubble.obj", bubbleContext, false); @@ -1287,6 +1317,16 @@ void init(GLFWwindow* window) loadModelToContext("./models/books2.obj", models::books2Context, false); loadModelToContext("./models/fan.obj", models::fanContext, false); loadModelToContext("./models/fan_top.obj", models::fanTopContext, false); + loadModelToContext("./models/colission1.obj", models::colission1Context, true); + loadModelToContext("./models/colission2.obj", models::colission2Context, true); + loadModelToContext("./models/colission3.obj", models::colission3Context, true); + loadModelToContext("./models/colission4.obj", models::colission4Context, true); + loadModelToContext("./models/handle.obj", models::handleContext, false); + loadModelToContext("./models/pillow1.obj", models::pillow1Context, false); + loadModelToContext("./models/pillow2.obj", models::pillow2Context, false); + loadModelToContext("./models/pillow3.obj", models::pillow3Context, false); + + collisionSystem.calculateSceneBounding(); diff --git a/cw 9/textures/panels_ao.png b/cw 9/textures/panels_ao.png index 9192488..a3fe407 100644 Binary files a/cw 9/textures/panels_ao.png and b/cw 9/textures/panels_ao.png differ diff --git a/cw 9/textures/pillow/black.png b/cw 9/textures/pillow/black.png new file mode 100644 index 0000000..a5e519e Binary files /dev/null and b/cw 9/textures/pillow/black.png differ diff --git a/cw 9/textures/pillow/white.png b/cw 9/textures/pillow/white.png new file mode 100644 index 0000000..7d8611b Binary files /dev/null and b/cw 9/textures/pillow/white.png differ diff --git a/cw 9/textures/pillow/yellow.png b/cw 9/textures/pillow/yellow.png new file mode 100644 index 0000000..ffef594 Binary files /dev/null and b/cw 9/textures/pillow/yellow.png differ diff --git a/cw 9/textures/white_wall/4K-wallpaper_41_height.png b/cw 9/textures/white_wall/4K-wallpaper_41_height.png new file mode 100644 index 0000000..93d5182 Binary files /dev/null and b/cw 9/textures/white_wall/4K-wallpaper_41_height.png differ diff --git a/cw 9/textures/white_wall/albedo.png b/cw 9/textures/white_wall/albedo.png new file mode 100644 index 0000000..3cbd876 Binary files /dev/null and b/cw 9/textures/white_wall/albedo.png differ diff --git a/cw 9/textures/white_wall/ao.png b/cw 9/textures/white_wall/ao.png new file mode 100644 index 0000000..66761d4 Binary files /dev/null and b/cw 9/textures/white_wall/ao.png differ diff --git a/cw 9/textures/white_wall/metallic.png b/cw 9/textures/white_wall/metallic.png new file mode 100644 index 0000000..dd4bed6 Binary files /dev/null and b/cw 9/textures/white_wall/metallic.png differ diff --git a/cw 9/textures/white_wall/normal.png b/cw 9/textures/white_wall/normal.png new file mode 100644 index 0000000..3199a6e Binary files /dev/null and b/cw 9/textures/white_wall/normal.png differ diff --git a/cw 9/textures/white_wall/roughness.png b/cw 9/textures/white_wall/roughness.png new file mode 100644 index 0000000..9b28a9e Binary files /dev/null and b/cw 9/textures/white_wall/roughness.png differ