Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Misc. typos #996

Open
wants to merge 4 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,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

Expand Down
2 changes: 1 addition & 1 deletion documentation/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ if (DOXYGEN_FOUND)
else()

message(WARNING
"Doxyen was not found : support for Doxygen automated API documentation is disabled.")
"Doxygen was not found : support for Doxygen automated API documentation is disabled.")

endif()

Expand Down
2 changes: 1 addition & 1 deletion documentation/OpenSubdiv.doxy
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
8 changes: 4 additions & 4 deletions documentation/cmake_build.rst
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,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:

Expand Down Expand Up @@ -214,14 +214,14 @@ Using Intel's C++ Studio XE
___________________________

OpenSubdiv can be also be built with `Intel's C++ compiler <http://software.intel.com/en-us/intel-compilers>`__
(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++

Expand All @@ -231,7 +231,7 @@ The installation location of the C++ Studio XE can be overriden with:
Using Clang
___________

CMake can also be overriden to use the `clang <http://clang.llvm.org/>`__ compilers by configuring the following options:
CMake can also be overridden to use the `clang <http://clang.llvm.org/>`__ compilers by configuring the following options:

.. code:: c++

Expand Down
10 changes: 5 additions & 5 deletions documentation/dxptexviewer.rst
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ OPTIONS
=======

See the description of the
`common comand line options <code_examples.html#common-command-line-options>`__
`common command line options <code_examples.html#common-command-line-options>`__
for the subset of common options supported here.

**-y**
Expand All @@ -86,15 +86,15 @@ for the subset of common options supported here.
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)*
Expand All @@ -110,7 +110,7 @@ KEYBOARD CONTROLS
q : quit
esc : hide GUI
f : fit frame
+/- : increase / decrese tessellation rate
+/- : increase / decrease tessellation rate



Expand Down
2 changes: 1 addition & 1 deletion documentation/dxviewer.rst
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ OPTIONS
=======

See the description of the
`common comand line options <code_examples.html#common-command-line-options>`__
`common command line options <code_examples.html#common-command-line-options>`__
for the subset of common options supported here.

.. include:: examples_see_also.rst
2 changes: 1 addition & 1 deletion documentation/glevallimit.rst
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ OPTIONS
=======

See the description of the
`common comand line options <code_examples.html#common-command-line-options>`__
`common command line options <code_examples.html#common-command-line-options>`__
for the subset of common options supported here.

.. include:: examples_see_also.rst
2 changes: 1 addition & 1 deletion documentation/glfvarviewer.rst
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ OPTIONS
=======

See the description of the
`common comand line options <code_examples.html#common-command-line-options>`__
`common command line options <code_examples.html#common-command-line-options>`__
for the subset of common options supported here.

.. include:: examples_see_also.rst
2 changes: 1 addition & 1 deletion documentation/glpainttest.rst
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ OPTIONS
=======

See the description of the
`common comand line options <code_examples.html#common-command-line-options>`__
`common command line options <code_examples.html#common-command-line-options>`__
for the subset of common options supported here.

KEYBOARD CONTROLS
Expand Down
2 changes: 1 addition & 1 deletion documentation/glptexviewer.rst
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ OPTIONS
=======

See the description of the
`common comand line options <code_examples.html#common-command-line-options>`__
`common command line options <code_examples.html#common-command-line-options>`__
for the subset of common options supported here.

**-e** *environment map*
Expand Down
2 changes: 1 addition & 1 deletion documentation/glsharetopology.rst
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ OPTIONS
=======

See the description of the
`common comand line options <code_examples.html#common-command-line-options>`__
`common command line options <code_examples.html#common-command-line-options>`__
for the subset of common options supported here.

.. include:: examples_see_also.rst
2 changes: 1 addition & 1 deletion documentation/glstencilviewer.rst
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ OPTIONS
=======

See the description of the
`common comand line options <code_examples.html#common-command-line-options>`__
`common command line options <code_examples.html#common-command-line-options>`__
for the subset of common options supported here.

.. include:: examples_see_also.rst
2 changes: 1 addition & 1 deletion documentation/glviewer.rst
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ OPTIONS
=======

See the description of the
`common comand line options <code_examples.html#common-command-line-options>`__
`common command line options <code_examples.html#common-command-line-options>`__
for the subset of common options supported here.

.. include:: examples_see_also.rst
2 changes: 1 addition & 1 deletion documentation/osd_overview.rst
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,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
Expand Down
2 changes: 1 addition & 1 deletion documentation/osd_shader_interface.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
4 changes: 2 additions & 2 deletions documentation/release_34.rst
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ Major Improvements to Introductory Documentation
A significant rewrite of the `Subdivision Surfaces <subdivision_surfaces.html>`__
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 |
Expand All @@ -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.

Expand Down
14 changes: 7 additions & 7 deletions documentation/release_notes_2x.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
=============
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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**
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -580,5 +580,5 @@ Release 1.1.0
Release 1.0.0
=============

Oringal release:
Original release:

2 changes: 1 addition & 1 deletion documentation/subdivision_surfaces.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion documentation/using_osd_hbr.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down
2 changes: 1 addition & 1 deletion documentation/vtr_overview.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion examples/common/clDeviceContext.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down
2 changes: 1 addition & 1 deletion examples/dxPtexViewer/dxPtexViewer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1900,7 +1900,7 @@ void usage(const char *program) {
printf(" -yup : Y-up model\n");
printf(" -m level : max mimmap level (default=10)\n");
printf(" -x <ptex limit MB> : ptex target memory size\n");
printf(" --disp <scale> : Displacment scale\n");
printf(" --disp <scale> : Displacement scale\n");
}

//------------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion examples/mtlPtexViewer/mtlPtexViewer.metal
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,7 @@ fragment float4 fragment_main(
,device ushort* textureOcclusion_Packing [[buffer(OCCLUSION_BUFFER_INDEX)]]
#endif
#if USE_SPECULAR_RESOURCES
,texture2d_array<float, acess::read> textureSpecular_Data [[texture(SPECULAR_TEXTURE_INDEX)]]
,texture2d_array<float, access::read> textureSpecular_Data [[texture(SPECULAR_TEXTURE_INDEX)]]
,device ushort* textureSpecular_Packing [[buffer(SPECULAR_BUFFER_INDEX)]]
#endif
,const constant LightSource (&lightSource [[buffer(0)]]) [NUM_LIGHTS]
Expand Down
8 changes: 4 additions & 4 deletions opensubdiv/far/catmarkPatchBuilder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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.)
Expand Down Expand Up @@ -841,7 +841,7 @@ void
GregoryConverter<REAL>::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)
Expand Down Expand Up @@ -1155,7 +1155,7 @@ GregoryConverter<REAL>::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:
Expand Down Expand Up @@ -1682,7 +1682,7 @@ BSplineConverter<REAL>::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:
//
Expand Down
8 changes: 4 additions & 4 deletions opensubdiv/far/loopPatchBuilder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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.)
Expand Down Expand Up @@ -817,7 +817,7 @@ void
GregoryTriConverter<REAL>::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)
Expand Down Expand Up @@ -1183,7 +1183,7 @@ GregoryTriConverter<REAL>::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:
Expand Down Expand Up @@ -1757,7 +1757,7 @@ convertToLoop(SourcePatch const & sourcePatch, SparseMatrix<REAL> & 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
Expand Down
Loading