diff --git a/opensubdiv/far/patchParam.h b/opensubdiv/far/patchParam.h index c995e12c..3ece59e9 100644 --- a/opensubdiv/far/patchParam.h +++ b/opensubdiv/far/patchParam.h @@ -173,7 +173,7 @@ struct PatchParam { /// \brief Resets everything to 0 void Clear() { field0 = field1 = 0; } - /// \brief Retuns the faceid + /// \brief Returns the faceid Index GetFaceId() const { return Index(unpack(field0,28,0)); } /// \brief Returns the log2 value of the u parameter at diff --git a/opensubdiv/far/patchTable.h b/opensubdiv/far/patchTable.h index c4a69db8..34e49281 100644 --- a/opensubdiv/far/patchTable.h +++ b/opensubdiv/far/patchTable.h @@ -397,7 +397,7 @@ public: /// \brief Evaluate basis functions for a varying value and /// derivatives at a given (u,v) parametric location of a patch. /// - /// @param handle A patch handle indentifying the sub-patch containing the + /// @param handle A patch handle identifying the sub-patch containing the /// (u,v) location /// /// @param u Patch coordinate (in base face normalized space) diff --git a/opensubdiv/far/patchTableFactory.cpp b/opensubdiv/far/patchTableFactory.cpp index 55dcdf80..1bb4c59d 100644 --- a/opensubdiv/far/patchTableFactory.cpp +++ b/opensubdiv/far/patchTableFactory.cpp @@ -1414,7 +1414,7 @@ PatchTableFactory::populateAdaptivePatches( context.GetIrregularPatchCornerSpans(patch.levelIndex, patch.faceIndex, irregCornerSpans); - // switch endcap patchtype by option + // switch endcap patch type by option switch(context.options.GetEndCapType()) { case Options::ENDCAP_GREGORY_BASIS: arrayBuilder->iptr += diff --git a/opensubdiv/far/primvarRefiner.h b/opensubdiv/far/primvarRefiner.h index b09b09a2..5b8c350d 100644 --- a/opensubdiv/far/primvarRefiner.h +++ b/opensubdiv/far/primvarRefiner.h @@ -207,7 +207,7 @@ private: private: // - // Local class to fulfil interface for in the Scheme mask queries: + // Local class to fulfill interface for in the Scheme mask queries: // class Mask { public: @@ -705,7 +705,7 @@ PrimvarRefiner::interpFVarFromEdges(int level, T const & src, U & dst, int chann Vtr::internal::FVarLevel const & childFVar = childLevel.getFVarLevel(channel); // - // Allocate and intialize (if linearly interpolated) interpolation weights for + // Allocate and initialize (if linearly interpolated) interpolation weights for // the edge mask: // float eVertWeights[2]; @@ -1108,7 +1108,7 @@ PrimvarRefiner::limit(T const & src, U & dstPos, U1 * dstTan1Ptr, U2 * dstTan2Pt // // Apply the tangent masks -- both will have the same number of weights and - // indices (one tangent may be "padded" to accomodate the other), but these + // indices (one tangent may be "padded" to accommodate the other), but these // may differ from those of the position: // if (hasTangents) { diff --git a/opensubdiv/far/ptexIndices.cpp b/opensubdiv/far/ptexIndices.cpp index fe45541a..19dfaddd 100644 --- a/opensubdiv/far/ptexIndices.cpp +++ b/opensubdiv/far/ptexIndices.cpp @@ -163,7 +163,7 @@ PtexIndices::GetAdjacency( adjEdges[2] = 1; } - { // resolve neighbor outisde the sub-face (edge 0) + { // resolve neighbor outside the sub-face (edge 0) int edge0 = fedges[quadrant]; Index adjface0 = getAdjacentFace(level, edge0, face); if (adjface0==-1) { @@ -182,7 +182,7 @@ PtexIndices::GetAdjacency( assert(adjFaces[0]!=-1); } - // resolve neighbor outisde the sub-face (edge 3) + // resolve neighbor outside the sub-face (edge 3) int edge3 = fedges[prevQuadrant]; Index adjface3 = getAdjacentFace(level, edge3, face); if (adjface3==-1) { diff --git a/opensubdiv/far/topologyRefiner.cpp b/opensubdiv/far/topologyRefiner.cpp index a0d1051f..0371c7ed 100644 --- a/opensubdiv/far/topologyRefiner.cpp +++ b/opensubdiv/far/topologyRefiner.cpp @@ -94,7 +94,7 @@ TopologyRefiner::Unrefine() { // -// Intializing and updating the component inventory: +// Initializing and updating the component inventory: // void TopologyRefiner::initializeInventory() { diff --git a/opensubdiv/far/topologyRefinerFactory.h b/opensubdiv/far/topologyRefinerFactory.h index 37918ccb..3e023cb5 100644 --- a/opensubdiv/far/topologyRefinerFactory.h +++ b/opensubdiv/far/topologyRefinerFactory.h @@ -161,7 +161,7 @@ protected: /// the vertices for that face. /// /// If a full boundary representation with all neighborhood information is not - /// available, e.g. faces and vertices are avaible but not edges, only the + /// available, e.g. faces and vertices are available but not edges, only the /// face-vertices should be specified. The remaining topological relationships /// will be constructed later in the assembly (though at greater cost than if /// specified directly). @@ -170,13 +170,13 @@ protected: /// specified in order, i.e. the number of face-vertices for each successive face. /// - /// \brief Specify the number of vertices to be accomodated + /// \brief Specify the number of vertices to be accommodated static void setNumBaseVertices(TopologyRefiner & newRefiner, int count); - /// \brief Specify the number of faces to be accomodated + /// \brief Specify the number of faces to be accommodated static void setNumBaseFaces(TopologyRefiner & newRefiner, int count); - /// \brief Specify the number of edges to be accomodated + /// \brief Specify the number of edges to be accommodated static void setNumBaseEdges(TopologyRefiner & newRefiner, int count); /// \brief Specify the number of vertices incident each face @@ -628,7 +628,7 @@ TopologyRefinerFactory::assignComponentTopology(TopologyRefiner& /* refine // void setBaseVertexNonManifold(TopologyRefiner& newRefiner, Index vertex, bool b); // // Also consider using TopologyLevel::ValidateTopology() when debugging to ensure - // that topolology has been completely and correctly specified. + // that topology has been completely and correctly specified. // return false; } diff --git a/opensubdiv/osd/clEvaluator.h b/opensubdiv/osd/clEvaluator.h index debc4650..27c0eb2b 100644 --- a/opensubdiv/osd/clEvaluator.h +++ b/opensubdiv/osd/clEvaluator.h @@ -95,7 +95,7 @@ public: /// Constructor. CLEvaluator(cl_context context, cl_command_queue queue); - /// Desctructor. + /// Destructor. ~CLEvaluator(); /// Generic creator template. diff --git a/opensubdiv/osd/clGLVertexBuffer.h b/opensubdiv/osd/clGLVertexBuffer.h index 92d52845..98f7784f 100644 --- a/opensubdiv/osd/clGLVertexBuffer.h +++ b/opensubdiv/osd/clGLVertexBuffer.h @@ -93,7 +93,7 @@ protected: /// Returns true if success. bool allocate(cl_context clContext); - /// Acqures a resource from GL. + /// Acquires a resource from GL. void map(cl_command_queue queue); /// Releases a resource to GL. diff --git a/opensubdiv/osd/cudaD3D11VertexBuffer.h b/opensubdiv/osd/cudaD3D11VertexBuffer.h index b7258894..e72e6391 100644 --- a/opensubdiv/osd/cudaD3D11VertexBuffer.h +++ b/opensubdiv/osd/cudaD3D11VertexBuffer.h @@ -85,7 +85,7 @@ protected: bool allocate(ID3D11Device *device); - // Acqures a cuda resource from DX11 + // Acquires a cuda resource from DX11 void map(); // Releases a cuda resource to DX11 diff --git a/opensubdiv/osd/d3d11ComputeEvaluator.h b/opensubdiv/osd/d3d11ComputeEvaluator.h index d699fa0c..8fd4b1dd 100644 --- a/opensubdiv/osd/d3d11ComputeEvaluator.h +++ b/opensubdiv/osd/d3d11ComputeEvaluator.h @@ -148,7 +148,7 @@ public: stencilTable, deviceContext); } else { - // Create an instace on demand (slow) + // Create an instance on demand (slow) (void)deviceContext; // unused instance = Create(srcDesc, dstDesc, BufferDescriptor(), @@ -212,7 +212,7 @@ private: ID3D11ClassLinkage * _classLinkage; ID3D11ClassInstance * _singleBufferKernel; ID3D11ClassInstance * _separateBufferKernel; - ID3D11Buffer * _uniformArgs; // uniform paramaeters for kernels + ID3D11Buffer * _uniformArgs; // uniform parameters for kernels int _workGroupSize; }; diff --git a/opensubdiv/osd/glXFBEvaluator.h b/opensubdiv/osd/glXFBEvaluator.h index 4b0a8248..c171d52e 100644 --- a/opensubdiv/osd/glXFBEvaluator.h +++ b/opensubdiv/osd/glXFBEvaluator.h @@ -328,7 +328,7 @@ public: } /// \brief dispatch eval stencils function with derivatives. - /// dispatch the GLSL XFB kernel on on GPU asynchronously. + /// dispatch the GLSL XFB kernel on GPU asynchronously. /// /// @param srcBuffer GL buffer of input primvars. /// diff --git a/opensubdiv/osd/glslPatchCommon.glsl b/opensubdiv/osd/glslPatchCommon.glsl index e10b4e18..7f186b76 100644 --- a/opensubdiv/osd/glslPatchCommon.glsl +++ b/opensubdiv/osd/glslPatchCommon.glsl @@ -304,7 +304,7 @@ uniform samplerBuffer OsdFVarDataBuffer; } // ------ extract from triangles (loop) --------- -// XXX: no interpolation supproted +// XXX: no interpolation supported #define OSD_COMPUTE_FACE_VARYING_TRI_1(result, fvarOffset, triVert) \ { \ @@ -575,7 +575,7 @@ OsdComputeBSplineBoundaryPoints(inout vec3 cpt[16], ivec3 patchParam) // (labeled vv* and ev* respectively). // // The two segments of each transition edge are labeled Lo and Hi, -// with the Lo segment occuring before the Hi segment along the +// with the Lo segment occurring before the Hi segment along the // transition edge's domain parameterization. These Lo and Hi segment // tessellation levels determine how domain evaluation coordinates // are remapped along transition edges. The Hi segment value will @@ -632,7 +632,7 @@ float OsdComputeTessLevel(vec3 p0, vec3 p1) // We restrict adaptive tessellation levels to half of the device // supported maximum because transition edges are split into two - // halfs and the sum of the two corresponding levels must not exceed + // halves and the sum of the two corresponding levels must not exceed // the device maximum. We impose this limit even for non-transition // edges because a non-transition edge must be able to match up with // one half of the transition edge of an adjacent transition patch. diff --git a/opensubdiv/osd/hlslPatchCommon.hlsl b/opensubdiv/osd/hlslPatchCommon.hlsl index b01ef898..e306f9f9 100644 --- a/opensubdiv/osd/hlslPatchCommon.hlsl +++ b/opensubdiv/osd/hlslPatchCommon.hlsl @@ -448,7 +448,7 @@ OsdComputeBSplineBoundaryPoints(inout float3 cpt[16], int3 patchParam) // (labeled vv* and ev* respectively). // // The two segments of each transition edge are labeled Lo and Hi, -// with the Lo segment occuring before the Hi segment along the +// with the Lo segment occurring before the Hi segment along the // transition edge's domain parameterization. These Lo and Hi segment // tessellation levels determine how domain evaluation coordinates // are remapped along transition edges. The Hi segment value will @@ -505,7 +505,7 @@ float OsdComputeTessLevel(float3 p0, float3 p1) // We restrict adaptive tessellation levels to half of the device // supported maximum because transition edges are split into two - // halfs and the sum of the two corresponding levels must not exceed + // halves and the sum of the two corresponding levels must not exceed // the device maximum. We impose this limit even for non-transition // edges because a non-transition edge must be able to match up with // one half of the transition edge of an adjacent transition patch. diff --git a/opensubdiv/sdc/loopScheme.h b/opensubdiv/sdc/loopScheme.h index 61e90a1e..ebb86b11 100644 --- a/opensubdiv/sdc/loopScheme.h +++ b/opensubdiv/sdc/loopScheme.h @@ -313,7 +313,7 @@ Scheme::assignSmoothLimitMask(VERTEX const& vertex, MASK& posMask) // // A note on tangent magnitudes: // -// Several formulae exist for limit tangents at a vertex to accomodate the +// Several formulae exist for limit tangents at a vertex to accommodate the // different topological configurations around the vertex. While these produce // the desired direction, there is inconsistency in the resulting magnitudes. // Ideally a regular mesh of uniformly shaped triangles with similar edge lengths diff --git a/opensubdiv/sdc/options.h b/opensubdiv/sdc/options.h index 47c95b2a..7508b69f 100644 --- a/opensubdiv/sdc/options.h +++ b/opensubdiv/sdc/options.h @@ -101,10 +101,10 @@ public: /// \brief Set edge crease rule void SetCreasingMethod(CreasingMethod c) { _creasingMethod = c; } - /// \brief Get triangle subdivsion weights rule (Catmark scheme only !) + /// \brief Get triangle subdivision weights rule (Catmark scheme only !) TriangleSubdivision GetTriangleSubdivision() const { return (TriangleSubdivision) _triangleSub; } - /// \brief Set triangle subdivsion weights rule (Catmark scheme only !) + /// \brief Set triangle subdivision weights rule (Catmark scheme only !) void SetTriangleSubdivision(TriangleSubdivision t) { _triangleSub = t; } private: diff --git a/opensubdiv/sdc/scheme.h b/opensubdiv/sdc/scheme.h index d2ca8ce7..530cf6e3 100644 --- a/opensubdiv/sdc/scheme.h +++ b/opensubdiv/sdc/scheme.h @@ -131,7 +131,7 @@ public: /// edge while T2 points inward across the limit surface. /// /// As for magnitude, no assumptions should be made of the magnitudes of the resulting - /// tanget vectors. Common formulae often factor out scale factors that contribute to + /// tangent vectors. Common formulae often factor out scale factors that contribute to /// magnitude. While some attempt has been made to make magnitudes more consistent /// between regular corners, boundaries and the interior, the same has not been done at /// irregular vertices -- at least not yet. This may be addressed in future, as having @@ -484,7 +484,7 @@ Scheme::ComputeEdgeVertexMask(EDGE const& edge, // provided though, there are cases where the parent and child sharpness values need to be // identified, so accounting for the unknown Rules too is not much of an added complication. // -// The benefit of supporting specified Rules is that they can often often be trivially +// The benefit of supporting specified Rules is that they can often be trivially // determined from context (e.g. a vertex derived from a face at a previous level will always // be smooth) rather than more generally, and at greater cost, inspecting neighboring and // they are often the same for parent and child. @@ -572,7 +572,7 @@ Scheme::ComputeVertexVertexMask(VERTEX const& vertex, } // - // Intialize a local child mask, compute the fractional weight from parent and child + // Initialize a local child mask, compute the fractional weight from parent and child // sharpness values and combine the two masks: // typedef typename MASK::Weight Weight; diff --git a/opensubdiv/vtr/fvarLevel.cpp b/opensubdiv/vtr/fvarLevel.cpp index 3a3e304c..4520efa9 100644 --- a/opensubdiv/vtr/fvarLevel.cpp +++ b/opensubdiv/vtr/fvarLevel.cpp @@ -139,7 +139,7 @@ FVarLevel::resizeValues(int valueCount) { // // Once values have been identified for each vertex and tagged, refinement propagates // the tags to child values using more simplified logic (child values inherit the -// topology of their parent) and no futher analysis is required. +// topology of their parent) and no further analysis is required. // void FVarLevel::completeTopologyFromFaceValues(int regularBoundaryValence) { @@ -413,7 +413,7 @@ FVarLevel::completeTopologyFromFaceValues(int regularBoundaryValence) { // // Now that we know the total number of additional sibling values (M values in addition - // to the N vertex values) allocate space to accomodate all N + M vertex values. + // to the N vertex values) allocate space to accommodate all N + M vertex values. // // Then make the second pass through the vertices to identify the values associated with // each and to inspect and tag local face-varying topology for those that don't match: diff --git a/opensubdiv/vtr/fvarLevel.h b/opensubdiv/vtr/fvarLevel.h index a5163886..d5959b40 100644 --- a/opensubdiv/vtr/fvarLevel.h +++ b/opensubdiv/vtr/fvarLevel.h @@ -66,7 +66,7 @@ namespace internal { // take up almost half the memory of this representation, so if memory does // become a concern, we do not need to store them. The only reason we do so now // is that the face-value interface for specifying base topology and inspecting -// subsequent levels is very familar to that of face-vertices for clients. So +// subsequent levels is very familiar to that of face-vertices for clients. So // having them available for such access is convenient. // // Regarding scope and access... diff --git a/opensubdiv/vtr/level.cpp b/opensubdiv/vtr/level.cpp index 4a77601c..3097027b 100644 --- a/opensubdiv/vtr/level.cpp +++ b/opensubdiv/vtr/level.cpp @@ -1463,7 +1463,7 @@ namespace { // // The "dynamic relation" allocates the latter vector of members based on a typical // number of members per component, e.g. we expect valence 4 vertices in a typical - // quad-mesh, and so an "expected" number might be 6 to accomodate a few x-ordinary + // quad-mesh, and so an "expected" number might be 6 to accommodate a few x-ordinary // vertices. The member vector is allocated with this number per component and the // counts and offsets initialized to refer to them -- but with the counts set to 0. // The count will be incremented as members are identified and entered, and if any diff --git a/opensubdiv/vtr/level.h b/opensubdiv/vtr/level.h index 59b1f301..b21b645a 100644 --- a/opensubdiv/vtr/level.h +++ b/opensubdiv/vtr/level.h @@ -59,11 +59,11 @@ class FVarLevel; // the topology (i.e. all quads or all tris if not level 0). // // This class is intended for private use within the library. There are still -// opportunities to specialize levels -- e.g. those supporing N-sided faces vs -// those are are purely quads or tris -- so we prefer to insulate it from public +// opportunities to specialize levels -- e.g. those supporting N-sided faces vs +// those that are purely quads or tris -- so we prefer to insulate it from public // access. // -// The represenation of topology here is to store six topological relationships +// The representation of topology here is to store six topological relationships // in tables of integers. Each is stored in its own array(s) so the result is // a SOA representation of the topology. The six relations are: // @@ -75,7 +75,7 @@ class FVarLevel; // - vert-edges: edges incident a vertex // // There is some redundancy here but the intent is not that this be a minimal -// represenation, the intent is that it be amenable to refinement. Classes in +// representation, the intent is that it be amenable to refinement. Classes in // the Far layer essentially store 5 of these 6 in a permuted form -- we add // the face-edges here to simplify refinement. // diff --git a/opensubdiv/vtr/quadRefinement.cpp b/opensubdiv/vtr/quadRefinement.cpp index 9e746a09..09cfaa51 100644 --- a/opensubdiv/vtr/quadRefinement.cpp +++ b/opensubdiv/vtr/quadRefinement.cpp @@ -196,7 +196,7 @@ QuadRefinement::populateFaceEdgesFromParentFaces() { // // This is fairly straightforward, but since we are dealing with edges here, we - // occasionally have to deal with the limition of them being undirected. Since + // occasionally have to deal with the limitation of them being undirected. Since // child faces from the same parent face share much in common, we iterate through // the parent faces. //