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

# 0.2.6-2

Browse Source 
- Add Scissor (CLIP RECT) to lithium commands and UI7 Drawlist API
- Enable ClipRect to UI7::Menu (probably create a enable/disable flag)
This commit is contained in:
tobid7 2025-03-05 20:18:00 +01:00
parent 229d54f088
commit 5375d0f3a9
13 changed files with 148 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -80,7 +80,7 @@ source/core/timetrace.cpp)
## Image Source Code
set(IMAGE_SRC
source/image/img_edit.cpp
source/image/image.cpp
source/image/img_blur.cpp
source/image/img_convert.cpp)

2
include/pd.hpp
View File

@ -38,9 +38,9 @@ SOFTWARE.
#include <pd/lithium/renderer.hpp>
#include <pd/lithium/spritesheet.hpp>
// Image
#include <pd/image/image.hpp>
#include <pd/image/img_blur.hpp>
#include <pd/image/img_convert.hpp>
#include <pd/image/img_edit.hpp>
// Drivers
#include <pd/drivers/hid.hpp>
// Overlays

1
include/pd/core/common.hpp
View File

@ -34,6 +34,7 @@ SOFTWARE.
#include <map>
#include <memory>
#include <sstream>
#include <stack>
#include <string>
#include <vector>

12
include/pd/image/img_edit.hpp → include/pd/image/image.hpp
View File

@ -27,15 +27,15 @@ SOFTWARE.
#include <pd/core/common.hpp>
namespace PD {
class ImgEdit {
class Image {
public:
ImgEdit() = default;
ImgEdit(const std::string& path) { this->Load(path); }
ImgEdit(const std::vector<u8>& buf) { this->Load(buf); }
ImgEdit(const std::vector<u8>& buf, int w, int h, int fmt = 4) {
Image() = default;
Image(const std::string& path) { this->Load(path); }
Image(const std::vector<u8>& buf) { this->Load(buf); }
Image(const std::vector<u8>& buf, int w, int h, int fmt = 4) {
this->Copy(buf, w, h, fmt);
}
~ImgEdit() = default;
~Image() = default;
void Load(const std::string& path);
void Load(const std::vector<u8>& buf);

22
include/pd/lithium/command.hpp
View File

@ -167,6 +167,24 @@ class Command : public SmartCtor<Command> {
*/
RenderMode Rendermode() const { return mode; }
/** Setter for Scissor Mode */
Command& SetScissorMode(ScissorMode mode) {
scissor = mode;
return *this;
}
/** Getter for Scissor Mode */
ScissorMode GetScissorMode() const { return scissor; }
/** Setter for Scissor Area */
Command& ScissorRect(const vec4& v) {
scissor_area = v;
return *this;
}
/** Getter for Scissor Area */
vec4 ScissorRect() const { return scissor_area; }
private:
/**
* Vertex Buffer
@ -188,6 +206,10 @@ class Command : public SmartCtor<Command> {
int index;
/** RenderMode (Default to RenderMode_RGBA) */
RenderMode mode = RenderMode_RGBA;
/** Scissor Mode (for defined area to render) */
ScissorMode scissor = ScissorMode_None;
/** scissor box (top left and bottom right) */
vec4 scissor_area;
};
} // namespace LI
} // namespace PD

6
include/pd/lithium/flags.hpp
View File

@ -61,5 +61,11 @@ enum RenderMode {
RenderMode_RGBA, ///< RGBA [for textures or solid colors]
RenderMode_Font, ///< A8 [for textures only crated by 1 color channel]
};
/** Scissor Mode (for ClipRect related rendering) */
enum ScissorMode {
ScissorMode_None = 0, ///< No Scissor
ScissorMode_Inverted = 1, ///< Render Pixels outside the box
ScissorMode_Normal = 3, ///< Only render pixels inside the box
};
} // namespace LI
} // namespace PD

32
include/pd/lithium/objects.hpp
View File

