glsl initializer lists are 4.2

This commit is contained in:
SamGondelman 2018-12-25 00:46:42 -05:00
parent 835615fbbd
commit a25c9395b3

View file

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