zhenyan121/Cubed
1
0
Fork 0
mirror of https://github.com/zhenyan121/Cubed.git synced 2026-08-09 02:07:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: include for glsl (#24)

Browse Source 
* refactor(gameplay): remove unused includes and members, clear vertex data after upload

* feat(shader-tools): add recursive #include support for shader sources

* refactor(shaders): extract noise and sky color functions into shared GLSL includes
This commit is contained in:
zhenyan121
2026-06-23 10:27:17 +08:00
committed by GitHub
parent 97993b72fe
commit d5a12869e6
11 changed files with 142 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
src/tools/shader_tools.cpp
View File

@@ -5,11 +5,70 @@
#include <filesystem>
#include <fstream>
#include <unordered_set>
namespace Cubed {
namespace fs = std::filesystem;
namespace {
bool is_include(const std::string& line) {
std::string_view sv(line);
auto first = sv.find_first_not_of(" \t");
return first != std::string::npos && sv.substr(first, 8) == "#include";
}
std::string parse_include(const std::string& line) {
auto pos = line.find("#include");
auto start = line.find_first_of("<\"", pos);
auto end = line.find_first_of(">\"", start + 1);
if (start == std::string::npos || end == std::string::npos) {
Logger::error("Invalid include: {}", line);
return {};
}
return line.substr(start + 1, end - start - 1);
}
void load_shader(std::string& source, const fs::path& file,
std::unordered_set<fs::path>& included) {
if (!fs::is_regular_file(file)) {
Logger::error("File {} don't Exist!", file.string());
return;
}
auto canon = fs::canonical(file);
if (!included.insert(canon).second) {
return;
}
std::ifstream in(file);
if (!in.is_open()) {
Logger::error("Can't open {}", file.string());
return;
}
std::string line;
while (std::getline(in, line)) {
if (is_include(line)) {
auto include_file = file.parent_path() / parse_include(line);
source += "// begin include ";
source += include_file.string();
source += "\n";
load_shader(source, include_file, included);
source += "// end include ";
source += include_file.string();
source += "\n";
} else {
source.append(line + "\n");
}
}
}
} // namespace
namespace Tools {
GLuint create_shader_program(const std::string& v_shader_path,
@@ -102,19 +161,9 @@ bool check_opengl_error() {
std::string read_shader_source(const std::string& file_path) {
std::string content;
std::ifstream file_stream(file_path, std::ios::in);
if (!file_stream.is_open()) {
Logger::error("{} not exist", file_path);
}
std::string line = "";
while (!file_stream.eof()) {
getline(file_stream, line);
content.append(line + "\n");
}
file_stream.close();
fs::path path(file_path);
std::unordered_set<fs::path> included;
load_shader(content, path, included);
return content;
}