josh/JGL
1
0
Fork 1
Code Issues 14 Pull Requests Actions Packages Projects Releases 58 Wiki Activity

Merged several branches, fixed small error, updated dependency packages.
All checks were successful
Run ReCI Build Test / Explore-Gitea-Actions (push) Successful in 5m14s
Details

Browse Source
This commit is contained in:
josh
2025-06-06 13:02:29 -05:00
parent 40412a300a
commit 2d536cd611
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@@ -17,7 +17,7 @@ include(cmake/CPM.cmake)
CPMAddPackage( CPMAddPackage(
NAME mcolor NAME mcolor
URL https://git.redacted.cc/maxine/mcolor/archive/Prerelease-7.2.zip URL https://git.redacted.cc/maxine/mcolor/archive/Release-1.zip
) )
CPMAddPackage( CPMAddPackage(
@@ -27,7 +27,7 @@ CPMAddPackage(
CPMAddPackage( CPMAddPackage(
NAME ReWindow 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( CPMAddPackage(
@@ -37,7 +37,7 @@ CPMAddPackage(
CPMAddPackage( CPMAddPackage(
NAME jlog NAME jlog
URL https://git.redacted.cc/josh/jlog/Prerelease-17.zip URL https://git.redacted.cc/josh/jlog/Prerelease-19.zip
) )
if (WIN32) if (WIN32)

8
src/types/Shader.cpp
View File

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