Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 17:41:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

glsl initializer lists are 4.2

Browse source
This commit is contained in:
SamGondelman 2018-12-25 00:46:42 -05:00
parent 835615fbbd
commit a25c9395b3
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -83,11 +83,11 @@ 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
TransformCamera cam = getTransformCamera(); TransformCamera cam = getTransformCamera();
vec4 position = cam._viewInverse * _positionES; vec4 position = cam._viewInverse * _positionES;
ProceduralFragmentWithPosition proceduralData = { ProceduralFragmentWithPosition proceduralData = ProceduralFragmentWithPosition(
position.xyz, position.xyz,
#endif #endif
normal, normal,
@ -99,7 +99,7 @@ void main(void) {
DEFAULT_METALLIC, DEFAULT_METALLIC,
DEFAULT_OCCLUSION, DEFAULT_OCCLUSION,
DEFAULT_SCATTERING DEFAULT_SCATTERING
}; );
#if defined(PROCEDURAL_V3) #if defined(PROCEDURAL_V3)
emissiveAmount = getProceduralFragment(proceduralData); emissiveAmount = getProceduralFragment(proceduralData);