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 --- .../Source/PhysX/src/buffering/ScbScenePvdClient.h | 25 +++++++++++----------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'PhysX_3.4/Source/PhysX/src/buffering/ScbScenePvdClient.h') diff --git a/PhysX_3.4/Source/PhysX/src/buffering/ScbScenePvdClient.h b/PhysX_3.4/Source/PhysX/src/buffering/ScbScenePvdClient.h index a7461571..92652efb 100644 --- a/PhysX_3.4/Source/PhysX/src/buffering/ScbScenePvdClient.h +++ b/PhysX_3.4/Source/PhysX/src/buffering/ScbScenePvdClient.h @@ -80,7 +80,6 @@ class ParticleSystemCore; namespace Vd { - class ScbScenePvdClient : public PxPvdSceneClient, public PvdClient, public PvdVisualizer { PX_NOCOPY(ScbScenePvdClient) @@ -90,34 +89,34 @@ class ScbScenePvdClient : public PxPvdSceneClient, public PvdClient, public PvdV // PxPvdSceneClient virtual void setScenePvdFlag(PxPvdSceneFlag::Enum flag, bool value); - virtual void setScenePvdFlags(PxPvdSceneFlags flags); - virtual PxPvdSceneFlags getScenePvdFlags() const; + virtual void setScenePvdFlags(PxPvdSceneFlags flags) { mFlags = flags; } + virtual PxPvdSceneFlags getScenePvdFlags() const { return mFlags; } virtual void updateCamera(const char* name, const PxVec3& origin, const PxVec3& up, const PxVec3& target); virtual void drawPoints(const PvdDebugPoint* points, PxU32 count); virtual void drawLines(const PvdDebugLine* lines, PxU32 count); virtual void drawTriangles(const PvdDebugTriangle* triangles, PxU32 count); virtual void drawText(const PvdDebugText& text); - virtual PvdClient* getClientInternal(); + virtual PvdClient* getClientInternal() { return this; } //~PxPvdSceneClient // pvdClient - virtual PvdDataStream* getDataStream(); - virtual PvdMetaDataBinding* getMetaDataBinding(); - virtual PvdUserRenderer* getUserRender(); - virtual bool isConnected() const ; + virtual PvdDataStream* getDataStream() { return mPvdDataStream; } + virtual PvdMetaDataBinding* getMetaDataBinding() { return &mMetaDataBinding; } + virtual PvdUserRenderer* getUserRender() { return mUserRender; } + virtual bool isConnected() const { return mIsConnected; } virtual void onPvdConnected(); virtual void onPvdDisconnected(); - virtual void flush(); + virtual void flush() {} //~pvdClient - PsPvd* getPsPvd(); - void setPsPvd(PsPvd* pvd); - - PX_INLINE bool checkPvdDebugFlag() + PX_FORCE_INLINE bool checkPvdDebugFlag() const { return mIsConnected && (mPvd->getInstrumentationFlags() & PxPvdInstrumentationFlag::eDEBUG); } + PX_FORCE_INLINE PxPvdSceneFlags getScenePvdFlagsFast() const { return mFlags; } + PX_FORCE_INLINE void setPsPvd(PsPvd* pvd) { mPvd = pvd; } + void frameStart(PxReal simulateElapsedTime); void frameEnd(); -- cgit v1.2.3