diff --git a/README.md b/README.md index 4e1d6a8fd..09ea81c16 100644 --- a/README.md +++ b/README.md @@ -125,7 +125,7 @@ SDKROOT=$(xcrun --sdk iphoneos --show-sdk-path) cmake -D NO_PTEX=1 -D NO_DOC=1 \ .. ``` - * This will produce an "OpenSubdiv.xcodeproj" that can be open and the targets 'mtlViewer' and 'mtlPtexViewer' (if NO_PTEX is ommitted and libPtex.a is installed in the iOS SDK) that can be run + * This will produce an "OpenSubdiv.xcodeproj" that can be open and the targets 'mtlViewer' and 'mtlPtexViewer' (if NO_PTEX is omitted and libPtex.a is installed in the iOS SDK) that can be run ### Useful cmake options and environment variables diff --git a/documentation/OpenSubdiv.doxy b/documentation/OpenSubdiv.doxy index 55e4573e2..154c34a3b 100644 --- a/documentation/OpenSubdiv.doxy +++ b/documentation/OpenSubdiv.doxy @@ -985,7 +985,7 @@ HTML_STYLESHEET = # user-defined cascading style sheet that is included after the standard # style sheets created by doxygen. Using this option one can overrule # certain style aspects. This is preferred over using HTML_STYLESHEET -# since it does not replace the standard style sheet and is therefor more +# since it does not replace the standard style sheet and is therefore more # robust against future updates. Doxygen will copy the style sheet file to # the output directory. diff --git a/documentation/cmake_build.rst b/documentation/cmake_build.rst index 7744b55f2..4192d342d 100644 --- a/documentation/cmake_build.rst +++ b/documentation/cmake_build.rst @@ -138,7 +138,7 @@ through the following environment variables: Automated Script ________________ -The GUI solution will probably become a burden for active developpers who tend to +The GUI solution will probably become a burden for active developers who tend to re-run the configuration step fairly often. A scripted solution can save a lot of time. Here is a typical workflow: @@ -218,14 +218,14 @@ Using Intel's C++ Studio XE ___________________________ OpenSubdiv can be also be built with `Intel's C++ compiler `__ -(icc). The default compiler can be overriden in CMake with the following configuration options: +(icc). The default compiler can be overridden in CMake with the following configuration options: .. code:: c++ -DCMAKE_CXX_COMPILER=[path to icc executable] -DCMAKE_C_COMPILER=[path to icc executable] -The installation location of the C++ Studio XE can be overriden with: +The installation location of the C++ Studio XE can be overridden with: .. code:: c++ @@ -235,7 +235,7 @@ The installation location of the C++ Studio XE can be overriden with: Using Clang ___________ -CMake can also be overriden to use the `clang `__ compilers by configuring the following options: +CMake can also be overridden to use the `clang `__ compilers by configuring the following options: .. code:: c++ diff --git a/documentation/dxptexviewer.rst b/documentation/dxptexviewer.rst index aebb644b4..c1477f15e 100644 --- a/documentation/dxptexviewer.rst +++ b/documentation/dxptexviewer.rst @@ -86,15 +86,15 @@ OPTIONS A ptex file containing RGB channels read as material albedo color. *ptex displacement file* - A single-channel ptex file (preferrably float precision) containing the + A single-channel ptex file (preferably float precision) containing the displacement values. *ptex occlusion file* - A single-channel ptex file (preferrably 8 bits precision) containing a + A single-channel ptex file (preferably 8 bits precision) containing a pre-computed ambient occlusion signal. *ptex specular file* - A single-channel ptex file (preferrably 8 bits precision) applied to modulate + A single-channel ptex file (preferably 8 bits precision) applied to modulate the specular reflectance of the material *objfile(s)* diff --git a/documentation/osd_overview.rst b/documentation/osd_overview.rst index 4aa50d7b3..4abba3a90 100644 --- a/documentation/osd_overview.rst +++ b/documentation/osd_overview.rst @@ -235,7 +235,7 @@ Cross-Platform Implementation One of the key goals of OpenSubdiv is to achieve as much cross-platform flexibility as possible and leverage all optimized hardware paths where available. This can -be very challenging as there is a very large variety of plaftorms and APIs +be very challenging as there is a very large variety of platforms and APIs available, with very distinct capabilities. In **Osd**, Evaluators don't care about interops between those APIs. All Evaluators diff --git a/documentation/release_notes_2x.rst b/documentation/release_notes_2x.rst index c7f57be3c..cebfceec5 100644 --- a/documentation/release_notes_2x.rst +++ b/documentation/release_notes_2x.rst @@ -60,7 +60,7 @@ Release 2.6.0 - Fix a bug in the CUDA computeRestrictedEdge kernel - Fix duplicate variables with identical name - Fix osdutil build errors - - Fix cmake diagnostic messsage + - Fix cmake diagnostic message Release 2.5.1 ============= @@ -103,7 +103,7 @@ Release 2.5.0 Moved transient states (current vertex buffer etc) to controller - Fix adaptive isolation of sharp corner vertices - Fix incorrect FarMeshFactory logic for isolating multiple corner vertices in corner patches - - Change EvalLimit Gregory patch kernels to the large weights table to accomodate higher valences + - Change EvalLimit Gregory patch kernels to the large weights table to accommodate higher valences - Fix calculation of screen space LOD tess factors for transition corner patches. - Add a public constructor to OsdMesh - Decrease compiler warning thresholds and fix outstanding warnings @@ -203,7 +203,7 @@ Release 2.3.5 **New Features** - Add the ability to read obj files to the dxViewer example - Add screen-capture function to ptexViewer - - Update documention for Xcode builds + - Update documentation for Xcode builds - Add documentation (boundary interpolation rules and face-varying boundary interpolation rules) **Changes** @@ -324,7 +324,7 @@ Release 2.3.1 - Optimize a bit of ptex mipmap lookup. - Show ptex memory usage in GL and DX11 ptexViewers - Improve ptex guttering - - Addding some video links to our collection of external resources + - Adding some video links to our collection of external resources **Bug Fixes** - Fix edge-only face-varying interpolation @@ -448,7 +448,7 @@ Release 1.2.4 **New Features** - Adding support for fractional tessellation of patches - - Adding a much needed API documention system based on Docutils RST markup + - Adding a much needed API documentation system based on Docutils RST markup - Adding support for face-varying interpolation in GLSL APIs - Adding varying data buffers to OsdMesh - Adding accessors to the vertex buffers in OsdGlMesh @@ -496,7 +496,7 @@ Release 1.2.3 - Face-varying data bug fixes : making sure the data is carried around appropriately Fixes for OpenCL use with the new batching APIs - GLSL general shader code cleanup & fixes for better portability - - GLSL Tranform Feedback initialization fix + - GLSL Transform Feedback initialization fix - Critical fix for FarMultiMesh batching (indexing was incorrect) - Fix osdutil CL implementation (protect #includes on systems with no OpenCL SDK installed) diff --git a/examples/common/clDeviceContext.cpp b/examples/common/clDeviceContext.cpp index 79f968a6e..907b8d807 100644 --- a/examples/common/clDeviceContext.cpp +++ b/examples/common/clDeviceContext.cpp @@ -220,7 +220,7 @@ CLDeviceContext::Initialize() { 0, NULL, &devicesSize); int numDevices = int(devicesSize / sizeof(cl_device_id)); if (numDevices == 0) { - error("No sharable devices.\n"); + error("No shareable devices.\n"); return false; } cl_device_id *clDevices = new cl_device_id[numDevices]; diff --git a/examples/dxPtexViewer/dxPtexViewer.cpp b/examples/dxPtexViewer/dxPtexViewer.cpp index 452e839a2..fa045d9a1 100644 --- a/examples/dxPtexViewer/dxPtexViewer.cpp +++ b/examples/dxPtexViewer/dxPtexViewer.cpp @@ -1914,7 +1914,7 @@ void usage(const char *program) { printf(" -y : Y-up model\n"); printf(" -m level : max mimmap level (default=10)\n"); printf(" -x : ptex target memory size\n"); - printf(" --disp : Displacment scale\n"); + printf(" --disp : Displacement scale\n"); } //------------------------------------------------------------------------------ diff --git a/opensubdiv/far/sparseMatrix.h b/opensubdiv/far/sparseMatrix.h index 047ba0af1..599c6c777 100644 --- a/opensubdiv/far/sparseMatrix.h +++ b/opensubdiv/far/sparseMatrix.h @@ -46,7 +46,7 @@ namespace Far { // format (CSR) is used as it provides us with stencils for points that // correspond to rows and so can be more directly and efficiently copied. // -// It has potential for other uses and so may eventually warrant a seperate +// It has potential for other uses and so may eventually warrant a separate // header file of its own. For now, in keeping with the trend of exposing // classes only where used, it is defined with the PatchBuilder. // diff --git a/opensubdiv/far/topologyRefiner.cpp b/opensubdiv/far/topologyRefiner.cpp index cf5da139b..c5f403945 100644 --- a/opensubdiv/far/topologyRefiner.cpp +++ b/opensubdiv/far/topologyRefiner.cpp @@ -291,7 +291,7 @@ namespace internal { FeatureMask() { Clear(); } FeatureMask(Options const & options, Sdc::SchemeType sType) { Clear(); InitializeFeatures(options, sType); } - // These are the two primary methods intended for use -- intialization via a set of Options + // These are the two primary methods intended for use -- initialization via a set of Options // and reduction of the subsequent feature set (which presumes prior initialization with the // same set as give) // @@ -326,7 +326,7 @@ namespace internal { // // The inf-sharp single-crease case now corresponds to an inf-sharp regular crease // in the interior -- and since such regular creases on the boundary are never - // considered for selection (just as interior smoot regular faces are not), this + // considered for selection (just as interior smooth regular faces are not), this // feature is only relevant for the interior case. So aside from it being used // when regular inf-sharp features are all selected, it can also be used for the // single-crease case. @@ -508,7 +508,7 @@ namespace { // Strictly speaking we should be testing all features and not returning based on // the selection status of the most likely feature that warrants selection, but in // practice, the separation of features and the typically common settings to groups - // of features (i.e. it not yet possible, or even desireable, to select irregular + // of features (i.e. it not yet possible, or even desirable, to select irregular // creases deeper than irregular corners) makes that unnecessary. // inline bool diff --git a/opensubdiv/hbr/creaseEdit.h b/opensubdiv/hbr/creaseEdit.h index 3f979dc27..420016030 100644 --- a/opensubdiv/hbr/creaseEdit.h +++ b/opensubdiv/hbr/creaseEdit.h @@ -75,7 +75,7 @@ class HbrCreaseEdit : public HbrHierarchicalEdit { sharp = HbrHalfedge::k_InfinitelySharp; // We have to make sure the neighbor of the edge exists at // this point. Otherwise, if it comes into being late, it - // will clobber the overriden sharpness and we will lose + // will clobber the overridden sharpness and we will lose // the edit. face->GetEdge(edgeid)->GuaranteeNeighbor(); face->GetEdge(edgeid)->SetSharpness(sharp); diff --git a/opensubdiv/hbr/hierarchicalEdit.h b/opensubdiv/hbr/hierarchicalEdit.h index 35407023c..336b46208 100644 --- a/opensubdiv/hbr/hierarchicalEdit.h +++ b/opensubdiv/hbr/hierarchicalEdit.h @@ -92,10 +92,10 @@ class HbrHierarchicalEdit { // face in question bool IsRelevantToFace(HbrFace* face) const; - // Applys edit to face. All subclasses may override this method + // Applies edit to face. All subclasses may override this method virtual void ApplyEditToFace(HbrFace* /* face */) {} - // Applys edit to vertex. Subclasses may override this method. + // Applies edit to vertex. Subclasses may override this method. virtual void ApplyEditToVertex(HbrFace* /* face */, HbrVertex* /* vertex */) {} #ifdef PRMAN diff --git a/opensubdiv/hbr/vertex.h b/opensubdiv/hbr/vertex.h index 995463f50..a814080a9 100644 --- a/opensubdiv/hbr/vertex.h +++ b/opensubdiv/hbr/vertex.h @@ -213,7 +213,7 @@ template class HbrVertex { // around this vertex void ApplyOperatorSurroundingVertices(HbrVertexOperator &op) const; - // Applys an operator to the ring of faces around this vertex + // Applies an operator to the ring of faces around this vertex void ApplyOperatorSurroundingFaces(HbrFaceOperator &op) const; // Returns the parent, which can be a edge, face, or vertex diff --git a/opensubdiv/osd/glXFBEvaluator.h b/opensubdiv/osd/glXFBEvaluator.h index c94d70720..62cd7f97a 100644 --- a/opensubdiv/osd/glXFBEvaluator.h +++ b/opensubdiv/osd/glXFBEvaluator.h @@ -186,7 +186,7 @@ class GLXFBEvaluator { /// \brief Constructor. /// /// The transform feedback evaluator can make more sparing use of - /// transform feeback buffer bindings when it is known that evaluator + /// transform feedback buffer bindings when it is known that evaluator /// output buffers are shared and the corresponding buffer descriptors /// are interleaved. When \a interleavedDerivativeBuffers is true /// then evaluation requires that either 1st derivative outputs are diff --git a/opensubdiv/osd/mtlVertexBuffer.mm b/opensubdiv/osd/mtlVertexBuffer.mm index 9482bdbe9..c33fe6f1d 100644 --- a/opensubdiv/osd/mtlVertexBuffer.mm +++ b/opensubdiv/osd/mtlVertexBuffer.mm @@ -92,7 +92,7 @@ -} //end namepsace Osd +} //end namespace Osd } //end namespace OPENSUBDIV_VERSION using namespace OPENSUBDIV_VERSION; } //end namespace OpenSubdiv diff --git a/opensubdiv/vtr/stackBuffer.h b/opensubdiv/vtr/stackBuffer.h index 22117d413..108734bb0 100644 --- a/opensubdiv/vtr/stackBuffer.h +++ b/opensubdiv/vtr/stackBuffer.h @@ -123,7 +123,7 @@ StackBuffer::deallocate() { // // Explicit element-wise construction and destruction within allocated memory. // Compilers do not always optimize out the iteration here even when there is -// no construction or destruction, so the POD_TYPE arguement can be used to +// no construction or destruction, so the POD_TYPE argument can be used to // force this when/if it becomes an issue (and it has been in some cases). // template diff --git a/tutorials/far/tutorial_9/far_tutorial_9.cpp b/tutorials/far/tutorial_9/far_tutorial_9.cpp index 1b92fd9ba..046d524c4 100644 --- a/tutorials/far/tutorial_9/far_tutorial_9.cpp +++ b/tutorials/far/tutorial_9/far_tutorial_9.cpp @@ -393,7 +393,7 @@ void PatchGroup::TessellateBaseFace(int face, PosVector & tessPoints, TriVector & tessTris) const { - // Tesselate the face with points at the midpoint of the face and at + // 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 // all are at the origin of the child face of the irregular base face: