From 948fdba7793f0122348e5c2ebd185d993bb9ddbf Mon Sep 17 00:00:00 2001 From: luz paz Date: Fri, 19 Nov 2021 15:32:49 -0500 Subject: [PATCH] Fixed additional typos --- documentation/dxptexviewer.rst | 4 ++-- documentation/dxviewer.rst | 2 +- documentation/glevallimit.rst | 2 +- documentation/glfvarviewer.rst | 2 +- documentation/glpainttest.rst | 2 +- documentation/glptexviewer.rst | 2 +- documentation/glsharetopology.rst | 2 +- documentation/glstencilviewer.rst | 2 +- documentation/glviewer.rst | 2 +- documentation/osd_shader_interface.rst | 2 +- documentation/release_34.rst | 4 ++-- documentation/release_notes_2x.rst | 2 +- documentation/subdivision_surfaces.rst | 2 +- documentation/using_osd_hbr.rst | 2 +- documentation/vtr_overview.rst | 2 +- opensubdiv/far/catmarkPatchBuilder.cpp | 8 ++++---- opensubdiv/far/loopPatchBuilder.cpp | 8 ++++---- opensubdiv/far/patchBuilder.cpp | 2 +- opensubdiv/far/patchMap.cpp | 2 +- opensubdiv/far/patchTable.cpp | 4 ++-- opensubdiv/far/patchTableFactory.cpp | 6 +++--- opensubdiv/osd/glslPatchCommon.glsl | 2 +- opensubdiv/osd/hlslPatchCommon.hlsl | 2 +- opensubdiv/osd/mtlPatchCommon.metal | 2 +- opensubdiv/osd/mtlVertexBuffer.mm | 2 +- tutorials/far/tutorial_1_2/far_tutorial_1_2.cpp | 2 +- tutorials/far/tutorial_5_1/far_tutorial_5_1.cpp | 6 +++--- tutorials/far/tutorial_5_2/far_tutorial_5_2.cpp | 2 +- tutorials/far/tutorial_5_3/far_tutorial_5_3.cpp | 2 +- 29 files changed, 42 insertions(+), 42 deletions(-) diff --git a/documentation/dxptexviewer.rst b/documentation/dxptexviewer.rst index 128227cab7..30afd81c57 100644 --- a/documentation/dxptexviewer.rst +++ b/documentation/dxptexviewer.rst @@ -62,7 +62,7 @@ OPTIONS ======= See the description of the -`common comand line options `__ +`common command line options `__ for the subset of common options supported here. **-y** @@ -110,7 +110,7 @@ KEYBOARD CONTROLS q : quit esc : hide GUI f : fit frame - +/- : increase / decrese tessellation rate + +/- : increase / decrease tessellation rate diff --git a/documentation/dxviewer.rst b/documentation/dxviewer.rst index 7d4c2df205..3358f2a91a 100644 --- a/documentation/dxviewer.rst +++ b/documentation/dxviewer.rst @@ -54,7 +54,7 @@ OPTIONS ======= See the description of the -`common comand line options `__ +`common command line options `__ for the subset of common options supported here. .. include:: examples_see_also.rst diff --git a/documentation/glevallimit.rst b/documentation/glevallimit.rst index f0642aa259..8e0e9f7e9c 100644 --- a/documentation/glevallimit.rst +++ b/documentation/glevallimit.rst @@ -77,7 +77,7 @@ OPTIONS ======= See the description of the -`common comand line options `__ +`common command line options `__ for the subset of common options supported here. .. include:: examples_see_also.rst diff --git a/documentation/glfvarviewer.rst b/documentation/glfvarviewer.rst index 9f7cbbc463..36e8c521c6 100644 --- a/documentation/glfvarviewer.rst +++ b/documentation/glfvarviewer.rst @@ -60,7 +60,7 @@ OPTIONS ======= See the description of the -`common comand line options `__ +`common command line options `__ for the subset of common options supported here. .. include:: examples_see_also.rst diff --git a/documentation/glpainttest.rst b/documentation/glpainttest.rst index 4048d06e3d..cbb7b2cb3d 100644 --- a/documentation/glpainttest.rst +++ b/documentation/glpainttest.rst @@ -54,7 +54,7 @@ OPTIONS ======= See the description of the -`common comand line options `__ +`common command line options `__ for the subset of common options supported here. KEYBOARD CONTROLS diff --git a/documentation/glptexviewer.rst b/documentation/glptexviewer.rst index 9b1159a9c3..10c8f27de4 100644 --- a/documentation/glptexviewer.rst +++ b/documentation/glptexviewer.rst @@ -60,7 +60,7 @@ OPTIONS ======= See the description of the -`common comand line options `__ +`common command line options `__ for the subset of common options supported here. **-e** *environment map* diff --git a/documentation/glsharetopology.rst b/documentation/glsharetopology.rst index 3a62449261..2f4c501d87 100644 --- a/documentation/glsharetopology.rst +++ b/documentation/glsharetopology.rst @@ -52,7 +52,7 @@ OPTIONS ======= See the description of the -`common comand line options `__ +`common command line options `__ for the subset of common options supported here. .. include:: examples_see_also.rst diff --git a/documentation/glstencilviewer.rst b/documentation/glstencilviewer.rst index 4dccf23a35..1290e5cb3e 100644 --- a/documentation/glstencilviewer.rst +++ b/documentation/glstencilviewer.rst @@ -54,7 +54,7 @@ OPTIONS ======= See the description of the -`common comand line options `__ +`common command line options `__ for the subset of common options supported here. .. include:: examples_see_also.rst diff --git a/documentation/glviewer.rst b/documentation/glviewer.rst index 5f672d88d9..4dfc711725 100644 --- a/documentation/glviewer.rst +++ b/documentation/glviewer.rst @@ -54,7 +54,7 @@ OPTIONS ======= See the description of the -`common comand line options `__ +`common command line options `__ for the subset of common options supported here. .. include:: examples_see_also.rst diff --git a/documentation/osd_shader_interface.rst b/documentation/osd_shader_interface.rst index 92340a4716..90c398e1e5 100644 --- a/documentation/osd_shader_interface.rst +++ b/documentation/osd_shader_interface.rst @@ -275,7 +275,7 @@ across adjacent patches. Tessellation levels computed at each patch ****************************************** -These tessellation levels can be computed the corresponding method in the tesselation control shader. Note that these functions potentially requires all bezier control +These tessellation levels can be computed the corresponding method in the tessellation control shader. Note that these functions potentially requires all bezier control points, you need to call barrier() to ensure the conversion is done for all invocations. See osd/glslPatchBSpline.glsl for more details. diff --git a/documentation/release_34.rst b/documentation/release_34.rst index f8721ad182..845c10a068 100644 --- a/documentation/release_34.rst +++ b/documentation/release_34.rst @@ -73,7 +73,7 @@ Major Improvements to Introductory Documentation A significant rewrite of the `Subdivision Surfaces `__ page is included in this release. The new documentation emphasizes the *piecewise parameteric surface* nature of subdivision surfaces and the implications of -supporting *arbitary topology*. +supporting *arbitrary topology*. +---------------------------------------+---------------------------------------+ | .. image:: images/val6_regular.jpg | .. image:: images/val6_irregular.jpg | @@ -91,7 +91,7 @@ Sparse Patch Tables Interfaces in Far for the construction of PatchTables and the required adaptive refinement have been extended to apply to an arbitrary subset of faces. This allows patches for either large meshes or meshes that may otherwise benefit -from some kind of partioning (e.g. areas of static and dynamic topology) to be +from some kind of partitioning (e.g. areas of static and dynamic topology) to be managed in an arbitrary number of groups. In the extreme, a PatchTable forming the tree of patches for a single base face can be constructed. diff --git a/documentation/release_notes_2x.rst b/documentation/release_notes_2x.rst index cebfceec50..bfa789e45f 100644 --- a/documentation/release_notes_2x.rst +++ b/documentation/release_notes_2x.rst @@ -580,5 +580,5 @@ Release 1.1.0 Release 1.0.0 ============= -Oringal release: +Original release: diff --git a/documentation/subdivision_surfaces.rst b/documentation/subdivision_surfaces.rst index 246eeb3b6b..b322135d76 100644 --- a/documentation/subdivision_surfaces.rst +++ b/documentation/subdivision_surfaces.rst @@ -147,7 +147,7 @@ way when only that point is moved: | :width: 80% | :width: 80% | | :target: images/basis_bspline.jpg | :target: images/basis_bezier.jpg | | | | -| Bicubic B-Spline basis function | Bicubic Bezier basis funciton | +| Bicubic B-Spline basis function | Bicubic Bezier basis function | +--------------------------------------+--------------------------------------+ It is these basis functions that often give rise to the names of the different patches. diff --git a/documentation/using_osd_hbr.rst b/documentation/using_osd_hbr.rst index 97a2cff887..b2a8f1e0ac 100644 --- a/documentation/using_osd_hbr.rst +++ b/documentation/using_osd_hbr.rst @@ -529,7 +529,7 @@ Here is some sample code: if (not fvt.IsInitialized()) { - // if no fvar daa exists yet on the vertex + // if no fvar data exists yet on the vertex fvt.SetAllData(2, fvdata); } else if (not fvt.CompareAll(2, fvdata)) { diff --git a/documentation/vtr_overview.rst b/documentation/vtr_overview.rst index fd6a55f9ec..cb85536ba4 100644 --- a/documentation/vtr_overview.rst +++ b/documentation/vtr_overview.rst @@ -54,7 +54,7 @@ similarly efficient to refine, but the topology is fixed once defined. representation of vertices, faces, etc. than Hbr in that they are not even parameterized by an interface to such components. So the same set of Vtr objects can eventually be used to serve more than one representation of these -components. The primary requirement is that a mesh be expressable as an +components. The primary requirement is that a mesh be expressible as an indexable set (i.e. a vector or array) of vertices, edges and faces. The index of a component uniquely identifies it and properties are retrieved by referring to it by index. diff --git a/opensubdiv/far/catmarkPatchBuilder.cpp b/opensubdiv/far/catmarkPatchBuilder.cpp index eeb2d05639..27fc9fdf63 100644 --- a/opensubdiv/far/catmarkPatchBuilder.cpp +++ b/opensubdiv/far/catmarkPatchBuilder.cpp @@ -494,7 +494,7 @@ namespace { // entries in place and deal with them as a post-process here. // // The SourcePatch is also sensitive to the presence of such valence-2 - // vertices for its own reasons (it needs to identifiy a unique set of + // vertices for its own reasons (it needs to identify a unique set of // source points from a set of corner rings), so a simple query of its // corners indicates when this post-process is necessary. (And since // this case is a rare occurrence, efficiency is not a major concern.) @@ -841,7 +841,7 @@ void GregoryConverter::Convert(Matrix & matrix) const { // - // Initialize the sparse matrix to accomodate the coefficients for each + // Initialize the sparse matrix to accommodate the coefficients for each // row/point -- identify common topological cases to treat more easily // (and note that specializing the popoluation of the matrix may also be // worthwhile in such cases) @@ -1155,7 +1155,7 @@ GregoryConverter::computeIrregularInteriorEdgePoints( pWeights, epWeights, emWeights); // - // Transer the weights for the ring into the stencil form of the required + // Transfer the weights for the ring into the stencil form of the required // Point type. The limit mask for position involves all ring weights, and // since Ep and Em depend on it, there should be no need to filter weights // with value 0: @@ -1682,7 +1682,7 @@ BSplineConverter::convertIrregularCorner(int irregularCorner, // // We use the ordering of points in the retrieved 1-ring for which weights // of the Catmark limit points are computed. So rather than re-order the - // ring to accomodate contributing source points, identify the locations + // ring to accommodate contributing source points, identify the locations // of the source points in the 1-ring so we can set coefficients // appropriately: // diff --git a/opensubdiv/far/loopPatchBuilder.cpp b/opensubdiv/far/loopPatchBuilder.cpp index 3ba346f53a..03980c8f8f 100644 --- a/opensubdiv/far/loopPatchBuilder.cpp +++ b/opensubdiv/far/loopPatchBuilder.cpp @@ -482,7 +482,7 @@ namespace { // entries in place and deal with them as a post-process here. // // The SourcePatch is also sensitive to the presence of such valence-2 - // vertices for its own reasons (it needs to identifiy a unique set of + // vertices for its own reasons (it needs to identify a unique set of // source points from a set of corner rings), so a simple query of its // corners indicates when this post-process is necessary. (And since // this case is a rare occurrence, efficiency is not a major concern.) @@ -817,7 +817,7 @@ void GregoryTriConverter::Convert(Matrix & matrix) const { // - // Initialize the sparse matrix to accomodate the coefficients for each + // Initialize the sparse matrix to accommodate the coefficients for each // row/point -- identify common topological cases to treat more easily // (and note that specializing the population of the matrix may also be // worthwhile in such cases) @@ -1183,7 +1183,7 @@ GregoryTriConverter::computeIrregularInteriorEdgePoints( pWeights, epWeights, emWeights); // - // Transer the weights for the ring into the stencil form of the required + // Transfer the weights for the ring into the stencil form of the required // Point type. The limit mask for position involves all ring weights, and // since Ep and Em depend on it, there should be no need to filter weights // with value 0: @@ -1757,7 +1757,7 @@ convertToLoop(SourcePatch const & sourcePatch, SparseMatrix & matrix) { // // For the full 12x15 conversion matrix from 15-point quartic Bezier patch // back to a Box spline patch, the matrix rows and columns are ordered - // according to control point orientations used elsewhere. Correllation of + // according to control point orientations used elsewhere. Correlation of // points between the Bezier and Gregory points is as follows: // // Q0 Q1 Q2 Q3 Q4 Q5 Q6 Q7 Q8 Q9 Q10 Q11 Q12 Q13 Q14 diff --git a/opensubdiv/far/patchBuilder.cpp b/opensubdiv/far/patchBuilder.cpp index 248ccf5610..62ca2d76b7 100644 --- a/opensubdiv/far/patchBuilder.cpp +++ b/opensubdiv/far/patchBuilder.cpp @@ -350,7 +350,7 @@ namespace { // // Functions to encode/decode the 5-bit boundary mask for a triangular patch - // from the two 3-bit boundary vertex and bounday edge masks. When referring + // from the two 3-bit boundary vertex and boundary edge masks. When referring // to a "boundary vertex" in the encoded bits, we are referring to a vertex on // a boundary while its incident edges of the triangle are not boundaries -- // topologically distinct from a vertex at the end of a boundary edge. diff --git a/opensubdiv/far/patchMap.cpp b/opensubdiv/far/patchMap.cpp index 3156b7a6f5..81a757f1f0 100644 --- a/opensubdiv/far/patchMap.cpp +++ b/opensubdiv/far/patchMap.cpp @@ -139,7 +139,7 @@ PatchMap::initializeQuadtree(PatchTable const & patchTable) { // // Reserve quadtree nodes for the worst case and prune later. Set the - // initial size to accomodate the root node of each patch face: + // initial size to accommodate the root node of each patch face: // int nPatchFaces = (_maxPatchFace - _minPatchFace) + 1; diff --git a/opensubdiv/far/patchTable.cpp b/opensubdiv/far/patchTable.cpp index 2c7613be4c..0a88cb5049 100644 --- a/opensubdiv/far/patchTable.cpp +++ b/opensubdiv/far/patchTable.cpp @@ -486,8 +486,8 @@ PatchTable::populateVaryingVertices() { // In order to support evaluation of varying data we need to access // the varying values indexed by the zero ring vertices of the vertex // patch. This indexing is redundant for triangles and quads and - // could be made redunant for other patch types if we reorganized - // the vertex patch indices so that the zero ring indices always occured + // could be made redundant for other patch types if we reorganized + // the vertex patch indices so that the zero ring indices always occurred // first. This will also need to be updated when we add support for // triangle patches. int numVaryingCVs = _varyingDesc.GetNumControlVertices(); diff --git a/opensubdiv/far/patchTableFactory.cpp b/opensubdiv/far/patchTableFactory.cpp index ad7bbf26fc..cf5e44afb6 100644 --- a/opensubdiv/far/patchTableFactory.cpp +++ b/opensubdiv/far/patchTableFactory.cpp @@ -1191,7 +1191,7 @@ PatchTableBuilder::populatePatches() { // Populate patch data buffers // - // Intentionally declare local vairables to contain patch topology info + // Intentionally declare local variables to contain patch topology info // outside the loop to avoid repeated memory de-allocation/re-allocation // associated with a change-of-basis. PatchInfo patchInfo; @@ -1241,7 +1241,7 @@ PatchTableBuilder::populatePatches() { *arrayBuilder->pptr++ = patchParam; // - // Assignment of face-varying patches is split between the comon/trivial + // Assignment of face-varying patches is split between the common/trivial // case of linear patches and the more complex non-linear cases: // assert((_fvarChannelIndices.size() > 0) == _requiresFVarPatches); @@ -1582,7 +1582,7 @@ PatchTableBuilder::LocalPointHelper::appendLocalPointStencils( int sourcePointOffset) { // - // Resize the StencilTable members to accomodate all rows and elements from + // Resize the StencilTable members to accommodate all rows and elements from // the given set of points represented by the matrix // StencilTableReal* stencilTable = _stencilTable.Get(); diff --git a/opensubdiv/osd/glslPatchCommon.glsl b/opensubdiv/osd/glslPatchCommon.glsl index dcfca2045b..2d2541e0a0 100644 --- a/opensubdiv/osd/glslPatchCommon.glsl +++ b/opensubdiv/osd/glslPatchCommon.glsl @@ -990,7 +990,7 @@ OsdEvalPatchGregory(ivec3 patchParam, vec2 UV, vec3 cv[20], // . . . . . . // 0 --- 1 --- 2 // -// The equivalant quartic Bezier triangle (15 points): +// The equivalent quartic Bezier triangle (15 points): // // 14 // . . diff --git a/opensubdiv/osd/hlslPatchCommon.hlsl b/opensubdiv/osd/hlslPatchCommon.hlsl index a824477bbe..35b4b9424a 100644 --- a/opensubdiv/osd/hlslPatchCommon.hlsl +++ b/opensubdiv/osd/hlslPatchCommon.hlsl @@ -972,7 +972,7 @@ OsdEvalPatchGregory(int3 patchParam, float2 UV, float3 cv[20], // . . . . . . // 0 --- 1 --- 2 // -// The equivalant quartic Bezier triangle (15 points): +// The equivalent quartic Bezier triangle (15 points): // // 14 // . . diff --git a/opensubdiv/osd/mtlPatchCommon.metal b/opensubdiv/osd/mtlPatchCommon.metal index 60c1a18d46..95ccb5966d 100644 --- a/opensubdiv/osd/mtlPatchCommon.metal +++ b/opensubdiv/osd/mtlPatchCommon.metal @@ -1171,7 +1171,7 @@ OsdEvalPatchGregory(int3 patchParam, float2 UV, thread float3* cv, // . . . . . . // 0 --- 1 --- 2 // -// The equivalant quartic Bezier triangle (15 points): +// The equivalent quartic Bezier triangle (15 points): // // 14 // . . diff --git a/opensubdiv/osd/mtlVertexBuffer.mm b/opensubdiv/osd/mtlVertexBuffer.mm index f5120d39a8..a6a07209ef 100644 --- a/opensubdiv/osd/mtlVertexBuffer.mm +++ b/opensubdiv/osd/mtlVertexBuffer.mm @@ -91,7 +91,7 @@ -} //end namepsace Osd +} //end namespace Osd } //end namespace OPENSUBDIV_VERSION } //end namespace OpenSubdiv diff --git a/tutorials/far/tutorial_1_2/far_tutorial_1_2.cpp b/tutorials/far/tutorial_1_2/far_tutorial_1_2.cpp index 8a5bd720ab..5d380daefc 100644 --- a/tutorials/far/tutorial_1_2/far_tutorial_1_2.cpp +++ b/tutorials/far/tutorial_1_2/far_tutorial_1_2.cpp @@ -191,7 +191,7 @@ int main(int, char **) { refiner->RefineUniform(Far::TopologyRefiner::UniformOptions(maxlevel)); // Allocate and populate data buffers for vertex primvar data -- positions and - // UVs. We assign UV coordiantes by simply projecting/assigning XY values. + // UVs. We assign UV coordinates by simply projecting/assigning XY values. // The position and UV buffers use their associated data types, while the // combined buffer uses 5 floats per vertex. // diff --git a/tutorials/far/tutorial_5_1/far_tutorial_5_1.cpp b/tutorials/far/tutorial_5_1/far_tutorial_5_1.cpp index cadcdfef5a..9ae570e002 100644 --- a/tutorials/far/tutorial_5_1/far_tutorial_5_1.cpp +++ b/tutorials/far/tutorial_5_1/far_tutorial_5_1.cpp @@ -153,7 +153,7 @@ int main(int, char **) { // // Choose patches adaptively refined to level 3 since the sharpest crease // in the shape is 3.0f (in g_creaseweights[]), and include the inf-sharp - // crease option just to illustrate the need to syncronize options. + // crease option just to illustrate the need to synchronize options. // int maxPatchLevel = 3; @@ -164,14 +164,14 @@ int main(int, char **) { patchOptions.endCapType = Far::PatchTableFactory::Options::ENDCAP_GREGORY_BASIS; - // Initialize corresonding options for adaptive refinement: + // Initialize corresponding options for adaptive refinement: Far::TopologyRefiner::AdaptiveOptions adaptiveOptions(maxPatchLevel); bool assignAdaptiveOptionsExplicitly = false; if (assignAdaptiveOptionsExplicitly) { adaptiveOptions.useInfSharpPatch = true; } else { - // Be sure patch options were intialized with the desired max level + // Be sure patch options were initialized with the desired max level adaptiveOptions = patchOptions.GetRefineAdaptiveOptions(); } assert(adaptiveOptions.useInfSharpPatch == patchOptions.useInfSharpPatch); diff --git a/tutorials/far/tutorial_5_2/far_tutorial_5_2.cpp b/tutorials/far/tutorial_5_2/far_tutorial_5_2.cpp index 005cf1cd27..60bf48f2c0 100644 --- a/tutorials/far/tutorial_5_2/far_tutorial_5_2.cpp +++ b/tutorials/far/tutorial_5_2/far_tutorial_5_2.cpp @@ -402,7 +402,7 @@ PatchGroup::TessellateBaseFace(int face, PosVector & tessPoints, // Tessellate the face with points at the midpoint of the face and at // each corner, and triangles connecting the midpoint to each edge. - // Irregular faces require an aribrary number of corners points, but + // Irregular faces require an arbitrary number of corners points, but // all are at the origin of the child face of the irregular base face: // float const quadPoints[5][2] = { { 0.5f, 0.5f }, diff --git a/tutorials/far/tutorial_5_3/far_tutorial_5_3.cpp b/tutorials/far/tutorial_5_3/far_tutorial_5_3.cpp index f2eb374a2c..b939b03f0f 100644 --- a/tutorials/far/tutorial_5_3/far_tutorial_5_3.cpp +++ b/tutorials/far/tutorial_5_3/far_tutorial_5_3.cpp @@ -522,7 +522,7 @@ main(int argc, char **argv) { // // Apply the constructed LimitStencilTable to compute limit positions // from the base level vertex positions. This is trivial if computing - // all positions in one invokation. The UpdateValues method (and those + // all positions in one invocation. The UpdateValues method (and those // for derivatives) are overloaded to optionally accept a subrange of // indices to distribute the computation: //