YourWishes/Dawn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

About 3/4 done with new font system

Browse Source
This commit is contained in:
Dominic Masters
2023-06-09 23:12:10 -07:00
parent 8b3ecc88a6
commit 1af1f9ef14
23 changed files with 383 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/dawnopengl/display/RenderManager.cpp
View File

@ -28,7 +28,6 @@ void RenderManager::init() {
this->fontShader = this->shaderManager.getShader<FontShader>(this->lockFontShader);
this->renderPipeline.init();
this->fontManager.init();
// Prepare the initial values
glEnable(GL_TEXTURE_2D);
@ -52,10 +51,6 @@ ShaderManager * RenderManager::getShaderManager() {
return &this->shaderManager;
}
FontManager * RenderManager::getFontManager() {
return &this->fontManager;
}
void RenderManager::setRenderFlags(renderflag_t flags) {
this->renderFlags = flags;

3
src/dawnopengl/display/RenderManager.hpp
View File

@ -10,7 +10,6 @@
#include "display/shader/shaders/FontShader.hpp"
#include "display/shader/shaders/UIShader.hpp"
#include "display/RenderPipeline.hpp"
#include "display/font/FontManager.hpp"
#include "display/font/ExampleFont.hpp"
namespace Dawn {
@ -18,7 +17,6 @@ namespace Dawn {
private:
RenderPipeline renderPipeline;
ShaderManager shaderManager;
FontManager fontManager;
shaderlock_t lockSimpleTextured = -1;
shaderlock_t lockUIShaderProgram = -1;
shaderlock_t lockFontShader = -1;
@ -38,7 +36,6 @@ namespace Dawn {
RenderTarget * getBackBuffer() override;
RenderPipeline * getRenderPipeline() override;
ShaderManager * getShaderManager() override;
FontManager * getFontManager() override;
void setRenderFlags(renderflag_t renderFlags) override;
void init() override;
void update() override;