mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-16 15:29:55 +00:00
Code Issues Releases Wiki Activity

Merge branch 'bhk' into 'master'

Browse source 
Load bhkCapsuleShape and bhkSphereShape

See merge request OpenMW/openmw!2377
This commit is contained in:
psi29a 2022-09-07 20:25:24 +00:00
commit 1f2c473242
4 changed files with 27 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/nif/niffile.cpp
View file

@ -156,6 +156,8 @@ static std::map<std::string, CreateRecord> makeFactory()
{"hkPackedNiTriStripsData" , &construct <hkPackedNiTriStripsData , RC_hkPackedNiTriStripsData >},
{"bhkConvexVerticesShape" , &construct <bhkConvexVerticesShape , RC_bhkConvexVerticesShape >},
{"bhkBoxShape" , &construct <bhkBoxShape , RC_bhkBoxShape >},
{"bhkCapsuleShape" , &construct <bhkCapsuleShape , RC_bhkCapsuleShape >},
{"bhkSphereShape" , &construct <bhkSphereShape , RC_bhkSphereShape >},
{"bhkListShape" , &construct <bhkListShape , RC_bhkListShape >},
{"bhkRigidBody" , &construct <bhkRigidBody , RC_bhkRigidBody >},
{"bhkRigidBodyT" , &construct <bhkRigidBody , RC_bhkRigidBodyT >},

10
components/nif/physics.cpp
View file

@ -289,6 +289,16 @@ namespace Nif
nif->skip(4); // Unused
}
void bhkCapsuleShape::read(NIFStream *nif)
{
bhkConvexShape::read(nif);
nif->skip(8); // Unused
mPoint1 = nif->getVector3();
mRadius1 = nif->getFloat();
mPoint2 = nif->getVector3();
mRadius2 = nif->getFloat();
}
void bhkListShape::read(NIFStream *nif)
{
mSubshapes.read(nif);

14
components/nif/physics.hpp
View file

@ -319,6 +319,18 @@ struct bhkBoxShape : public bhkConvexShape
void read(NIFStream *nif) override;
};
// A capsule
struct bhkCapsuleShape : public bhkConvexShape
{
osg::Vec3f mPoint1, mPoint2;
float mRadius1, mRadius2;
void read(NIFStream *nif) override;
};
// A sphere
using bhkSphereShape = bhkConvexShape;
// A list of shapes
struct bhkListShape : public bhkShapeCollection
{
@ -340,4 +352,4 @@ struct bhkRigidBody : public bhkEntity
};
} // Namespace
#endif
#endif

2
components/nif/record.hpp
View file

@ -138,6 +138,8 @@ enum RecordType
RC_hkPackedNiTriStripsData,
RC_bhkConvexVerticesShape,
RC_bhkBoxShape,
RC_bhkCapsuleShape,
RC_bhkSphereShape,
RC_bhkListShape,
RC_bhkRigidBody,
RC_bhkRigidBodyT,