diff --git a/sfw/render_core/font.h b/sfw/render_core/font.h index 91ea494..a34985d 100644 --- a/sfw/render_core/font.h +++ b/sfw/render_core/font.h @@ -9,7 +9,7 @@ #include "core/ustring.h" -#include "text_material.h" +#include "font_material.h" // TODO figure out how to forward declare stbtt_packedchar #include "3rd_stb_truetype.h" @@ -148,7 +148,7 @@ protected: // opengl stuff GLuint vao; - Ref program; + Ref program; // font bitmap texture // generated using stb_truetype.h diff --git a/sfw/render_core/text_material.h b/sfw/render_core/font_material.h similarity index 97% rename from sfw/render_core/text_material.h rename to sfw/render_core/font_material.h index cde1002..843a39b 100644 --- a/sfw/render_core/text_material.h +++ b/sfw/render_core/font_material.h @@ -1,5 +1,5 @@ -#ifndef TEXT_MATERIAL_H -#define TEXT_MATERIAL_H +#ifndef FONT_MATERIAL_H +#define FONT_MATERIAL_H #include "render_core/material.h" @@ -7,7 +7,7 @@ #include "render_core/render_state.h" -class TextMaterial : public Material { +class FontMaterial : public Material { public: int get_material_id() { return 10; @@ -102,7 +102,7 @@ public: return fragment_shader_source; } - TextMaterial() { + FontMaterial() { } GLint projection_matrix_location;