From 1ed1210d29f5e27c4ac58d9be19b226da9154286 Mon Sep 17 00:00:00 2001 From: themancalledjakob Date: Sat, 8 Apr 2023 17:16:06 +0200 Subject: [PATCH] cleanup --- src/LayerComposition.cpp | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/src/LayerComposition.cpp b/src/LayerComposition.cpp index dc2f091..4442e2e 100644 --- a/src/LayerComposition.cpp +++ b/src/LayerComposition.cpp @@ -16,15 +16,6 @@ void MsdfAtlasLayerCombo::setup(const ComboIdentifier & layerIdentifier){ atlasSettings.characters = ""; atlasSettings.maxInterpolationStepSize = 50.0; - //string fontName = "RobotoFlex.ttf"; - //string fontPath = "data/fonts/" + fontName; - //string fontPath = "data/celines-fonts/testing2VF.ttf"; - string fontPath = "data/celines-fonts/Version-2-var.ttf"; - //string fontPath = "data/celines-fonts/Version-2-var.ttf"; - //string fontPath = "data/celines-fonts/Version-3-var.ttf"; - //string fontPath = "data/celines-fonts/Version-4-var.ttf"; - //string fontPath = "data/celines-fonts/Alfarn2.otf"; - //string fontPath = "data/celines-fonts/Cottagecore.ttf"; atlas = make_shared (); msdfShader = make_shared (); @@ -34,9 +25,7 @@ void MsdfAtlasLayerCombo::setup(const ComboIdentifier & layerIdentifier){ msdfShader->load("ofxMsdfgen/shaders/mix/GL3/shader"); #endif - cout << "settings scale before " << atlasSettings.scale << endl - << "minimum scale before " << atlasSettings.minimumScale << endl; - atlas->setup(fontPath, atlasSettings); + atlas->setup(this->identifier.fontPath, atlasSettings); } void MsdfAtlasLayerCombo::update(){