diff options
Diffstat (limited to 'NvCloth/samples/SampleBase')
12 files changed, 31 insertions, 43 deletions
diff --git a/NvCloth/samples/SampleBase/renderer/Mesh.h b/NvCloth/samples/SampleBase/renderer/Mesh.h index 3a2885b..14a7081 100644 --- a/NvCloth/samples/SampleBase/renderer/Mesh.h +++ b/NvCloth/samples/SampleBase/renderer/Mesh.h @@ -12,8 +12,8 @@ #define MESH_H #include <vector> -#include "PxVec2.h" -#include "PxVec3.h" +#include <foundation/PxVec2.h> +#include <foundation/PxVec3.h> class Mesh diff --git a/NvCloth/samples/SampleBase/renderer/RenderMaterial.cpp b/NvCloth/samples/SampleBase/renderer/RenderMaterial.cpp index eb07c84..46d29dd 100644 --- a/NvCloth/samples/SampleBase/renderer/RenderMaterial.cpp +++ b/NvCloth/samples/SampleBase/renderer/RenderMaterial.cpp @@ -12,6 +12,7 @@ #include <DirectXMath.h> #include "ShaderUtils.h" #include "Renderer.h" +#include <NvCloth/Callbacks.h> /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -116,7 +117,7 @@ void RenderMaterial::setBlending(BlendMode blendMode) desc.RenderTarget[0].RenderTargetWriteMask = D3D11_COLOR_WRITE_ENABLE_ALL; break; default: - PX_ALWAYS_ASSERT_MESSAGE("Unknown blend mode"); + NV_CLOTH_ASSERT_WITH_MESSAGE(false,"Unknown blend mode"); } ID3D11Device* device = GetDeviceManager()->GetDevice(); @@ -187,7 +188,7 @@ RenderMaterial::InstancePtr RenderMaterial::getMaterialInstance(const D3D11_INPU return materialInstance; } } - PX_ALWAYS_ASSERT(); + NV_CLOTH_ASSERT(false); return NULL; } diff --git a/NvCloth/samples/SampleBase/renderer/Renderable.cpp b/NvCloth/samples/SampleBase/renderer/Renderable.cpp index c0560fd..6151bc3 100644 --- a/NvCloth/samples/SampleBase/renderer/Renderable.cpp +++ b/NvCloth/samples/SampleBase/renderer/Renderable.cpp @@ -11,6 +11,7 @@ #include "Renderable.h" #include "Renderer.h" #include "RenderUtils.h" +#include <NvCloth/Callbacks.h> const DirectX::XMFLOAT4 DEFAULT_COLOR(0.5f, 0.5f, 0.5f, 1.0f); @@ -42,7 +43,7 @@ void Renderable::render(Renderer& renderer, bool depthStencilOnly) const auto& material = m_materialInstances[submeshId%getMaterialCount()]; if(!material->isValid()) { - PX_ALWAYS_ASSERT(); + NV_CLOTH_ASSERT(false); return; } diff --git a/NvCloth/samples/SampleBase/renderer/Renderer.cpp b/NvCloth/samples/SampleBase/renderer/Renderer.cpp index dffcebd..4c6c9d5 100644 --- a/NvCloth/samples/SampleBase/renderer/Renderer.cpp +++ b/NvCloth/samples/SampleBase/renderer/Renderer.cpp @@ -14,6 +14,8 @@ #include "SampleProfiler.h" #include "PxRenderBuffer.h" + +#include <NvCloth/Callbacks.h> using namespace physx; #include <set> @@ -692,7 +694,7 @@ IRenderMesh* Renderer::getPrimitiveRenderMesh(PrimitiveRenderMeshType::Enum type m_primitiveRenderMeshes[type] = new SphereRenderMesh(); break; default: - PX_ALWAYS_ASSERT_MESSAGE("Unsupported PxGeometryType"); + NV_CLOTH_ASSERT_WITH_MESSAGE(false,"Unsupported PxGeometryType"); return NULL; } } diff --git a/NvCloth/samples/SampleBase/renderer/ResourceManager.cpp b/NvCloth/samples/SampleBase/renderer/ResourceManager.cpp index fc76e1c..b7655ea 100644 --- a/NvCloth/samples/SampleBase/renderer/ResourceManager.cpp +++ b/NvCloth/samples/SampleBase/renderer/ResourceManager.cpp @@ -9,7 +9,7 @@ */ #include "ResourceManager.h" -#include "PxAssert.h" +#include <NvCloth/Callbacks.h> #include "Utils.h" #include <windows.h> @@ -58,7 +58,7 @@ const Resource* ResourceManager::requestResource(ResourceType type, const char* } else { - PX_ALWAYS_ASSERT_MESSAGE(name); + NV_CLOTH_ASSERT_WITH_MESSAGE(false,name); } } else if (type == eTEXTURE) @@ -85,7 +85,7 @@ const Resource* ResourceManager::requestResource(ResourceType type, const char* } else { - PX_ALWAYS_ASSERT_MESSAGE("Unsupported texture extension"); + NV_CLOTH_ASSERT_WITH_MESSAGE(false,"Unsupported texture extension"); } resource = textureResource; } @@ -98,7 +98,7 @@ const Resource* ResourceManager::requestResource(ResourceType type, const char* } else { - PX_ALWAYS_ASSERT_MESSAGE(name); + NV_CLOTH_ASSERT_WITH_MESSAGE(false,name); return nullptr; } } diff --git a/NvCloth/samples/SampleBase/renderer/SkinnedRenderMesh.cpp b/NvCloth/samples/SampleBase/renderer/SkinnedRenderMesh.cpp index deb518d..99a999c 100644 --- a/NvCloth/samples/SampleBase/renderer/SkinnedRenderMesh.cpp +++ b/NvCloth/samples/SampleBase/renderer/SkinnedRenderMesh.cpp @@ -11,10 +11,11 @@ #include "SkinnedRenderMesh.h" #include "Renderer.h" +#include <NvCloth/Callbacks.h> SkinnedRenderMesh::SkinnedRenderMesh(const std::vector<const SimpleMesh*>& meshes) { - PX_ASSERT_WITH_MESSAGE(meshes.size() <= MeshesCountMax, "meshes.size() have to be <= SkinnedRenderMesh::MeshesCountMax"); + NV_CLOTH_ASSERT_WITH_MESSAGE(meshes.size() <= MeshesCountMax, "meshes.size() have to be <= SkinnedRenderMesh::MeshesCountMax"); m_device = GetDeviceManager()->GetDevice(); @@ -179,7 +180,7 @@ void SkinnedRenderMesh::updateVisibleMeshes(const std::vector<uint32_t>& visible } context->Unmap(m_indexBuffer, 0); m_indexCount = indexCount; - PX_ASSERT(m_indexCount % 3 == 0); + NV_CLOTH_ASSERT(m_indexCount % 3 == 0); } } diff --git a/NvCloth/samples/SampleBase/scene/scenes/PlaneCollisionScene.cpp b/NvCloth/samples/SampleBase/scene/scenes/PlaneCollisionScene.cpp index 8a677f1..7ab5ca0 100644 --- a/NvCloth/samples/SampleBase/scene/scenes/PlaneCollisionScene.cpp +++ b/NvCloth/samples/SampleBase/scene/scenes/PlaneCollisionScene.cpp @@ -83,7 +83,7 @@ void PlaneCollisionScene::initializeCloth(int index, physx::PxVec3 offset) //assign as collision data nv::cloth::Range<const physx::PxVec4> planesR(&planes[0], &planes[0] + planes.size()); - mClothActor[index]->mCloth->setPlanes(planesR, 0, mClothActor[index]->mCloth->getNumPlanes()); + mClothActor[index]->mCloth->setPlanes(planesR, planesR); //assign convex indices std::vector<uint32_t> indices; diff --git a/NvCloth/samples/SampleBase/scene/scenes/SphereScene.cpp b/NvCloth/samples/SampleBase/scene/scenes/SphereScene.cpp index 2e6912e..8bb004e 100644 --- a/NvCloth/samples/SampleBase/scene/scenes/SphereScene.cpp +++ b/NvCloth/samples/SampleBase/scene/scenes/SphereScene.cpp @@ -84,7 +84,9 @@ void SphereScene::initializeCloth(int index, physx::PxVec3 offset) physx::PxVec4 spheres[1] = {physx::PxVec4(physx::PxVec3(0.f, 10.f, -1.f) + offset,1.5)}; - mClothActor[index]->mCloth->setSpheres(nv::cloth::Range<physx::PxVec4>(spheres, spheres + 1), 0, mClothActor[index]->mCloth->getNumSpheres()); + //mClothActor[index]->mCloth->setSpheres(nv::cloth::Range<physx::PxVec4>(spheres, spheres + 1), 0, mClothActor[index]->mCloth->getNumSpheres()); + mClothActor[index]->mCloth->setSpheres(nv::cloth::Range<physx::PxVec4>(spheres, spheres + 1), nv::cloth::Range<physx::PxVec4>(spheres, spheres + 1)); + // Setup phase configs std::vector<nv::cloth::PhaseConfig> phases(mFabric[index]->getNumPhases()); diff --git a/NvCloth/samples/SampleBase/task/PxTask.h b/NvCloth/samples/SampleBase/task/PxTask.h index 85d91da..e2b19e2 100644 --- a/NvCloth/samples/SampleBase/task/PxTask.h +++ b/NvCloth/samples/SampleBase/task/PxTask.h @@ -32,7 +32,6 @@ #include "task/PxTaskManager.h" #include "task/PxCpuDispatcher.h" #include "task/PxGpuDispatcher.h" -#include "foundation/PxAssert.h" namespace physx { @@ -117,7 +116,7 @@ public: //! \brief Release method implementation virtual void release() { - PX_ASSERT(mTm); + NV_CLOTH_ASSERT(mTm); // clear mTm before calling taskCompleted() for safety PxTaskManager* save = mTm; @@ -129,7 +128,7 @@ public: // task is allowed to start. PX_INLINE void finishBefore( PxTaskID taskID ) { - PX_ASSERT(mTm); + NV_CLOTH_ASSERT(mTm); mTm->finishBefore( *this, taskID); } @@ -137,7 +136,7 @@ public: // task has completed. PX_INLINE void startAfter( PxTaskID taskID ) { - PX_ASSERT(mTm); + NV_CLOTH_ASSERT(mTm); mTm->startAfter( *this, taskID ); } @@ -147,7 +146,7 @@ public: */ PX_INLINE void addReference() { - PX_ASSERT(mTm); + NV_CLOTH_ASSERT(mTm); mTm->addReference( mTaskID ); } @@ -157,7 +156,7 @@ public: */ PX_INLINE void removeReference() { - PX_ASSERT(mTm); + NV_CLOTH_ASSERT(mTm); mTm->decrReference( mTaskID ); } @@ -244,7 +243,7 @@ public: */ PX_INLINE void setContinuation(PxTaskManager& tm, PxBaseTask* c) { - PX_ASSERT( mRefCount == 0 ); + NV_CLOTH_ASSERT( mRefCount == 0 ); mRefCount = 1; mCont = c; mTm = &tm; @@ -263,15 +262,15 @@ public: */ PX_INLINE void setContinuation( PxBaseTask* c ) { - PX_ASSERT( c ); - PX_ASSERT( mRefCount == 0 ); + NV_CLOTH_ASSERT( c ); + NV_CLOTH_ASSERT( mRefCount == 0 ); mRefCount = 1; mCont = c; if( mCont ) { mCont->addReference(); mTm = mCont->getTaskManager(); - PX_ASSERT( mTm ); + NV_CLOTH_ASSERT( mTm ); } } diff --git a/NvCloth/samples/SampleBase/utils/CallbackImplementations.cpp b/NvCloth/samples/SampleBase/utils/CallbackImplementations.cpp index 0a257ba..3d00961 100644 --- a/NvCloth/samples/SampleBase/utils/CallbackImplementations.cpp +++ b/NvCloth/samples/SampleBase/utils/CallbackImplementations.cpp @@ -16,8 +16,6 @@ #include <d3d11.h> //#endif -#include <PsThread.h> - NvClothEnvironment* NvClothEnvironment::sEnv = nullptr; @@ -52,9 +50,6 @@ DxContextManagerCallbackImpl::DxContextManagerCallbackImpl(ID3D11Device* device, { mDevice->AddRef(); mDevice->GetImmediateContext(&mContext); -#ifdef _DEBUG - mLockCountTls = physx::shdfnd::TlsAlloc(); -#endif } DxContextManagerCallbackImpl::~DxContextManagerCallbackImpl() { @@ -72,24 +67,15 @@ DxContextManagerCallbackImpl::~DxContextManagerCallbackImpl() mDevice->Release(); -#if _DEBUG - physx::shdfnd::TlsFree(mLockCountTls); -#endif } void DxContextManagerCallbackImpl::acquireContext() { mMutex.lock(); -#if _DEBUG - physx::shdfnd::TlsSet(mLockCountTls, reinterpret_cast<void*>(reinterpret_cast<intptr_t>(physx::shdfnd::TlsGet(mLockCountTls)) + 1)); -#endif } void DxContextManagerCallbackImpl::releaseContext() { -#if _DEBUG - physx::shdfnd::TlsSet(mLockCountTls, reinterpret_cast<void*>(reinterpret_cast<intptr_t>(physx::shdfnd::TlsGet(mLockCountTls)) - 1)); -#endif mMutex.unlock(); } ID3D11Device* DxContextManagerCallbackImpl::getDevice() const @@ -98,9 +84,6 @@ ID3D11Device* DxContextManagerCallbackImpl::getDevice() const } ID3D11DeviceContext* DxContextManagerCallbackImpl::getContext() const { -#if _DEBUG - assert(reinterpret_cast<intptr_t>(physx::shdfnd::TlsGet(mLockCountTls)) > 0); -#endif return mContext; } bool DxContextManagerCallbackImpl::synchronizeResources() const diff --git a/NvCloth/samples/SampleBase/utils/CallbackImplementations.h b/NvCloth/samples/SampleBase/utils/CallbackImplementations.h index 38a4b17..214f689 100644 --- a/NvCloth/samples/SampleBase/utils/CallbackImplementations.h +++ b/NvCloth/samples/SampleBase/utils/CallbackImplementations.h @@ -12,7 +12,6 @@ #include <NvCloth/Callbacks.h> #include <foundation/PxAllocatorCallback.h> #include <foundation/PxErrorCallback.h> -#include <foundation/PxAssert.h> #include <foundation/PxProfiler.h> #include <vector> diff --git a/NvCloth/samples/SampleBase/utils/ClothMeshGenerator.cpp b/NvCloth/samples/SampleBase/utils/ClothMeshGenerator.cpp index a0c0d3a..c3781c2 100644 --- a/NvCloth/samples/SampleBase/utils/ClothMeshGenerator.cpp +++ b/NvCloth/samples/SampleBase/utils/ClothMeshGenerator.cpp @@ -10,7 +10,7 @@ #include "ClothMeshGenerator.h" -#include "PsMathUtils.h" +#include <NvCloth/ps/PsMathUtils.h> #include <fstream> #include <iterator> |