mirror of
https://github.com/Relintai/sfw.git
synced 2025-02-19 23:14:19 +01:00
Renamed TextMaterial to FontMaterial.
This commit is contained in:
parent
e55d4fc027
commit
8bd597e390
@ -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<TextMaterial> program;
|
||||
Ref<FontMaterial> program;
|
||||
|
||||
// font bitmap texture
|
||||
// generated using stb_truetype.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;
|
Loading…
Reference in New Issue
Block a user