TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-25 06:15:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1558 from OTHGMars/Px3Crouch

Browse source 
Spacial update for Px3 character controller
This commit is contained in:
Areloch 2016-05-31 23:15:56 -05:00
commit 7ea3c19017
2 changed files with 32 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Engine/source/T3D/physics/physx3/px3Player.cpp
View file

@ -329,3 +329,33 @@ Box3F Px3Player::getWorldBounds()
return px3Cast<Box3F>( bounds ); return px3Cast<Box3F>( bounds );
} }
bool Px3Player::testSpacials(const Point3F &nPos, const Point3F &nSize) const
{
F32 offset = nSize.z * 0.5f;
F32 radius = getMax(nSize.x, nSize.y) * 0.5f - mSkinWidth;
F32 height = (nSize.z - (radius * 2.0f)) * 0.5f;
height -= mSkinWidth * 2.0f;
physx::PxCapsuleGeometry geom(radius, height);
physx::PxVec3 pos(nPos.x, nPos.y, nPos.z + offset);
physx::PxQuat orientation(Float_HalfPi, physx::PxVec3(0.0f, 1.0f, 0.0f));
physx::PxOverlapBuffer hit;
physx::PxQueryFilterData queryFilter(physx::PxQueryFlag::eANY_HIT | physx::PxQueryFlag::eSTATIC | physx::PxQueryFlag::eDYNAMIC);
queryFilter.data.word0 = PX3_DEFAULT;
bool hasHit = mWorld->getScene()->overlap(geom, physx::PxTransform(pos, orientation), hit, queryFilter);
return !hasHit; // Return true if there are no overlapping objects
}
void Px3Player::setSpacials(const Point3F &nPos, const Point3F &nSize)
{
mOriginOffset = nSize.z * 0.5f;
F32 radius = getMax(nSize.x, nSize.y) * 0.5f - mSkinWidth;
F32 height = nSize.z - (radius * 2.0f);
height -= mSkinWidth * 2.0f;
mWorld->releaseWriteLock();
mController->resize(height);
px3GetFirstShape(mController->getActor())->getCapsuleGeometry(mGeometry);
}

4
Engine/source/T3D/physics/physx3/px3Player.h
View file

@ -94,8 +94,8 @@ public:
PhysicsWorld *world ); PhysicsWorld *world );
virtual Point3F move( const VectorF &displacement, CollisionList &outCol ); virtual Point3F move( const VectorF &displacement, CollisionList &outCol );
virtual void findContact( SceneObject **contactObject, VectorF *contactNormal, Vector<SceneObject*> *outOverlapObjects ) const; virtual void findContact( SceneObject **contactObject, VectorF *contactNormal, Vector<SceneObject*> *outOverlapObjects ) const;
virtual bool testSpacials( const Point3F &nPos, const Point3F &nSize ) const { return true; } virtual bool testSpacials( const Point3F &nPos, const Point3F &nSize ) const;
virtual void setSpacials( const Point3F &nPos, const Point3F &nSize ) {} virtual void setSpacials( const Point3F &nPos, const Point3F &nSize );
virtual void enableCollision(); virtual void enableCollision();
virtual void disableCollision(); virtual void disableCollision();
}; };