Commit Graph

1215 Commits

Author SHA1 Message Date
barry
9219b0fb00 Fix Far::LimitStencilTableFactory issues with uniform refinement:
- corrected stencil estimates according to the interpolation mode
    - removed the added error checking for the tables provided
    - use uniform vertex patches when varying interpolation specified
2018-12-12 12:03:54 -08:00
barry
82856a410f Fixed PatchTableFactory internal option for uniform tables:
- set non-linear uniform option back to false for linear uniform tables
2018-11-20 14:24:52 -08:00
David G Yu
c16cdefc1d
Merge pull request #1025 from barfowl/far_quad_boundaries
Remove boundary isolation requirement for quads in adaptive refinement
2018-11-20 10:59:36 -08:00
barry
e494738e88 Disabled boundary isolation requirement for quads in adaptive refinement:
- turned off internal quad boundary isolation option in adaptive refinement
    - added regression/shape to verify support for multiple boundary features
2018-11-19 10:56:21 -08:00
David G Yu
7a8243f9d0
Merge pull request #1024 from barfowl/far_uniform_patch_table
Added internal support for non-linear uniform PatchTables
2018-11-17 10:53:57 -08:00
David G Yu
d8c85d5b7d
Merge pull request #1023 from barfowl/far_patch_descriptor
Updated Far::PatchDescriptor methods involving "adaptive" patch types
2018-11-17 10:53:47 -08:00
David G Yu
f5b674e089
Merge pull request #1022 from barfowl/far_gregory_boundaries
Minor fixes to PatchBuilders related to boundary isolation assumptions
2018-11-17 10:53:22 -08:00
barry
def63b301e Added internal support for non-linear uniform PatchTables:
- added internal option to generate polygons vs patches when uniform
    - updated PatchTableFactory to identify patches at a specified level
    - renamed internal symbols to remove obsolete references to Adaptive
2018-11-16 17:51:22 -08:00
barry
0b61b20ec6 Minor fixes to PatchBuilders related to boundary isolation assumptions:
- updated Catmark builder to use edge-point boundary tags like Loop
    - fixed Gregory face point reliance on boundary isolation assumptions
    - added comments to PatchBuilder base class to clarify intention and usage
2018-11-16 16:53:10 -08:00
David G Yu
ff34c514f5 Improved patch basis eval for Osd to match Far
This updates the patch basis evaluation functions in Osd
to match recent changes to far/patchBasis.

This also exposes a common facility for dealing with PatchCoord,
PatchArray, and PatchParam. These are exposed as global functions
operating on struct data, since C++ style class methods are not
supported by all of the Osd shader and kernel execution envirionments.

Changes:
    - Merged far/patchBasis.cpp to osd/patchBasisCommon{,Types,Eval}.h
    - Exposed PatchCoord, PatchArray, and PatchParam to Osd kernels
    - exposed OsdEvaluatePatchBasis and OsdEvaluatePatchBasisNormalized
    - Updated CPU, TBB, Omp, CUDA, OpenCL, GLSL, HLSL, and Metal evaluators
    - Updated glFVarViewer
2018-11-15 17:11:50 -08:00
barry
9206ab0f21 Updated Far::PatchDescriptor methods involving "adaptive" patch types:
- modified IsAdaptive() method to better identify non-linear types
    - updated comments to better reflect current use of patches
2018-11-13 18:36:28 -08:00
barry
4e0a96f964 Improve Far::PatchMap to better support sparse and triangular PatchTables:
- identify the subrange of originating patch faces while assigning handles
    - limit queries and memory allocation to the identified subrange of faces
    - separate quadtree construction for quad and triangular patches
2018-11-12 10:51:47 -08:00
barry
d95f49b5ca Fixed bug in adaptive refinement related to irregular faces:
- reject irregular faces before combining and testing the composite tag
2018-11-08 12:36:43 -08:00
David G Yu
bf570cd019
Merge pull request #1017 from barfowl/patch_table_query
Fixed Far::PatchTable::IsFeatureAdaptive() to work for all schemes
2018-11-07 19:14:09 -08:00
David G Yu
2520bed85f
Merge pull request #1016 from barfowl/far_irregular_faces
Extended Far topology tagging to better handle irregular faces
2018-11-07 19:13:12 -08:00
barry
78e5badc72 Fixed Far::PatchTable::IsFeatureAdaptive() to work with all schemes:
- added new PatchTable member to indicate uniform (linear) construction
    - initialize new member in PatchTableFactory
    - use new member to determine result of IsFeatureAdaptive() query
