diff options
Diffstat (limited to 'NvCloth/samples/SampleBase/renderer')
6 files changed, 17 insertions, 12 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); } } |