From dbce7d772e766b27e73a0dadf2adbfa57cb04010 Mon Sep 17 00:00:00 2001 From: korenkonder Date: Thu, 18 May 2023 23:20:13 +0300 Subject: [PATCH] Fix typo --- src/CRE/rob/ex_block.cpp | 6 +++--- src/CRE/rob/rob.hpp | 14 +++++++------- src/DivaGL/bone_data.cpp | 6 +++--- src/DivaGL/bone_data.hpp | 14 +++++++------- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/CRE/rob/ex_block.cpp b/src/CRE/rob/ex_block.cpp index e9c44707..d5c0f24b 100644 --- a/src/CRE/rob/ex_block.cpp +++ b/src/CRE/rob/ex_block.cpp @@ -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: diff --git a/src/CRE/rob/rob.hpp b/src/CRE/rob/rob.hpp index cee89623..d0e7d790 100644 --- a/src/CRE/rob/rob.hpp +++ b/src/CRE/rob/rob.hpp @@ -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, }; } diff --git a/src/DivaGL/bone_data.cpp b/src/DivaGL/bone_data.cpp index bdc91240..8c393852 100644 --- a/src/DivaGL/bone_data.cpp +++ b/src/DivaGL/bone_data.cpp @@ -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: diff --git a/src/DivaGL/bone_data.hpp b/src/DivaGL/bone_data.hpp index 8444ce21..2c4f7fd0 100644 --- a/src/DivaGL/bone_data.hpp +++ b/src/DivaGL/bone_data.hpp @@ -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, }; }