s464965/GRK_Room
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix resize

Browse Source
This commit is contained in:
Anna Śmigiel 2023-02-07 21:14:43 +01:00
parent 27e912bcbd
commit 158c48f703
9 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vs/grk-project/v16/.suo
View File

Binary file not shown.

BIN
Release/room.exe
View File

Binary file not shown.

BIN
Release/room.pdb
View File

Binary file not shown.

8
cw 9/Release/grk-cw9.log
View File

@ -31,11 +31,11 @@ C:\Users\annas\Desktop\graf\cw 9\src\room.hpp(525,59): warning C4305: "argument"
] ]
C:\Users\annas\Desktop\graf\cw 9\src\room.hpp(526,37): warning C4305: "argument": obcięcie z "double" do "float" C:\Users\annas\Desktop\graf\cw 9\src\room.hpp(526,37): warning C4305: "argument": obcięcie z "double" do "float"
C:\Users\annas\Desktop\graf\cw 9\src\room.hpp(559,2): warning C4305: "argument": obcięcie z "double" do "float" C:\Users\annas\Desktop\graf\cw 9\src\room.hpp(559,2): warning C4305: "argument": obcięcie z "double" do "float"
C:\Users\annas\Desktop\graf\cw 9\src\room.hpp(684,21): warning C4305: "-=": obcięcie z "double" do "float" C:\Users\annas\Desktop\graf\cw 9\src\room.hpp(687,21): warning C4305: "-=": obcięcie z "double" do "float"
C:\Users\annas\Desktop\graf\cw 9\src\room.hpp(686,21): warning C4305: "+=": obcięcie z "double" do "float" C:\Users\annas\Desktop\graf\cw 9\src\room.hpp(689,21): warning C4305: "+=": obcięcie z "double" do "float"
Trwa generowanie kodu Trwa generowanie kodu
3 of 595 functions ( 0.5%) were compiled, the rest were copied from previous compilation. 2 of 595 functions ( 0.3%) were compiled, the rest were copied from previous compilation.
0 functions were new in current compilation 0 functions were new in current compilation
7 functions had inline decision re-evaluated but remain unchanged 6 functions had inline decision re-evaluated but remain unchanged
Zakończono generowanie kodu Zakończono generowanie kodu
grk-cw9.vcxproj -> C:\Users\annas\Desktop\graf\Release\room.exe grk-cw9.vcxproj -> C:\Users\annas\Desktop\graf\Release\room.exe

BIN
cw 9/Release/main.obj
View File

Binary file not shown.

BIN
cw 9/Release/room.iobj
View File

Binary file not shown.

BIN
cw 9/Release/room.ipdb
View File

Binary file not shown.

BIN
cw 9/Release/vc142.pdb
View File

Binary file not shown.

5
cw 9/src/room.hpp
View File

@ -220,7 +220,7 @@ void drawObjectDepth(Core::RenderContext& context, glm::mat4 viewProjection, glm
// glm::mat4 transformation = viewProjectionMatrix * modelMatrix; // glm::mat4 transformation = viewProjectionMatrix * modelMatrix;
// glUniformMatrix4fv(glGetUniformLocation(programSkybox, "transformation"), 1, GL_FALSE, (float*)&transformation); // glUniformMatrix4fv(glGetUniformLocation(programSkybox, "transformation"), 1, GL_FALSE, (float*)&transformation);
// glUniform1i(glGetUniformLocation(programSkybox, "skybox"), 10); // glUniform1i(glGetUniformLocation(programSkybox, "skybox"), 10);
// //Core::SetActiveTexture(texture::cubemapTexture, "skybox", programSkybox, 10); // Core::SetActiveTexture(texture::cubemapTexture, "skybox", programSkybox, 0);
// glUniform1f(glGetUniformLocation(programSkybox, "exposition"), exposition); // glUniform1f(glGetUniformLocation(programSkybox, "exposition"), exposition);
// Core::DrawContext(context); // Core::DrawContext(context);
// glEnable(GL_DEPTH_TEST); // glEnable(GL_DEPTH_TEST);
@ -585,6 +585,9 @@ void framebuffer_size_callback(GLFWwindow* window, int width, int height)
glViewport(0, 0, width, height); glViewport(0, 0, width, height);
WIDTH = width; WIDTH = width;
HEIGHT = height; HEIGHT = height;
initBloom();
initPingPong();
} }
void loadModelToContext(std::string path, Core::RenderContext& context) void loadModelToContext(std::string path, Core::RenderContext& context)