# Stage 1.7

- Added File to Memory and FastHashMomory
- Add Protection that only one app can exist
- Add a Trace exist Variable as GetTraceRef automatically creates a trace
- Outsource the LI::Rect to its own header
- Add a CurrentScreen func
- Use Rect for uv (to manually set all corners)
- Rect still supports to use vec4 for uv
- Add tex3ds Spritesheet support
- Add T3X Loader to Texture (if single tex)
- Integrate an autounload into Texture as in case of spritesheet the Tex needs to be unloaded manually
- Safe some performance in texture loading by combining the Loops (best thing ive ever found)
- Use the Momory Hash to only render one error icon into the TTF Texture
- Also Try loading the whole 16-Bit range
- Use GPU_A8 format for TTF rendering to save 24Bits per pixel and use the same Rendermode as System Font
- Simplify Quad Command by using modern vec api
- Integrate Text aligning
- Fix FPS displayed twice in Performance overlay
- UI7 DrawList now has its own AST system
  - TODO: do the same layering for the objects as Text uses
- Map Drawcommands with a bool that declares either bottom or top screen was active
- Add first basic Manu functions
- Fix Typos in Theme
- Add a basic UI7 Context Handler

## Extra
- Added JetBrainsMono font in Test app
## Bugs:
- Performance Overlay Freezes 3ds hardware and crashes Citra with Vulkan when System Font is used
- UI7 Menu scrolling is as scruffed as back in RenderD7 0.9.5
This commit is contained in:
2025-01-29 03:14:29 +01:00
parent d55f485b8d
commit 2914f2c8e5
33 changed files with 1198 additions and 211 deletions

View File

@ -38,7 +38,7 @@ class DrawList : public SmartCtor<DrawList> {
void AddTriangle(vec2 pos0, vec2 pos1, vec2 pos2, const UI7Color& clr);
void AddText(vec2 pos, const std::string& text, const UI7Color& clr,
LITextFlags flags = 0, vec2 box = vec2());
void AddImage(vec2 pos, Texture::Ref img);
void AddImage(vec2 pos, Texture::Ref img, vec2 size = 0.f);
void Clear();
void Process();
@ -47,9 +47,22 @@ class DrawList : public SmartCtor<DrawList> {
void Layer(int v) { layer = v; }
private:
/// @brief Base Layer offset (Internal Used)
int BaseLayer() const { return base; }
/// @brief Base Layer offset (Internal Used)
void BaseLayer(int v) { base = v; }
/// @brief Exopose Renderer here for Menus [DONT KNOW IF THIUS GETS REMOVED]
LI::Renderer::Ref GetRenderer() { return ren; }
friend class Menu;
friend class Context;
int layer;
int base;
LI::Renderer::Ref ren;
std::vector<LI::Command::Ref> commands;
std::unordered_map<u32, LI::Renderer::StaticText::Ref> static_text;
std::vector<std::pair<bool, LI::Command::Ref>> commands;
};
} // namespace UI7
} // namespace PD

View File

@ -7,13 +7,23 @@ namespace PD {
namespace UI7 {
class ID {
public:
ID(const std::string& text) { id = PD::Strings::FastHash(text); }
ID(const std::string& text) {
id = PD::Strings::FastHash(text);
name = text;
}
ID(const char* text) {
id = PD::Strings::FastHash(text);
name = text;
}
~ID() {}
std::string GetName() const { return name; }
operator u32() const { return id; }
private:
u32 id;
std::string name;
};
} // namespace UI7
} // namespace PD

View File

