diff --git a/src/conversion.h b/src/conversion.h index 2d7ca8a..5a7cd39 100644 --- a/src/conversion.h +++ b/src/conversion.h @@ -1,12 +1,19 @@ #pragma once -#include "GlyphBox.h" -#include "glyph-generators.h" +//#include "GlyphBox.h" +//#include "glyph-generators.h" #include "ofMain.h" -#include "BitmapAtlasStorage.h" -#include "GlyphGeometry.h" +//#include "BitmapAtlasStorage.h" +//#include "GlyphGeometry.h" #include +#define F26DOT6_TO_DOUBLE(x) (1 / 64. * double(x)) +#define F16DOT16_TO_DOUBLE(x) (1 / 65536. * double(x)) +#define DOUBLE_TO_F16DOT16(x) FT_Fixed(65536. * x) +#define F26DOT6_TO_FLOAT(x) (1.0f / 64.f * float(x)) +#define F16DOT16_TO_FLOAT(x) (1.0f / 65536.f * float(x)) +#define FLOAT_TO_F16DOT16(x) FT_Fixed(65536.f * x) + namespace ofxMsdfgen { using GlyphBox = msdf_atlas::GlyphBox; using GlyphGeometry = msdf_atlas::GlyphGeometry;