mirror/openlara
1
0
Fork 0
mirror of https://github.com/XProger/OpenLara.git synced 2025-08-11 23:54:09 +02:00
Code Issues Releases Wiki Activity

fix shadow shader and ambient factors for pickups

Browse Source
This commit is contained in:
XProger
2019-05-25 06:56:40 +03:00
parent b5e54e3a39
commit 34920ccec8
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/level.h
View File

@@ -1961,12 +1961,21 @@ struct Level : IGame {
memcpy(controller->ambient, cube.colors, sizeof(cube.colors)); // store last calculated ambient into controller memcpy(controller->ambient, cube.colors, sizeof(cube.colors)); // store last calculated ambient into controller
} }
} else { } else {
controller->ambient[0] = if (entity.isPickup()) {
controller->ambient[1] = controller->ambient[0] =
controller->ambient[2] = controller->ambient[1] =
controller->ambient[3] = controller->ambient[5] =
controller->ambient[4] = controller->ambient[4] = vec4(Core::active.material.y * 0.8f);
controller->ambient[5] = vec4(Core::active.material.y); controller->ambient[2] = vec4(Core::active.material.y * 0.1f);
controller->ambient[3] = vec4(Core::active.material.y);
} else {
controller->ambient[0] =
controller->ambient[1] =
controller->ambient[2] =
controller->ambient[3] =
controller->ambient[4] =
controller->ambient[5] = vec4(Core::active.material.y);
}
} }
Core::active.shader->setParam(uAmbient, controller->ambient[0], 6); Core::active.shader->setParam(uAmbient, controller->ambient[0], 6);
} }

2
src/shaders/compose.glsl
View File

@@ -13,7 +13,7 @@ R"====(
#endif #endif
#ifdef OPT_SHADOW #ifdef OPT_SHADOW
#define SHADOW_TEXEL vec3(1.0 / 1024.0, 1.0 / 1024.0, 0.0) #define SHADOW_TEXEL vec3(1.0 / 2048.0, 1.0 / 2048.0, 0.0)
uniform mat4 uLightProj; uniform mat4 uLightProj;
#ifdef OPT_VLIGHTPROJ #ifdef OPT_VLIGHTPROJ