@ -23,14 +23,20 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
*/
#include <pd/controls/hid.hpp>
#include <pd/ui7/drawlist.hpp>
#include <pd/ui7/flags.hpp>
#include <pd/ui7/id.hpp>
namespace PD {
namespace UI7 {
class Menu : public SmartCtor<Menu> {
public:
Menu(u32 id) {
Menu(ID id, Theme* tl, Hid::Ref h) {
linked_theme = tl;
this->inp = h;
this->id = id;
this->name = id.GetName();
scrolling[0] = false;
scrolling[1] = false;
scrollbar[0] = false;
@ -38,10 +44,75 @@ class Menu : public SmartCtor<Menu> {
scroll_allowed[0] = false;
scroll_allowed[1] = false;
};
~Menu() {};
~Menu() {}
/// Objects
void Label(const std::string& label);
bool Button(const std::string& label);
void Checkbox(const std::string& label, bool& v);
void Image(Texture::Ref img, vec2 size = 0.f);
/// Basic API
void SameLine();
void Separator();
void SeparatorText(const std::string& label);
/// API for Custom Objects
bool HandleScrolling(vec2& pos, const vec2& size);
vec2 Cursor() const { return cursor; }
void Cursor(const vec2& v) {
bcursor = cursor;
cursor = v;
}
void RestoreCursor() {
cursor = bcursor;
bcursor = vec2();
}
/// Draw Lists
DrawList::Ref BackList() { return back; }
void BackList(DrawList::Ref v) { back = v; }
DrawList::Ref MainList() { return main; }
void MainList(DrawList::Ref v) { main = v; }
DrawList::Ref FrontList() { return front; }
void FrontList(DrawList::Ref v) { front = v; }
/// Advanced
void DebugLabels();
/// Uneditable Stuff
std::string GetName() const { return name; }
u32 GetID() const { return id; }
private:
/// Advanced Handlers
void PreHandler(UI7MenuFlags flags);
void PostHandler();
/// Basic Settings
vec2 BackupCursor() const { return bcursor; }
void BackupCursor(const vec2& v) { bcursor = v; }
vec2 SameLineCursor() const { return slcursor; }
void SameLineCursor(const vec2& v) { slcursor = v; }
vec4 ViewArea() const { return view_area; }
void ViewArea(const vec4& v) { view_area = v; }
vec2 ScrollOffset() const { return scrolling_off; }
void ScrollOffset(const vec2& v) { scrolling_off = v; }
vec2 ScrollMod() const { return scroll_mod; }
void ScrollMod(const vec2& v) { scroll_mod = v; }
/// Advanced
void CursorMove(const vec2& szs);
/// Internal Processing
void Update(float delta);
/// This ability is crazy useful
friend class Context;
/// Data
UI7MenuFlags flags = 0;
u32 id;
std::string name;
vec2 cursor;
vec2 bcursor;
vec2 slcursor;
@ -65,6 +136,12 @@ class Menu : public SmartCtor<Menu> {
vec2 mouse;
vec2 bslpos;
vec2 last_size;
// Theme
Theme* linked_theme;
// Input Reference
Hid::Ref inp;
};
} // namespace UI7
} // namespace PD

View File

@ -32,14 +32,14 @@ enum UI7Color_ {
UI7Color_Button,
UI7Color_ButtonDead,
UI7Color_ButtonActive,
UI7Color_ButtonDisabled,
UI7Color_ButtonHovered,
UI7Color_Text,
UI7Color_TextDead,
UI7Color_Header,
UI7Color_Selector,
UI7Color_Checkmark,
UI7Color_FrameBackground,
UI7Color_FragmeBackgroundHovered,
UI7Color_FrameBackgroundHovered,
UI7Color_Progressbar,
UI7Color_ListEven,
UI7Color_ListOdd,
@ -115,20 +115,4 @@ class Theme {
std::vector<std::pair<UI7Color, u32>> changes;
};
} // namespace UI7
/// Using UI7Color as a Class to be able to
/// define it as struct as well as using it as enum
class UI7Color {
public:
UI7Color() {
/// No Color
}
UI7Color(unsigned int c) { color = c; }
UI7Color(UI7Color_ c) {}
~UI7Color() {}
operator u32() const { return color; }
private:
u32 color;
};
} // namespace PD

View File

@ -23,23 +23,45 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
*/
#include <pd/controls/hid.hpp> //// WOW A NON UI/ Header
#include <pd/ui7/drawlist.hpp>
#include <pd/ui7/flags.hpp>
#include <pd/ui7/id.hpp>
#include <pd/ui7/menu.hpp>
#include <pd/ui7/theme.hpp>
#include <unordered_map>
namespace PD {
namespace UI7 {
class Context : public SmartCtor<Context> {
public:
Context() {}
Context(LI::Renderer::Ref ren, Hid::Ref hid) {
this->ren = ren;
this->inp = hid;
Theme::Default(theme);
back = DrawList::New(ren);
front = DrawList::New(ren);
}
~Context() {}
bool BeginMenu(const ID& id, UI7MenuFlags flags = 0);
Menu::Ref GetCurrentMenu();
void EndMenu();
/// Theme Management
Theme& GetTheme() { return theme; }
/// @brief Update Context (Render menus)
/// @param delta deltatime
void Update(float delta);
/// Expose DrawLists
DrawList::Ref BackList() { return back; }
DrawList::Ref FrontList() { return front; }
private:
// Linked Renderer / Hid
LI::Renderer::Ref ren;
Hid::Ref inp;
// Timing
float delta;
float time;
@ -50,11 +72,14 @@ class Context : public SmartCtor<Context> {
bool debugging;
// Menu Handlers
std::unordered_map<u32, Menu::Ref> menus;
std::vector<u32> amenus; // Active ones
Menu::Ref current;
// Context DrawList
DrawList::Ref debug;
DrawList::Ref front;
DrawList::Ref back;
// Theme
Theme theme;
// Promt Handler
};
} // namespace UI7