diff --git a/src/GPUFontAtlasLayerCombo.cpp b/src/GPUFontAtlasLayerCombo.cpp index 07460ac..de91a0c 100644 --- a/src/GPUFontAtlasLayerCombo.cpp +++ b/src/GPUFontAtlasLayerCombo.cpp @@ -9,7 +9,6 @@ #include "ofRectangle.h" #include "ofUtils.h" #include "quaternion.hpp" -#include namespace ofxVariableLab { @@ -18,13 +17,18 @@ void GPUFontAtlasLayerCombo::setup(const ComboIdentifier & identifier, this->identifier = identifier; this->settings = static_cast (settings); #ifdef TARGET_EMSCRIPTEN - string shaderDir = "data/ofxGPUFont/shaders/DEBUG_ES3"; + string shaderDir = "data/ofxGPUFont/shaders/ES3"; #else string shaderDir = "data/ofxGPUFont/shaders/GL3"; #endif shaderCatalog = std::make_shared (shaderDir); //backgroundShader = shaderCatalog->get("background"); - fontShader = shaderCatalog->get("font"); + + if(this->settings.bufferTargetType == GL_TEXTURE_2D_ARRAY){ + fontShader = shaderCatalog->get("font_ta"); + }else if(this->settings.bufferTargetType == GL_UNIFORM_BUFFER){ + fontShader = shaderCatalog->get("font_ub"); + } { FT_Error error = FT_Init_FreeType(&library);