From 0e8f87d6c6cf3261c3768921dd77af26b780264e Mon Sep 17 00:00:00 2001 From: brunoherbelin Date: Mon, 11 Jan 2021 18:31:38 +0100 Subject: [PATCH] OSX compilation --- rsc/shaders/mask_draw.fs | 6 +++--- tinyxml2Toolkit.h | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/rsc/shaders/mask_draw.fs b/rsc/shaders/mask_draw.fs index 1422b26..bbcdf79 100644 --- a/rsc/shaders/mask_draw.fs +++ b/rsc/shaders/mask_draw.fs @@ -55,11 +55,11 @@ void main() vec3 color = texture(iChannel0, vertexUV).rgb; // raw color // clear - color += mix(vec3(0), vec3(1) - color, effect == 1); + color += mix(vec3(0), vec3(1) - color, int(effect == 1)); // invert - color = mix(color, vec3(1) - color, effect == 2); + color = mix(color, vec3(1) - color, int(effect == 2)); // step edge - color = mix(color, vec3(1.0 - step(dot(color, vec3(1.0/3.0)), 0.6)), effect == 3); + color = mix(color, vec3(1.0 - step(dot(color, vec3(1.0/3.0)), 0.6)), int(effect == 3)); if ( option > 0 ) { diff --git a/tinyxml2Toolkit.h b/tinyxml2Toolkit.h index bc67424..5342bdb 100644 --- a/tinyxml2Toolkit.h +++ b/tinyxml2Toolkit.h @@ -2,6 +2,10 @@ #define TINYXML2TOOLKIT_H #include +#ifdef __APPLE__ +#include +#endif + #include namespace tinyxml2 {