Takahito Tejima
3885c4a6f7
Fix bug of incorrect patchParam table splicing.
2013-06-18 14:07:32 -07:00
manuelk
d3e9bdbfee
Merge branch 'release/v1_2_3' into dev
2013-06-17 19:36:14 -07:00
manuelk
12e25f076a
Release 1.2.3
2013-06-17 19:35:29 -07:00
manuelk
bbe4435b19
minor API refactor of for EvalLimit :
...
- Replaced EvalData and EvalVertexData classes with a simpler DataStream class that only
accesses a single data stream, binds and unbinds it
- DataStream has both an input and an output version which avoids much of the const-ness
const-related ambiguity of the previous design pattern
- Vertex, varying and face-varying data now all have a dedicate struct (VertexData, VaryingData, FaceVaryingData)
as a way of gathering the various data-streams required to perform sampling
- renamd some "Buffers" into "Tables" for better naming consistency with Far
2013-06-17 18:13:13 -07:00
David G Yu
077f95b8f0
Fixed a couple bugs/typos in simple_math.h
2013-06-14 09:55:55 -07:00
David G Yu
185e55b859
Fixed VS2010 error/warning
2013-06-14 09:54:38 -07:00
manuelk
cf13a8d755
Add check in shape_utils that detects dicsonnected vertices in a shape mesh and exits with an error message.
...
A more permanent fix will be to handle fully non-manifold topology at the Hbr level, but that is beyond the
scope of fixing this problem.
fixes #175
2013-06-13 16:22:59 -07:00
manuelk
795dec5fdc
Merge branch 'dev' of github.com:PixarAnimationStudios/OpenSubdiv into dev
2013-06-13 14:02:08 -07:00
manuelk
54bef92aab
switch cpuEvalLimitController to use a quad-tree based patch access map :
...
- remove PatchMap from FarPatchTables
- add a new FarPatchMap quad-tree class (constructed from FarPatchTables)
- refactor the EvalLimitController to use the quad-tree search instead of a
serial loop access
fixes #174
2013-06-13 14:01:23 -07:00
manuelk
642bb27d68
fix FarPatchParm : adding version.h include
2013-06-11 17:25:54 -07:00
manuelk
fab0527f91
minor FarPatchTables::PatchMap code refactor :
...
- replace use of std::multimap with an std::sort
- refactor some methods into PatchParam
2013-06-11 15:59:43 -07:00
David G Yu
38c951a06c
Fixed patch color override for uniform subdivision
2013-06-10 23:33:34 -07:00
David G Yu
61b8fb4713
Removed extraneous clipFlag declaration.
2013-06-10 23:00:38 -07:00
David G Yu
06701a8855
Removed examples/evalTest from examples/CMakeLists
2013-06-10 17:26:58 -07:00
David G Yu
6c487c5bac
Deleted examples/evalTest
2013-06-10 17:24:34 -07:00
David G Yu
29afdfc8b3
Fixed GLSL transform feedback initialization.
2013-06-10 16:56:32 -07:00
David G Yu
f5f524322a
Fixed VS2010 build warning/error
2013-06-10 16:32:45 -07:00
David G Yu
2b972f3117
Consolidated OpenGL includes into osd/opengl.h
2013-06-10 16:32:45 -07:00
David G Yu
967fc4db72
Fixed glsl shader portability edgeDistance
...
Moved all edgeDistance declarations to client shader code.
2013-06-10 16:32:45 -07:00
David G Yu
1461deb308
Fixed glsl shader portability (input,output)
2013-06-10 16:31:30 -07:00
David G Yu
ffe427dc65
Fixed glsl unsigned conversions in Gregory shaders
2013-06-10 16:21:48 -07:00
David G Yu
2551c32448
Fixed glsl shader portability
...
- defined a fallback value for ROTATE
- made GetPatchLevel() a macro to avoid
referencing gl_PrimitiveID from vertex shaders
- fixed float array initializers
2013-06-10 16:21:47 -07:00
David G Yu
e1930e58cd
Fixed some glsl preprocessor tests
...
Changed #if --> #ifdef for OSD_ENABLE_SCREENSPACE_TESSELLATION
2013-06-10 16:21:47 -07:00
David G Yu
c185968809
Updated glsl code texelFetchBuffer -> texelFetch
...
This allows us to remove unnecessary directives
to require GL_EXT_gpu_shader4
2013-06-10 16:21:47 -07:00
manuelk
7cb2463dc7
fix FarPatchTables::IsFeatureAdaptive() :
...
- trivial return if Gregory specific patch data is set
- or iterate through the patch-arrays until an adaptive patch is found (REGULAR,...,GREGORY_BOUNDARY)
fixes #173
2013-06-10 14:36:25 -07:00
manuelk
419b6b9716
- add a message to limitEval when trying to display face-varying UVs on shapes
...
that do not have that type of data
- fix some regression shapes that had "empty" uv values
(including some minor topo surgery that luckily appears to not break
regression baselines)
2013-06-07 17:53:23 -07:00
manuelk
cf1b2f1334
- fix a face-varying bug in shape_utils : now face-varying UVs are indexed correctly
...
coming out of our shape format
- set blue component of point-cloud to 0 in face-varying mode (save a few micro-secs)
2013-06-07 14:47:41 -07:00
manuelk
307b353b13
shape_utils : make sure we don't create a mesh with face-varying data declared
...
if the shape does not actually contain usable face-varying data.
2013-06-07 10:40:11 -07:00
manuelk
f5a7ad4cdb
evalLimit example : make sure to reset the output buffer on creation - some of the prims may not
...
set all the point colors (if face-varying data is missing on the test shape for instance)
and we don't want random values creeping from unset memory allocations.
2013-06-07 10:38:10 -07:00
manuelk
c18cf5bff2
first pass at face-varying interpolation for CpuEvalLimit - still
...
a couple of kinks to be worked out...
2013-06-06 18:07:46 -07:00
Takahito Tejima
f0be0b5799
Fix bug : multi mesh wasn't working correctly. FarMultiMesh has to set meshIndex to FarKernelBatch.
...
fixes #170
2013-06-06 16:20:40 -07:00
manuelk
043369485c
- adding varying data interpolation to the EvalLimit module
...
- minor refactoring of the LimitEvalContext to accomodate all the data buffers
- pushing some minor sub-patch functionality back to FarPatchParams
- extend example code with randomly generated varying vertex colors
2013-06-05 11:44:30 -07:00
Takahito Tejima
b0e8533ef4
Fix cmakefile and #ifdefs for opencl configuration.
2013-06-05 10:44:21 -07:00
manuelk
5fe38c3ac0
If Hbr carries no fvar data, then we shouldn't attempt to build fvar data tables in Far,
...
where the factory requests it or not...
fixes #169
2013-06-04 17:53:28 -07:00
Takahito Tejima
a6bf169344
Fix fvardata interpolation on adaptive patches.
2013-06-04 11:02:27 -07:00
manuelk
71b51eb16d
Merge branch 'release/1.2.2' into dev
2013-06-03 17:52:49 -07:00
manuelk
6ea2dee727
Release 1.2.2
2013-06-03 17:51:58 -07:00
manuelk
b270f99ea0
- prevent corner gutter texels from going into an infinite loop by
...
adding an arbitrary break if vertex valence is > 256
- add a Warning function to Osd error reporting
- minor cleanup /refactor / document of OsdError
fixes #167
2013-06-03 17:33:02 -07:00
Takahito Tejima
b037fc3307
Added early exit to Refine method to avoid unnecessary interop.
2013-06-03 17:06:33 -07:00
manuelk
21b9fbbb95
Moving some member variables of OsdGlDrawContext from public to protected
...
and adding the requisite accessors
Note : all our example code goes through the same boiler-plate texture
binding code - we might want to move it as a member function of the DrawContext.
2013-05-31 17:11:16 -07:00
manuelk
bcc31df715
doc fix for EvalLimitSample
2013-05-31 14:17:23 -07:00
manuelk
f2b3419a4d
bug fix in limitEval example : calculation for the required number of samples was incorrect
...
on geometry with non-quad faces. This should be fixed now.
2013-05-31 14:14:42 -07:00
manuelk
e52af3660e
fix cpuEvalLimitController : some samples were being dropped because
...
of bad parameterization on non-quad faces
2013-05-31 13:51:21 -07:00
manuelk
87188355f1
fix the last bugs in the GregoryBoundary EvalLimit CPU kernel
2013-05-30 18:12:09 -07:00
manuelk
49b710ee77
bug fixes to cpuEvalLimitKernel.cpp (use unsinge ivalence in the correct places)
...
minor code cleanup
Note : there is still a resilient bug in the Gregory Boundary patch case
2013-05-28 16:37:45 -07:00
manuelk
2849965f59
bug fixes for Gregory Boundary patches in cpuEvelLimitKernel.cpp
2013-05-28 13:54:37 -07:00
manuelk
3c80aea965
Merge branch 'master' of github.com:PixarAnimationStudios/OpenSubdiv into dev
2013-05-28 09:53:02 -07:00
manuelk
262a0d43a1
fix some MSVC++ build warnings (mostly float precision literals)
2013-05-24 16:51:13 -07:00
manuelk
85a3001120
Work in progress on EvalLimit : added Gregory & GregoryBoundary kernels.
...
Note : GregoryBoundary does not generate the correct surface yet (bug to be squashed soon)
2013-05-24 16:29:28 -07:00
manuelk
f617cdd6ed
Work in Progress : checkin in function kernels for boundary and corner patches.
...
Casual testing doesn't reveal any bug within our sample shapes.
Remaining : gregory & gregory boundary patches.
2013-05-22 18:56:27 -07:00