aboutsummaryrefslogtreecommitdiff
path: root/sdk/toolkit/include
diff options
context:
space:
mode:
authorAnton Novoselov <[email protected]>2017-08-14 16:41:28 +0300
committerAnton Novoselov <[email protected]>2017-08-14 16:41:28 +0300
commit9a1c1d814f3fa0b54b49d90b43130c02bc280f44 (patch)
treeeae6ead883173c66619c30b6a1ed085f3cb70f4d /sdk/toolkit/include
parentUpdated to CL 22627414: (diff)
downloadblast-9a1c1d814f3fa0b54b49d90b43130c02bc280f44.tar.xz
blast-9a1c1d814f3fa0b54b49d90b43130c02bc280f44.zip
Updated to CL 22661993:
* docs updates * authoring fixes * asset view in sample fix * latest blast_tools_and_samples-windows.zip
Diffstat (limited to 'sdk/toolkit/include')
-rw-r--r--sdk/toolkit/include/NvBlastTkActor.h12
-rw-r--r--sdk/toolkit/include/NvBlastTkFamily.h2
-rw-r--r--sdk/toolkit/include/NvBlastTkFramework.h4
-rw-r--r--sdk/toolkit/include/NvBlastTkGroup.h2
4 files changed, 10 insertions, 10 deletions
diff --git a/sdk/toolkit/include/NvBlastTkActor.h b/sdk/toolkit/include/NvBlastTkActor.h
index 453e4c4..73e83cd 100644
--- a/sdk/toolkit/include/NvBlastTkActor.h
+++ b/sdk/toolkit/include/NvBlastTkActor.h
@@ -167,9 +167,9 @@ public:
/**
Apply damage to this actor.
- Actual damage processing is deferred till the group process() call. Sets actor in 'pending' state.
+ Actual damage processing is deferred till the group worker process() call. Sets actor in 'pending' state.
- It's the user's responsibility to keep programParams pointer alive until the group sync() call.
+ It's the user's responsibility to keep programParams pointer alive until the group endProcess() call.
\param[in] program A NvBlastDamageProgram containing damage shaders.
\param[in] programParams Parameters for the NvBlastDamageProgram.
@@ -179,7 +179,7 @@ public:
/**
Apply damage to this actor.
- Actual damage processing is deferred till the group process() call. Sets actor in 'pending' state.
+ Actual damage processing is deferred till the group worker process() call. Sets actor in 'pending' state.
Damage Desc will be stacked into NvBlastProgramParams. NvBlastProgramParams will be passed into shader.
@@ -194,16 +194,16 @@ public:
/**
Apply damage to this actor.
- Actual damage processing is deferred till the group process() call. Sets actor in 'pending' state.
+ Actual damage processing is deferred till the group worker process() call. Sets actor in 'pending' state.
Damage Desc will be stacked into NvBlastDamageProgram. NvBlastDamageProgram will be passed into shader.
- This function overload explicitly sets a material to be passed into NvBlastProgramParams, it must be valid until the group sync() call.
+ This function overload explicitly sets a material to be passed into NvBlastProgramParams, it must be valid until the group endProcess() call.
\param[in] program A NvBlastDamageProgram containing damage shaders.
\param[in] damageDesc Parameters to be put in NvBlastDamageProgram, have to be POD type (will be copied).
\param[in] descSize Size of damageDesc in bytes. Required to copy and store Damage Desc.
- \param[in] material Material to be passed into NvBlastProgramParams. Must be valid until the group sync() call.
+ \param[in] material Material to be passed into NvBlastProgramParams. Must be valid until the group endProcess() call.
*/
virtual void damage(const NvBlastDamageProgram& program, const void* damageDesc, uint32_t descSize, const void* material) = 0;
diff --git a/sdk/toolkit/include/NvBlastTkFamily.h b/sdk/toolkit/include/NvBlastTkFamily.h
index 119d308..02b91cb 100644
--- a/sdk/toolkit/include/NvBlastTkFamily.h
+++ b/sdk/toolkit/include/NvBlastTkFamily.h
@@ -128,7 +128,7 @@ public:
virtual const void* getMaterial() const = 0;
/**
- Set the default material to be passed into NvBlastDamageProgram when a TkActor in this family is damaged. Must be valid till group sync() call.
+ Set the default material to be passed into NvBlastDamageProgram when a TkActor in this family is damaged. Must be valid till group endProcess() call.
\param[in] material The material to be the new default.
*/
diff --git a/sdk/toolkit/include/NvBlastTkFramework.h b/sdk/toolkit/include/NvBlastTkFramework.h
index 51ee743..e9601ff 100644
--- a/sdk/toolkit/include/NvBlastTkFramework.h
+++ b/sdk/toolkit/include/NvBlastTkFramework.h
@@ -129,9 +129,9 @@ Descriptor for joint creation.
*/
struct TkJointDesc
{
- TkFamily* families[2]; //!< The TkFamily objects containint the chunks joined by the joint
+ TkFamily* families[2]; //!< The TkFamily objects containing the chunks joined by the joint
uint32_t chunkIndices[2]; //!< The chunk indices within the corresponding TkFamily objects joined by the joint. The indexed chunks will be support chunks.
- physx::PxVec3 attachPositions[2]; //!< The position of the joint relative to each TkActor which ownes the chunks jointed by this joint
+ physx::PxVec3 attachPositions[2]; //!< The position of the joint relative to each TkActor which owns the chunks jointed by this joint
};
diff --git a/sdk/toolkit/include/NvBlastTkGroup.h b/sdk/toolkit/include/NvBlastTkGroup.h
index 2e5ee3e..c799485 100644
--- a/sdk/toolkit/include/NvBlastTkGroup.h
+++ b/sdk/toolkit/include/NvBlastTkGroup.h
@@ -176,7 +176,7 @@ public:
/**
Helper function to process the group synchronously on a single thread.
*/
- virtual void process();
+ void process();
/**
For profile builds only, request stats of the last successful processing. Inactive in other builds.