Commit Graph

2645 Commits

Author SHA1 Message Date
George ElKoura
39844f807b Mostly cosmetic clean up to the Metal example apps
- Renamed the default "NewApplication" in menus to the real name of the app
- Fixed copyright information in the "About" dialog.
2019-03-09 23:17:23 -08:00
George ElKoura
0f2dd41f0a Fix build of Metal examples when also building GL
This fixes the build when trying to build both the Metal examples
and the GL examples in the same build. The change is an unfortunate
consequence of how dependencies are bundled together in
examples/common and a future task is needed to split up these
dependencies.  The same workaround exists in the DirectX examples as
well and would also benefit from splitting up the dependencies.
2019-03-09 22:58:34 -08:00
George ElKoura
f64b87de28 Fix up incorrect include path 2019-03-09 22:52:42 -08:00
George ElKoura
385ae6d012 Fixes to the build script for macOS
- Default the generator to Xcode on macOS
- Fix up how we pass in number of jobs so it works with Xcode
2019-03-09 11:57:09 -08:00
George ElKoura
45a03a460b Turn on C++11 in clang when building with Metal
The example code that uses Metal forces C++11 features, therefore
we have to turn it on clang so that we can enable the building of
compatible code that can be used by Metal and GL at the same time.
2019-03-09 11:42:45 -08:00
Pol
834204451a
Merge pull request #1073 from c64kernal/dev_bpfix
Fix build script on Linux when not building ptex
2019-03-08 14:10:35 -08:00
George ElKoura
2f39150a39 Fix build script on Linux when not building ptex
The build script assumed that we always had ZLIB, but we only add it when we
build ptex.  Instead of removing it on Linux, we now only add it when we need
to on non-Linux platforms.
2019-03-04 22:34:12 -08:00
Pol
6ff680f34e
Merge pull request #1068 from c64kernal/dev_buildypy
Prototype build and install script for OpenSubdiv
2019-03-04 15:23:17 -08:00
Pol
b4faafb256
Merge pull request #1070 from c64kernal/dev_docutils
Allow using docutils on Windows
2019-03-04 15:12:14 -08:00
Pol
c6b100218e
Merge pull request #1072 from c64kernal/dev_rmoldimages
Removed unused old logo images from documentation
2019-03-04 15:10:51 -08:00
Pol
77b67d35a5
Merge pull request #1071 from c64kernal/dev_newlogo
Use new OpenSubdiv logos
2019-03-04 15:10:15 -08:00
Pol
9cfe03f191
Merge pull request #1069 from c64kernal/dev_readme
Update README for documentation build requirements
2019-03-04 15:09:18 -08:00
Pol
c5ba79618b
Merge pull request #1067 from c64kernal/dev_cudadep
Turn off CUDA deprecation warnings until addressed
2019-03-04 15:08:19 -08:00
Pol
2534b3881e
Merge pull request #1066 from c64kernal/dev_dxsdk
Add support for newer DirectX SDKs
2019-03-04 15:05:08 -08:00
George ElKoura
a3ad4a51dc Removed unused old logo images from documentation 2019-03-02 23:43:57 -08:00
George ElKoura
67fbf96014 Use new OpenSubdiv logos 2019-03-02 23:35:54 -08:00
George ElKoura
7eef4c33e1 Allow using docutils on Windows
On Windows we now look for and use an explicit python interpreter to
find the version of docutils installed.  There is more information in
the commit, but it would result in a much cleaner change if we could
decide that it's okay to do this for all platforms.  For now, just do it
for Windows to get us unblocked.
2019-03-02 12:17:04 -08:00
George ElKoura
57aeaeaa8a Update README for documentation build requirements
- Split out the requirements for building docs into their own table
- Added missing dependency on graphviz
2019-03-02 12:12:07 -08:00
George ElKoura
7edf03e4b5 Prototype build and install script for OpenSubdiv
This script is intended to make building OpenSubdiv with all its various options easier to manage.  It will automatically download and install the dependencies where it can (e.g., it can get GLEW automatically, but it can't get the CUDA SDK).

This is a fork of the similar script found in the USD repo.
2019-03-02 00:09:47 -08:00
George ElKoura
9fa434e27c Add support for newer DirectX SDKs
- Add search path for Windows 10 support for DirectX SDK

- Turn off searching the default paths for the DirectX libraries and
instead use the explicit paths provided.  On certain configurations,
this fixes the case where cmake will pick up the librariees for the wrong
architecture

- Be more explicit when a required DirectX library is not found instead
of silent failure.
2019-03-01 22:44:16 -08:00
George ElKoura
08c04c9a61 Turn off CUDA deprecation warnings until addressed
As mentioned in issue #997, OpenSubdiv still uses CUDA functionality
that is being deprecated.  When warnings are treated as errors, this
can make OpenSubdiv fail to compile.  For now, we turn off these
deprecation warnings until we can address them.
2019-03-01 22:40:26 -08:00
Barry Fowler
0cd7a01f08
Merge pull request #1065 from c64kernal/dev_doc
Minor modification to the contribution docs.
2019-02-28 09:48:21 -08:00
George ElKoura
409669b7f9 Minor modification to the contribution docs.
- Removed explicit username and replaced it with generic example username.
2019-02-27 16:52:44 -08:00
David G Yu
6e52c57a0e
Merge pull request #1062 from barfowl/far_tutorial_additions
Additions and minor improvements to far/tutorials
2019-02-14 15:04:01 -08:00
David G Yu
aa3f75fe5f
Merge pull request #1060 from barfowl/glsl_tri_degen_normal
Minor improvement to degenerate normals in GLSL Bezier triangle
2019-02-14 11:22:04 -08:00
barry
6cae3a8e6d Additions and minor improvements to far/tutorials:
- added far/tutorial_10 illustrating variable width vertex class
    - revised far/tutorial_9 for command line and documentation conventions
    - updated doc/tutorials.rst with missing and new tutorial descriptions
2019-02-13 11:37:41 -08:00
barry
1cdbb7246a Minor improvement to degenerate normals in GLSL Bezier triangle:
- negate derivative terms when evaluating points on edge where u + v = 1
2019-02-11 18:05:08 -08:00
David G Yu
ec231f842d
Merge pull request #1058 from barfowl/examples_glfvarviewer_options
Added options to glFVarViewer example consistent with glViewer
2019-02-06 22:33:12 -08:00
David G Yu
e5ace59631
Merge pull request #1057 from barfowl/far_boundary_box_spline
Correction to minor changes to BoxSplineTri boundary computation
2019-02-06 22:32:02 -08:00
barry
aa46fd3d6d Added UI options to examples/glFVarViewer consistent with glViewer:
- added the smooth corner, single crease and inf-sharp patch options
    - added a missing shape illustrating inf-sharp patches
2019-02-06 18:45:02 -08:00
barry
479a297bc6 Correction to recent changes to boundary weights of box-spline triangles:
- fixed corner vertex cases (two boundary edges) in both Far and Osd
2019-02-06 18:30:26 -08:00
David G Yu
f83adf942e
Merge pull request #1056 from barfowl/examples_gl
Several minor updates to the GL examples
2019-02-06 00:03:50 -08:00
Barry Fowler
7b3a471cfb
Merge pull request #1055 from davidgyu/box_spline_tri_boundary_fix
Thanks, David
2019-02-05 18:40:00 -08:00
barry
5595255858 Several minor updates to the GL examples:
- addition of new shapes -- mainly Loop and Bilinear
    - removal of redundant shapes and those not suited to a particular example
    - enforced consistent "Patch Type" coloring where provided
    - enforced consistent command line usage for common options and Obj input
    - enforced consistent default settings on initialization
    - added errors and/or assertions where legitimate limitations remain
    - improved error handling (OSD errors not being flushed before termination)
2019-02-05 17:22:10 -08:00
David G Yu
35065d3a2f
Merge pull request #1054 from barfowl/far_inf_sharp_darts
Fix cracks between triangular Gregory patches at inf-sharp darts
2019-02-05 13:17:44 -08:00
David G Yu
d468aca0a2
Merge pull request #1053 from barfowl/far_patch_is_adaptive
Fixed Far::PatchDescriptor::IsAdaptive() for legacy Gregory
2019-02-05 13:17:28 -08:00
David G Yu
abb8af32c5 Minor changes to BoxSplineTri boundary computation
The computation to adjust patch evaluation weights
for box spline triangle patches to account for boundaries
has been updated to use simple conditional logic instead
of index indirection tables. This results in better register
resource usage for some shader compiler implementations.
Previously, these methods could fail to compile on some
systems.
2019-02-05 12:57:41 -08:00
barry
b83dd92757 Fix cracks between triangular Gregory patches along inf-sharp dart edges:
- corrected regular vs irregular assignment of the quartic mid-edge point
2019-02-04 11:19:24 -08:00
barry
de29bc897f Fix Far::PatchDescriptor::IsAdaptive() for legacy Gregory patches:
- determine based on patch type ID rather than control point count
2019-02-04 11:04:26 -08:00
David G Yu
480afc0189
Merge pull request #1052 from barfowl/far_tri_ptex_adjacency
Removed triangular restriction in Far Ptex adjacency query
2019-02-03 09:52:22 -08:00
David G Yu
3ba6a1a11c
Merge pull request #1051 from barfowl/examples_headers
Enforced consistent header file inclusion in source for examples
2019-01-31 15:15:44 -08:00
barry
20dcd24b9d Updated all example source for consistent inclusion of header files:
- prepend the opensubdiv directory to all library headers included
    - removed the opensubdiv directory from all declared include paths
2019-01-31 10:49:02 -08:00
David G Yu
e4375aea9e
Merge pull request #1048 from barfowl/glsl_adaptive_tess_levels
Minor refactoring of GLSL functions to compute adaptive tess levels
2019-01-31 00:54:06 -08:00
barry
d1f601ef9b Enabled Far::PtexIndices::GetAdjacency() for triangular refinement 2019-01-30 20:55:18 -08:00
Barry Fowler
0c2f3ee884
Merge pull request #1050 from davidgyu/loop_patches_eval_limit 2019-01-30 20:27:12 -08:00
Barry Fowler
cbbfc5b64b
Merge pull request #1049 from davidgyu/glsl_gregory_tri_varying_fix 2019-01-30 20:10:11 -08:00
barry
e8fdec9f88 Made use of newer GLSL adaptive tess functions in patch shaders:
- replaced use of "LimitPoints" functions in all patch shaders
    - removed the unreleased "LimitPointsTriangle" functions
    - added internal tess functions for processing patch boundaries
    - updated Bezier quad and tri tess evaluation to use boundary functions
2019-01-30 10:25:04 -08:00
barry
e8859cac85 Added GLSL adaptive tess functions to reflect associated patch types:
- renamed core "LimitPoints" functions to reflect the patch type (Bezier)
    - overloaded new functions with the additionally computed tess level
    - preserved stubs of all "LimitPoints" functions for compatibility
2019-01-30 10:12:15 -08:00
David G Yu
62ae245b9a
Merge pull request #1047 from barfowl/far_adapt_refine_options
New method to determine adaptive refinement options from choices for patches
2019-01-29 09:29:46 -08:00
David G Yu
c13a6ba2e4
Merge pull request #1046 from barfowl/glsl_bezier_normal_derivs
Added normal derivatives to GLSL Bezier triangle evaluation
2019-01-29 09:29:28 -08:00