Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-04-07 03:03:00 +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,
#endif
normal,
vec3(0.0),
diffuse,
DEFAULT_SPECULAR,
DEFAULT_EMISSIVE,
emissive,
1.0,
DEFAULT_ROUGHNESS,
DEFAULT_METALLIC,
DEFAULT_OCCLUSION,
DEFAULT_SCATTERING
roughness,
metallic,
occlusion,
scattering
);
#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));
#elif defined(PROCEDURAL_V3) || defined(PROCEDURAL_V4)
#if defined(PROCEDURAL_V3)
ProceduralFragment proceduralData = {
ProceduralFragment proceduralData = ProceduralFragment(
#else
vec4 position = cam._viewInverse * _positionES;
ProceduralFragmentWithPosition proceduralData = {
ProceduralFragmentWithPosition proceduralData = ProceduralFragmentWithPosition(
position.xyz,
#endif
normal,
vec3(0.0),
DEFAULT_SPECULAR,
DEFAULT_EMISSIVE,
1.0,
DEFAULT_ROUGHNESS,
DEFAULT_METALLIC,
DEFAULT_OCCLUSION,
diffuse,
fresnel,
emissive,
alpha,
roughness,
metallic,
occlusion,
DEFAULT_SCATTERING
};
);
#if defined(PROCEDURAL_V3)
emissiveAmount = getProceduralFragment(proceduralData);