@ -118,6 +118,26 @@ class StaticObject : public SmartCtor<StaticObject> {
}
}
/**
* Set a Custom Scissor Mode for Object Copy List
* @param m New Mode to Set
*/
void ReSetScissorMode(ScissorMode m) {
for (auto& i : cpy) {
i->SetScissorMode(m);
}
}
/**
* Set Custom Scissor Rect to All Objects
* @param v Scissor Rect to set
*/
void ReScissorRect(const vec4& v) {
for (auto& i : cpy) {
i->ScissorRect(v);
}
}
/**
* Get a Reference to the Copy Commands List
* @return command list reference
@ -296,6 +316,18 @@ class StaticText : public SmartCtor<StaticText> {
*/
Font::Ref Font() { return font; }
/**
* Set a Custom Scissor Mode Static Text
* @param m New Mode to Set
*/
void SetScissorMode(ScissorMode m) { text->ReSetScissorMode(m); }
/**
* Set Custom Scissor Rect to Static Text
* @param v Scissor Rect to set
*/
void ScissorRect(const vec4& v) { text->ReScissorRect(v); }
private:
/** Font */
Font::Ref font;

13
include/pd/ui7/drawlist.hpp
View File

@ -85,6 +85,12 @@ class DrawList : public SmartCtor<DrawList> {
/** Process [Render] the Drawlist */
void Process();
/** Push a Clip Rect */
void PushClipRect(const vec4& v) { clip_rects.push(v); }
/** Revert Last Clip Rect */
void PopClipRect() { clip_rects.pop(); }
/** Getter for the Layer */
int Layer() const { return layer; }
/** Setter fot the Layer */
@ -100,9 +106,10 @@ class DrawList : public SmartCtor<DrawList> {
friend class Menu;
friend class Context;
int layer; ///< Current Layer
int base; ///< Base Layer
LI::Renderer::Ref ren; ///< Renderer Reference
int layer; ///< Current Layer
int base; ///< Base Layer
LI::Renderer::Ref ren; ///< Renderer Reference
std::stack<vec4> clip_rects; ///< Stack containing Scissor Areas
// Map for Auto Static Text
std::unordered_map<u32, LI::StaticText::Ref> static_text;
// List of Drawcommands generated

35
source/image/img_edit.cpp → source/image/image.cpp
View File

@ -26,14 +26,35 @@ SOFTWARE.
#include <cstring>
#include <memory>
#include <pd/image/img_edit.hpp>
#include <pd/image/image.hpp>
#include <pd/image/img_convert.hpp>
namespace PD {
void ImgEdit::Load(const std::string& path) {
u8* buf = stbi_load(path.c_str(), &w, &h, &fmt, 4);
buffer.assign(buf, buf + (w * h * 4));
stbi_image_free(buf);
void Image::Load(const std::string& path) {
u8* img = stbi_load(path.c_str(), &w, &h, &fmt, 4);
if (fmt == 3) {
stbi_image_free(img);
img = stbi_load(path.c_str(), &w, &h, &fmt, 3);
buffer.resize(w * h * 4);
PD::ImgConvert::RGB24toRGBA32(
buffer, std::vector<u8>(img, img + (w * h * 3)), w, h);
} else {
buffer.assign(img, img + (w * h * 4));
stbi_image_free(img);
}
}
void ImgEdit::Load(const std::vector<u8>& buf) {}
void ImgEdit::Copy(const std::vector<u8>& buf, int w, int h, int fmt) {}
void Image::Load(const std::vector<u8>& buf) {
u8* img = stbi_load_from_memory(buf.data(), buf.size(), &w, &h, &fmt, 4);
if (fmt == 3) {
stbi_image_free(img);
img = stbi_load_from_memory(buf.data(), buf.size(), &w, &h, &fmt, 3);
buffer.resize(w * h * 4);
PD::ImgConvert::RGB24toRGBA32(
buffer, std::vector<u8>(img, img + (w * h * 3)), w, h);
} else {
buffer.assign(img, img + (w * h * 4));
stbi_image_free(img);
}
}
void Image::Copy(const std::vector<u8>& buf, int w, int h, int fmt) {}
} // namespace PD

8
source/lithium/renderer.cpp
View File

@ -465,11 +465,17 @@ void Renderer::Render(Screen::Ref s) {
while (index < cmds.size()) {
C3D_Tex* tex = cmds[index]->Tex()->GetTex();
auto mode = cmds[index]->Rendermode();
auto smode = cmds[index]->GetScissorMode();
auto spos = cmds[index]->ScissorRect();
C3D_SetScissor((GPU_SCISSORMODE)smode, s->GetSize().y() - spos.w(),
s->GetSize().x() - spos.z(), s->GetSize().y() - spos.y(),
s->GetSize().x() - spos.x());
UpdateRenderMode(mode);
u32 start_vtx = vertex_idx;
u32 start_idx = index_idx;
while (index < cmds.size() && cmds[index]->Tex()->GetTex() == tex &&
cmds[index]->Rendermode() == mode) {
cmds[index]->Rendermode() == mode &&
cmds[index]->GetScissorMode() == smode) {
auto c = cmds[index];
// Indices
for (size_t i = 0; i < c->IndexList().size(); i++) {

50
source/lithium/texture.cpp
View File

@ -27,11 +27,12 @@ SOFTWARE.
#include <tex3ds.h>
#include <pd/app/error.hpp>
#include <pd/core/bit_util.hpp>
#include <pd/core/io.hpp>
#include <pd/core/timetrace.hpp>
#include <pd/lithium/texture.hpp>
#include <pd/core/bit_util.hpp>
#include <pd/image/image.hpp>
#include <pd/image/img_convert.hpp>
#include <pd/lithium/texture.hpp>
namespace PD {
GPU_TEXCOLOR GetTexFmt(Texture::Type type) {
@ -115,51 +116,24 @@ void Texture::Delete() {
void Texture::LoadFile(const std::string& path) {
PD::TT::Scope st("texldr-" + path);
Delete();
int w = 0, h = 0, c = 0;
u8* image = stbi_load(path.c_str(), &w, &h, &c, 4);
PD::Assert(image != nullptr, "Unable to load image: " + path);
if (w > 1024 || h > 1024) {
stbi_image_free(image);
PD::Image img(path);
PD::Assert(img.GetBuffer().size(), "Unable to load image: " + path);
if (img.Width() > 1024 || img.Height() > 1024) {
PD::Error("Width or heigt is > 1024");
return;
}
std::vector<u8> buf;
if (c == 3) {
stbi_image_free(image);
image = stbi_load(path.c_str(), &w, &h, &c, 3);
buf.resize(w * h * 4);
PD::ImgConvert::RGB24toRGBA32(
buf, std::vector<u8>(image, image + (w * h * 3)), w, h);
} else {
buf.assign(image, image + (w * h * 4));
stbi_image_free(image);
}
MakeTex(buf, w, h);
MakeTex(img, img.Width(), img.Height());
}
void Texture::LoadMemory(const std::vector<u8>& data) {
Delete();
int w, h, c;
u8* image = stbi_load_from_memory(data.data(), data.size(), &w, &h, &c, 4);
if (image == nullptr) {
PD::Image img(data);
PD::Assert(img.GetBuffer().size(), "Unable to load image from Memory!");
if (img.Width() > 1024 || img.Height() > 1024) {
PD::Error("Width or heigt is > 1024");
return;
}
if (w > 1024 || h > 1024) {
stbi_image_free(image);
return;
}
std::vector<u8> buf;
if (c == 3) {
stbi_image_free(image);
image = stbi_load_from_memory(data.data(), data.size(), &w, &h, &c, 3);
buf.resize(w * h * 4);
PD::ImgConvert::RGB24toRGBA32(
buf, std::vector<u8>(image, image + (w * h * 3)), w, h);
} else {
buf.assign(image, image + (w * h * 4));
stbi_image_free(image);
}
MakeTex(buf, w, h);
MakeTex(img, img.Width(), img.Height());
}
void Texture::LoadPixels(const std::vector<u8>& pixels, int w, int h, Type type,

20
source/ui7/drawlist.cpp
View File

@ -35,6 +35,10 @@ void DrawList::AddRectangle(vec2 pos, vec2 szs, const UI7Color& clr) {
ren->UseTex();
ren->SetupCommand(cmd);
cmd->Layer(base + layer);
if (!clip_rects.empty()) {
cmd->SetScissorMode(LI::ScissorMode_Normal);
cmd->ScissorRect(clip_rects.top());
}
ren->QuadCommand(cmd, rect, vec4(0.f, 1.f, 1.f, 0.f), clr);
commands.push_back(std::make_pair(
ren->CurrentScreen()->ScreenType() == Screen::Bottom, cmd));
@ -49,6 +53,10 @@ void DrawList::AddTriangle(vec2 pos0, vec2 pos1, vec2 pos2,
ren->UseTex();
ren->SetupCommand(cmd);
cmd->Layer(base + layer);
if (!clip_rects.empty()) {
cmd->SetScissorMode(LI::ScissorMode_Normal);
cmd->ScissorRect(clip_rects.top());
}
ren->TriangleCommand(cmd, pos0, pos1, pos2, clr);
commands.push_back(std::make_pair(
ren->CurrentScreen()->ScreenType() == Screen::Bottom, cmd));
@ -76,6 +84,10 @@ void DrawList::AddText(vec2 pos, const std::string& text, const UI7Color& clr,
e->second->SetPos(pos);
e->second->SetColor(clr);
e->second->SetLayer(layer);
if (!clip_rects.empty()) {
e->second->SetScissorMode(LI::ScissorMode_Normal);
e->second->ScissorRect(clip_rects.top());
}
e->second->Draw();
////// STILL LEAVING THE OLD CODE BELOW AS IT IS MAYBE NEEDED //////
@ -107,6 +119,10 @@ void DrawList::AddImage(vec2 pos, Texture::Ref img, vec2 size) {
ren->UseTex(img);
ren->SetupCommand(cmd);
cmd->Layer(base + layer);
if (!clip_rects.empty()) {
cmd->SetScissorMode(LI::ScissorMode_Normal);
cmd->ScissorRect(clip_rects.top());
}
ren->QuadCommand(cmd, rect, img->GetUV(), 0xffffffff);
commands.push_back(std::make_pair(
ren->CurrentScreen()->ScreenType() == Screen::Bottom, cmd));
@ -123,6 +139,10 @@ void DrawList::AddLine(const vec2& a, const vec2& b, const UI7Color& clr,
ren->UseTex();
ren->SetupCommand(cmd);
cmd->Layer(base + layer);
if (!clip_rects.empty()) {
cmd->SetScissorMode(LI::ScissorMode_Normal);
cmd->ScissorRect(clip_rects.top());
}
ren->QuadCommand(cmd, line, vec4(0.f, 1.f, 1.f, 0.f), clr);
commands.push_back(std::make_pair(
ren->CurrentScreen()->ScreenType() == Screen::Bottom, cmd));

2
source/ui7/menu.cpp
View File

@ -108,6 +108,7 @@ void UI7::Menu::Update(float delta) {
if (!scroll_anim.IsFinished()) {
scrolling_off = scroll_anim;
}
main->PushClipRect(vec4(5, tbh, view_area.z() - 12, view_area.w()));
std::vector<int> tbr;
for (int i = 0; i < (int)objects.size(); i++) {
auto& it = objects[i];
@ -131,6 +132,7 @@ void UI7::Menu::Update(float delta) {
for (auto it : tbr) {
idobjs.erase(idobjs.begin() + it);
}
main->PopClipRect();
this->back->Process();
this->main->Process();
this->front->Process();