2018-11-07 16:51:10 -08:00
barry
662dccfe4d Extended vertex tagging to improve handling of irregular faces:
- added new TopologyRefiner member to detect presence of irregular faces
    - added new Vtr::Level::VTag to indicate vertex incident an irregular face
    - populated new VTag bit when irregular faces present
    - updated refinement to clear new bit for refined faces
    - branch adaptive refinement in linear cases to avoid testing features
    - updated feature detection for irregular faces -- now a simple bit test
    - updated PatchBuilder with now-trivial test for incident irregular faces
2018-11-07 13:16:03 -08:00
David G Yu
92a12edcb0
Merge pull request #1015 from barfowl/far_patch_eval
Minor refactoring of Far patch basis evaluation methods
2018-11-07 09:38:49 -08:00
barry
484c2746d1 Minor refactoring of internal functions in far/patchBasis.*:
- individual basis functions now purely normalized with no PatchParam
    - two new higher level functions deal with patch type and PatchParam
    - updated Far::PatchTable and Osd evaluators that used old methods
2018-11-06 13:29:16 -08:00
barry
ff9d936ee8 Fixed MSVC warning/error regarding use of bool in expression 2018-11-06 12:38:57 -08:00
barry
cd3faaf33c Improved Far::PatchBuilder's determination of patch properties:
- clarified handling of isolated/unisolated features in IsPatchRegular()
    - simplified GetPatchBoundaryMask() to make use of bit masks
    - removed private method supporting approx-smooth-corner-as-sharp option
    - removed debugging tests verifying irregular patch points
2018-11-06 12:11:43 -08:00
David G Yu
3dbcc32a28
Merge pull request #1013 from barfowl/nonmanifold_patches
Improve patch construction around non-manifold vertices to close gaps
2018-11-05 11:40:43 -08:00
barry
0520fc53ff Extended non-manifold patches to irregular to prevent gaps:
- Far::PatchBuilder additions to identify spans around non-manifold corners
    - re-organized patch regularity test to inspect individual corner features
    - updated partial span gathering function to handle non-manifold cases
    - ensure vertex tag xordinary bit remains unset when non-manifold
2018-11-01 10:17:40 -07:00
David G Yu
a1c7b8c87f
Merge pull request #1012 from barfowl/fvar_limit_stencil_table
Added support for creation of face-varying Far::LimitStencilTables
2018-10-29 19:04:47 -07:00
barry
c59c801e9c Added support for creation of face-varying Far::LimitStencilTables:
- added necessary options to struct LimitStencilTableFactory...::Options
    - updated Create() to support creation of varying and face-varying stencils
    - updated Create() to provide clarity and stricter compatibility checks for
      the optional StencilTable and PatchTable arguments
    - modified Doxygen comments for Create() to clarify requirements of the
      optional table arguments
    - added missing StencilTableFactory::AppendLocalPointStencilTableVarying()
2018-10-29 10:46:03 -07:00
barry
313f27295b Extended Far::StencilTable data interpolation interfaces:
- changed UpdateValues() use of *T to &T for consistency with PrimvarRefiner
   - assigned unique types <T> and <U> to src and dst arguments for consistency
   - kept the *T interfaces for backward compatibility
2018-10-29 10:30:05 -07:00
David G Yu
968f6e001c
Merge pull request #1010 from barfowl/varying_patch_descriptor
Fix initialization of PatchTable's varying patch descriptor
2018-10-20 13:32:37 -07:00
barry
8fef4d6930 Fix initialization of PatchTable's varying patch descriptor:
- initialize on construction, regardless of whether varying patches present
2018-10-19 13:17:41 -07:00
barry
2910970021 Fixed naming of function parameters to suppress Doxygen warning 2018-10-19 13:15:45 -07:00
barry
d84666c829 Populate Far::PatchTable with triangular patches for Loop scheme:
- extended patch construction in base PatchBuilder to support triangles
    - added extraction of regular triangular patches to base PatchBuilder
    - converted irregular patches to supported patch types in LoopPatchBuilder
2018-10-11 17:51:56 -07:00
David G Yu
c5c9704b90
Merge pull request #1003 from barfowl/tri_patch_support
Added low-level support in Far for triangular patches
2018-10-03 17:44:01 -07:00
David G Yu
2fe36033d5
Merge pull request #1002 from barfowl/vtr_level_tag_bits
Simplify Vtr bitfield operations to avoid issues with older versions of GCC
2018-10-01 13:05:17 -07:00
David G Yu
521fc52e70
Merge pull request #1001 from barfowl/osd_cpu_patch_table
Corrected initialization of patch arrays in Osd::CpuPatchTable
2018-10-01 13:04:20 -07:00
barry
d6572ab226 Updated Osd evaluators to deal with changes to PatchParam boundary:
- updated evaluators to extract the extended 5-bit mask from PatchParam
2018-09-27 20:13:01 -07:00
barry
e96bf355e0 Added low-level support in Far for triangular patches:
- fixed missing PatchDescriptor functionality for Loop triangle
    - add new PatchDescriptor::Type for Gregory triangle
    - extended PatchParam boundary mask from 4 to 5 bits (!)
    - added new PatchParam methods for parameterization of triangles
    - extended PatchMap to support triangular patches
    - added basis evaluation for triangular patch types
