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

Added some missing stuff

Browse Source
This commit is contained in:
korenkonder
2024-01-07 18:00:28 +03:00
parent eea8f8064b
commit 246d912a5f
3 changed files with 43 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/CRE/auth_3d.cpp
+5 -5
View File
@@ -473,7 +473,7 @@ void auth_3d::disp(render_context* rctx) {
if (i->active)
i->Disp(this, &mat, rctx);
rctx->disp_manager->set_material_list(0, 0);
rctx->disp_manager->set_material_list();
}
void auth_3d::load(a3da* auth_file,
@@ -3967,8 +3967,11 @@ static void auth_3d_set_material_list(auth_3d* auth, render_context* rctx) {
mdl::DispManager& disp_manager = *rctx->disp_manager;
int32_t mat_list_count = 0;
material_list_struct mat_list[TEXTURE_PATTERN_COUNT];
material_list_struct mat_list[MATERIAL_LIST_COUNT];
for (auth_3d_material_list& i : auth->material_list) {
if (!i.blend_color.flags && !i.emission.flags)
continue;
if (i.blend_color.flags) {
vec4& blend_color = mat_list[mat_list_count].blend_color;
vec4u8& has_blend_color = mat_list[mat_list_count].has_blend_color;
@@ -3999,9 +4002,6 @@ static void auth_3d_set_material_list(auth_3d* auth, render_context* rctx) {
mat_list[mat_list_count].has_emission = {};
}
if (!i.blend_color.flags && !i.emission.flags)
continue;
mat_list[mat_list_count].hash = i.hash;
mat_list_count++;
}
src/CRE/mdl/disp_manager.cpp
+25 -23
View File
@@ -226,9 +226,10 @@ namespace mdl {
void ObjData::init_sub_mesh(DispManager* disp_manager, const mat4* mat, float_t radius,
const obj_sub_mesh* sub_mesh, const obj_mesh* mesh, const obj_material_data* material,
const std::vector<GLuint>* textures, int32_t mat_count, const mat4* mats,
GLuint vertex_buffer, size_t vertex_buffer_offset, GLuint index_buffer, const vec4* blend_color,
const vec4* emission, GLuint morph_vertex_buffer, size_t morph_vertex_buffer_offset,
int32_t instances_count, const mat4* instances_mat, void(*func)(const ObjSubMeshArgs*)) {
GLuint vertex_buffer, size_t vertex_buffer_offset, GLuint index_buffer,
const vec4& blend_color, const vec4& emission, GLuint morph_vertex_buffer,
size_t morph_vertex_buffer_offset, int32_t instances_count, const mat4* instances_mat,
void(*func)(const ObjSubMeshArgs*), const ObjSubMeshArgs* func_data) {
kind = mdl::OBJ_KIND_NORMAL;
this->mat = *mat;
this->radius = radius;
@@ -255,19 +256,19 @@ namespace mdl {
for (int32_t i = 0; i < disp_manager->texture_transform_count && i < TEXTURE_TRANSFORM_COUNT; i++)
args->texture_transform_array[i] = disp_manager->texture_transform_array[i];
if (blend_color && *blend_color != 1.0f) {
if (blend_color != 1.0f) {
args->set_blend_color = true;
args->blend_color = *blend_color;
args->blend_color = blend_color;
}
else {
args->set_blend_color = false;
args->blend_color = 1.0f;
}
args->emission = *emission;
args->emission = emission;
args->chara_color = disp_manager->chara_color;
args->self_shadow = disp_manager->obj_flags & (mdl::OBJ_8 | mdl::OBJ_4) ? 1 : 0;
args->self_shadow = !!(disp_manager->obj_flags & (mdl::OBJ_8 | mdl::OBJ_4));
args->shadow = disp_manager->shadow_type;
args->texture_color_coefficients = disp_manager->texture_color_coefficients;
args->texture_color_coefficients.w = disp_manager->wet_param;
@@ -277,6 +278,7 @@ namespace mdl {
args->instances_count = instances_count;
args->instances_mat = instances_mat;
args->func = func;
args->func_data = func_data;
disp_manager->add_vertex_array(args);
}
@@ -2598,10 +2600,10 @@ namespace mdl {
}
bool DispManager::entry_obj(const ::obj* object, obj_mesh_vertex_buffer* obj_vertex_buf,
obj_mesh_index_buffer* obj_index_buf, const mat4* mat,
const std::vector<GLuint>* textures, const vec4* blend_color, const mat4* bone_mat,
const ::obj* object_morph, obj_mesh_vertex_buffer* obj_morph_vertex_buf, int32_t instances_count,
const mat4* instances_mat, void(*func)(const ObjSubMeshArgs*), bool enable_bone_mat, bool local) {
obj_mesh_index_buffer* obj_index_buf, const mat4* mat, const std::vector<GLuint>* textures,
const vec4* blend_color, const mat4* bone_mat, const ::obj* object_morph,
obj_mesh_vertex_buffer* obj_morph_vertex_buf, int32_t instances_count, const mat4* instances_mat,
void(*func)(const ObjSubMeshArgs*), const ObjSubMeshArgs* func_data, bool enable_bone_mat, bool local) {
if (!obj_vertex_buf || !obj_index_buf) {
printf_debug("mdl::DispManager::entry_obj: no vertex or index object buffer to draw;\n");
printf_debug(" Object: %s\n", object->name);
@@ -2811,8 +2813,8 @@ namespace mdl {
}
data->init_sub_mesh(this, mat, object->bounding_sphere.radius, sub_mesh, mesh, material, textures,
num_bone_index, mats, vertex_buffer, vertex_buffer_offset, index_buffer, &_blend_color, &_emission,
morph_vertex_buffer, morph_vertex_buffer_offset, instances_count, instances_mat, func);
num_bone_index, mats, vertex_buffer, vertex_buffer_offset, index_buffer, _blend_color, _emission,
morph_vertex_buffer, morph_vertex_buffer_offset, instances_count, instances_mat, func, func_data);
if (obj_flags & mdl::OBJ_SHADOW_OBJECT) {
entry_list((ObjType)(OBJ_TYPE_SHADOW_OBJECT_CHARA
@@ -2985,17 +2987,17 @@ namespace mdl {
vec4* blend_color_ptr = alpha < 1.0f ? &blend_color : 0;
entry_obj(obj, obj_vert_buf, obj_index_buf, mat, textures, blend_color_ptr,
bone_mat, 0, 0, 0, 0, 0, !!bone_mat);
bone_mat, 0, 0, 0, 0, 0, 0, !!bone_mat);
}
bool DispManager::entry_obj_by_object_info(const mat4* mat, object_info obj_info, const mat4* bone_mat) {
vec4 blend_color = 1.0f;
return entry_obj_by_object_info(mat, obj_info, &blend_color, bone_mat, 0, 0, 0, true);
return entry_obj_by_object_info(mat, obj_info, &blend_color, bone_mat, 0, 0, 0, 0, true);
}
bool DispManager::entry_obj_by_object_info(const mat4* mat, object_info obj_info,
const vec4* blend_color, const mat4* bone_mat, int32_t instances_count,
const mat4* instances_mat, void(*func)(const ObjSubMeshArgs*), bool enable_bone_mat, bool local) {
bool DispManager::entry_obj_by_object_info(const mat4* mat, object_info obj_info, const vec4* blend_color,
const mat4* bone_mat, int32_t instances_count, const mat4* instances_mat,
void(*func)(const ObjSubMeshArgs*), const ObjSubMeshArgs* func_data, bool enable_bone_mat, bool local) {
if (obj_info.id == -1 && obj_info.set_id == -1)
return false;
@@ -3016,25 +3018,25 @@ namespace mdl {
return entry_obj(object, obj_vertex_buffer, obj_index_buffer,
mat, textures, blend_color, bone_mat, obj_morph, obj_morph_vertex_buffer,
instances_count, instances_mat, func, enable_bone_mat, local);
instances_count, instances_mat, func, func_data, enable_bone_mat, local);
}
bool DispManager::entry_obj_by_object_info(const mat4* mat,
object_info obj_info, float_t alpha, const mat4* bone_mat) {
vec4 blend_color = 1.0f;
blend_color.w = alpha;
return entry_obj_by_object_info(mat, obj_info, &blend_color, bone_mat, 0, 0, 0, true);
return entry_obj_by_object_info(mat, obj_info, &blend_color, bone_mat, 0, 0, 0, 0, true);
}
bool DispManager::entry_obj_by_object_info(const mat4* mat, object_info obj_info,
float_t r, float_t g, float_t b, float_t a, const mat4* bone_mat, bool local) {
vec4 blend_color = { r, g, b, a };
return entry_obj_by_object_info(mat, obj_info, &blend_color, bone_mat, 0, 0, 0, true, local);
return entry_obj_by_object_info(mat, obj_info, &blend_color, bone_mat, 0, 0, 0, 0, true, local);
}
bool DispManager::entry_obj_by_object_info(const mat4* mat, object_info obj_info,
const vec4* blend_color, const mat4* bone_mat, bool local) {
return entry_obj_by_object_info(mat, obj_info, blend_color, 0, 0, 0, 0, false, local);
return entry_obj_by_object_info(mat, obj_info, blend_color, 0, 0, 0, 0, 0, false, local);
}
bool DispManager::entry_obj_by_object_info_instanced(object_info obj_info,
@@ -3054,7 +3056,7 @@ namespace mdl {
memmove(instances_mat, instances.data(), sizeof(mat4) * instances.size());
return entry_obj_by_object_info(&mat4_identity, obj_info, a >= 0.0f ? &blend_color : (vec4*)0,
0, (int32_t)instances.size(), instances_mat, 0, true);
0, (int32_t)instances.size(), instances_mat, 0, 0, true);
}
void DispManager::entry_obj_by_object_info_object_skin(object_info obj_info,
src/CRE/mdl/disp_manager.hpp
+13 -11
View File
@@ -194,7 +194,8 @@ namespace mdl {
texture_transform_struct texture_transform_array[TEXTURE_TRANSFORM_COUNT];
int32_t instances_count;
const mat4* instances_mat;
void(*func)(const mdl::ObjSubMeshArgs*);
void(*func)(const ObjSubMeshArgs*);
const ObjSubMeshArgs* func_data;
ObjSubMeshArgs();
};
@@ -359,9 +360,10 @@ namespace mdl {
void init_sub_mesh(DispManager* disp_manager, const mat4* mat, float_t radius,
const obj_sub_mesh* sub_mesh, const obj_mesh* mesh, const obj_material_data* material,
const std::vector<GLuint>* textures, int32_t mat_count, const mat4* mats,
GLuint vertex_buffer, size_t vertex_buffer_offset, GLuint index_buffer, const vec4* blend_color,
const vec4* emission, GLuint morph_vertex_buffer, size_t morph_vertex_buffer_offset,
int32_t instances_count, const mat4* instances_mat, void(*func)(const ObjSubMeshArgs*));
GLuint vertex_buffer, size_t vertex_buffer_offset, GLuint index_buffer,
const vec4& blend_color, const vec4& emission, GLuint morph_vertex_buffer,
size_t morph_vertex_buffer_offset, int32_t instances_count, const mat4* instances_mat,
void(*func)(const ObjSubMeshArgs*), const ObjSubMeshArgs* func_data);
void init_translucent(const mat4* mat, ObjTranslucentArgs* translucent);
void init_user(const mat4* mat, UserArgsFunc func, void* data);
};
@@ -464,18 +466,18 @@ namespace mdl {
/*void draw_show_vector(mdl::ObjType type, int32_t show_vector);*/
void entry_list(ObjType type, ObjData* data);
bool entry_obj(const ::obj* object, obj_mesh_vertex_buffer* obj_vertex_buf,
obj_mesh_index_buffer* obj_index_buf, const mat4* mat,
const std::vector<GLuint>* textures, const vec4* blend_color, const mat4* bone_mat,
const ::obj* object_morph, obj_mesh_vertex_buffer* obj_morph_vertex_buf, int32_t instances_count,
const mat4* instances_mat, void(*func)(const mdl::ObjSubMeshArgs*),
obj_mesh_index_buffer* obj_index_buf, const mat4* mat, const std::vector<GLuint>* textures,
const vec4* blend_color, const mat4* bone_mat, const ::obj* object_morph,
obj_mesh_vertex_buffer* obj_morph_vertex_buf, int32_t instances_count, const mat4* instances_mat,
void(*func)(const mdl::ObjSubMeshArgs*), const ObjSubMeshArgs* func_data,
bool enable_bone_mat, bool local = false);
void entry_obj_by_obj(const mat4* mat,
const ::obj* obj, const std::vector<GLuint>* textures, obj_mesh_vertex_buffer* obj_vert_buf,
obj_mesh_index_buffer* obj_index_buf, const mat4* bone_mat, float_t alpha);
bool entry_obj_by_object_info(const mat4* mat, object_info obj_info, const mat4* bone_mat = 0);
bool entry_obj_by_object_info(const mat4* mat, object_info obj_info,
const vec4* blend_color, const mat4* bone_mat, int32_t instances_count,
const mat4* instances_mat, void(*func)(const mdl::ObjSubMeshArgs*),
bool entry_obj_by_object_info(const mat4* mat, object_info obj_info, const vec4* blend_color,
const mat4* bone_mat, int32_t instances_count, const mat4* instances_mat,
void(*func)(const mdl::ObjSubMeshArgs*), const ObjSubMeshArgs* func_data,
bool enable_bone_mat, bool local = false);
bool entry_obj_by_object_info(const mat4* mat, object_info obj_info, float_t alpha, const mat4* bone_mat = 0);
bool entry_obj_by_object_info(const mat4* mat, object_info obj_info,