From ef6937e69e8ee3f409cf9d460d5ad300a65d5924 Mon Sep 17 00:00:00 2001 From: sschirm Date: Fri, 23 Dec 2016 14:20:36 +0100 Subject: PhysX 3.4 / APEX 1.4 release candidate @21506124 --- PhysX_3.4/Source/SceneQuery/include/SqSceneQueryManager.h | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'PhysX_3.4/Source/SceneQuery/include/SqSceneQueryManager.h') diff --git a/PhysX_3.4/Source/SceneQuery/include/SqSceneQueryManager.h b/PhysX_3.4/Source/SceneQuery/include/SqSceneQueryManager.h index 4315a7fc..09e5dcdb 100644 --- a/PhysX_3.4/Source/SceneQuery/include/SqSceneQueryManager.h +++ b/PhysX_3.4/Source/SceneQuery/include/SqSceneQueryManager.h @@ -59,7 +59,6 @@ namespace Scb namespace Sc { class ActorCore; - struct SqBoundsSync; } namespace Sq @@ -78,7 +77,7 @@ namespace Sq PX_FORCE_INLINE const Sc::ActorCore& convertScbActor2Sc(const Scb::Actor& actor) const { return *Ps::pointerOffset(&actor, scbToSc[actor.getScbType()]); } ptrdiff_t pxActorToScbActor[PxConcreteType::ePHYSX_CORE_COUNT]; - ptrdiff_t scbToSc[ScbType::TYPE_COUNT]; + ptrdiff_t scbToSc[ScbType::eTYPE_COUNT]; }; extern OffsetTable gOffsetTable; @@ -118,9 +117,9 @@ namespace Sq struct DynamicBoundsSync : public Sc::SqBoundsSync { - virtual void sync(const PxU32* sqRefs, const PxU32* indices, const PxBounds3* bounds, PxU32 count); - Pruner* mPruner; - PxU32 *mTimestamp; + virtual void sync(const PrunerHandle* handles, const PxU32* indices, const PxBounds3* bounds, PxU32 count); + Pruner* mPruner; + PxU32* mTimestamp; }; class SceneQueryManager : public Ps::UserAllocated @@ -179,9 +178,9 @@ namespace Sq // PT: TODO: replace PrunerData with just PxU32 to save memory on Win64. Breaks binary compatibility though. // PT: was previously called 'ActorShape' but does not contain an actor or shape pointer, contrary to the Np-level struct with the same name. // PT: it only contains a pruner index (0 or 1) and a pruner handle. Hence the new name. - PX_FORCE_INLINE PrunerData createPrunerData(PxU32 index, PrunerHandle h) { return size_t((h << 1) | index); } - PX_FORCE_INLINE PxU32 getPrunerIndex(PrunerData data) { return PxU32(data & 1); } - PX_FORCE_INLINE PrunerHandle getPrunerHandle(PrunerData data) { return PxU32(data >> 1); } + PX_FORCE_INLINE PrunerData createPrunerData(PxU32 index, PrunerHandle h) { return PrunerData((h << 1) | index); } + PX_FORCE_INLINE PxU32 getPrunerIndex(PrunerData data) { return PxU32(data & 1); } + PX_FORCE_INLINE PrunerHandle getPrunerHandle(PrunerData data) { return PrunerHandle(data >> 1); } /////////////////////////////////////////////////////////////////////////////// -- cgit v1.2.3