falso
/
botw
mirror of https://github.com/zeldaret/botw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ksys/phys: Finish RigidBodyFromShape (add factory functions)

This commit is contained in:
Léo Lam 2022-02-13 15:50:28 +01:00
parent 6727376291
commit db72086c68
No known key found for this signature in database
GPG Key ID: 0DF30F9081000741
5 changed files with 275 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
data/uking_functions.csv
View File

@ -83280,33 +83280,33 @@ Address,Quality,Size,Name
0x0000007100f9952c,O,000188,_ZN4ksys4phys18RigidBodyFromShape14createBoxWaterEPNS0_22RigidBodyInstanceParamEPN4sead4HeapE
0x0000007100f995e8,O,000188,_ZN4ksys4phys18RigidBodyFromShape14createPolytopeEPNS0_22RigidBodyInstanceParamEPN4sead4HeapE
0x0000007100f996a4,O,000188,_ZN4ksys4phys18RigidBodyFromShape10createListEPNS0_22RigidBodyInstanceParamEPN4sead4HeapE
0x0000007100f99760,U,000264,
0x0000007100f99868,U,000036,
0x0000007100f9988c,U,000652,
0x0000007100f99b18,U,000676,
0x0000007100f99dbc,U,000688,
0x0000007100f9a06c,U,000688,
0x0000007100f9a31c,U,000692,
0x0000007100f9a5d0,U,000692,
0x0000007100f9a884,U,000652,
0x0000007100f9ab10,U,000592,
0x0000007100f9ad60,U,000396,
0x0000007100f9aeec,U,000304,
0x0000007100f9b01c,U,000304,
0x0000007100f9b14c,U,000304,
0x0000007100f9b27c,U,000304,
0x0000007100f9b3ac,U,000304,
0x0000007100f9b4dc,U,000304,
0x0000007100f9b60c,U,000304,
0x0000007100f9b73c,U,000304,
0x0000007100f9b86c,U,000320,
0x0000007100f9b9ac,U,000660,
0x0000007100f9bc40,U,000692,
0x0000007100f9bef4,U,000704,
0x0000007100f9c1b4,U,000704,
0x0000007100f9c474,U,000696,
0x0000007100f9c72c,U,000656,
0x0000007100f9c9bc,U,000608,
0x0000007100f99760,O,000264,_ZNK4ksys4phys18RigidBodyFromShape5cloneEPN4sead4HeapEPNS0_18SystemGroupHandlerE
0x0000007100f99868,O,000036,_ZNK4ksys4phys18RigidBodyFromShape12getShapeTypeEv
0x0000007100f9988c,O,000652,_ZNK4ksys4phys18RigidBodyFromShape9cloneImplINS0_15SphereRigidBodyENS0_11SphereShapeENS0_11SphereParamEEEPT_PN4sead4HeapEPNS0_18SystemGroupHandlerE
0x0000007100f99b18,O,000676,_ZNK4ksys4phys18RigidBodyFromShape9cloneImplINS0_16CapsuleRigidBodyENS0_12CapsuleShapeENS0_12CapsuleParamEEEPT_PN4sead4HeapEPNS0_18SystemGroupHandlerE
0x0000007100f99dbc,O,000688,_ZNK4ksys4phys18RigidBodyFromShape9cloneImplINS0_17CylinderRigidBodyENS0_13CylinderShapeENS0_13CylinderParamEEEPT_PN4sead4HeapEPNS0_18SystemGroupHandlerE
0x0000007100f9a06c,O,000688,_ZNK4ksys4phys18RigidBodyFromShape9cloneImplINS0_22CylinderWaterRigidBodyENS0_18CylinderWaterShapeENS0_13CylinderParamEEEPT_PN4sead4HeapEPNS0_18SystemGroupHandlerE
0x0000007100f9a31c,O,000692,_ZNK4ksys4phys18RigidBodyFromShape9cloneImplINS0_12BoxRigidBodyENS0_8BoxShapeENS0_8BoxParamEEEPT_PN4sead4HeapEPNS0_18SystemGroupHandlerE
0x0000007100f9a5d0,O,000692,_ZNK4ksys4phys18RigidBodyFromShape9cloneImplINS0_17BoxWaterRigidBodyENS0_13BoxWaterShapeENS0_8BoxParamEEEPT_PN4sead4HeapEPNS0_18SystemGroupHandlerE
0x0000007100f9a884,O,000652,_ZNK4ksys4phys18RigidBodyFromShape9cloneImplINS0_17PolytopeRigidBodyENS0_13PolytopeShapeENS0_13PolytopeParamEEEPT_PN4sead4HeapEPNS0_18SystemGroupHandlerE
0x0000007100f9ab10,O,000592,_ZNK4ksys4phys18RigidBodyFromShape9cloneImplINS0_18ListShapeRigidBodyENS0_9ListShapeENS0_23ListShapeRigidBodyParamEEEPT_PN4sead4HeapEPNS0_18SystemGroupHandlerE
0x0000007100f9ad60,O,000396,_ZN4ksys4phys18RigidBodyFromShape6createERKNS0_5ShapeEPNS0_22RigidBodyInstanceParamEPN4sead4HeapEPKNS0_18SystemGroupHandlerE
0x0000007100f9aeec,O,000304,_ZN4ksys4phys18RigidBodyFromShape4makeINS0_15SphereRigidBodyENS0_11SphereShapeEEEPT_RKNS0_5ShapeEPNS0_22RigidBodyInstanceParamEPN4sead4HeapEPKNS0_18SystemGroupHandlerE
0x0000007100f9b01c,O,000304,_ZN4ksys4phys18RigidBodyFromShape4makeINS0_16CapsuleRigidBodyENS0_12CapsuleShapeEEEPT_RKNS0_5ShapeEPNS0_22RigidBodyInstanceParamEPN4sead4HeapEPKNS0_18SystemGroupHandlerE
0x0000007100f9b14c,O,000304,_ZN4ksys4phys18RigidBodyFromShape4makeINS0_17CylinderRigidBodyENS0_13CylinderShapeEEEPT_RKNS0_5ShapeEPNS0_22RigidBodyInstanceParamEPN4sead4HeapEPKNS0_18SystemGroupHandlerE
0x0000007100f9b27c,O,000304,_ZN4ksys4phys18RigidBodyFromShape4makeINS0_22CylinderWaterRigidBodyENS0_18CylinderWaterShapeEEEPT_RKNS0_5ShapeEPNS0_22RigidBodyInstanceParamEPN4sead4HeapEPKNS0_18SystemGroupHandlerE
0x0000007100f9b3ac,O,000304,_ZN4ksys4phys18RigidBodyFromShape4makeINS0_12BoxRigidBodyENS0_8BoxShapeEEEPT_RKNS0_5ShapeEPNS0_22RigidBodyInstanceParamEPN4sead4HeapEPKNS0_18SystemGroupHandlerE
0x0000007100f9b4dc,O,000304,_ZN4ksys4phys18RigidBodyFromShape4makeINS0_17BoxWaterRigidBodyENS0_13BoxWaterShapeEEEPT_RKNS0_5ShapeEPNS0_22RigidBodyInstanceParamEPN4sead4HeapEPKNS0_18SystemGroupHandlerE
0x0000007100f9b60c,O,000304,_ZN4ksys4phys18RigidBodyFromShape4makeINS0_17PolytopeRigidBodyENS0_13PolytopeShapeEEEPT_RKNS0_5ShapeEPNS0_22RigidBodyInstanceParamEPN4sead4HeapEPKNS0_18SystemGroupHandlerE
0x0000007100f9b73c,O,000304,_ZN4ksys4phys18RigidBodyFromShape4makeINS0_18ListShapeRigidBodyENS0_9ListShapeEEEPT_RKNS0_5ShapeEPNS0_22RigidBodyInstanceParamEPN4sead4HeapEPKNS0_18SystemGroupHandlerE
0x0000007100f9b86c,O,000320,_ZN4ksys4phys18RigidBodyFromShape21createEntityShapeBodyERKN4sead14SafeStringBaseIcEENS0_12ContactLayerEPS1_PNS2_4HeapEPNS0_18SystemGroupHandlerE
0x0000007100f9b9ac,O,000660,_ZN4ksys4phys18RigidBodyFromShape25createEntityShapeBodyImplINS0_15SphereRigidBodyENS0_11SphereShapeENS0_11SphereParamEEEPT_RKN4sead14SafeStringBaseIcEENS0_12ContactLayerEPS1_PNS8_4HeapEPNS0_18SystemGroupHandlerE
0x0000007100f9bc40,O,000692,_ZN4ksys4phys18RigidBodyFromShape25createEntityShapeBodyImplINS0_16CapsuleRigidBodyENS0_12CapsuleShapeENS0_12CapsuleParamEEEPT_RKN4sead14SafeStringBaseIcEENS0_12ContactLayerEPS1_PNS8_4HeapEPNS0_18SystemGroupHandlerE
0x0000007100f9bef4,O,000704,_ZN4ksys4phys18RigidBodyFromShape25createEntityShapeBodyImplINS0_17CylinderRigidBodyENS0_13CylinderShapeENS0_13CylinderParamEEEPT_RKN4sead14SafeStringBaseIcEENS0_12ContactLayerEPS1_PNS8_4HeapEPNS0_18SystemGroupHandlerE
0x0000007100f9c1b4,O,000704,_ZN4ksys4phys18RigidBodyFromShape25createEntityShapeBodyImplINS0_22CylinderWaterRigidBodyENS0_18CylinderWaterShapeENS0_13CylinderParamEEEPT_RKN4sead14SafeStringBaseIcEENS0_12ContactLayerEPS1_PNS8_4HeapEPNS0_18SystemGroupHandlerE
0x0000007100f9c474,O,000696,_ZN4ksys4phys18RigidBodyFromShape25createEntityShapeBodyImplINS0_12BoxRigidBodyENS0_8BoxShapeENS0_8BoxParamEEEPT_RKN4sead14SafeStringBaseIcEENS0_12ContactLayerEPS1_PNS8_4HeapEPNS0_18SystemGroupHandlerE
0x0000007100f9c72c,O,000656,_ZN4ksys4phys18RigidBodyFromShape25createEntityShapeBodyImplINS0_17PolytopeRigidBodyENS0_13PolytopeShapeENS0_13PolytopeParamEEEPT_RKN4sead14SafeStringBaseIcEENS0_12ContactLayerEPS1_PNS8_4HeapEPNS0_18SystemGroupHandlerE
0x0000007100f9c9bc,O,000608,_ZN4ksys4phys18RigidBodyFromShape25createEntityShapeBodyImplINS0_18ListShapeRigidBodyENS0_9ListShapeENS0_23ListShapeRigidBodyParamEEEPT_RKN4sead14SafeStringBaseIcEENS0_12ContactLayerEPS1_PNS8_4HeapEPNS0_18SystemGroupHandlerE
0x0000007100f9cc1c,O,000080,_ZN4ksys4phys18RigidBodyFromShapeC2EP12hkpRigidBodyNS0_16ContactLayerTypeERKN4sead14SafeStringBaseIcEEbPNS5_4HeapE
0x0000007100f9cc6c,O,000100,_ZN4ksys4phys18RigidBodyFromShapeD1Ev
0x0000007100f9ccd0,O,000104,_ZThn32_N4ksys4phys18RigidBodyFromShapeD1Ev

