ellipsoid/QuaternionEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIX: AO/Emissive loading fix

Browse Source
This commit is contained in:
hydrogendeuteride
2025-12-05 16:54:00 +09:00
parent 28572c1679
commit 20f6ad494c
5 changed files with 64 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
shaders/gbuffer.frag
View File

@@ -68,9 +68,15 @@ void main() {
outNorm = vec4(Nw, roughness);
outAlbedo = vec4(albedo, metallic);
// Extra G-buffer: x = AO, yzw = emissive
// extra[0].y = AO strength, extra[0].z = hasAO flag (1 = use AO texture)
float hasAO = materialData.extra[0].z;
float aoStrength = clamp(materialData.extra[0].y, 0.0, 1.0);
float aoTex = texture(occlusionTex, inUV).r;
float ao = 1.0 - aoStrength + aoStrength * aoTex;
float ao = 1.0;
if (hasAO > 0.5)
{
ao = 1.0 - aoStrength + aoStrength * aoTex;
}
vec3 emissiveFactor = materialData.extra[1].rgb;
vec3 emissiveTex = texture(emissiveTex, inUV).rgb;
vec3 emissive = emissiveTex * emissiveFactor;

8
shaders/mesh.frag
View File

@@ -70,9 +70,15 @@ void main()
vec3 diffIBL = (1.0 - metallic) * albedo * sh_eval_irradiance(N);
// Ambient occlusion from texture + strength (indirect only)
// extra[0].y = AO strength, extra[0].z = hasAO flag (1 = use AO texture)
float hasAO = materialData.extra[0].z;
float aoStrength = clamp(materialData.extra[0].y, 0.0, 1.0);
float aoTex = texture(occlusionTex, inUV).r;
float ao = 1.0 - aoStrength + aoStrength * aoTex;
float ao = 1.0;
if (hasAO > 0.5)
{
ao = 1.0 - aoStrength + aoStrength * aoTex;
}
// Emissive from texture and factor
vec3 emissiveFactor = materialData.extra[1].rgb;