josh/JGL
1
0
Fork 1
Code Issues 14 Pull Requests Actions Packages Projects Releases 58 Wiki Activity

Refactor & undo shader commits AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
Some checks failed
Run ReCI Build Test / Explore-Gitea-Actions (push) Failing after 6m18s
Details

Browse Source
This commit is contained in:
Redacted
2024-09-05 11:20:57 -04:00
parent 55160044b6
commit ff2a8ab787
7 changed files with 97 additions and 1018 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/TextRendering.cpp
View File

@@ -2,15 +2,15 @@
#if __linux__
#include <freetype2/ft2build.h>
#include FT_FREETYPE_H
#include FT_OUTLINE_H
#include <freetype2/ft2build.h>
#include FT_FREETYPE_H
#include FT_OUTLINE_H
#endif
#if _WIN32
#include <ft2build.h>
#include FT_FREETYPE_H
#include FT_OUTLINE_H
#include <ft2build.h>
#include FT_FREETYPE_H
#include FT_OUTLINE_H
#endif
#include <JGL/types/Font.h>
@@ -31,13 +31,6 @@ namespace JGL {
CachedFont* cachedFont = fontCache.getFont(size, font.index);
//Set up the regular font.
//for (const auto &f : Font::GetLoadedFonts())
// if (f.index == font.index)
// font = f;
if (font.face == nullptr)
return;
@@ -74,7 +67,7 @@ namespace JGL {
FT_GlyphSlot g = font.face->glyph;
width += g->bitmap.width;
max_height = std::max(max_height, (GLsizei)g->bitmap.rows);
max_height = std::max(max_height, (GLsizei) g->bitmap.rows);
charcode = FT_Get_Next_Char(font.face, charcode, &gindex);
}
@@ -115,7 +108,7 @@ namespace JGL {
}
}
glColor4f(color.r / 255.f, color.g / 255.f, color.b / 255.f, color.a / 255.f);
glColor4ubv(color.ptr());
//Texture parameters are restored when the texture_handle is bound
glBindTexture(GL_TEXTURE_2D, *cachedFont->getTexture());
@@ -125,8 +118,9 @@ namespace JGL {
for (int i = 0; i < text.length(); i++) {
float x2, y2, w, h;
CachedGlyph *glyph = cachedFont->getGlyph(text.c_str()[i]);
if (glyph == nullptr) continue;
CachedGlyph* glyph = cachedFont->getGlyph(text.c_str()[i]);
if (glyph == nullptr)
continue;
x2 = x + glyph->x2offset * scale;
y2 = y - glyph->y2offset * scale; // Adjust y-coordinate
@@ -155,12 +149,6 @@ namespace JGL {
glColor4f(1, 1, 1, 1);
}
void J2D::DrawString(const Color3& color, const std::string& text, float x, float y, float scale, u32 size, const Font& font) {
J2D::DrawString(Color4::FromColor3(color, 255), text, x, y, scale, size, font);
}
void J3D::DrawString(const Color4& color, const std::string& text, const Vector3& pos, const Vector3& angle, float scale, u32 size, const Font& font) {
//TODO figure out what the scale should actually be mathematically.
scale = scale * 0.002f;
@@ -173,14 +161,8 @@ namespace JGL {
glUseProgram(0); // Fixed-function pipeline.
glColor4ubv(color.ptr());
//Font font;
//for (auto& f : Font::GetLoadedFonts())
//if (f.index == font.index)
//font = f;
if (font.face == NULL) {
std::cout << "null font" << std::endl;
return;
}
if (font.face == nullptr)
throw std::runtime_error("FreeType font face is null.");
FT_Set_Pixel_Sizes(font.face, 0, size);