Can't render this file because it is too large.

8
src/KingSystem/Physics/RigidBody/Shape/CharacterPrism/physCharacterPrismShape.h
View File

@ -5,6 +5,8 @@
namespace ksys::phys {
class PolytopeShape;
struct CharacterPrismShapeParam {
float radius;
sead::Vector3f translate_0;
@ -20,6 +22,12 @@ public:
void setMaterialMask(const MaterialMask& mask);
const MaterialMask& getMaterialMask() const;
PolytopeShape* getUnderlyingShape() const { return mShape; }
private:
/// The underlying shape for this character prism shape.
PolytopeShape* mShape{};
};
} // namespace ksys::phys

206
src/KingSystem/Physics/RigidBody/physRigidBodyFromShape.cpp
View File

@ -8,6 +8,7 @@
#include "KingSystem/Physics/RigidBody/Shape/BoxWater/physBoxWaterShape.h"
#include "KingSystem/Physics/RigidBody/Shape/Capsule/physCapsuleRigidBody.h"
#include "KingSystem/Physics/RigidBody/Shape/Capsule/physCapsuleShape.h"
#include "KingSystem/Physics/RigidBody/Shape/CharacterPrism/physCharacterPrismShape.h"
#include "KingSystem/Physics/RigidBody/Shape/Cylinder/physCylinderRigidBody.h"
#include "KingSystem/Physics/RigidBody/Shape/CylinderWater/physCylinderWaterRigidBody.h"
#include "KingSystem/Physics/RigidBody/Shape/CylinderWater/physCylinderWaterShape.h"
@ -20,6 +21,7 @@
#include "KingSystem/Physics/RigidBody/Shape/physShape.h"
#include "KingSystem/Physics/RigidBody/physRigidBodyParam.h"
#include "KingSystem/Physics/System/physDefines.h"
#include "KingSystem/Physics/System/physGroupFilter.h"
#include "KingSystem/Physics/physConversions.h"
#include "KingSystem/Utils/HeapUtil.h"
@ -63,6 +65,101 @@ ListShapeRigidBody* RigidBodyFromShape::createList(RigidBodyInstanceParam* param
return make<ListShapeRigidBody, ListShape, ListShapeRigidBodyParam>(param, heap);
}
RigidBody* RigidBodyFromShape::clone(sead::Heap* heap, SystemGroupHandler* group_handler) const {
switch (getShapeType()) {
case ShapeType::Sphere:
return cloneImpl<SphereRigidBody, SphereShape, SphereParam>(heap, group_handler);
case ShapeType::Capsule:
return cloneImpl<CapsuleRigidBody, CapsuleShape, CapsuleParam>(heap, group_handler);
case ShapeType::Cylinder:
return cloneImpl<CylinderRigidBody, CylinderShape, CylinderParam>(heap, group_handler);
case ShapeType::CylinderWater:
return cloneImpl<CylinderWaterRigidBody, CylinderWaterShape, CylinderParam>(heap,
group_handler);
case ShapeType::Box:
return cloneImpl<BoxRigidBody, BoxShape, BoxParam>(heap, group_handler);
case ShapeType::BoxWater:
return cloneImpl<BoxWaterRigidBody, BoxWaterShape, BoxParam>(heap, group_handler);
case ShapeType::Polytope:
return cloneImpl<PolytopeRigidBody, PolytopeShape, PolytopeParam>(heap, group_handler);
case ShapeType::List:
return cloneImpl<ListShapeRigidBody, ListShape, ListShapeRigidBodyParam>(heap,
group_handler);
case ShapeType::CharacterPrism:
case ShapeType::Unknown:
break;
}
return nullptr;
}
RigidBody* RigidBodyFromShape::create(const Shape& shape, RigidBodyInstanceParam* param,
sead::Heap* heap, const SystemGroupHandler* group_handler) {
switch (shape.getType()) {
case ShapeType::Sphere:
return make<SphereRigidBody, SphereShape>(shape, param, heap, group_handler);
case ShapeType::Capsule:
return make<CapsuleRigidBody, CapsuleShape>(shape, param, heap, group_handler);
case ShapeType::Cylinder:
return make<CylinderRigidBody, CylinderShape>(shape, param, heap, group_handler);
case ShapeType::CylinderWater:
return make<CylinderWaterRigidBody, CylinderWaterShape>(shape, param, heap, group_handler);
case ShapeType::Box:
return make<BoxRigidBody, BoxShape>(shape, param, heap, group_handler);
case ShapeType::BoxWater:
return make<BoxWaterRigidBody, BoxWaterShape>(shape, param, heap, group_handler);
case ShapeType::Polytope:
return make<PolytopeRigidBody, PolytopeShape>(shape, param, heap, group_handler);
case ShapeType::List:
return make<ListShapeRigidBody, ListShape>(shape, param, heap, group_handler);
case ShapeType::CharacterPrism: {
auto* prism = sead::DynamicCast<const CharacterPrismShape>(&shape);
if (!prism || !prism->getUnderlyingShape())
break;
return make<PolytopeRigidBody, PolytopeShape>(*prism->getUnderlyingShape(), param, heap,
group_handler);
}
case ShapeType::Unknown:
break;
}
return nullptr;
}
RigidBody* RigidBodyFromShape::createEntityShapeBody(const sead::SafeString& name,
ContactLayer layer,
RigidBodyFromShape* linked_body,
sead::Heap* heap,
SystemGroupHandler* group_handler) {
switch (linked_body->getShapeType()) {
case ShapeType::Sphere:
return createEntityShapeBodyImpl<SphereRigidBody, SphereShape, SphereParam>(
name, layer, linked_body, heap, group_handler);
case ShapeType::Capsule:
return createEntityShapeBodyImpl<CapsuleRigidBody, CapsuleShape, CapsuleParam>(
name, layer, linked_body, heap, group_handler);
case ShapeType::Cylinder:
return createEntityShapeBodyImpl<CylinderRigidBody, CylinderShape, CylinderParam>(
name, layer, linked_body, heap, group_handler);
case ShapeType::CylinderWater:
return createEntityShapeBodyImpl<CylinderWaterRigidBody, CylinderWaterShape, CylinderParam>(
name, layer, linked_body, heap, group_handler);
case ShapeType::Box:
return createEntityShapeBodyImpl<BoxRigidBody, BoxShape, BoxParam>(name, layer, linked_body,
heap, group_handler);
case ShapeType::BoxWater:
break;
case ShapeType::Polytope:
return createEntityShapeBodyImpl<PolytopeRigidBody, PolytopeShape, PolytopeParam>(
name, layer, linked_body, heap, group_handler);
case ShapeType::List:
return createEntityShapeBodyImpl<ListShapeRigidBody, ListShape, ListShapeRigidBodyParam>(
name, layer, linked_body, heap, group_handler);
case ShapeType::CharacterPrism:
case ShapeType::Unknown:
break;
}
return nullptr;
}
RigidBodyFromShape::RigidBodyFromShape(hkpRigidBody* hkp_rigid_body, ContactLayerType layer_type,
const sead::SafeString& name, bool set_flag_10,
sead::Heap* heap)
@ -77,6 +174,10 @@ RigidBodyFromShape::~RigidBodyFromShape() {
operator delete(mHkBody);
}
ShapeType RigidBodyFromShape::getShapeType() const {
return getShape_()->getType();
}
const MaterialMask* RigidBodyFromShape::tryGetMaterialMask() const {
switch (getShape_()->getType()) {
case ShapeType::Sphere:
@ -227,4 +328,109 @@ RigidBodyT* RigidBodyFromShape::make(ShapeT* shape, bool set_flag_10,
return static_cast<RigidBodyT*>(body);
}
template <typename RigidBodyT, typename ShapeT>
RigidBodyT* RigidBodyFromShape::make(const Shape& shape, RigidBodyInstanceParam* param,
sead::Heap* heap, const SystemGroupHandler* group_handler) {
auto* derived_shape = sead::DynamicCast<const ShapeT>(&shape);
auto* cloned_shape = derived_shape->clone(heap);
RigidBody* body = make<RigidBodyT, ShapeT>(cloned_shape, true, *param, heap);
body->setUpdateRequestedFlag();
u32 collision_filter_info = body->getCollisionFilterInfo();
if (body->isEntity()) {
const u32 idx = group_handler ? group_handler->getIndex() : 0;
collision_filter_info = [&] {
EntityCollisionFilterInfo info{collision_filter_info};
info.group_handler_index.SetUnsafe(idx);
return info.raw;
}();
} else {
const u32 idx = group_handler ? group_handler->getIndex() : 0;
collision_filter_info = [&] {
ReceiverMask info{collision_filter_info};
info.custom_receiver_data.group_handler_index.SetUnsafe(idx);
return info.raw;
}();
}
body->setCollisionFilterInfo(collision_filter_info);
body->processUpdateRequests();
return static_cast<RigidBodyT*>(body);
}
template <typename RigidBodyT, typename ShapeT, typename ParamT>
RigidBodyT* RigidBodyFromShape::cloneImpl(sead::Heap* heap,
SystemGroupHandler* group_handler) const {
ParamT derived_param;
RigidBodyInstanceParam& param = derived_param;
param.name = getHkBodyName().cstr();
param.motion_type = getMotionType();
param.mass = getMass();
param.inertia = getInertiaLocal();
param.center_of_mass = getCenterOfMassInLocal();
param.linear_damping = getLinearDamping();
param.angular_damping = getAngularDamping();
param.gravity_factor = getGravityFactor();
param.time_factor = getTimeFactor();
param.max_linear_velocity = getMaxLinearVelocity();
param.max_angular_velocity_rad = getMaxAngularVelocity();
param.magne_mass_scaling_factor = getMagneMassScalingFactor();
param.enable_deactivation = !hasFlag(RigidBody::Flag::_2000000);
param.toi = hasFlag(RigidBody::Flag::HighQualityCollidable);
param.system_group_handler = group_handler;
param.contact_layer = getContactLayer();
param.groundhit = getGroundHitType();
param.contact_mask = mContactMask;
if (isEntity()) {
param.max_impulse = getMaxImpulse();
param.col_impulse_scale = getColImpulseScale();
param.water_buoyancy_scale = getWaterBuoyancyScale();
param.water_flow_effective_rate = getWaterFlowEffectiveRate();
param.water_flow_effective_rate = getWaterFlowEffectiveRate();
param.friction_scale = getFrictionScale();
param.restitution_scale = getRestitutionScale();
}
auto* shape = getShape_();
return make<RigidBodyT, ShapeT>(*shape, &param, heap, group_handler);
}
template <typename RigidBodyT, typename ShapeT, typename ParamT>
RigidBodyT*
RigidBodyFromShape::createEntityShapeBodyImpl(const sead::SafeString& name, ContactLayer layer,
RigidBodyFromShape* linked_body, sead::Heap* heap,
SystemGroupHandler* group_handler) {
auto* shape_base = std::as_const(*linked_body).getShape_();
// XXX: get rid of the const_cast!
auto* shape = sead::DynamicCast<ShapeT>(const_cast<Shape*>(shape_base));
ParamT derived_param;
RigidBodyInstanceParam& param = derived_param;
param.name = name.cstr();
param.motion_type = linked_body->getMotionType() == MotionType::Fixed ? MotionType::Fixed :
MotionType::Keyframed;
param.mass = linked_body->getMass();
param.inertia = linked_body->getInertiaLocal();
param.center_of_mass = linked_body->getCenterOfMassInLocal();
param.linear_damping = linked_body->getLinearDamping();
param.angular_damping = linked_body->getAngularDamping();
param.gravity_factor = linked_body->getGravityFactor();
param.time_factor = linked_body->getTimeFactor();
param.max_linear_velocity = linked_body->getMaxLinearVelocity();
param.max_angular_velocity_rad = linked_body->getMaxAngularVelocity();
param.enable_deactivation = true;
param.toi = linked_body->hasFlag(RigidBody::Flag::HighQualityCollidable);
param.contact_layer = layer;
param.groundhit = linked_body->getGroundHitType();
param.system_group_handler = group_handler;
RigidBody* body = make<RigidBodyT, ShapeT>(shape, false, param, heap);
body->setLinkedRigidBody(linked_body);
return static_cast<RigidBodyT*>(body);
}
} // namespace ksys::phys

33
src/KingSystem/Physics/RigidBody/physRigidBodyFromShape.h
View File

@ -4,6 +4,7 @@
namespace ksys::phys {
enum class ShapeType;
class MaterialMask;
class Shape;
struct RigidBodyInstanceParam;
@ -17,6 +18,15 @@ class ListShapeRigidBody;
class PolytopeRigidBody;
class SphereRigidBody;
class BoxShape;
class BoxWaterShape;
struct CapsuleShape;
class CylinderShape;
class CylinderWaterShape;
class ListShape;
class PolytopeShape;
class SphereShape;
class RigidBodyFromShape : public RigidBody {
SEAD_RTTI_OVERRIDE(RigidBodyFromShape, RigidBody)
public:
@ -30,10 +40,20 @@ public:
static PolytopeRigidBody* createPolytope(RigidBodyInstanceParam* param, sead::Heap* heap);
static ListShapeRigidBody* createList(RigidBodyInstanceParam* param, sead::Heap* heap);
RigidBody* clone(sead::Heap* heap, SystemGroupHandler* group_handler) const;
static RigidBody* create(const Shape& shape, RigidBodyInstanceParam* param, sead::Heap* heap,
const SystemGroupHandler* group_handler);
static RigidBody* createEntityShapeBody(const sead::SafeString& name, ContactLayer layer,
RigidBodyFromShape* linked_body, sead::Heap* heap,
SystemGroupHandler* group_handler);
RigidBodyFromShape(hkpRigidBody* hkp_rigid_body, ContactLayerType layer_type,
const sead::SafeString& name, bool set_flag_10, sead::Heap* heap);
~RigidBodyFromShape() override;
ShapeType getShapeType() const;
const MaterialMask* tryGetMaterialMask() const;
protected:
@ -54,6 +74,19 @@ private:
template <typename RigidBodyT, typename ShapeT>
static RigidBodyT* make(ShapeT* shape, bool set_flag_10, const RigidBodyInstanceParam& param,
sead::Heap* heap);
/// Create a RigidBodyFromShape with the specified shape, rigid body parameters and handler.
template <typename RigidBodyT, typename ShapeT>
static RigidBodyT* make(const Shape& shape, RigidBodyInstanceParam* param, sead::Heap* heap,
const SystemGroupHandler* group_handler);
template <typename RigidBodyT, typename ShapeT, typename ParamT>
RigidBodyT* cloneImpl(sead::Heap* heap, SystemGroupHandler* group_handler) const;
template <typename RigidBodyT, typename ShapeT, typename ParamT>
static RigidBodyT* createEntityShapeBodyImpl(const sead::SafeString& name, ContactLayer layer,
RigidBodyFromShape* linked_body, sead::Heap* heap,
SystemGroupHandler* group_handler);
};
} // namespace ksys::phys

1
src/KingSystem/Physics/System/physDefines.h
View File

@ -286,6 +286,7 @@ union EntityCollisionFilterInfo {
util::BitField<6, 1, bool, u32> no_ground_collision;
/// Whether water collision is disabled.
util::BitField<7, 1, bool, u32> no_water_collision;
util::BitField<16, 10, u32> group_handler_index;
util::BitField<30, 1, bool, u32> unk30;
util::BitField<31, 1, bool, u32> is_ground_hit_mask;
};