Font working
This commit is contained in:
@ -33,7 +33,7 @@ float_t TrueTypeFont::getSpaceSize(float_t fontSize) {
|
||||
}
|
||||
|
||||
float_t TrueTypeFont::getInitialLineHeight(float_t fontSize) {
|
||||
return mathRoundFloat(this->getScale(fontSize) * 11.0f);
|
||||
return 8.0f;
|
||||
}
|
||||
|
||||
void TrueTypeFont::buffer(
|
||||
@ -185,7 +185,7 @@ void TrueTypeFont::draw(Mesh &mesh, int32_t startchar, int32_t length) {
|
||||
}
|
||||
|
||||
float_t TrueTypeFont::getLineHeight(float_t fontSize) {
|
||||
return mathRoundFloat(this->getScale(fontSize) * 14.0f);
|
||||
return 13.0f;
|
||||
}
|
||||
|
||||
float_t TrueTypeFont::getDefaultFontSize() {
|
||||
|
@ -14,7 +14,7 @@ namespace Dawn {
|
||||
#define TRUETYPE_NUM_CHARS 96
|
||||
|
||||
/** Refer to STBTT docs for OpenGL Fill Mode v d3d Fill Modes */
|
||||
#define TRUETYPE_FILL_MODE 1
|
||||
#define TRUETYPE_FILL_MODE 0
|
||||
|
||||
typedef stbtt_bakedchar truetypechar_t;
|
||||
typedef stbtt_aligned_quad truetypequad_t;
|
||||
|
@ -101,6 +101,6 @@ namespace Dawn {
|
||||
* @param parameter parameter to set the texture on to.
|
||||
* @param texture Texture to bind to the parameter.
|
||||
*/
|
||||
virtual void setTexture(T parameter, std::shared_ptr<Texture> texture)=0;
|
||||
virtual void setTexture(T parameter, Texture *texture) = 0;
|
||||
};
|
||||
}
|
Reference in New Issue
Block a user