Jeremy Cowles
4b72d80fe4
Merge pull request #524 from c64kernal/dev_small
...
Fix build breakage on MSVC due to implicit downcasting.
2015-05-24 07:27:43 -07:00
George ElKoura
670a48fd86
Fix build breakage on MSVC due to implicit downcasting.
...
Be explicit about the casting from size_t to int in stencilBuilder.cpp.
2015-05-24 01:21:48 -07:00
George ElKoura
6c0e903fbc
Merge pull request #523 from jcowles/dev
...
Add stencilTable.cpp, minor cleanup
2015-05-24 01:07:28 -07:00
Jeremy Cowles
15020c2c4c
Fix StencilBuilder copyright (2015)
2015-05-23 20:34:59 -07:00
Jeremy Cowles
befbc282db
Add stencilTable.cpp, minor cleanup
...
* Added stencilTable.cpp
* Fixed the "off" variable shadow warning
* Moved constructors to cpp file
* Made LimitStencilTable constructor private
* other minor clean up.
2015-05-23 20:31:18 -07:00
barfowl
a15edc1f2c
Moved primvar interpolation methods to new Far::PrimvarRefiner class
...
- created new class Far::PrimvarRefiner with interpolation methods
- removed interpolation and limit methods from Far::TopologyRefiner
- replaced internal usage in Far::StencilTableFactory
- replaced usage in regressions, tutorials and examples
2015-05-23 18:56:36 -07:00
Ignacio Lillo
e6733580ba
Fixed warning that prevented building the project.
2015-05-23 00:48:58 -03:00
Ignacio Lillo
79eb6d5aeb
Merge branch 'dev' into 358
2015-05-23 00:30:03 -03:00
Ignacio Lillo
0a6a47159e
Merge branch 'upstream-dev' into dev
2015-05-23 00:29:39 -03:00
Ignacio Lillo
37ccad54a3
Refs #358 . Refactored functions to comply with code conventions.
...
Also deleted bool uses_tesselation_shaders() since it was a duplicate of
bool SupportsAdaptiveTessellation().
2015-05-23 00:28:37 -03:00
George ElKoura
7a97d7be5d
Merge pull request #520 from barfowl/vtr_friends
...
Removing friends from Vtr classes
2015-05-22 18:49:47 -07:00
Takahito Tejima
5ca67a9383
Merge pull request #519 from jcowles/dev
...
Faster, simpler stencil table construction
2015-05-22 16:42:45 -07:00
jcowles
909757ca9b
Faster, simpler stencil table construction.
...
This is a new implementation of the stencil table construction algorithm found
in protoStencil.h. In local tests with production assets, the new algorithm is
~25% faster and significantly more stable, in terms of average performance
In one asset test, generating stencils for level 10 adaptive refinement of
BuzzLightyear was reduced from 18s to 13s.
2015-05-22 16:36:12 -07:00
barfowl
b64eb5e2e0
Removing friends from Vtr classes and making more accessible internally:
...
- removed all friend declarations (no more Far declarations with Vtr)
- all protected methods made public
- intent is to move these into namespace internal
- access between Vtr classes is under review
2015-05-22 15:52:47 -07:00
Jeremy Cowles
330dd95e93
Merge pull request #518 from takahito-tejima/rename
...
Rename PatchTables/StencilTables to PatchTable/StencilTable
2015-05-22 12:57:40 -07:00
Takahito Tejima
a7c5179ef9
renaming (2/2) PatchTables and StencilTables to PatchTable and StencilTable
...
replace all occurrences reffering PatchTables, StencilTables, and their factories.
2015-05-22 11:50:01 -07:00
Takahito Tejima
e6f951c010
renaming (1/2) PatchTables and StencilTables to PatchTable and StencilTable
...
this commit just changes filenames (for better diffs)
2015-05-22 11:02:58 -07:00
Takahito Tejima
403268f2aa
Merge pull request #517 from jcowles/dev-fix-glsl
...
Fix sharpness GLSL error for OSX
2015-05-22 08:58:15 -07:00
Takahito Tejima
5df793762b
Merge pull request #516 from jcowles/dev-fixmaya
...
Fix MayaPolySmooth example
2015-05-22 08:56:14 -07:00
Jeremy Cowles
9759012dec
Fix sharpness GLSL error on OSX
2015-05-22 00:43:41 -07:00
jcowles
b479851502
Fix MayaPolySmooth example
...
Fixing some minor fallout after merging #514 .
2015-05-22 00:37:25 -07:00
Jeremy Cowles
bec60d5500
Merge pull request #512 from takahito-tejima/dev
...
remove maximum valence limitation in gregory basis and bspline basis end caps.
2015-05-21 23:38:40 -07:00
Jeremy Cowles
dc8bd1224d
Merge pull request #514 from barfowl/far_level
...
Replacing obsolete TopologyRefiner methods with TopologyLevel
2015-05-21 23:32:05 -07:00
barfowl
54fbbc4538
Removed last remaining occurrences of obsolete methods.
2015-05-21 21:38:10 -07:00
barfowl
3d80cc56f5
Replaced and removed remaining use of TopologyRefiner level methods:
...
- replaced all remaining usage internal to far with TopologyLevel
- removed the obsolete methods from TopologyRefiner
2015-05-21 21:26:41 -07:00
barfowl
5dbc1aee0d
Fixed issue with exampls/farViewer
2015-05-21 20:42:29 -07:00
barfowl
fd89a1323e
Fixed issue with examples/glFVarViewer
2015-05-21 20:33:02 -07:00
barfowl
ff13665a02
Introduced Far::TopologyLevel methods in place of TopologyRefiner in Osd
2015-05-21 20:20:16 -07:00
barfowl
04de3a37d9
Missed a few corrections in the previous commit.
2015-05-21 20:14:46 -07:00
barfowl
6d5b29c2dc
Replacing use of old Far::TopologyRefiner methods with Far::TopologyLevel
2015-05-21 19:52:25 -07:00
Ignacio Lillo
d82492dce5
Merge branch 'dev' into 358
2015-05-21 23:49:45 -03:00
David G Yu
2b33de38f8
Merge pull request #513 from takahito-tejima/refactor2
...
implements Osd::CpuEvaluator::EvalPatches function.
2015-05-21 18:55:09 -07:00
David G Yu
71055dbdd9
Merge pull request #510 from takahito-tejima/refactor
...
glStencilViewer crash fix
2015-05-21 18:53:45 -07:00
Ignacio Lillo
ed2e48f651
Merge branch 'upstream-dev' into dev
...
Conflicts:
examples/common/d3d11Utils.h
examples/common/glUtils.cpp
examples/glViewer/glViewer.cpp
2015-05-21 22:47:36 -03:00
Takahito Tejima
2e26f932e1
implements Osd::CpuEvaluator::EvalPatches function.
...
- it takes number and pointer for the input PatchCoords.
- add derivative evaluations.
- enhance glEvalLimit example to see the derivative evaluation works.
2015-05-21 17:45:13 -07:00
Takahito Tejima
2008e6ca05
Merge pull request #511 from davidgyu/shadingRefactor
...
Sync'ed up GLSL and HLSL patch shader source.
2015-05-21 11:51:40 -07:00
Takahito Tejima
b15762204a
remove maxvalence limitation in FarGregoryBasis.
2015-05-21 10:59:40 -07:00
David G Yu
f4a8cafe86
Sync'ed up GLSL and HLSL patch shader source.
...
Cleaned up the Legacy Gregory shader source by accessing buffer
data through helper functions.
Switched to performing tessellation in untransformed (object) space.
2015-05-21 09:56:25 -07:00
Takahito Tejima
743c424e9c
Add high-valence evaluation path into gregory basis.
2015-05-21 09:42:26 -07:00
Takahito Tejima
b5af25e413
Add high-valence shapes into glViewer (currently crashes)
2015-05-21 09:41:50 -07:00
Takahito Tejima
e8ac41dbc8
glStencilViewer crash fix #2
...
this change fixes a crash when selecting catmark_hole_test1
in glStencilViewer. If there's a hole limit stencils may not
be found for given limit location, resulting invalid stencil
entries.
2015-05-21 09:05:33 -07:00
Takahito Tejima
c9150cfb23
glStencilViewer crash fix #1
...
use patchtables instead of patchTables (yes, quite confusing...)
patchtables may be created ondemand if patchTables isn't given
as an argument.
2015-05-21 09:03:06 -07:00
Takahito Tejima
ee04e3f7ea
Merge pull request #509 from barfowl/max_valence
...
Raised maximum valence supported by Vtr and included new test shapes:
2015-05-21 08:49:40 -07:00
barfowl
05e9c48ea9
Raised maximum valence supported by Vtr and included new test shapes:
...
- changed Vtr::LocalIndex to 16-bit integer from 8-bit
- added test shapes including valence 360 vertices
- disabled new shapes in far/regression until improved accuracy accepted
2015-05-20 23:36:45 -07:00
George ElKoura
32e9bb7e29
Merge pull request #508 from davidgyu/dxfix
...
Fixed HLSL shader compile error.
2015-05-20 22:25:14 -07:00
David G Yu
1bdc69dbfc
Merge pull request #506 from c64kernal/dev_patch
...
Remove need for friending a class in PatchTables.
2015-05-20 21:53:19 -07:00
David G. Yu
d1452a02cf
Fixed HLSL shader compile error.
2015-05-20 21:48:52 -07:00
David G Yu
957f863ba1
Merge pull request #507 from c64kernal/dev_f
...
Removed unnecessary friendship in ProtoStencil.
2015-05-20 21:43:18 -07:00
George ElKoura
b53a73f7de
Removed unnecessary friendship in ProtoStencil.
2015-05-20 20:10:14 -07:00
George ElKoura
f521c9dde3
Remove need for friending a class in PatchTables.
...
PatchTables no longer needs to friend EndCapLegacyGregoryPatchFactory.
Instead we now make the patch table factory pass in the data that needs
to be updated directly to EndCapLegacyGregoryPatchFactory.
2015-05-20 19:44:43 -07:00