From b99b3783cd7e3fb1bb0a07dc472b2fc000c4cdc1 Mon Sep 17 00:00:00 2001 From: Sheikh Dawood Date: Fri, 25 May 2018 09:54:38 -0500 Subject: PhysX 3.4, APEX 1.4 patch release @24214033 --- PhysX_3.4/Source/SimulationController/src/ScRigidSim.h | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'PhysX_3.4/Source/SimulationController/src/ScRigidSim.h') diff --git a/PhysX_3.4/Source/SimulationController/src/ScRigidSim.h b/PhysX_3.4/Source/SimulationController/src/ScRigidSim.h index 992e3f22..d6e91185 100644 --- a/PhysX_3.4/Source/SimulationController/src/ScRigidSim.h +++ b/PhysX_3.4/Source/SimulationController/src/ScRigidSim.h @@ -23,7 +23,7 @@ // components in life support devices or systems without express written approval of // NVIDIA Corporation. // -// Copyright (c) 2008-2017 NVIDIA Corporation. All rights reserved. +// Copyright (c) 2008-2018 NVIDIA Corporation. All rights reserved. // Copyright (c) 2004-2008 AGEIA Technologies, Inc. All rights reserved. // Copyright (c) 2001-2004 NovodeX AG. All rights reserved. @@ -52,18 +52,15 @@ namespace Sc RigidSim(Scene&, RigidCore&); virtual ~RigidSim(); - PX_FORCE_INLINE RigidCore& getRigidCore() const { return static_cast(mCore); } + PX_FORCE_INLINE RigidCore& getRigidCore() const { return static_cast(mCore); } - PX_FORCE_INLINE PxU32 getID() const { return mRigidId; } - - PX_FORCE_INLINE PxU32 getBroadphaseGroupId() const { return (getActorType()!=PxActorType::eRIGID_STATIC ? mRigidId + PxU32(Bp::FilterGroup::eDYNAMICS_BASE) : PxU32(Bp::FilterGroup::eSTATICS));} + PX_FORCE_INLINE PxU32 getRigidID() const { return mRigidId; } void notifyShapesOfTransformChange(); Sc::ShapeSim& getSimForShape(Sc::ShapeCore& shape) const; - - PxActor* getPxActor() const; + PxActor* getPxActor() const { return getRigidCore().getPxActor(); } private: PxU32 mRigidId; }; -- cgit v1.2.3