Compare commits

..

4 Commits

Author SHA1 Message Date
9f9191a9db Temp patch for text size bounds. Needs to be fixed properly.
All checks were successful
Run ReCI Build Test / Explore-Gitea-Actions (push) Successful in 2m13s
2025-06-09 15:54:48 -05:00
2d536cd611 Merged several branches, fixed small error, updated dependency packages.
All checks were successful
Run ReCI Build Test / Explore-Gitea-Actions (push) Successful in 5m14s
2025-06-06 13:02:29 -05:00
40412a300a Merge pull request 'Completed Shaders Task' (#47) from shaders_again into master
Some checks failed
Run ReCI Build Test / Explore-Gitea-Actions (push) Failing after 1m39s
Reviewed-on: #47
2025-06-06 13:44:47 -04:00
b3fb28be38 Package Maintenance - Update mcolor to 7.1
Some checks failed
Run ReCI Build Test / Explore-Gitea-Actions (push) Failing after 1m41s
2025-04-22 17:19:00 -04:00
3 changed files with 12 additions and 8 deletions

View File

@@ -17,7 +17,7 @@ include(cmake/CPM.cmake)
CPMAddPackage(
NAME mcolor
URL https://git.redacted.cc/maxine/mcolor/archive/Prerelease-6.2.zip
URL https://git.redacted.cc/maxine/mcolor/archive/Release-1.zip
)
CPMAddPackage(
@@ -27,7 +27,7 @@ CPMAddPackage(
CPMAddPackage(
NAME ReWindow
URL https://git.redacted.cc/Redacted/ReWindow/archive/Prerelease-32.zip
URL https://git.redacted.cc/Redacted/ReWindow/archive/Prerelease-34.zip
)
CPMAddPackage(
@@ -37,7 +37,7 @@ CPMAddPackage(
CPMAddPackage(
NAME jlog
URL https://git.redacted.cc/josh/jlog/Prerelease-17.zip
URL https://git.redacted.cc/josh/jlog/Prerelease-19.zip
)
if (WIN32)

View File

@@ -112,7 +112,11 @@ namespace JGL {
Vector2 extents = Vector2::Zero;
for(auto& f : fontCache.getFonts()) {
if (f->getFontIndex() == this->index) {
// This edit technically "works" by solving the immediate problem of text-bounds returning incorrectly,
// But I am **sure** this is not how it should be implemented, I will leave that to Will to fix.
if (f->getFontIndex() == this->index && f->getFontSize() == ptSize) {
for (const char &c: text) {
auto glyph = f->getGlyph(c);
extents.x += glyph->advanceX;

View File

@@ -14,7 +14,7 @@ namespace JGL {
bool stack_top = (already_included.size() == 0);
if (stack_top) {
already_included.emplace_back(filepath);
already_included.emplace_back(filepath.string());
}
std::string ret_data = "";
@@ -42,7 +42,7 @@ namespace JGL {
#elif __linux__
std::replace(rel_include_path.begin(), rel_include_path.end(), '\\', '/');
#endif
std::string full_include_path = extract_path(filepath) + rel_include_path;
std::string full_include_path = extract_path(filepath.string()) + rel_include_path;
// Avoid including self
if (filepath == full_include_path) {
@@ -117,8 +117,8 @@ namespace JGL {
Shader::Shader(const std::filesystem::path& vertex_source_path, const std::filesystem::path& fragment_source_path, const std::vector<std::pair<std::string, GLint>>& attribute_bindings) :
Shader(ReadFile(vertex_source_path), ReadFile(fragment_source_path), attribute_bindings) {
vertexPath = vertex_source_path;
fragmentPath = fragment_source_path;
vertexPath = vertex_source_path.string();
fragmentPath = fragment_source_path.string();
}
void Shader::checkCompileErrors(GLuint shader, const std::string& type) {