Skip to content

Commit

Permalink
Merge pull request #1485 from waywardmonkeys/typo-fixes
Browse files Browse the repository at this point in the history
Typo fixes.

(Internal change: 2160690)
  • Loading branch information
pixar-oss committed Apr 20, 2021
2 parents fe5d10e + c4821e1 commit e1b7819
Show file tree
Hide file tree
Showing 23 changed files with 47 additions and 44 deletions.
2 changes: 1 addition & 1 deletion pxr/base/work/loops.h
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ WorkSerialForN(size_t n, Fn &&fn)
///
/// void LoopCallback(size_t begin, size_t end);
///
/// grainSize specifices a minumum amount of work to be done per-thread. There
/// grainSize specifies a minimum amount of work to be done per-thread. There
/// is overhead to launching a thread (or task) and a typical guideline is that
/// you want to have at least 10,000 instructions to count for the overhead of
/// launching a thread.
Expand Down
13 changes: 8 additions & 5 deletions pxr/imaging/hd/bufferArray.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,9 @@ HdBufferArray::TryAssignRange(HdBufferArrayRangeSharedPtr &range)
}

range->SetBufferArray(this);

_needsReallocation = true; // Multiple threads may try to set this to true at once, which is ok.

// Multiple threads may try to set this to true at once, which is ok.
_needsReallocation = true;

