Commit Graph

2712 Commits

Author SHA1 Message Date
David G Yu
1b556809c3 Merge remote-tracking branch 'origin/dev' into rc/v3_4_0 2019-06-24 20:19:28 -07:00
Barry Fowler
9b02dbf9bf
Merge pull request #1145 from davidgyu/mtl_viewer_ios_fix
Thanks, David
2019-06-24 19:45:53 -07:00
Barry Fowler
87c3b48bd7
Merge pull request #1144 from davidgyu/mtl_eval_fix
Thanks
2019-06-24 19:36:43 -07:00
Barry Fowler
30ca09dc54
Merge pull request #1143 from davidgyu/docs_release_34
Updated Far and Osd user guide docs for 3.4
2019-06-24 19:20:33 -07:00
David G Yu
95138e680f Updated Far and Osd user guide docs for 3.4
Updated the Far Overview and Osd Overview and shader
interface pages for 3.4 to include a discussion of
trianglular patch types and other minor updates.
2019-06-24 18:43:05 -07:00
David G Yu
03417ea7b1
Merge pull request #1142 from barfowl/docs_release_34
Minor updates to release notes pages
2019-06-24 18:18:35 -07:00
David G Yu
2c569ad661 Fixed mtlViewer for iOS
-Fixed the iOS ViewController to set the correct irregular
 patch approximation mode.
-Fixed the setting of fractionalSpacing to be separate from
 screenspace tessellation.
-Fixed the configuration of the internal stage-in setting
 on embedded builds.
2019-06-24 17:12:00 -07:00
David G Yu
5c8cdf9121 Fixed regression in MTLComputeEvaluator
Fixed the initialization of patchArray and patchParam
in the implementation of the MTLComputeEvaluator::EvalPatches()
compute kernel.
2019-06-24 16:47:56 -07:00
David G Yu
b28290439c
Merge pull request #1141 from barfowl/docs_images_intro
Added and revised figures in the introductory documentation
2019-06-24 16:01:13 -07:00
barry
ebb4250a54 Added additional level of sections to Release Notes summary page:
- added minor version number secions for more structured table of contents
2019-06-24 16:00:33 -07:00
barry
7dee8b6396 Updated 3.4 release notes page:
- amended section on Loop patches with a little more information
    - added the Osd shader interface additions to API extensions
2019-06-24 15:57:06 -07:00
Barry Fowler
abbe0acc69
Merge pull request #1140 from davidgyu/docs_examples_updates_and_images
Thanks
2019-06-24 14:02:04 -07:00
barry
801b416ccf Added and revised figures in the introductory documentation:
- added new pair of figures illustrating the concept of basis functions
    - updated the Subdivision Surfaces page to insert the new figures
    - replaced stand-in figures for the animated mesh with three unique poses
2019-06-24 13:54:07 -07:00
David G Yu
1049c77440 Updated more examples images and docs
-Updated dxViewer, dxPtexViewer, and glPtexViewer screen shots
-Updated mtlViewer, and mtlPtexViewer screen shots and docs
2019-06-24 12:42:11 -07:00
David G Yu
8137efabf1
Merge pull request #1139 from barfowl/docs_images_release
Updated documentation images for the 3.4 release notes
2019-06-24 08:11:24 -07:00
David G Yu
14a0581315
Merge pull request #1138 from barfowl/docs_images_examples
Updated documentation images for the OpenGL examples
2019-06-24 08:10:20 -07:00
barry
000b335a5d Updated images for screen captures in the Release 3.4 notes:
- revised images capture examples with the new version number in title bar
2019-06-23 21:36:12 -07:00
barry
914cf98e60 Updates images for screen shots of all OpenGL examples other than glPtexViewer 2019-06-23 21:25:14 -07:00
Barry Fowler
48ecdb405b
Merge pull request #1137 from davidgyu/examples_build_fixes
Thanks
2019-06-21 11:38:47 -07:00
David G Yu
4160a248da Removed accidentally committed .swp file 2019-06-21 10:52:46 -07:00
David G Yu
daf4c6f489 Fixed uninitialized var warning 2019-06-21 10:51:26 -07:00
David G Yu
7dbcee64e6 Fixed int to bool conversion warning 2019-06-21 10:50:50 -07:00
David G Yu
980c303a6e
Merge pull request #1136 from barfowl/examples_glpainttest
Improved examples/glPaintTest with slider to modify brush size
2019-06-21 10:10:08 -07:00
barry
6ab31b9061 Improved examples/glPaintTest with slider to modify brush size:
- changed default brush size from 500 to 100 pixels
    - added slider to HUD to modify brush size interactively
2019-06-20 21:07:47 -07:00
David G Yu
8291df957c
Merge pull request #1135 from barfowl/far_api_doxygen
Minor improvements to Doxygen comments in Far header files
2019-06-20 18:31:31 -07:00
David G Yu
1ac3d98a3d
Merge pull request #1134 from barfowl/docs_examples
Added missing documentation pages and images for some of the examples
2019-06-20 17:47:36 -07:00
barry
3484311cc0 Fixed copyright date on recently added file 2019-06-20 17:17:02 -07:00
Barry Fowler
8270c77959
Merge pull request #1133 from davidgyu/hud_logo_update
Thanks, David -- that turned out to be more involved than expected!
2019-06-20 14:23:57 -07:00
barry
5e1a4b44be Minor improvements to Doxygen comments for Far header files:
- minor changes to Doxygen comments based on feedback
    - new description for PatchTableFactory::Options::EndCapType
    - fixed warnings related to Doxygen use of <REAL> in patchTable.h
