tobid7/palladium
1
0
Fork 0
Code Issues 7 Pull Requests Actions Packages Projects Releases Wiki Activity

Changes:

Browse Source 
- Add FCS to UI7 and Lithium
  - Schould fix Visual glitches with rects
  - Lithium one should be disabled as textrendering looks glitched
This commit is contained in:
tobid7 2024-10-03 10:59:33 +02:00
parent eac36bcc6e
commit 0fede0441f
3 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/pd/Lithium.hpp
View File

@ -30,6 +30,7 @@ enum PDLithiumFlags_ {
PDLithiumFlags_None = 0,
PDLithiumFlags_TMS = MAKEFLAG(0), // Text Map System
PDLithiumFlags_LRS = MAKEFLAG(1), // Layer Render System
PDLithiumFlags_FCS = MAKEFLAG(2), // Floor Coords System
PDLithiumFlags_Default = PDLithiumFlags_TMS,
};
@ -112,6 +113,7 @@ class LI {
NVec4 uv;
int layer = 0;
int cmd_type = 0;
bool fcs = false; // Floor Coords System
unsigned int clr = 0;
bool sfr = false; // SysFontRender
Texture::Ref tex = nullptr;

21
source/Lithium.cpp
View File

@ -375,6 +375,17 @@ void LI::RenderFrame(bool bottom) {
}
sfr = c.sfr;
}
// FCS
if (c.fcs) {
c.top[0] = std::floor(c.top[0]);
c.top[1] = std::floor(c.top[1]);
c.top[2] = std::ceil(c.top[2]);
c.top[3] = std::floor(c.top[3]);
c.bot[0] = std::floor(c.bot[0]);
c.bot[1] = std::ceil(c.bot[1]);
c.bot[2] = std::ceil(c.bot[2]);
c.bot[3] = std::ceil(c.bot[3]);
}
if (c.cmd_type == 1) {
// Tiangle 1
idx_buffer[idx_index++] = vertex_index + 0;
@ -491,6 +502,7 @@ void LI::DrawRect(NVec2 pos, NVec2 size, unsigned int clr, NVec4 uvs) {
return;
MakeRect(c.top, c.bot, pos, size);
c.fcs = flags & PDLithiumFlags_FCS;
c.uv = uvs;
c.clr = clr;
c.tex = active_texture;
@ -511,6 +523,7 @@ void LI::DrawTriangle(NVec2 a, NVec2 b, NVec2 c, unsigned int clr) {
c[1] > screen_size[1]) ||
(a[0] < 0 && b[0] < 0 && c[0] < 0) || (a[1] < 0 && b[1] < 0 && c[1] < 0))
return;
cmd.fcs = flags & PDLithiumFlags_FCS;
cmd.top = NVec4(a, b);
cmd.bot = NVec4(c, NVec2());
cmd.uv = NVec4(0, 1, 1, 0);
@ -525,6 +538,8 @@ void LI::DrawTriangle(NVec2 a, NVec2 b, NVec2 c, unsigned int clr) {
void LI::DrawCircle(NVec2 pos, float r, unsigned int color, int segments) {
if (segments < 3) return;
Cmd c;
// Not Tested yet ...
c.fcs = flags & PDLithiumFlags_FCS;
c.top = NVec4(pos, NVec2(r, segments));
c.bot = NVec4();
c.uv = NVec4(0, 1, 1, 0);
@ -557,6 +572,8 @@ void LI::DrawLine(NVec2 a, NVec2 b, unsigned int clr, int t) {
float py3 = b[1] - offset[1];
Cmd c;
// Schould be always true as lines otherwise could disappear for some reason
c.fcs = flags & PDLithiumFlags_FCS;
c.top = NVec4(px2, py2, px3, py3);
c.bot = NVec4(px0, py0, px1, py1);
c.uv = NVec4(0, 1, 1, 0);
@ -693,6 +710,9 @@ NVec2 LI::GetTextDimensions(const std::string& text) {
void LI::DrawText(NVec2 pos, unsigned int color, const std::string& text,
PDTextFlags flags, NVec2 ap) {
if (!font) return;
PDLithiumFlags tmp_flags = flags;
// Do not use FCS in Text Rendering...
flags &= ~PDLithiumFlags_FCS;
std::string txt = text;
NVec2 offset;
float txt_scale = text_scale;
@ -763,5 +783,6 @@ void LI::DrawText(NVec2 pos, unsigned int color, const std::string& text,
offset[1] += line_height;
offset[0] = 0;
}
flags = tmp_flags;
}
} // namespace Palladium

15
source/UI7.cpp
View File

@ -120,6 +120,15 @@ class DrawCmd {
}
Palladium::LI::OnScreen(screen);
Palladium::LI::Layer(layer);
// floor the coords to prevent graphical glitches
if (fcs) {
rect[0] = std::floor(rect[0]);
rect[1] = std::floor(rect[1]);
rect[2] = std::floor(rect[2]);
rect[3] = std::floor(rect[3]);
add_coords[0] = std::floor(add_coords[0]);
add_coords[1] = std::floor(add_coords[1]);
}
if (type == DrawCmdType_Rect) {
Palladium::LI::DrawRect(NVec2(rect[0], rect[1]), NVec2(rect[2], rect[3]),
clr);
@ -189,6 +198,7 @@ class DrawCmd {
NVec2 text_box = NVec2(); // Maximum text Box
bool screen = false; // Defines Top or Bottom
int layer = 0; // Defines the Rendering Layer
bool fcs = false; // Floor Coords System
};
void UI7DrawList::AddRectangle(NVec2 pos, NVec2 szs, PDColor clr) {
@ -201,6 +211,7 @@ void UI7DrawList::AddRectangle(NVec2 pos, NVec2 szs, PDColor clr) {
cmd->clr = Palladium::ThemeActive()->Get(clr);
cmd->type = DrawCmdType_Rect;
cmd->layer = bl + layer;
cmd->fcs = true;
AddDebugCall(cmd);
AddCall(cmd);
}
@ -215,6 +226,7 @@ void UI7DrawList::AddRectangle(NVec2 pos, NVec2 szs, unsigned int clr) {
cmd->clr = clr;
cmd->type = DrawCmdType_Rect;
cmd->layer = bl + layer;
cmd->fcs = true;
AddDebugCall(cmd);
AddCall(cmd);
}
@ -262,6 +274,7 @@ void UI7DrawList::AddText(NVec2 pos, const std::string &text, PDColor clr,
cmd->text_box = box;
cmd->type = DrawCmdType_Text;
cmd->layer = bl + layer + 1;
cmd->fcs = true;
AddDebugCall(cmd);
AddCall(cmd);
}
@ -278,6 +291,7 @@ void UI7DrawList::AddText(NVec2 pos, const std::string &text, unsigned int clr,
cmd->clr = clr;
cmd->type = DrawCmdType_Text;
cmd->layer = bl + layer + 1;
cmd->fcs = true;
AddDebugCall(cmd);
AddCall(cmd);
}
@ -290,6 +304,7 @@ void UI7DrawList::AddImage(NVec2 pos, Palladium::Image::Ref img) {
cmd->img = img;
cmd->type = DrawCmdType_Image;
cmd->layer = bl + layer + 1; // USe Text Layer as well
cmd->fcs = true;
AddDebugCall(cmd);
AddCall(cmd);
}