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

Fix typo

Browse Source
This commit is contained in:
korenkonder
2023-05-18 23:20:13 +03:00
parent 5ceb6c23b2
commit dbce7d772e
4 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/CRE/rob/ex_block.cpp
+3 -3
View File
@@ -426,7 +426,7 @@ void OsageCollision::Work::update_cls_work(OsageCollision::Work* cls,
mat4_mult_vec3(&transform[cls_param->node_idx[0]],
&cls_param->pos[1], &cls->pos[1]);
break;
case SkinParam::CollisionTypeCapsulle:
case SkinParam::CollisionTypeCapsule:
case SkinParam::CollisionTypeEllipse:
mat4_mult_vec3_trans(&transform[cls_param->node_idx[1]],
&cls_param->pos[1], &cls->pos[1]);
@@ -689,7 +689,7 @@ int32_t OsageCollision::osage_capsule_cls(vec3& p0, vec3& p1, const float_t& cls
case SkinParam::CollisionTypeBall:
v8 += OsageCollision::cls_line2ball_oidashi(vec, p0, p1, cls->pos[0], cls_r + cls->radius);
break;
case SkinParam::CollisionTypeCapsulle:
case SkinParam::CollisionTypeCapsule:
v8 += OsageCollision::cls_line2capsule_oidashi(vec, p0, p1, cls, cls_r + cls->radius);
break;
case SkinParam::CollisionTypeEllipse:
@@ -724,7 +724,7 @@ int32_t OsageCollision::osage_cls(vec3& p, const float_t& cls_r, const OsageColl
case SkinParam::CollisionTypeBall:
v11 = OsageCollision::cls_ball_oidashi(vec, p, cls->pos[0], cls->radius + cls_r);
break;
case SkinParam::CollisionTypeCapsulle:
case SkinParam::CollisionTypeCapsule:
v11 = OsageCollision::cls_capsule_oidashi(vec, p, cls, cls->radius + cls_r);
break;
case SkinParam::CollisionTypePlane:
src/CRE/rob/rob.hpp
+7 -7
View File
@@ -829,13 +829,13 @@ enum SubActParamType {
namespace SkinParam {
enum CollisionType {
CollisionTypeEnd = 0x0,
CollisionTypeBall = 0x1,
CollisionTypeCapsulle = 0x2,
CollisionTypePlane = 0x3,
CollisionTypeEllipse = 0x4,
CollisionTypeAABB = 0x5,
CollisionTypeMax = 0x6,
CollisionTypeEnd = 0x0,
CollisionTypeBall = 0x1,
CollisionTypeCapsule = 0x2,
CollisionTypePlane = 0x3,
CollisionTypeEllipse = 0x4,
CollisionTypeAABB = 0x5,
CollisionTypeMax = 0x6,
};
}
src/DivaGL/bone_data.cpp
+3 -3
View File
@@ -803,7 +803,7 @@ static int32_t OsageCollision__osage_capsule_cls(vec3* p0, vec3* p1, const float
case SkinParam::CollisionTypeBall:
v8 += OsageCollision__cls_line2ball_oidashi(&vec, p0, p1, &cls->pos[0], *cls_r + cls->radius);
break;
case SkinParam::CollisionTypeCapsulle:
case SkinParam::CollisionTypeCapsule:
v8 += OsageCollision__cls_line2capsule_oidashi(&vec, p0, p1, cls, *cls_r + cls->radius);
break;
case SkinParam::CollisionTypeEllipse:
@@ -837,7 +837,7 @@ static void OsageCollision__Work__update_cls_work(OsageCollision__Work* cls,
case SkinParam::CollisionTypePlane:
mat4_mult_vec3(&mat, &cls_param->pos[1], &cls->pos[1]);
break;
case SkinParam::CollisionTypeCapsulle:
case SkinParam::CollisionTypeCapsule:
case SkinParam::CollisionTypeEllipse:
mat = transform[cls_param->node_idx[1]];
mat4_transpose(&mat, &mat);
@@ -960,7 +960,7 @@ static int32_t OsageCollision__osage_cls(vec3* p, const float_t* cls_r, const Os
case SkinParam::CollisionTypeBall:
v11 = OsageCollision__cls_ball_oidashi(&v31, p, &cls->pos[0], cls->radius + *cls_r);
break;
case SkinParam::CollisionTypeCapsulle:
case SkinParam::CollisionTypeCapsule:
v11 = OsageCollision__cls_capsule_oidashi(&v31, p, cls, cls->radius + *cls_r);
break;
case SkinParam::CollisionTypePlane:
src/DivaGL/bone_data.hpp
+7 -7
View File
@@ -847,13 +847,13 @@ enum rob_osage_parts {
namespace SkinParam {
enum CollisionType {
CollisionTypeEnd = 0x0,
CollisionTypeBall = 0x1,
CollisionTypeCapsulle = 0x2,
CollisionTypePlane = 0x3,
CollisionTypeEllipse = 0x4,
CollisionTypeAABB = 0x5,
CollisionTypeMax = 0x6,
CollisionTypeEnd = 0x0,
CollisionTypeBall = 0x1,
CollisionTypeCapsule = 0x2,
CollisionTypePlane = 0x3,
CollisionTypeEllipse = 0x4,
CollisionTypeAABB = 0x5,
CollisionTypeMax = 0x6,
};
}