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

feat: add shader class

Browse Source
This commit is contained in:
zhenyan121
2026-03-29 11:13:34 +08:00
parent b1a5581131
commit 2cfbd1a03b
11 changed files with 216 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/tools/font.cpp
View File

@@ -1,4 +1,5 @@
#include <Cubed/config.hpp>
#include <Cubed/shader.hpp>
#include <Cubed/tools/font.hpp>
#include <Cubed/tools/log.hpp>
@@ -90,10 +91,10 @@ void Font::setup_font_character() {
void Font::render_text(GLuint program, const std::string& text, float x, float y, float scale, const glm::vec3& color) {
void Font::render_text(const Shader& shader, const std::string& text, float x, float y, float scale, const glm::vec3& color) {
static Font font;
glUseProgram(program);
glUniform3f(glGetUniformLocation(program, "textColor"), color.x, color.y, color.z);
glUniform3f(shader.loc("textColor"), color.x, color.y, color.z);
glActiveTexture(GL_TEXTURE0);
std::vector<Vertex2D> vertices;

18
src/tools/shader_tools.cpp
View File

@@ -6,11 +6,11 @@
#include <Cubed/tools/log.hpp>
namespace Shader {
namespace Tools {
GLuint create_shader_program(const std::string& v_shader_path, const std::string& f_shader_path) {
std::string v_shader_str = Shader::read_shader_source(v_shader_path);
std::string f_shader_str = Shader::read_shader_source(f_shader_path);
std::string v_shader_str = Tools::read_shader_source(v_shader_path);
std::string f_shader_str = Tools::read_shader_source(f_shader_path);
const char *v_shader_source = v_shader_str.c_str();
const char *f_shader_source = f_shader_str.c_str();
@@ -21,19 +21,19 @@ namespace Shader {
glShaderSource(v_shader, 1, &v_shader_source, NULL);
glShaderSource(f_shader, 1, &f_shader_source, NULL);
glCompileShader(v_shader);
Shader::check_opengl_error();
Tools::check_opengl_error();
glGetShaderiv(v_shader, GL_COMPILE_STATUS, &vc);
if (vc != 1) {
LOG::error("vertex compilation failed");
Shader::print_shader_log(v_shader);
Tools::print_shader_log(v_shader);
CUBED_ASSERT(0);
}
glCompileShader(f_shader);
Shader::check_opengl_error();
Tools::check_opengl_error();
glGetShaderiv(f_shader, GL_COMPILE_STATUS, &fc);
if (fc != 1) {
LOG::error("vertex compilation failed");
Shader::print_shader_log(f_shader);
Tools::print_shader_log(f_shader);
CUBED_ASSERT(0);
}
GLuint vf_program = glCreateProgram();
@@ -42,11 +42,11 @@ namespace Shader {
glLinkProgram(vf_program);
GLint linked;
Shader::check_opengl_error();
Tools::check_opengl_error();
glGetProgramiv(vf_program, GL_LINK_STATUS, &linked);
if (linked != 1) {
LOG::error("linking failed");
Shader::print_program_info(vf_program);
Tools::print_program_info(vf_program);
CUBED_ASSERT(0);
}
glDeleteShader(v_shader);