diff --git a/.vs/grk-project/v16/.suo b/.vs/grk-project/v16/.suo index ab3cbc1..daa160c 100644 Binary files a/.vs/grk-project/v16/.suo and b/.vs/grk-project/v16/.suo differ diff --git a/.vs/grk-project/v16/Browse.VC.db b/.vs/grk-project/v16/Browse.VC.db index 55e27af..eb1f87f 100644 Binary files a/.vs/grk-project/v16/Browse.VC.db and b/.vs/grk-project/v16/Browse.VC.db differ diff --git a/Debug/room.exe b/Debug/room.exe index 109927e..d5fd1a2 100644 Binary files a/Debug/room.exe and b/Debug/room.exe differ diff --git a/Debug/room.pdb b/Debug/room.pdb index fa733d7..1020a9a 100644 Binary files a/Debug/room.pdb and b/Debug/room.pdb differ diff --git a/cw 9/Debug/grk-cw9.log b/cw 9/Debug/grk-cw9.log index 432a4b4..cc7ecc4 100644 --- a/cw 9/Debug/grk-cw9.log +++ b/cw 9/Debug/grk-cw9.log @@ -2,32 +2,32 @@ 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\annas\Desktop\grafika_proj\GRK_Room\dependencies\glfw-3.3.8.bin.WIN32\include\GLFW\glfw3.h(123): message : zobacz poprzednią definicję „APIENTRY” -C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(175,30): warning C4305: "inicjowanie": obcięcie z "double" do "float" -C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(194,38): warning C4305: "=": obcięcie z "double" do "float" -C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(217,16): warning C4305: "inicjowanie": obcięcie z "double" do "float" -C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(236,16): warning C4305: "inicjowanie": obcięcie z "double" do "float" -C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(254,15): warning C4101: "textureID": lokalna zmienna, do której nie istnieje odwołanie -C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(342,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych -C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(348,96): warning C4305: "argument": obcięcie z "double" do "T" +C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(180,30): warning C4305: "inicjowanie": obcięcie z "double" do "float" +C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(199,38): warning C4305: "=": obcięcie z "double" do "float" +C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(222,16): warning C4305: "inicjowanie": obcięcie z "double" do "float" +C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(241,16): warning C4305: "inicjowanie": obcięcie z "double" do "float" +C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(259,15): warning C4101: "textureID": lokalna zmienna, do której nie istnieje odwołanie +C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(347,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych +C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(353,96): warning C4305: "argument": obcięcie z "double" do "T" with [ T=float ] -C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(351,59): warning C4305: "argument": obcięcie z "double" do "T" +C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(356,59): warning C4305: "argument": obcięcie z "double" do "T" with [ T=float ] -C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(500,29): warning C4018: "<": niezgodność typu ze znakiem/bez znaku -C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(525,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych -C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(539,109): warning C4305: "argument": obcięcie z "double" do "T" +C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(505,29): warning C4018: "<": niezgodność typu ze znakiem/bez znaku +C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(530,13): warning C4244: "inicjowanie": konwersja z "double" do "float", możliwa utrata danych +C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(544,109): warning C4305: "argument": obcięcie z "double" do "T" with [ T=float ] -C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(782,21): warning C4305: "-=": obcięcie z "double" do "float" -C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(784,21): warning C4305: "+=": obcięcie z "double" do "float" -C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(794,30): warning C4244: "=": konwersja z "double" do "float", możliwa utrata danych +C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(791,21): warning C4305: "-=": obcięcie z "double" do "float" +C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(793,21): warning C4305: "+=": obcięcie z "double" do "float" +C:\Users\annas\Desktop\grafika_proj\GRK_Room\cw 9\src\room.hpp(803,30): warning C4244: "=": konwersja z "double" do "float", możliwa utrata danych 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\annas\Desktop\grafika_proj\GRK_Room\Debug\room.exe diff --git a/cw 9/Debug/main.obj b/cw 9/Debug/main.obj index e3121fb..9533a35 100644 Binary files a/cw 9/Debug/main.obj and b/cw 9/Debug/main.obj differ diff --git a/cw 9/Debug/room.tlog/link.read.1.tlog b/cw 9/Debug/room.tlog/link.read.1.tlog index c9f84cd..9c199c7 100644 Binary files a/cw 9/Debug/room.tlog/link.read.1.tlog and b/cw 9/Debug/room.tlog/link.read.1.tlog differ diff --git a/cw 9/Debug/vc142.idb b/cw 9/Debug/vc142.idb index edcb286..ba29b8c 100644 Binary files a/cw 9/Debug/vc142.idb and b/cw 9/Debug/vc142.idb differ diff --git a/cw 9/Debug/vc142.pdb b/cw 9/Debug/vc142.pdb index 54ebbe2..efdf915 100644 Binary files a/cw 9/Debug/vc142.pdb and b/cw 9/Debug/vc142.pdb differ diff --git a/cw 9/src/room.hpp b/cw 9/src/room.hpp index 7667aa0..f537889 100644 --- a/cw 9/src/room.hpp +++ b/cw 9/src/room.hpp @@ -86,6 +86,11 @@ namespace texture { GLuint wallNorm; GLuint wallArm; + GLuint door; + GLuint doorNorm; + GLuint doorArm; + + GLuint wood3; GLuint woodNormal3; GLuint woodARM3; @@ -546,7 +551,7 @@ void renderScene(GLFWwindow* window) glUseProgram(program); drawObjectPBR(models::coffeeTableContext, glm::translate(glm::vec3(2.8f, 0, 0.5f)), texture::wood, texture::woodNormal, texture::woodARM); - drawObjectPBR(models::doorContext, glm::mat4(), texture::wood, texture::woodNormal, texture::woodARM); + drawObjectPBR(models::doorContext, glm::mat4(), texture::door, texture::doorNorm, texture::doorArm); drawObjectPBR(models::planeContext, glm::mat4(), texture::floor, texture::floorNormal, texture::floorARM); drawObjectPBR(models::roomContext, glm::mat4(), texture::wall, texture::wallNorm, texture::wallArm); //drawObjectPBR(models::roofContext, glm::mat4(), texture::roof, texture::roofNormal, texture::roofARM); @@ -702,6 +707,10 @@ void init(GLFWwindow* window) texture::redLeatherNormal = Core::LoadTexture("textures/leather/leather_red_03_nor_gl_4k.png"); texture::redLeatherARM = Core::LoadTexture("textures/leather/leather_red_03_arm_4k.png"); + texture::door = Core::LoadTexture("textures/door/door.jpg"); + texture::doorNorm = Core::LoadTexture("textures/door/door_norm.jpg"); + texture::doorArm = Core::LoadTexture("textures/door/door_arm.jpg"); + loadModelToContext("./models/sphere.obj", sphereContext); loadModelToContext("./models/cube.obj", cubeContext); diff --git a/cw 9/textures/door/door.jpg b/cw 9/textures/door/door.jpg new file mode 100644 index 0000000..23d1ef3 Binary files /dev/null and b/cw 9/textures/door/door.jpg differ diff --git a/cw 9/textures/door/door_arm.jpg b/cw 9/textures/door/door_arm.jpg new file mode 100644 index 0000000..897b556 Binary files /dev/null and b/cw 9/textures/door/door_arm.jpg differ diff --git a/cw 9/textures/door/door_norm.jpg b/cw 9/textures/door/door_norm.jpg new file mode 100644 index 0000000..6e64b18 Binary files /dev/null and b/cw 9/textures/door/door_norm.jpg differ