cleanup
This commit is contained in:
parent
bae9d0453a
commit
1ed1210d29
1 changed files with 1 additions and 12 deletions
|
@ -16,15 +16,6 @@ void MsdfAtlasLayerCombo::setup(const ComboIdentifier & layerIdentifier){
|
||||||
atlasSettings.characters = "";
|
atlasSettings.characters = "";
|
||||||
atlasSettings.maxInterpolationStepSize = 50.0;
|
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 <ofxMsdfgen::Atlas>();
|
atlas = make_shared <ofxMsdfgen::Atlas>();
|
||||||
|
|
||||||
msdfShader = make_shared <ofShader>();
|
msdfShader = make_shared <ofShader>();
|
||||||
|
@ -34,9 +25,7 @@ void MsdfAtlasLayerCombo::setup(const ComboIdentifier & layerIdentifier){
|
||||||
msdfShader->load("ofxMsdfgen/shaders/mix/GL3/shader");
|
msdfShader->load("ofxMsdfgen/shaders/mix/GL3/shader");
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
cout << "settings scale before " << atlasSettings.scale << endl
|
atlas->setup(this->identifier.fontPath, atlasSettings);
|
||||||
<< "minimum scale before " << atlasSettings.minimumScale << endl;
|
|
||||||
atlas->setup(fontPath, atlasSettings);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void MsdfAtlasLayerCombo::update(){
|
void MsdfAtlasLayerCombo::update(){
|
||||||
|
|
Loading…
Reference in a new issue