Skip to content

Make Fontstash Optional #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SnapperTT wants to merge 15 commits into
base: master
Choose a base branch
from
Open

Make Fontstash Optional #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
ee4879d
Made Fontstash optional
SnapperTT Jan 17, 2025
2c46265
Update vg.cpp
SnapperTT Jan 17, 2025
88edf72
Update vg.h
SnapperTT Jan 17, 2025
9383015
Update vg.cpp
SnapperTT Jan 18, 2025
dc70ec1
Update vg.cpp
SnapperTT Jan 20, 2025
3756776
Update vg.h
SnapperTT Jan 20, 2025
6da73b3
Update vg.inl
SnapperTT Jan 20, 2025
8b27d8d
Update vg.cpp
SnapperTT Jan 21, 2025
1f7e501
Update vg.inl
SnapperTT Jan 21, 2025
83b2f02
Update vg.h - Changed callback API to accept usrPtr
SnapperTT Jan 21, 2025
f8a8231
Update vg.cpp - ctxCustomCallback forces a new draw command
SnapperTT Feb 11, 2025
843f3aa
Update vg.cpp - Fix compile warnings
SnapperTT Feb 24, 2025
f9809fc
Fix callback clearing an previously empty but currently in-use index …
SnapperTT Mar 25, 2025
36ab31d
end() - free index and vertex buffers if they are unused
SnapperTT Mar 27, 2025
bd37a2f
Update vg.cpp - fix includes
SnapperTT Mar 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions include/vg/inline/vg.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,6 +379,11 @@ inline void clTextBox(CommandListRef& ref, const TextConfig& cfg, float x, float
clTextBox(ref.m_Context, ref.m_Handle, cfg, x, y, breakWidth, str, end, textboxFlags);
}

inline void clCustomCallback(CommandListRef&ref, void* usrPtr, const uint32_t arg1, const uint32_t arg2)
{
clCustomCallback(ref.m_Context, ref.m_Handle, usrPtr, arg1, arg2);
}

inline void clSubmitCommandList(CommandListRef& ref, CommandListHandle child)
{
clSubmitCommandList(ref.m_Context, ref.m_Handle, child);
Expand Down
13 changes: 13 additions & 0 deletions include/vg/vg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
# define VG_CONFIG_DEBUG 0
#endif

#ifndef VG_USE_FONTSTASH
# define VG_USE_FONTSTASH 1
#endif

#ifndef VG_CONFIG_ENABLE_SHAPE_CACHING
# define VG_CONFIG_ENABLE_SHAPE_CACHING 1
#endif
Expand Down Expand Up @@ -44,6 +48,7 @@
# define VG_CONFIG_COMMAND_LIST_BEGIN_END_API 1
#endif


#if VG_CONFIG_DEBUG
#include <bx/debug.h>

Expand Down Expand Up @@ -97,6 +102,7 @@ namespace bgfx
struct TextureHandle;
}


namespace vg
{
typedef uint32_t Color;
Expand Down Expand Up @@ -462,6 +468,7 @@ void measureTextBox(Context* ctx, const TextConfig& cfg, float x, float y, float
float getTextLineHeight(Context* ctx, const TextConfig& cfg);
int textBreakLines(Context* ctx, const TextConfig& cfg, const char* str, const char* end, float breakRowWidth, TextRow* rows, int maxRows, uint32_t flags);
int textGlyphPositions(Context* ctx, const TextConfig& cfg, float x, float y, const char* text, const char* end, GlyphPosition* positions, int maxPositions);
void customCallback(Context* ctx, void* usrPtr, const uint32_t arg1, const uint32_t arg2);

/*
* pos: A list of 2D vertices (successive x,y pairs)
Expand Down Expand Up @@ -537,6 +544,7 @@ void clSetGlobalAlpha(Context* ctx, CommandListHandle handle, float alpha);

void clText(Context* ctx, CommandListHandle handle, const TextConfig& cfg, float x, float y, const char* str, const char* end);
void clTextBox(Context* ctx, CommandListHandle handle, const TextConfig& cfg, float x, float y, float breakWidth, const char* str, const char* end, uint32_t textboxFlags);
void clCustomCallback(Context* ctx, CommandListHandle handle, void* usrPtr, const uint32_t arg1, const uint32_t arg2);

void clSubmitCommandList(Context* ctx, CommandListHandle parent, CommandListHandle child);

Expand All @@ -553,6 +561,10 @@ float getTextLineHeight(Context* ctx, FontHandle fontHandle, float fontSize, uin
int textBreakLines(Context* ctx, FontHandle fontHandle, float fontSize, uint32_t alignment, const char* str, const char* end, float breakRowWidth, TextRow* rows, int maxRows, uint32_t flags);
int textGlyphPositions(Context* ctx, FontHandle fontHandle, float fontSize, uint32_t alignment, float x, float y, const char* str, const char* end, GlyphPosition* positions, int maxPositions);

// Call backs added
typedef void (*CustomCallbackFn) (Context* ctx, void* usrPtr, const uint32_t arg1, const uint32_t arg2);
extern CustomCallbackFn gCustomCallback;

// Helper struct and functions to avoid moving around both a Context and a CommandListHandle.
struct CommandListRef
{
Expand Down Expand Up @@ -604,6 +616,7 @@ void clSetGlobalAlpha(CommandListRef &ref, float alpha);

void clText(CommandListRef& ref, const TextConfig& cfg, float x, float y, const char* str, const char* end);
void clTextBox(CommandListRef& ref, const TextConfig& cfg, float x, float y, float breakWidth, const char* str, const char* end, uint32_t textboxFlags);
void clCustomCallback(CommandListRef&ref, void* usrPtr, const uint32_t arg1, const uint32_t arg2);
void clSubmitCommandList(CommandListRef& ref, CommandListHandle child);
}

Expand Down
Loading