From a2fa63495c04a73a6d0455bc283341d30ac099b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Thu, 3 Feb 2022 12:43:40 +0100 Subject: [PATCH] ksys/phys: Fix a regalloc diff in CapsuleShape::setScale --- data/uking_functions.csv | 2 +- src/KingSystem/Physics/RigidBody/Shape/physCapsuleShape.cpp | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/data/uking_functions.csv b/data/uking_functions.csv index ab3377d5..5eaf0933 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -83598,7 +83598,7 @@ Address,Quality,Size,Name 0x0000007100fabcd4,O,000008,_ZN4ksys4phys12CapsuleShape13getHavokShapeEv 0x0000007100fabcdc,O,000008,_ZNK4ksys4phys12CapsuleShape13getHavokShapeEv 0x0000007100fabce4,O,000252,_ZN4ksys4phys12CapsuleShape16updateHavokShapeEv -0x0000007100fabde0,m,000160,_ZN4ksys4phys12CapsuleShape8setScaleEf +0x0000007100fabde0,O,000160,_ZN4ksys4phys12CapsuleShape8setScaleEf 0x0000007100fabe80,O,000192,_ZN4ksys4phys12CapsuleShape17transformVerticesEPN4sead7Vector3IfEES5_RK12hkTransformf 0x0000007100fabf40,O,000204,_ZNK4ksys4phys12CapsuleShape27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x0000007100fac00c,O,000092,_ZNK4ksys4phys12CapsuleShape18getRuntimeTypeInfoEv diff --git a/src/KingSystem/Physics/RigidBody/Shape/physCapsuleShape.cpp b/src/KingSystem/Physics/RigidBody/Shape/physCapsuleShape.cpp index accbeb1d..25fb18f8 100644 --- a/src/KingSystem/Physics/RigidBody/Shape/physCapsuleShape.cpp +++ b/src/KingSystem/Physics/RigidBody/Shape/physCapsuleShape.cpp @@ -106,10 +106,12 @@ hkpShape* CapsuleShape::updateHavokShape() { return nullptr; } -// NON_MATCHING: float regalloc void CapsuleShape::setScale(float scale) { setRadius(radius * scale); - setVertices(vertex_a * scale, vertex_b * scale); + + sead::Vector3f va, vb; + getVertices(&va, &vb); + setVertices(va * scale, vb * scale); } void CapsuleShape::transformVertices(sead::Vector3f* veca, sead::Vector3f* vecb,