Backups/Eclipse-Shader
1
0
Fork 0
mirror of https://github.com/Merlin1809/Eclipse-Shader.git synced 2026-10-10 04:53:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix compile error with floodfill disabled

Browse Source
This commit is contained in:
Merlin1809
2026-03-24 21:05:44 +01:00
parent 16aae16745
commit 36e4906e1c
2 changed files with 37 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shaders/dimensions/composite2.fsh
+1 -1
View File
@@ -542,7 +542,7 @@ void main() {
FINAL_COLOR += flashLightReflection;
#endif
#if defined Hand_Held_lights && (defined IS_LPV_ENABLED || defined PHOTONICS)
#if defined Hand_Held_lights && defined IS_LPV_ENABLED
if(!hand && firstPersonCamera) {
if (heldItemId > 0){
vec3 shiftedViewPos = viewPos + vec3(-0.25, 0.2, 0.0);
shaders/lib/specular.glsl
+36 -34
View File
@@ -2455,48 +2455,50 @@ vec3 specularReflections(
specularReflections += flashLightReflection;
#endif
if(!isHand && firstPersonCamera) {
if (heldItemId > 0){
vec3 shiftedViewPos = viewPos + vec3(-0.25, 0.2, 0.0);
vec3 shiftedPlayerPos = mat3(gbufferModelViewInverse) * shiftedViewPos + gbufferModelViewInverse[3].xyz + (cameraPosition - previousCameraPosition);
#if defined Hand_Held_lights && defined IS_LPV_ENABLED
if(!isHand && firstPersonCamera) {
if (heldItemId > 0){
vec3 shiftedViewPos = viewPos + vec3(-0.25, 0.2, 0.0);
vec3 shiftedPlayerPos = mat3(gbufferModelViewInverse) * shiftedViewPos + gbufferModelViewInverse[3].xyz + (cameraPosition - previousCameraPosition);
float lightRange = 0.0;
vec3 handLightCol = GetHandLight(heldItemId, shiftedPlayerPos, lightRange);
float lightRange = 0.0;
vec3 handLightCol = GetHandLight(heldItemId, shiftedPlayerPos, lightRange);
if(lightRange > 0.0) {
vec3 handheldReflection1 = handLightCol * GGX(normal, -shiftedPlayerPos, -shiftedPlayerPos, roughness, reflectance, metalAlbedoTint);
specularReflections += handheldReflection1;
}
}
if(lightRange > 0.0) {
vec3 handheldReflection1 = handLightCol * GGX(normal, -shiftedPlayerPos, -shiftedPlayerPos, roughness, reflectance, metalAlbedoTint);
specularReflections += handheldReflection1;
}
}
if (heldItemId2 > 0){
vec3 shiftedViewPos = viewPos + vec3(0.25, 0.2, 0.0);
vec3 shiftedPlayerPos = mat3(gbufferModelViewInverse) * shiftedViewPos + gbufferModelViewInverse[3].xyz + (cameraPosition - previousCameraPosition);
if (heldItemId2 > 0){
vec3 shiftedViewPos = viewPos + vec3(0.25, 0.2, 0.0);
vec3 shiftedPlayerPos = mat3(gbufferModelViewInverse) * shiftedViewPos + gbufferModelViewInverse[3].xyz + (cameraPosition - previousCameraPosition);
float lightRange = 0.0;
vec3 handLightCol = GetHandLight(heldItemId2, shiftedPlayerPos, lightRange);
float lightRange = 0.0;
vec3 handLightCol = GetHandLight(heldItemId2, shiftedPlayerPos, lightRange);
if(lightRange > 0.0) {
vec3 handheldReflection1 = handLightCol * GGX(normal, -shiftedPlayerPos, -shiftedPlayerPos, roughness, reflectance, metalAlbedoTint);
specularReflections += handheldReflection1;
}
}
if(lightRange > 0.0) {
vec3 handheldReflection1 = handLightCol * GGX(normal, -shiftedPlayerPos, -shiftedPlayerPos, roughness, reflectance, metalAlbedoTint);
specularReflections += handheldReflection1;
}
}
#ifdef BELTBORNE_LANTERNS
if (IEXT_beltborne_lanterns_Id > 0){
vec3 shiftedViewPos = viewPos + vec3(0.15, 0.2, 0.0);
vec3 shiftedPlayerPos = mat3(gbufferModelViewInverse) * shiftedViewPos + gbufferModelViewInverse[3].xyz + (cameraPosition - previousCameraPosition);
#ifdef BELTBORNE_LANTERNS
if (IEXT_beltborne_lanterns_Id > 0){
vec3 shiftedViewPos = viewPos + vec3(0.15, 0.2, 0.0);
vec3 shiftedPlayerPos = mat3(gbufferModelViewInverse) * shiftedViewPos + gbufferModelViewInverse[3].xyz + (cameraPosition - previousCameraPosition);
float lightRange = 0.0;
vec3 handLightCol = GetHandLight(IEXT_beltborne_lanterns_Id, shiftedPlayerPos, lightRange);
float lightRange = 0.0;
vec3 handLightCol = GetHandLight(IEXT_beltborne_lanterns_Id, shiftedPlayerPos, lightRange);
if(lightRange > 0.0) {
vec3 handheldReflection1 = handLightCol * GGX(normal, -shiftedPlayerPos, -shiftedPlayerPos, roughness, reflectance, metalAlbedoTint);
specularReflections += handheldReflection1;
}
}
#endif
}
if(lightRange > 0.0) {
vec3 handheldReflection1 = handLightCol * GGX(normal, -shiftedPlayerPos, -shiftedPlayerPos, roughness, reflectance, metalAlbedoTint);
specularReflections += handheldReflection1;
}
}
#endif
}
#endif
#endif
return specularReflections;