update
This commit is contained in:
@@ -9,7 +9,7 @@ Mesh createMesh(const char* obj_file) {
|
|||||||
|
|
||||||
tinyobj::ObjReader reader = tinyobj::ObjReader();
|
tinyobj::ObjReader reader = tinyobj::ObjReader();
|
||||||
bool success = reader.ParseFromFile(obj_file);
|
bool success = reader.ParseFromFile(obj_file);
|
||||||
log("%s\n", reader.Error().c_str());
|
print("%s\n", reader.Error().c_str());
|
||||||
|
|
||||||
const tinyobj::attrib_t attrib = reader.GetAttrib();
|
const tinyobj::attrib_t attrib = reader.GetAttrib();
|
||||||
|
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ uint32 createGlShader(string file_path, ShaderType shader_type) {
|
|||||||
string info_log = PushString(temp.arena, (size_t)info_log_length + 1);
|
string info_log = PushString(temp.arena, (size_t)info_log_length + 1);
|
||||||
glGetShaderInfoLog(shader, info_log_length, NULL, info_log.str);
|
glGetShaderInfoLog(shader, info_log_length, NULL, info_log.str);
|
||||||
const char* shader_type_name = shader_type == ShaderType::fragment ? "FRAGMENT" : "VERTEX";
|
const char* shader_type_name = shader_type == ShaderType::fragment ? "FRAGMENT" : "VERTEX";
|
||||||
log("%s shader compilation error (%S):\n%S", shader_type_name, file_path, info_log);
|
print("%s shader compilation error (%S):\n%S", shader_type_name, file_path, info_log);
|
||||||
}
|
}
|
||||||
scratchEnd(temp);
|
scratchEnd(temp);
|
||||||
return shader;
|
return shader;
|
||||||
@@ -50,7 +50,7 @@ Shader createShader(string vertex_path, string fragment_path) {
|
|||||||
glGetShaderiv(result.prog_id, GL_INFO_LOG_LENGTH, &info_log_length);
|
glGetShaderiv(result.prog_id, GL_INFO_LOG_LENGTH, &info_log_length);
|
||||||
string info_log_prog = PushString(temp.arena, (size_t)info_log_length + 1);
|
string info_log_prog = PushString(temp.arena, (size_t)info_log_length + 1);
|
||||||
glGetProgramInfoLog(result.prog_id, info_log_length, NULL, info_log_prog.str);
|
glGetProgramInfoLog(result.prog_id, info_log_length, NULL, info_log_prog.str);
|
||||||
log("Shader program link error:\n%S", info_log_prog);
|
print("Shader program link error:\n%S", info_log_prog);
|
||||||
}
|
}
|
||||||
|
|
||||||
glDeleteShader(vertex_shader);
|
glDeleteShader(vertex_shader);
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ Texture createTexture(const char* source_path) {
|
|||||||
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, result.width, result.height, 0, GL_RGB, GL_UNSIGNED_BYTE, data);
|
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, result.width, result.height, 0, GL_RGB, GL_UNSIGNED_BYTE, data);
|
||||||
glGenerateMipmap(GL_TEXTURE_2D);
|
glGenerateMipmap(GL_TEXTURE_2D);
|
||||||
} else {
|
} else {
|
||||||
log("Failed to load texture.");
|
print("Failed to load texture.");
|
||||||
}
|
}
|
||||||
stbi_image_free(data);
|
stbi_image_free(data);
|
||||||
|
|
||||||
|
|||||||
@@ -31,18 +31,18 @@ Entity *get_entity(uint32 id);
|
|||||||
SceneGraphNode *get_scene_graph_node(int id);
|
SceneGraphNode *get_scene_graph_node(int id);
|
||||||
uint32 new_graph_node();
|
uint32 new_graph_node();
|
||||||
|
|
||||||
void log(glm::vec3* vector) {
|
void print(glm::vec3* vector) {
|
||||||
glm::vec3 vec = *vector;
|
glm::vec3 vec = *vector;
|
||||||
log(
|
print(
|
||||||
"┌ ┐\n"
|
"┌ ┐\n"
|
||||||
"│%7.2f%, %7.2f, %7.2f │\n"
|
"│%7.2f%, %7.2f, %7.2f │\n"
|
||||||
"└ ┘\n",
|
"└ ┘\n",
|
||||||
vec[0], vec[1], vec[2]);
|
vec[0], vec[1], vec[2]);
|
||||||
}
|
}
|
||||||
|
|
||||||
void log(glm::mat4* matrix) {
|
void print(glm::mat4* matrix) {
|
||||||
glm::mat4 mat = *matrix;
|
glm::mat4 mat = *matrix;
|
||||||
log(
|
print(
|
||||||
"┌ ┐\n"
|
"┌ ┐\n"
|
||||||
"│%7.2f%, %7.2f, %7.2f, %7.2f │\n"
|
"│%7.2f%, %7.2f, %7.2f, %7.2f │\n"
|
||||||
"│%7.2f%, %7.2f, %7.2f, %7.2f │\n"
|
"│%7.2f%, %7.2f, %7.2f, %7.2f │\n"
|
||||||
|
|||||||
Reference in New Issue
Block a user