return true;
}
Expand All @@ -105,13 +106,15 @@ HdBufferArray::RemoveUnusedRanges()
size_t idx = 0;
while (idx < numRanges) {
if (_rangeList[idx].expired()) {
// Order of range objects doesn't matter so use range at end to fill gap.
// Order of range objects doesn't matter so use range at end to fill
// gap.
_rangeList[idx] = _rangeList[numRanges - 1];
_rangeList[numRanges - 1].reset();
--numRanges;

HD_PERF_COUNTER_INCR(_garbageCollectionPerfToken);
// Don't increament idx as we need to check the value we just moved into the slot.
// Don't increment idx as we need to check the value we just moved
// into the slot.
} else {
++idx;
}
Expand All @@ -125,7 +128,7 @@ HdBufferArrayRangePtr
HdBufferArray::GetRange(size_t idx) const
{
// XXX: This would need a lock on range list
// if run in parrelel to TryAssignRange
// if run in parallel to TryAssignRange

TF_VERIFY(idx < _rangeCount); // Note this maybe lower than the actual array
return _rangeList[idx];
Expand Down
2 changes: 1 addition & 1 deletion pxr/imaging/hd/renderIndex.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1458,7 +1458,7 @@ HdRenderIndex::SyncAll(HdTaskSharedPtrVector *tasks,

{
HF_TRACE_FUNCTION_SCOPE("Clean Up");
// Give Delegate's to do any post-parrellel work,
// Give Delegate's to do any post-parallel work,
// such as garbage collection.
TF_FOR_ALL(dlgIt, syncMap) {
HdSceneDelegate *delegate = dlgIt->first;
Expand Down
2 changes: 1 addition & 1 deletion pxr/imaging/hd/sceneDelegate.h
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ class HdSceneDelegate {
virtual void Sync(HdSyncRequestVector* request);

/// Opportunity for the delegate to clean itself up after
/// performing parrellel work during sync phase
/// performing parallel work during sync phase
HD_API
virtual void PostSyncCleanup();

Expand Down
2 changes: 1 addition & 1 deletion pxr/imaging/hdSt/renderBuffer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ HdStRenderBuffer::Allocate(

if (multiSampled) {
if (!_textureMSAAObject) {
// Allocate texture object if necesssary
// Allocate texture object if necessary
_textureMSAAObject =
std::dynamic_pointer_cast<HdStDynamicUvTextureObject>(
_resourceRegistry->AllocateTextureObject(
Expand Down
2 changes: 1 addition & 1 deletion pxr/imaging/hdSt/renderPass.h
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ class HdSt_RenderPass : public HdRenderPass {
void _PrepareCommandBuffer(TfTokenVector const& renderTags);

// XXX: This should really be in HdSt_DrawBatch::PrepareDraw.
void _FrustumCullCPU(HdStRenderPassStateSharedPtr const &renderPasssState);
void _FrustumCullCPU(HdStRenderPassStateSharedPtr const &renderPassState);

// -----------------------------------------------------------------------
// Drawing state
Expand Down
4 changes: 2 additions & 2 deletions pxr/imaging/hdSt/resourceRegistry.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ HdStResourceRegistry::AddSources(HdBufferArrayRangeSharedPtr const &range,
sources[srcNum] = sources.back();
sources.pop_back();

// Don't increament srcNum as it now points
// Don't increment srcNum as it now points
// to the new item or is off the end of the vector
}
}
Expand Down Expand Up @@ -802,7 +802,7 @@ HdStResourceRegistry::_Commit()
// the reallocation happens only once per BufferArray.
//
// if the range is already larger than the current one,
// leave it as it is (there is a possibilty that GPU
// leave it as it is (there is a possibility that GPU
// computation generates less data than it was).
int currentNumElements = dstRange->GetNumElements();
if (currentNumElements < numElements) {
Expand Down
2 changes: 1 addition & 1 deletion pxr/usd/usd/apiSchemaBase.h
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ class SdfAssetPath;
/// schema or directly from APISchemaBase. Similarly, a non-applied API schema
/// can only inherit from a non-applied API Schema or directly from
/// APISchemaBase. 'usdGenSchema' attempts to issue a warning if it detects
/// an incompability.
/// an incompatibility.
///
/// \note A multiple-apply API schema may not inherit from a single-apply API
/// schema and vice versa.
Expand Down
2 changes: 1 addition & 1 deletion pxr/usd/usd/generatedSchema.usda
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class "APISchemaBase" (
schema or directly from APISchemaBase. Similarly, a non-applied API schema
can only inherit from a non-applied API Schema or directly from
APISchemaBase. 'usdGenSchema' attempts to issue a warning if it detects
an incompability.
an incompatibility.

\\note A multiple-apply API schema may not inherit from a single-apply API
schema and vice versa.
Expand Down
14 changes: 7 additions & 7 deletions pxr/usd/usd/relationship.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ typedef std::vector<UsdRelationship> UsdRelationshipVector;
/// A UsdRelationship is a pointer to other objects, which are named by their
/// scenegraph paths. When authoring relationships, the \em target parameters
/// should be scenegraph paths in the composed namespace of the UsdStage into
/// which you are authoring. If your edits are targetted to a different
/// which you are authoring. If your edits are targeted to a different
/// layer, across various composition arcs (because you specified a non-default
/// \ref UsdEditTarget), the target's path will be automatically translated
/// into the proper namespace.
Expand All @@ -65,10 +65,10 @@ typedef std::vector<UsdRelationship> UsdRelationshipVector;
/// relationship in weaker layers \em without stomping the weaker opinions,
/// although stomping behavior is still possible, via SetTargets().
///
/// An authored relationship creates a dependency of the targetting prim on
/// the targetted prim(s). We consider these dependencies to be "load
/// An authored relationship creates a dependency of the targeting prim on
/// the targeted prim(s). We consider these dependencies to be "load
/// dependencies", which means that when we load the targeting prim's
/// "load group", we will also load the targetted prims' load groups, to ensure
/// "load group", we will also load the targeted prims' load groups, to ensure
/// that all the data required to render the model containing the targeting
/// prim is composed and available.
///
Expand All @@ -89,7 +89,7 @@ typedef std::vector<UsdRelationship> UsdRelationshipVector;
/// the aggregate.
///
/// This can happen because references encapsulate just the tree whose root
/// is targetted in the reference - no other scene description in the
/// is targeted in the reference - no other scene description in the
/// referenced layer will be composed into the aggregate. So if some
/// descendant prim of the referenced root targets a relationship to another
/// tree in the same layer, that relationship would dangle, and the client
Expand Down Expand Up @@ -117,11 +117,11 @@ typedef std::vector<UsdRelationship> UsdRelationshipVector;
/// other prims to target. The prim also hosts a "bindingVariant"
/// UsdVariantSet whose variants each modulate the target of the
/// binding-post relationship. We can now change the \em forwarded target
/// of all prims targetting the binding-post by simply switching the
/// of all prims targeting the binding-post by simply switching the
/// bindingVariant VariantSet. We will work through this example in
/// the USD reference manual.
/// \li Defining a relationship as part of a model's interface (so that it can
/// be targetted in model hierarchy with no models loaded), which, inside
/// be targeted in model hierarchy with no models loaded), which, inside
/// the model's payload, forwards to prims useful to a client, the set of
/// which may vary depending on the model's configured VariantSets.
///
Expand Down
2 changes: 1 addition & 1 deletion pxr/usd/usd/schema.usda
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ class "APISchemaBase"
schema or directly from APISchemaBase. Similarly, a non-applied API schema
can only inherit from a non-applied API Schema or directly from
APISchemaBase. 'usdGenSchema' attempts to issue a warning if it detects
an incompability.
an incompatibility.

\\note A multiple-apply API schema may not inherit from a single-apply API
schema and vice versa.
Expand Down
2 changes: 1 addition & 1 deletion pxr/usd/usd/stage.h
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ SDF_DECLARE_HANDLES(SdfLayer);
/// - \ref Usd_stageSerialization "Serialization" methods for "flattening" a
/// composition (to varying degrees), and exporting a completely flattened
/// view of the stage to a string or file. These methods can be very useful
/// for targetted asset optimization and debugging, though care should be
/// for targeted asset optimization and debugging, though care should be
/// exercized with large scenes, as flattening defeats some of the benefits of
/// referenced scene description, and may produce very large results,
/// especially in file formats that do not support data de-duplication, like
Expand Down
2 changes: 1 addition & 1 deletion pxr/usd/usdGeom/basisCurves.h
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ class SdfAssetPath;
/// the behavior of cubic Bspline and Catmull-Rom curves. To evaluate or render
/// pinned curves, a client must effectively add 'phantom points' at the
/// beginning and end of every curve in a batch. These phantom points
/// are injected to ensure that the inteprolated curve begins at P[0] and
/// are injected to ensure that the interpolated curve begins at P[0] and
/// ends at P[n-1].
///
/// For a curve with initial point P[0] and last point P[n-1], the phantom
Expand Down
4 changes: 2 additions & 2 deletions pxr/usd/usdGeom/generatedSchema.usda
Original file line number Diff line number Diff line change
Expand Up @@ -2294,7 +2294,7 @@ class BasisCurves "BasisCurves" (
the behavior of cubic Bspline and Catmull-Rom curves. To evaluate or render
pinned curves, a client must effectively add 'phantom points' at the
beginning and end of every curve in a batch. These phantom points
are injected to ensure that the inteprolated curve begins at P[0] and
are injected to ensure that the interpolated curve begins at P[0] and
ends at P[n-1].

For a curve with initial point P[0] and last point P[n-1], the phantom
Expand Down Expand Up @@ -3178,7 +3178,7 @@ class PointInstancer "PointInstancer" (

Processing and Not Processing Prototypes

Any prim in the scenegraph can be targetted as a prototype by the
Any prim in the scenegraph can be targeted as a prototype by the
prototypes relationship. We do not, however, provide a specific
mechanism for identifying prototypes as geometry that should not be drawn
(or processed) in their own, local spaces in the scenegraph. We
Expand Down
2 changes: 1 addition & 1 deletion pxr/usd/usdGeom/imageable.h
Original file line number Diff line number Diff line change
Expand Up @@ -511,7 +511,7 @@ class UsdGeomImageable : public UsdTyped
///
/// To facilitate authoring on sparse or unloaded stages, we do not
/// perform any validation of this prim's purpose or the type or
/// purpoes of the specified prim.
/// purpose of the specified prim.
///
/// \sa ComputeProxyPrim(), GetProxyPrimRel()
USDGEOM_API
Expand Down
2 changes: 1 addition & 1 deletion pxr/usd/usdGeom/pointInstancer.h
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ class SdfAssetPath;
///
/// \section UsdGeomPointInstancer_protoProcessing Processing and Not Processing Prototypes
///
/// Any prim in the scenegraph can be targetted as a prototype by the
/// Any prim in the scenegraph can be targeted as a prototype by the
/// \em prototypes relationship. We do not, however, provide a specific
/// mechanism for identifying prototypes as geometry that should not be drawn
/// (or processed) in their own, local spaces in the scenegraph. We
Expand Down
4 changes: 2 additions & 2 deletions pxr/usd/usdGeom/schema.usda
Original file line number Diff line number Diff line change
Expand Up @@ -1282,7 +1282,7 @@ class BasisCurves "BasisCurves" (
the behavior of cubic Bspline and Catmull-Rom curves. To evaluate or render
pinned curves, a client must effectively add 'phantom points' at the
beginning and end of every curve in a batch. These phantom points
are injected to ensure that the inteprolated curve begins at P[0] and
are injected to ensure that the interpolated curve begins at P[0] and
ends at P[n-1].

For a curve with initial point P[0] and last point P[n-1], the phantom
Expand Down Expand Up @@ -1724,7 +1724,7 @@ class PointInstancer "PointInstancer" (

\\section UsdGeomPointInstancer_protoProcessing Processing and Not Processing Prototypes

Any prim in the scenegraph can be targetted as a prototype by the
Any prim in the scenegraph can be targeted as a prototype by the
\\em prototypes relationship. We do not, however, provide a specific
mechanism for identifying prototypes as geometry that should not be drawn
(or processed) in their own, local spaces in the scenegraph. We
Expand Down
14 changes: 7 additions & 7 deletions pxr/usd/usdSkel/doxygen/apiIntro.dox
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ localSpaceXforms = skelQuery.ComputeJointLocalTransforms(time)
skelSpaceXforms = skelQuery.ComputeJointSkelTransforms(time)
\endcode

Note that this allows the animated transforms of a Skeleton to be exracted
Note that this allows the animated transforms of a Skeleton to be extracted
without having to deal with some of the more complicated aspects of the
Skeleton encoding, such as the inheritance of the _skel:animationSource_
relationship.
Expand Down Expand Up @@ -139,7 +139,7 @@ in a Skeleton might look something like the following:
std::vector<Joint> joints;

// GetTopology() returns a UsdSkelTopology object, which describes
// the parent<->child relationships. It also gives the numer of joints.
// the parent<->child relationships. It also gives the number of joints.
size_t numJoints = skelQuery.GetTopology().GetNumJoints();
for (size_t i = 0; i < numJoints; ++i) {
std::string name = SdfPath(skelQuery.GetJointOrder()[i]).GetName();
Expand Down Expand Up @@ -178,7 +178,7 @@ clear whether or not the parent joint had been constructed yet. However,
it is a schema **requirement** that the set of joints is ordered, with
parent joints coming before child joints. That is, linearly iterating
through the ordered set of joints on a Skeleton must always describe
a top-down hiearchy traversal. When a UsdSkelSkeletonQuery is constructed,
a top-down hierarchy traversal. When a UsdSkelSkeletonQuery is constructed,
its topology is validated, and the resulting query object is only valid
if that topology check passes. So given a valid UsdSkelSkeletonQuery,
the above code snippet will be safe.
Expand Down Expand Up @@ -560,7 +560,7 @@ instanced, skinnable prims are populated on the cache. If there is no need
to consider instanced primitives, then a predicate that does not traverse
instance proxies -- such as UsdPrimDefaultPredicae -- may be used instead.

The SkelRoot that enapsulates a primitive can be found using UsdSkelRoot::Find.
The SkelRoot that encapsulates a primitive can be found using UsdSkelRoot::Find.
If no SkelRoot is found, that means that the primitive is not encapsulated
within a SkelRoot, and so any properties on the prim related to skinning
should be ignored.
Expand All @@ -583,7 +583,7 @@ Having found a SkelRoot and populated the UsdSkelCache, we can access a
UsdSkelSkinningQuery object for the primitive that is being skinned.
If the resulting UsdSkelSkinningQuery is invalid, that means that either
the primitive is not considered to be skinnable, or the skinning properties
are malformed in some way. If the latter, appropriate warning messsages will
are malformed in some way. If the latter, appropriate warning messages will
have been posted.

- C++:
Expand Down Expand Up @@ -729,15 +729,15 @@ stage.Save();

\section UsdSkel_API_WritingSkels Writing Skeletons

The following code demonstarates full USD/UsdSkel API, showing how an animated
The following code demonstrates the full USD/UsdSkel API, showing how an animated
Skeleton might be authored by a DCC application. It is not meant to be a
definitive example on the *right* way to author a Skeleton, but merely serves
as a simple example to start from.

For simplicity, this example focuses solely on encoding a Skeleton, and does
not including bindings for skinnable primitives.

As with previous examples, we begin wtih complete code, and then break it
As with previous examples, we begin with complete code, and then break it
down into its component parts.

- C++:
Expand Down
2 changes: 1 addition & 1 deletion pxr/usd/usdSkel/doxygen/intro.dox
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ common terminology:
\section UsdSkel_SkinnablePrims What Can Be Skinned?

UsdSkel makes an attempt at encoding skinning information in a way that
generalizes to many types of prims, rather than targetting a strict subset of
generalizes to many types of prims, rather than targeting a strict subset of
known types.

As a general rule, if a primitive's type inherits from UsdGeomBoundable,
Expand Down
2 changes: 1 addition & 1 deletion pxr/usd/usdSkel/skeletonQuery.h
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ class UsdSkelSkeletonQuery
USDSKEL_API
const UsdSkelAnimMapper& GetMapper() const;

/// Returns an arrray of joint paths, given as tokens, describing
/// Returns an array of joint paths, given as tokens, describing
/// the order and parent-child relationships of joints in the skeleton.
///
/// \sa UsdSkelSkeleton::GetJointOrder
Expand Down
2 changes: 1 addition & 1 deletion pxr/usd/usdUtils/sparseValueWriter.h
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ class UsdUtilsSparseAttrValueWriter {
/// the existing default value of \p attr.
///
/// It \p defaultValue is null or points to an empty VtValue, the sparse
/// authoring logic is intialized with the existing authored default value
/// authoring logic is initialized with the existing authored default value
/// or the fallback value, if \p attr has one.
///
/// For efficiency, this function swaps out the given \p defaultValue,
Expand Down
6 changes: 3 additions & 3 deletions pxr/usdImaging/usdImaging/delegate.h
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ class UsdImagingDelegate : public HdSceneDelegate, public TfWeakBase {
void SyncAll(bool includeUnvarying);

/// Opportunity for the delegate to clean itself up after
/// performing parrellel work during sync phase
/// performing parallel work during sync phase
USDIMAGING_API
virtual void PostSyncCleanup() override;

Expand Down Expand Up @@ -197,7 +197,7 @@ class UsdImagingDelegate : public HdSceneDelegate, public TfWeakBase {
void SetCullStyleFallback(HdCullStyle cullStyle);

/// Sets the root transform for the entire delegate, which is applied to all
/// render prims generated. Settting this value will immediately invalidate
/// render prims generated. Setting this value will immediately invalidate
/// existing rprim transforms.
USDIMAGING_API
void SetRootTransform(GfMatrix4d const& xf);
Expand All @@ -206,7 +206,7 @@ class UsdImagingDelegate : public HdSceneDelegate, public TfWeakBase {
const GfMatrix4d &GetRootTransform() const { return _rootXf; }

/// Sets the root visibility for the entire delegate, which is applied to
/// all render prims generated. Settting this value will immediately
/// all render prims generated. Setting this value will immediately
/// invalidate existing rprim visibility.
USDIMAGING_API
void SetRootVisibility(bool isVisible);
Expand Down
2 changes: 1 addition & 1 deletion pxr/usdImaging/usdImaging/pointInstancerAdapter.h
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ class UsdImagingPointInstancerAdapter : public UsdImagingPrimAdapter
// Indexed by cachePath (each prim has one entry)
typedef std::unordered_map<SdfPath, _ProtoPrim, SdfPath::Hash> _ProtoPrimMap;

// All data asscoiated with a given Instancer prim. PrimMap could
// All data associated with a given Instancer prim. PrimMap could
// technically be split out to avoid two lookups, however it seems cleaner
// to keep everything bundled up under the instancer path.
struct _InstancerData {
Expand Down

0 comments on commit e1b7819

Please sign in to comment.