Skip to content
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.

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

msdfgen: Update to 1.12 #101367

Merged
merged 1 commit into from
Jan 10, 2025
Merged

msdfgen: Update to 1.12 #101367

merged 1 commit into from
Jan 10, 2025

Conversation

akien-mga
Copy link
Member

@akien-mga akien-mga commented Jan 9, 2025

Didn't test.

Added the new DistanceMapping.cpp to the build, but not the save-/export- helpers.

@akien-mga akien-mga added this to the 4.x milestone Jan 9, 2025
@akien-mga akien-mga requested a review from bruvzg January 9, 2025 20:16
@akien-mga akien-mga requested a review from a team as a code owner January 9, 2025 20:16
@bruvzg
Copy link
Member

bruvzg commented Jan 9, 2025

Adding EdgeHolder.h seems to fix build (at least on macOS), will check if it works tomorrow:

diff --git a/modules/text_server_adv/text_server_adv.cpp b/modules/text_server_adv/text_server_adv.cpp
index d163b9f232..aa97a4073d 100644
--- a/modules/text_server_adv/text_server_adv.cpp
+++ b/modules/text_server_adv/text_server_adv.cpp
@@ -69,6 +69,7 @@ using namespace godot;
 #ifdef _MSC_VER
 #pragma warning(disable : 4458)
 #endif
+#include <core/EdgeHolder.h>
 #include <core/ShapeDistanceFinder.h>
 #include <core/contour-combiners.h>
 #include <core/edge-selectors.h>

@akien-mga
Copy link
Member Author

Yeah I was looking into this, it seems the API entry points are all over the place in this lib. There's msdfgen.h which includes almost everything but the few headers we end up having to include manually. Those seem to be internal / low-level headers but the high-level implementations implicitly require them without including them properly? I'm confused.

@akien-mga akien-mga requested a review from a team as a code owner January 9, 2025 21:04
@bruvzg
Copy link
Member

bruvzg commented Jan 9, 2025

This might be some sort of build cache issue, not sure. But we do access some low level APIs to integrate processing with WorkerThreadPool.

@akien-mga
Copy link
Member Author

They moved the EdgeHolder constructor implementation from the .cpp to the .h so I think it's expected we need the header now, it's just weird that whichever API we use that uses EdgeHolder internally doesn't include the file itself.

Copy link
Member

@bruvzg bruvzg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested it with few fonts, seems to be working fine.

@akien-mga akien-mga modified the milestones: 4.x, 4.4 Jan 10, 2025
@akien-mga akien-mga merged commit 85fbf7c into godotengine:master Jan 10, 2025
20 checks passed
@akien-mga akien-mga deleted the msdfgen-1.12 branch January 10, 2025 22:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants