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

Adapted new findings. Again

Browse Source
This commit is contained in:
korenkonder
2024-10-22 14:34:21 +03:00
parent 31ce8b9009
commit dc74c3c33e
3 changed files with 85 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/CRE/rob/ex_block.cpp
+66 -90
View File
@@ -106,9 +106,8 @@ static void sub_14047F990(RobOsage* rob_osg, const mat4* root_matrix,
static void sub_140480260(RobOsage* rob_osg, const mat4* root_matrix,
const vec3* parent_scale, float_t step, bool disable_external_force);
static bool sub_140482FF0(mat4& mat, vec3& direction, skin_param_hinge* hinge, vec3* rot, int32_t& yz_order);
static void sub_14053CE30(RobOsageNodeDataNormalRef* normal_ref, mat4* a2);
static bool sub_14053D1B0(vec3* l_trans, vec3* r_trans,
vec3* u_trans, vec3* d_trans, vec3* a5, vec3* a6, vec3* a7);
static bool sub_14053D1B0(const vec3& l_trans, const vec3& r_trans,
const vec3& u_trans, const vec3& d_trans, vec3& z_axis, vec3& y_axis, vec3& x_axis);
static const exp_func_op1 exp_func_op1_array[] = {
{ "neg" , exp_neg },
@@ -292,6 +291,7 @@ bool RobOsageNodeDataNormalRef::Check() {
return set;
}
// 0x14053CAC0
void RobOsageNodeDataNormalRef::GetMat() {
if (!Check())
return;
@@ -307,28 +307,47 @@ void RobOsageNodeDataNormalRef::GetMat() {
mat4_get_translation(&l->mat, &l_trans);
mat4_get_translation(&r->mat, &r_trans);
vec3 v21;
vec3 v22;
vec3 v23;
if (sub_14053D1B0(&l_trans, &r_trans, &u_trans, &d_trans, &v22, &v21, &v23)) {
mat4 mat;
mat.row0.x = v23.x;
mat.row0.y = v21.x;
mat.row0.z = v22.x;
mat.row0.w = 0.0f;
mat.row1.x = v23.y;
mat.row1.y = v21.y;
mat.row1.z = v22.y;
mat.row1.w = 0.0f;
mat.row2.x = v23.z;
mat.row2.y = v21.z;
mat.row2.z = v22.z;
mat.row2.w = 0.0f;
mat.row3.x = -vec3::dot(n_trans, v23);
mat.row3.y = -vec3::dot(n_trans, v21);
mat.row3.z = -vec3::dot(n_trans, v22);
mat.row3.w = 1.0f;
mat4_mul(&n->mat, &mat, &this->mat);
vec3 z_axis;
vec3 y_axis;
vec3 x_axis;
if (sub_14053D1B0(l_trans, r_trans, u_trans, d_trans, z_axis, y_axis, x_axis)) {
mat4 temp = mat4(
x_axis.x, y_axis.x, z_axis.x, 0.0f,
x_axis.y, y_axis.y, z_axis.y, 0.0f,
x_axis.z, y_axis.z, z_axis.z, 0.0f,
-vec3::dot(n_trans, x_axis),
-vec3::dot(n_trans, y_axis),
-vec3::dot(n_trans, z_axis), 1.0f);
mat4_mul(&n->mat, &temp, &mat);
}
}
// 0x14053CE30
void RobOsageNodeDataNormalRef::GetMatBoneNode(mat4* mat) {
if (!set)
return;
vec3 n_trans;
vec3 u_trans;
vec3 d_trans;
vec3 l_trans;
vec3 r_trans;
mat4_get_translation(n->bone_node_ptr->ex_data_mat, &n_trans);
mat4_get_translation(u->bone_node_ptr->ex_data_mat, &u_trans);
mat4_get_translation(d->bone_node_ptr->ex_data_mat, &d_trans);
mat4_get_translation(l->bone_node_ptr->ex_data_mat, &l_trans);
mat4_get_translation(r->bone_node_ptr->ex_data_mat, &r_trans);
vec3 z_axis;
vec3 y_axis;
vec3 x_axis;
if (sub_14053D1B0(l_trans, r_trans, u_trans, d_trans, z_axis, y_axis, x_axis)) {
mat4 temp = mat4(
x_axis.x, x_axis.y, x_axis.z, 0.0f,
y_axis.x, y_axis.y, y_axis.z, 0.0f,
z_axis.x, z_axis.y, z_axis.z, 0.0f,
n_trans.x, n_trans.y, n_trans.z, 1.0f);
mat4_mul(&this->mat, &temp, mat);
}
}
@@ -1239,20 +1258,20 @@ void RobCloth::InitData(size_t root_count, size_t nodes_count, obj_skin_block_cl
for (size_t i = 0; i < root_count; i++) {
this->root.push_back({});
RobClothRoot& v34 = this->root.back();
v34.pos = root[i].pos;
v34.normal = root[i].normal;
RobClothRoot& cls_root = this->root.back();
cls_root.pos = root[i].pos;
cls_root.normal = root[i].normal;
for (int32_t j = 0; j < 4; j++) {
obj_skin_block_cloth_root_bone_weight& bone_weight = root[i].bone_weights[j];
v34.node[j] = 0;
v34.node_mat[j] = 0;
v34.bone_mat[j] = &mats[bone_weight.matrix_index];
cls_root.node[j] = 0;
cls_root.node_mat[j] = 0;
cls_root.bone_mat[j] = &mats[bone_weight.matrix_index];
if (bone_weight.bone_name) {
v34.node[j] = itm_eq_obj->get_bone_node(bone_weight.bone_name, bone_data);
if (v34.node[j])
v34.node_mat[j] = v34.node[j]->mat;
cls_root.node[j] = itm_eq_obj->get_bone_node(bone_weight.bone_name, bone_data);
if (cls_root.node[j])
cls_root.node_mat[j] = cls_root.node[j]->mat;
}
v34.weight[j] = bone_weight.weight;
cls_root.weight[j] = bone_weight.weight;
}
}
@@ -3440,10 +3459,7 @@ static float_t sub_14021A290(const vec3& trans_a, const vec3& trans_b, const vec
binormal = vec3::cross(_tangent, normal);
tangent = vec3::cross(normal, binormal);
mat3 mat;
mat.row0 = tangent;
mat.row1 = binormal;
mat.row2 = normal;
mat3 mat = mat3(tangent, binormal, normal);
mat3_transpose(&mat, &mat);
return mat3_determinant(&mat);
}
@@ -3457,10 +3473,7 @@ static float_t sub_14021A5E0(const vec3& pos_a, const vec3& pos_b,
binormal = vec3::cross(_tangent, normal);
tangent = vec3::cross(normal, binormal);
mat3 mat;
mat.row0 = tangent;
mat.row1 = binormal;
mat.row2 = normal;
mat3 mat = mat3(tangent, binormal, normal);
mat3_transpose(&mat, &mat);
return mat3_determinant(&mat);
}
@@ -3773,7 +3786,7 @@ static void sub_14047E1C0(RobOsage* rob_osg, vec3* scale) {
RobOsageNode* i_end = rob_osg->nodes.data() + rob_osg->nodes.size();
for (RobOsageNode* i = i_begin; i != i_end; i++)
if (i->data_ptr->normal_ref.set) {
sub_14053CE30(&i->data_ptr->normal_ref, i->bone_node_mat);
i->data_ptr->normal_ref.GetMatBoneNode(i->bone_node_mat);
mat4_scale_rot(i->bone_node_mat, scale, i->bone_node_mat);
}
}
@@ -4263,55 +4276,18 @@ static bool sub_140482FF0(mat4& mat, vec3& direction, skin_param_hinge* hinge, v
return clipped;
}
static void sub_14053CE30(RobOsageNodeDataNormalRef* normal_ref, mat4* a2) {
if (!normal_ref->set)
return;
vec3 n_trans;
vec3 u_trans;
vec3 d_trans;
vec3 l_trans;
vec3 r_trans;
mat4_get_translation(normal_ref->n->bone_node_ptr->ex_data_mat, &n_trans);
mat4_get_translation(normal_ref->u->bone_node_ptr->ex_data_mat, &u_trans);
mat4_get_translation(normal_ref->d->bone_node_ptr->ex_data_mat, &d_trans);
mat4_get_translation(normal_ref->l->bone_node_ptr->ex_data_mat, &l_trans);
mat4_get_translation(normal_ref->r->bone_node_ptr->ex_data_mat, &r_trans);
vec3 v27;
vec3 v26;
vec3 v28;
if (sub_14053D1B0(&l_trans, &r_trans, &u_trans, &d_trans, &v27, &v26, &v28)) {
mat4 v34;
*(vec3*)&v34.row0 = v28;
*(vec3*)&v34.row1 = v26;
*(vec3*)&v34.row2 = v27;
*(vec3*)&v34.row3 = n_trans;
v34.row0.w = 0.0f;
v34.row1.w = 0.0f;
v34.row2.w = 0.0f;
v34.row3.w = 1.0f;
mat4 v33 = normal_ref->mat;
mat4_mul(&v33, &v34, a2);
}
}
static bool sub_14053D1B0(vec3* l_trans, vec3* r_trans,
vec3* u_trans, vec3* d_trans, vec3* a5, vec3* a6, vec3* a7) {
float_t length;
*a5 = *d_trans - *u_trans;
length = vec3::length_squared(*a5);
if (length <= 0.000001f)
static bool sub_14053D1B0(const vec3& l_trans, const vec3& r_trans,
const vec3& u_trans, const vec3& d_trans, vec3& z_axis, vec3& y_axis, vec3& x_axis) {
z_axis = d_trans - u_trans;
if (fabsf(vec3::length_squared(z_axis)) <= 0.000001f)
return false;
*a5 *= 1.0f / sqrtf(length);
*a6 = vec3::cross(*r_trans - *l_trans, *a5);
length = vec3::length_squared(*a6);
if (length <= 0.000001f)
z_axis = vec3::normalize(z_axis);
y_axis = vec3::cross(r_trans - l_trans, z_axis);
if (fabsf(vec3::length_squared(y_axis)) <= 0.000001f)
return false;
*a6 *= 1.0f / sqrtf(length);
*a7 = vec3::normalize(vec3::cross(*a5, *a6));
y_axis = vec3::normalize(y_axis);
x_axis = vec3::normalize(vec3::cross(z_axis, y_axis));
return true;
}
src/CRE/rob/rob.hpp
+1
View File
@@ -1521,6 +1521,7 @@ struct RobOsageNodeDataNormalRef {
bool Check();
void GetMat();
void GetMatBoneNode(mat4* mat);
};
struct skin_param_hinge {
src/KKdLib/mat.hpp
+18
View File
@@ -22,6 +22,14 @@ struct mat3 {
row0(row0), row1(row1), row2(row2) {
}
inline mat3(const float_t in_m00, const float_t in_m01, const float_t in_m02,
const float_t in_m10, const float_t in_m11, const float_t in_m12,
const float_t in_m20, const float_t in_m21, const float_t in_m22) {
row0 = vec3(in_m00, in_m01, in_m02);
row1 = vec3(in_m10, in_m11, in_m12);
row2 = vec3(in_m20, in_m21, in_m22);
}
};
struct mat4 {
@@ -38,6 +46,16 @@ struct mat4 {
row0(row0), row1(row1), row2(row2), row3(row3) {
}
inline mat4(const float_t in_m00, const float_t in_m01, const float_t in_m02, const float_t in_m03,
const float_t in_m10, const float_t in_m11, const float_t in_m12, const float_t in_m13,
const float_t in_m20, const float_t in_m21, const float_t in_m22, const float_t in_m23,
const float_t in_m30, const float_t in_m31, const float_t in_m32, const float_t in_m33) {
row0 = vec4(in_m00, in_m01, in_m02, in_m03);
row1 = vec4(in_m10, in_m11, in_m12, in_m13);
row2 = vec4(in_m20, in_m21, in_m22, in_m23);
row3 = vec4(in_m30, in_m31, in_m32, in_m33);
}
};
extern const mat3 mat3_identity;