Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 04:57:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #14748 from SamGondelman/procedural

Browse source 
Case 20774: Possible fix for procedurals on mac
This commit is contained in:
Sam Gateau 2019-01-22 11:45:30 -08:00 committed by GitHub
commit 8a1bec420e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libraries/render-utils/src/simple.slf
View file

@ -91,14 +91,14 @@ void main(void) {
position.xyz, position.xyz,
#endif #endif
normal, normal,
vec3(0.0), diffuse,
DEFAULT_SPECULAR, DEFAULT_SPECULAR,
DEFAULT_EMISSIVE, emissive,
1.0, 1.0,
DEFAULT_ROUGHNESS, roughness,
DEFAULT_METALLIC, metallic,
DEFAULT_OCCLUSION, occlusion,
DEFAULT_SCATTERING scattering
); );
#if defined(PROCEDURAL_V3) #if defined(PROCEDURAL_V3)

20
libraries/render-utils/src/simple_transparent.slf
View file

@ -92,22 +92,22 @@ void main(void) {
emissive = vec3(clamp(emissiveAmount, 0.0, 1.0)); emissive = vec3(clamp(emissiveAmount, 0.0, 1.0));
#elif defined(PROCEDURAL_V3) || defined(PROCEDURAL_V4) #elif defined(PROCEDURAL_V3) || defined(PROCEDURAL_V4)
#if defined(PROCEDURAL_V3) #if defined(PROCEDURAL_V3)
ProceduralFragment proceduralData = { ProceduralFragment proceduralData = ProceduralFragment(
#else #else
vec4 position = cam._viewInverse * _positionES; vec4 position = cam._viewInverse * _positionES;
ProceduralFragmentWithPosition proceduralData = { ProceduralFragmentWithPosition proceduralData = ProceduralFragmentWithPosition(
position.xyz, position.xyz,
#endif #endif
normal, normal,
vec3(0.0), diffuse,
DEFAULT_SPECULAR, fresnel,
DEFAULT_EMISSIVE, emissive,
1.0, alpha,
DEFAULT_ROUGHNESS, roughness,
DEFAULT_METALLIC, metallic,
DEFAULT_OCCLUSION, occlusion,
DEFAULT_SCATTERING DEFAULT_SCATTERING
}; );
#if defined(PROCEDURAL_V3) #if defined(PROCEDURAL_V3)
emissiveAmount = getProceduralFragment(proceduralData); emissiveAmount = getProceduralFragment(proceduralData);