2018-09-27 20:09:59 -07:00
David G Yu
54346afaa9
Merge pull request #999 from barfowl/tri_adaptive_refinement
Remove Catmark-only restriction on adpative refinement in Far
2018-09-26 14:39:59 -07:00
barry
99f6a27604 Simplified access to Vtr::Level tag bits for integer operations:
- added alternate/explicit constructor to initialize from integer bits
    - added accessor to retrieve collections of bits as an integer
    - replaced pointer aliasing in bitwise combinations with use of new methods
2018-09-25 15:51:01 -07:00
barry
89c4ce78b7 Corrected initialization of patch arrays in Osd::CpuPatchTable
- assigned appropriate patch count and base offsets to varying arrays
    - assigned appropriate patch count and base offsets to face-varying arrays
    - fixed append to face-varying PatchParam buffer for each array
2018-09-25 15:13:55 -07:00
barry
fe0b397e2f Removed assertion restricting adaptive refinement to Catmark scheme:
- split face tag analysis into functions for face and individual corner
    - avoided forced boundary isolation of triangles, preserved for quads
2018-09-25 14:29:35 -07:00
David G Yu
91478f149a
Merge pull request #995 from barfowl/fvar_patch_array_dev
Extended face-varying patch arrays to properly support two types
2018-09-19 17:29:01 -07:00
David G Yu
c732ff346a
Merge pull request #994 from barfowl/compute_local_points
Reverted PatchTable local point methods to address template issues
2018-09-17 17:54:47 -07:00
barry
b542bc78c3 Added missing include of <algorithm> for std::max with stricter compilers 2018-09-17 11:46:41 -07:00
barry
86e3712564 Fixed oversight deriving Far::LimitStencil from new template class:
- added the "public" keyword that was inadvertantly omitted
2018-09-17 09:33:08 -07:00
barry
45928c1b81 Extended face-varying patch arrays to properly support two types:
- extended Far::PatchTable's FVar channels with two descriptors and stride
    - updated Far::PatchTableFactory to properly construct FVar patch arrays
    - extended Osd::PatchArray with two descriptors and common stride
    - updated Osd::CpuPatchTable and CpuEvaluator to use PatchArray extensions
2018-09-13 16:51:53 -07:00
barry
5c9f77d83e Reverted PatchTable::ComputeLocalPointVaues...() to avoid template issues:
- reverted original methods to operate in single precision instead of both
    - removed overloads in favor of direct stencil table access and update
    - updated precision related assertions with clearer condition
    - updated far/tutorial_6 to use template stencil table access
    - updated far/tutorial_9 to use conventional stencil table access
2018-09-13 12:50:00 -07:00
David G Yu
79476c87cb
Merge pull request #991 from barfowl/val2_gregory_simplify
Simplify construction of Gregory patches with val-2 interior corners
2018-09-13 12:29:06 -07:00
barry
725d3c585b Simplified Gregory point initialization with more direct assignment:
- replaced use of Append() with Assign(index) now that row size is clear
    - added asserts for all row sizes to ensure assignment matches allocation
    - simplified utility class for SparseMatrix point/row down to bare minimum
2018-09-12 16:01:03 -07:00
barry
e0457241e8 Simplified Catmark->Gregory conversion with val-2 interior corner:
- replaced the invasive valence-2 conditions with a post-process
    - removed inefficient and now unnecessary Point::AddOrAppend()
2018-09-12 15:52:59 -07:00
barry
f58330fdee Minor extensions to Far classes to help manage large PatchTables:
- overloaded PatchTableFactory::Create() to take subset of base faces
    - overloaded TopologyRefiner::RefineAdaptive() to take subset of base faces
    - added TopologyRefinerFactory::Create() to create new TopologyRefiner
      that shares base level with another, allowing independent refinement
    - overloaded PatchTable::ComputeLocalPointValues...() to accept split
      buffers with separate base-level primvar values
    - overloaded StencilTable::UpdateValues() to accept split buffers as above
2018-09-11 16:13:06 -07:00
David G Yu
c566e8f2ab
Merge pull request #988 from barfowl/sparse_matrix_additions
Minor improvements to internal Far::SparseMatrix class
2018-08-29 18:22:35 -07:00