2019-06-20 13:56:54 -07:00
David G Yu
64d366a145 Updated OpenSubdiv logo in examples HUD
Reorganized the character cells used for UI
elements and removed elements that were not
being used in order to provide more space
for the logo image and logo text.

Updated to the new OpenSubdiv logo and updated
the HUD drawing code used to display the logo
character cells.
2019-06-20 13:56:44 -07:00
barry
2fca20ed5f Minor improvements to documentation pages for DirectX examples:
- added missing image for the dxPtexViewer
    - updated command line usage to reflect updated DirectX examples
    - fixed other minor inconsistencies
2019-06-20 11:43:57 -07:00
barry
707e585ea2 Added new documentation pages for Metal examples:
- added new RST pages and images for the mtlViewer and mtlPtexViewer
    - added new table to the main Code Examples page for the Metal examples
2019-06-20 11:40:28 -07:00
Barry Fowler
fdd08b96f1
Merge pull request #1132 from davidgyu/mtl_ptexviewer_fix
Metal PtexViewer fixes and improvements
2019-06-18 19:22:09 -07:00
Barry Fowler
7e229cf095
Merge pull request #1131 from davidgyu/mtl_viewer_options
Thanks, David
2019-06-18 16:23:47 -07:00
Barry Fowler
c49a0c2e44
Merge pull request #1130 from davidgyu/mtl_viewer_tess_fix
Thanks, David
2019-06-18 16:23:31 -07:00
David G Yu
78113981e6 Updated mtlPtexViewer to match mtlViewer
These changes update the mtlPtexViewer implementation
to match recent changes to the mtlViewer including:
- improved shader organization
- correct screenspace tessellation
- support for common command line arguments and fit to frame
2019-06-18 15:32:07 -07:00
David G Yu
b4ace6791b Fixed mtlPtexMipmapTexture 3-component textures
Fixed the example mtlPtexMipmapTexture loader to support
the padAlpha option used when loading 3-component textures.
2019-06-18 15:30:43 -07:00
David G Yu
7794010e8f Removed unused shape list from mtlPtexViewer 2019-06-18 15:30:05 -07:00
David G Yu
317e242bee
Merge pull request #1129 from barfowl/far_fvar_corner_tags
Fixed cracks in face-varying Loop patches for lineaar-boundaries option
2019-06-18 15:10:41 -07:00
David G Yu
dc22a0cb1d Updated mtlViewer command line arguments
Updated the mtlViewer to make use of common/argOptions.h
like the other viewers and also implemented a "fit to frame"
hotkey. Both changes help improve manual testing.
2019-06-18 14:27:33 -07:00
David G Yu
cdbeac560f Fixed mtlViewer transition patch tessellation
Patches with transition edges were not being tessellated
correctly when drawing multiple patch types, e.g. with
Gregory or Legacy Gregory approximation at irregular features,
because the per-patch tess factors buffer was not being
offset correctly for the draw command for each patch type.

Fixed this to be consistent with other patch drawing by
recording and applying offsets when binding this buffer
for each patch type, and making sure that attributes for
the tess factors buffer are bound when drawing Legacy Gregory
patch types.
2019-06-18 13:36:49 -07:00
barry
6d3e1b02af Added condition to compensate for incorrect FVar corner tags:
- re-assess corner tags for irregular patches on FVar boundaries
2019-06-18 11:24:23 -07:00
George ElKoura
a001cfb440
Merge pull request #1128 from davidgyu/fvar_viewer_options
Update glFVarViewer option defaults
2019-06-18 10:49:49 -07:00
David G Yu
58a71672a7 Update glFVarViewer option defaults
Enabled smooth corner, inf sharp and single crease patch
options by default.
2019-06-18 10:28:54 -07:00
George ElKoura
3c4081aac3
Merge pull request #1126 from davidgyu/examples_shaders
Minor improvements to examples for Loop
2019-06-17 21:11:02 -07:00
George ElKoura
2d7919f3ee
Merge pull request #1127 from davidgyu/examples_options_and_shapes
Examples options and shapes
2019-06-17 20:33:53 -07:00
David G Yu
92a5d73913
Merge pull request #1125 from barfowl/regression_far_perf
Improvements to far_perf output and options
2019-06-17 18:13:23 -07:00
David G Yu
ed3fa312e5 Removed obsolete LOOP define from example shaders
Removed the use of the LOOP preprocessor symbol from
the remaining example shader code. The shader code is now
configured according to the types of the resulting patches
without depending on the subdivision scheme of the mesh
topology.
2019-06-17 17:59:15 -07:00
David G Yu
9fe1284ae3 improved glViewer shaders for Loop
Removed the use of the LOOP preprocessor symbol from
the glFVarViewer shaders code. The shader code is now
configured according to the types of the resulting patches
without depending on the subdivision scheme of the mesh
topology.

Improved the implementation of face-varying interpolation
similar to the glFVarViewer. Now the face-varying patch
type is obtained from the face-varying patch array
descriptor instead of being hard-coded by subdivison scheme.
2019-06-17 17:59:15 -07:00
David G Yu
5d33f7c28e Improved glFVarViewer shaders for Loop
Removed the use of the LOOP preprocessor symbol from
the glFVarViewer shaders code. The shader code is now
configured according to the types of the resulting patches
without depending on the subdivision scheme of the mesh
topology.

This allows the implementation of face-varying interpolation
to be improved and simplifies both the shader code and
application code.

Also, fixed a couple of incorrect buffer/texture bindings
that were raising GL errors.
2019-06-17 17:59:15 -07:00