v4games
/
v4k-git-backup
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

render: optimise pbr load

main
Dominik Madarász 2024-03-26 15:22:36 +01:00
parent d636c1c796
commit d2582796a8
3 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
engine/joint/v4k.h
View File

@ -373484,16 +373484,11 @@ bool model_load_textures(iqm_t *q, const struct iqmheader *hdr, model_t *model,
material_t mt = {0}; material_t mt = {0};
mt.name = STRDUP(&str[m->material]); mt.name = STRDUP(&str[m->material]);
// initialise basic texture layer first // initialise basic texture layer
mt.layer[MATERIAL_CHANNEL_DIFFUSE].map.color = material_color_hex ? material_color : vec4(1,1,1,1); mt.layer[MATERIAL_CHANNEL_DIFFUSE].map.color = material_color_hex ? material_color : vec4(1,1,1,1);
mt.layer[MATERIAL_CHANNEL_DIFFUSE].map.texture = CALLOC(1, sizeof(texture_t)); mt.layer[MATERIAL_CHANNEL_DIFFUSE].map.texture = CALLOC(1, sizeof(texture_t));
mt.layer[MATERIAL_CHANNEL_DIFFUSE].map.texture->id = *out++; mt.layer[MATERIAL_CHANNEL_DIFFUSE].map.texture->id = *out++;
// initialise PBR material workflow
if (_flags & MODEL_PBR) {
model_load_pbr(&mt);
}
array_push(model->materials, mt); array_push(model->materials, mt);
} }
@ -373905,7 +373900,9 @@ void model_shading(model_t *m, int shading) {
} }
// rebind shader // rebind shader
// @fixme: destroy old shader program // @fixme: app crashes rn
// glUseProgram(0);
// glDeleteProgram(m->program);
const char *symbols[] = { "{{include-shadowmap}}", vfs_read("shaders/fs_0_0_shadowmap_lit.glsl") }; // #define RIM const char *symbols[] = { "{{include-shadowmap}}", vfs_read("shaders/fs_0_0_shadowmap_lit.glsl") }; // #define RIM
int shaderprog = shader(strlerp(1,symbols,vfs_read("shaders/vs_323444143_16_3322_model.glsl")), strlerp(1,symbols,vfs_read("shaders/fs_32_4_model.glsl")), //fs, int shaderprog = shader(strlerp(1,symbols,vfs_read("shaders/vs_323444143_16_3322_model.glsl")), strlerp(1,symbols,vfs_read("shaders/fs_32_4_model.glsl")), //fs,
"att_position,att_texcoord,att_normal,att_tangent,att_instanced_matrix,,,,att_indexes,att_weights,att_vertexindex,att_color,att_bitangent,att_texcoord2","fragColor", "att_position,att_texcoord,att_normal,att_tangent,att_instanced_matrix,,,,att_indexes,att_weights,att_vertexindex,att_color,att_bitangent,att_texcoord2","fragColor",

11
engine/split/v4k_render.c
View File

@ -3450,16 +3450,11 @@ bool model_load_textures(iqm_t *q, const struct iqmheader *hdr, model_t *model,
material_t mt = {0}; material_t mt = {0};
mt.name = STRDUP(&str[m->material]); mt.name = STRDUP(&str[m->material]);
// initialise basic texture layer first // initialise basic texture layer
mt.layer[MATERIAL_CHANNEL_DIFFUSE].map.color = material_color_hex ? material_color : vec4(1,1,1,1); mt.layer[MATERIAL_CHANNEL_DIFFUSE].map.color = material_color_hex ? material_color : vec4(1,1,1,1);
mt.layer[MATERIAL_CHANNEL_DIFFUSE].map.texture = CALLOC(1, sizeof(texture_t)); mt.layer[MATERIAL_CHANNEL_DIFFUSE].map.texture = CALLOC(1, sizeof(texture_t));
mt.layer[MATERIAL_CHANNEL_DIFFUSE].map.texture->id = *out++; mt.layer[MATERIAL_CHANNEL_DIFFUSE].map.texture->id = *out++;
// initialise PBR material workflow
if (_flags & MODEL_PBR) {
model_load_pbr(&mt);
}
array_push(model->materials, mt); array_push(model->materials, mt);
} }
@ -3871,7 +3866,9 @@ void model_shading(model_t *m, int shading) {
} }
// rebind shader // rebind shader
// @fixme: destroy old shader program // @fixme: app crashes rn
// glUseProgram(0);
// glDeleteProgram(m->program);
const char *symbols[] = { "{{include-shadowmap}}", vfs_read("shaders/fs_0_0_shadowmap_lit.glsl") }; // #define RIM const char *symbols[] = { "{{include-shadowmap}}", vfs_read("shaders/fs_0_0_shadowmap_lit.glsl") }; // #define RIM
int shaderprog = shader(strlerp(1,symbols,vfs_read("shaders/vs_323444143_16_3322_model.glsl")), strlerp(1,symbols,vfs_read("shaders/fs_32_4_model.glsl")), //fs, int shaderprog = shader(strlerp(1,symbols,vfs_read("shaders/vs_323444143_16_3322_model.glsl")), strlerp(1,symbols,vfs_read("shaders/fs_32_4_model.glsl")), //fs,
"att_position,att_texcoord,att_normal,att_tangent,att_instanced_matrix,,,,att_indexes,att_weights,att_vertexindex,att_color,att_bitangent,att_texcoord2","fragColor", "att_position,att_texcoord,att_normal,att_tangent,att_instanced_matrix,,,,att_indexes,att_weights,att_vertexindex,att_color,att_bitangent,att_texcoord2","fragColor",

11
engine/v4k.c
View File

@ -20624,16 +20624,11 @@ bool model_load_textures(iqm_t *q, const struct iqmheader *hdr, model_t *model,
material_t mt = {0}; material_t mt = {0};
mt.name = STRDUP(&str[m->material]); mt.name = STRDUP(&str[m->material]);
// initialise basic texture layer first // initialise basic texture layer
mt.layer[MATERIAL_CHANNEL_DIFFUSE].map.color = material_color_hex ? material_color : vec4(1,1,1,1); mt.layer[MATERIAL_CHANNEL_DIFFUSE].map.color = material_color_hex ? material_color : vec4(1,1,1,1);
mt.layer[MATERIAL_CHANNEL_DIFFUSE].map.texture = CALLOC(1, sizeof(texture_t)); mt.layer[MATERIAL_CHANNEL_DIFFUSE].map.texture = CALLOC(1, sizeof(texture_t));
mt.layer[MATERIAL_CHANNEL_DIFFUSE].map.texture->id = *out++; mt.layer[MATERIAL_CHANNEL_DIFFUSE].map.texture->id = *out++;
// initialise PBR material workflow
if (_flags & MODEL_PBR) {
model_load_pbr(&mt);
}
array_push(model->materials, mt); array_push(model->materials, mt);
} }
@ -21045,7 +21040,9 @@ void model_shading(model_t *m, int shading) {
} }
// rebind shader // rebind shader
// @fixme: destroy old shader program // @fixme: app crashes rn
// glUseProgram(0);
// glDeleteProgram(m->program);
const char *symbols[] = { "{{include-shadowmap}}", vfs_read("shaders/fs_0_0_shadowmap_lit.glsl") }; // #define RIM const char *symbols[] = { "{{include-shadowmap}}", vfs_read("shaders/fs_0_0_shadowmap_lit.glsl") }; // #define RIM
int shaderprog = shader(strlerp(1,symbols,vfs_read("shaders/vs_323444143_16_3322_model.glsl")), strlerp(1,symbols,vfs_read("shaders/fs_32_4_model.glsl")), //fs, int shaderprog = shader(strlerp(1,symbols,vfs_read("shaders/vs_323444143_16_3322_model.glsl")), strlerp(1,symbols,vfs_read("shaders/fs_32_4_model.glsl")), //fs,
"att_position,att_texcoord,att_normal,att_tangent,att_instanced_matrix,,,,att_indexes,att_weights,att_vertexindex,att_color,att_bitangent,att_texcoord2","fragColor", "att_position,att_texcoord,att_normal,att_tangent,att_instanced_matrix,,,,att_indexes,att_weights,att_vertexindex,att_color,att_bitangent,att_texcoord2","fragColor",