Max/korenkonder_ReDIVA
1
0
Fork 0
mirror of https://github.com/korenkonder/ReDIVA.git synced 2026-10-08 06:38:27 +03:00
Code Issues Packages Projects Releases Wiki Activity

Shader overhaul

Browse Source
This commit is contained in:
korenkonder
2025-12-28 21:47:05 +03:00
parent b789e17a8d
commit c64a20f0c0
11 changed files with 320 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/CRE/render_context.cpp
+34 -12
View File
@@ -223,7 +223,9 @@ bool light_proj::set_mat(render_data_context& rend_data_ctx, cam_data& cam, bool
mat4 mat;
light_proj_get_view_proj_mat(cam, position, interest,
fov * RAD_TO_DEG_FLOAT, 4.0f, 0.1f, 10.0f, &mat);
rend_data_ctx.set_scene_light_projection(mat);
mat4 mat_depth = mat;
rend_data_ctx.set_scene_light_projection(mat, mat_depth);
}
else
light_proj_get_view_proj_mat(cam, position, interest,
@@ -328,6 +330,7 @@ void render_data::obj_scene_data::reset() {
g_light_env_chara_specular = 0.0f;
g_light_env_reflect_diffuse = 1.0f;
g_light_env_reflect_ambient = 0.0f;
g_light_env_reflect_specular = 0.0f;
g_light_env_proj_diffuse = 1.0f;
g_light_env_proj_specular = 0.0f;
g_light_env_proj_position = 0.0f;
@@ -339,7 +342,6 @@ void render_data::obj_scene_data::reset() {
g_light_chara_luce = 0.0f;
g_light_chara_back = 0.0f;
g_light_face_diff = 0.0f;
g_chara_color_rim = 0.0f;
g_chara_color0 = 0.0f;
g_chara_color1 = 0.0f;
g_chara_f_dir = { 0.0f, 1.0f, 0.0f, 0.0f };
@@ -382,6 +384,10 @@ void render_data::obj_scene_data::reset() {
g_light_projection[1] = mat4_identity.row1;
g_light_projection[2] = mat4_identity.row2;
g_light_projection[3] = mat4_identity.row3;
g_light_projection_depth[0] = mat4_identity.row0;
g_light_projection_depth[1] = mat4_identity.row1;
g_light_projection_depth[2] = mat4_identity.row2;
g_light_projection_depth[3] = mat4_identity.row3;
g_forward_z_projection_row2 = 0.0f;
}
@@ -844,11 +850,12 @@ void render_data_context::set_scene_light(const mat4& irradiance_r_transforms, c
const vec4& light_env_stage_specular, const vec4& light_env_chara_diffuse,
const vec4& light_env_chara_ambient, const vec4& light_env_chara_specular,
const vec4& light_env_reflect_diffuse, const vec4& light_env_reflect_ambient,
const vec4& light_env_proj_diffuse, const vec4& light_env_proj_specular,
const vec4& light_env_proj_position, const vec4& light_stage_dir, const vec4& light_stage_diff,
const vec4& light_stage_spec, const vec4& light_chara_dir, const vec4& light_chara_spec,
const vec4& light_chara_luce, const vec4& light_chara_back, const vec4& light_face_diff,
const vec4& chara_color0, const vec4& chara_color1, const vec4& chara_f_dir, const vec4& chara_f_ambient,
const vec4& light_env_reflect_specular, const vec4& light_env_proj_diffuse,
const vec4& light_env_proj_specular, const vec4& light_env_proj_position,
const vec4& light_stage_dir, const vec4& light_stage_diff, const vec4& light_stage_spec,
const vec4& light_chara_dir, const vec4& light_chara_spec, const vec4& light_chara_luce,
const vec4& light_chara_back, const vec4& light_face_diff, const vec4& chara_color0,
const vec4& chara_color1, const vec4& chara_f_dir, const vec4& chara_f_ambient,
const vec4& chara_f_diffuse, const vec4& chara_tc_param, const mat4& normal_tangent_transforms,
const vec4& light_reflect_dir, const vec4& clip_plane, const vec4& npr_cloth_spec_color) {
mat4 temp;
@@ -874,6 +881,7 @@ void render_data_context::set_scene_light(const mat4& irradiance_r_transforms, c
data.buffer_scene_data.g_light_env_chara_specular = light_env_chara_specular;
data.buffer_scene_data.g_light_env_reflect_diffuse = light_env_reflect_diffuse;
data.buffer_scene_data.g_light_env_reflect_ambient = light_env_reflect_ambient;
data.buffer_scene_data.g_light_env_reflect_specular = light_env_reflect_specular;
data.buffer_scene_data.g_light_env_proj_diffuse = light_env_proj_diffuse;
data.buffer_scene_data.g_light_env_proj_specular = light_env_proj_specular;
data.buffer_scene_data.g_light_env_proj_position = light_env_proj_position;
@@ -901,13 +909,19 @@ void render_data_context::set_scene_light(const mat4& irradiance_r_transforms, c
enum_or(data.flags, RENDER_DATA_SCENE_UPDATE);
}
void render_data_context::set_scene_light_projection(const mat4& light_projection) {
void render_data_context::set_scene_light_projection(
const mat4& light_projection, const mat4& light_projection_depth) {
mat4 temp;
mat4_transpose(&light_projection, &temp);
data.buffer_scene_data.g_light_projection[0] = temp.row0;
data.buffer_scene_data.g_light_projection[1] = temp.row1;
data.buffer_scene_data.g_light_projection[2] = temp.row2;
data.buffer_scene_data.g_light_projection[3] = temp.row3;
mat4_transpose(&light_projection_depth, &temp);
data.buffer_scene_data.g_light_projection_depth[0] = temp.row0;
data.buffer_scene_data.g_light_projection_depth[1] = temp.row1;
data.buffer_scene_data.g_light_projection_depth[2] = temp.row2;
data.buffer_scene_data.g_light_projection_depth[3] = temp.row3;
enum_or(data.flags, RENDER_DATA_SCENE_UPDATE);
}
@@ -1119,13 +1133,21 @@ sprite_width(), sprite_height(), screen_x_offset(), screen_y_offset(), screen_wi
gl_state.bind_array_buffer(box_vbo);
glEnableVertexAttribArray(0);
glVertexAttribPointer(0, 4, GL_FLOAT, GL_FALSE, sizeof(float_t) * 16, (void*)0);
glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, sizeof(float_t) * 8, (void*)0);
glEnableVertexAttribArray(1);
glVertexAttribPointer(1, 4, GL_FLOAT, GL_FALSE, sizeof(float_t) * 16, (void*)(sizeof(float_t) * 4));
glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, sizeof(float_t) * 8, (void*)(sizeof(float_t) * 2));
glEnableVertexAttribArray(2);
glVertexAttribPointer(2, 4, GL_FLOAT, GL_FALSE, sizeof(float_t) * 16, (void*)(sizeof(float_t) * 8));
glVertexAttribPointer(2, 2, GL_FLOAT, GL_FALSE, sizeof(float_t) * 8, (void*)(sizeof(float_t) * 4));
glEnableVertexAttribArray(3);
glVertexAttribPointer(3, 4, GL_FLOAT, GL_FALSE, sizeof(float_t) * 16, (void*)(sizeof(float_t) * 12));
glVertexAttribPointer(3, 2, GL_FLOAT, GL_FALSE, sizeof(float_t) * 8, (void*)(sizeof(float_t) * 6));
glEnableVertexAttribArray(4);
glVertexAttribPointer(4, 2, GL_FLOAT, GL_FALSE, sizeof(float_t) * 8, (void*)(sizeof(float_t) * 8));
glEnableVertexAttribArray(5);
glVertexAttribPointer(5, 2, GL_FLOAT, GL_FALSE, sizeof(float_t) * 8, (void*)(sizeof(float_t) * 10));
glEnableVertexAttribArray(6);
glVertexAttribPointer(6, 2, GL_FLOAT, GL_FALSE, sizeof(float_t) * 8, (void*)(sizeof(float_t) * 12));
glEnableVertexAttribArray(7);
glVertexAttribPointer(7, 2, GL_FLOAT, GL_FALSE, sizeof(float_t) * 8, (void*)(sizeof(float_t) * 14));
glGenVertexArrays(1, &lens_ghost_vao);
gl_state.bind_vertex_array(lens_ghost_vao);