PulseStudio/VoxelEngine
PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'main' of https://github.com/MihailRis/VoxelEngine-Cpp

Browse Source
This commit is contained in:
@clasher113 2023-11-28 11:57:20 +02:00
commit 805f203f22
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/frontend/graphics/Skybox.cpp
View File

@ -86,7 +86,7 @@ void Skybox::refresh(float t, float mie, uint quality) {
shader->uniform1i("u_quality", quality); shader->uniform1i("u_quality", quality);
shader->uniform1f("u_mie", mie); shader->uniform1f("u_mie", mie);
shader->uniform3f("u_lightDir", glm::normalize(vec3(sin(t), -cos(t), 0.7f))); shader->uniform3f("u_lightDir", glm::normalize(vec3(sin(t), -cos(t), -0.7f)));
for (uint face = 0; face < 6; face++) { for (uint face = 0; face < 6; face++) {
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_CUBE_MAP_POSITIVE_X + face, cubemap, 0); glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_CUBE_MAP_POSITIVE_X + face, cubemap, 0);
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);

8
src/window/Window.cpp
View File

@ -178,7 +178,9 @@ void Window::pushScissor(vec4 area) {
if (area.z < 0.0f || area.w < 0.0f) { if (area.z < 0.0f || area.w < 0.0f) {
glScissor(0, 0, 0, 0); glScissor(0, 0, 0, 0);
} else { } else {
glScissor(area.x, Window::height-area.w, area.z-area.x, area.w-area.y); glScissor(area.x, Window::height-area.w,
std::max(0, int(area.z-area.x)),
std::max(0, int(area.w-area.y)));
} }
scissorArea = area; scissorArea = area;
} }
@ -193,7 +195,9 @@ void Window::popScissor() {
if (area.z < 0.0f || area.w < 0.0f) { if (area.z < 0.0f || area.w < 0.0f) {
glScissor(0, 0, 0, 0); glScissor(0, 0, 0, 0);
} else { } else {
glScissor(area.x, Window::height-area.w, area.z-area.x, area.w-area.y); glScissor(area.x, Window::height-area.w,
std::max(0, int(area.z-area.x)),
std::max(0, int(area.w-area.y)));
} }
if (scissorStack.empty()) { if (scissorStack.empty()) {
glDisable(GL_SCISSOR_TEST); glDisable(GL_SCISSOR_TEST);