diff --git a/Release/grk-cw9.exe b/Release/grk-cw9.exe index 19147a3..ef42c81 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 a9e3c6c..9fb76d5 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 ff08e0b..34d9c56 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 92b2d6f..9208e34 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 1f4596e..444ed22 100644 --- a/cw 9/Release/grk-cw9.log +++ b/cw 9/Release/grk-cw9.log @@ -60,25 +60,25 @@ C:\Users\jedrz\Desktop\g\GRK_Project\cw 9\src\ex_9_1.hpp(986,87): warning C4305: 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(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" +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(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(1115,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(1411,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(1412,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(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" +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(1431,21): warning C4305: "+=": obcięcie z "double" do "float" Trwa generowanie kodu - 89 of 713 functions (12.5%) were compiled, the rest were copied from previous compilation. + 2 of 713 functions ( 0.3%) were compiled, the rest were copied from previous compilation. 0 functions were new in current compilation - 13 functions had inline decision re-evaluated but remain unchanged + 9 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 6c8900a..3a76307 100644 Binary files a/cw 9/Release/main.obj and b/cw 9/Release/main.obj differ diff --git a/cw 9/src/ex_9_1.hpp b/cw 9/src/ex_9_1.hpp index ff77d46..a743eaf 100644 --- a/cw 9/src/ex_9_1.hpp +++ b/cw 9/src/ex_9_1.hpp @@ -623,7 +623,7 @@ void renderShadowapSun(float angle) { glClear(GL_DEPTH_BUFFER_BIT); //ustawianie programu glUseProgram(programDepth); - + glm::mat4 p1 = glm::translate(glm::mat4(), -glm::vec3(-2.103f, 1.0699f, -2.3338f)); glm::mat4 p2 = glm::translate(glm::mat4(), glm::vec3(-2.103f, 1.0699f, -2.3338f)); glm::mat4 rotate = p2 * glm::rotate(glm::mat4(), glm::radians(angle * speed), glm::vec3(1, 0, 0)) * p1; @@ -984,8 +984,8 @@ void renderScene(GLFWwindow* window) glm::mat4 transform(1.0f); //transform = glm::rotate(glm::mat4(), angle, glm::vec3(1.0f, 0.0f, 0.0f)); 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::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))); @@ -1004,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(1, 1, 1), + glm::vec3(0.3, 0.3, 0.3), 0.2, 1.0 ); @@ -1020,7 +1020,8 @@ void renderScene(GLFWwindow* window) 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); - + 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); glUseProgram(programTexPBR); drawObjectTexPBR(models::tableContext, glm::mat4(), texture::table_roughness, texture::table_metallic, texture::table_albedo, texture::table_normal, texture::table_ao);