Commit Graph

937 Commits

Author SHA1 Message Date
David G Yu
4a6ba2de64 Fixed function proto mismatch in d3d11DrawContext
Fixes #143
2013-03-25 10:54:40 -07:00
Manuel Kraemer
a5b7c0337e size_t requires #include <stdlib.h>
fixes #143
2013-03-25 07:32:17 -07:00
manuelk
e6e7c96a52 We need to leverage our per-patch ptex indexing scheme in the EvalLimit API.
- replace ptex indexing with the FarPtexCoord structure as a way to pass per-patch
  ptex data to the shaders.

  We are replacing a vector<int> arranged as :
  int[0] : ptex face index
  int[1] : (u,v) as 16 bits encoding the log2 coordinate of the top left corner

  Instead we are now using a struct arranged as :
  int[0] : ptex face index
  int[1] : is a bit-field containing u,v, rotation, depth and non-quad

  The u,v coordinates have been reduced to 10 bits instead of 16, which still
  gives us a lot of margin.

- Replace OsdVertexBufferDescriptor with something more adequate for general
  primvar representation (this name will probably eventually change...)

- Improve OsdPatchDescriptor
    - add a "loop" boolean (true if the patch is of loop type)
    - add a GetPatchSize() accessor

- OsdPatchArray :
    - remove some redundant elements (still more to do there)

- Fix all shader / examples / regressions & stuff to make this all work.

fixes #143
2013-03-22 18:20:50 -07:00
manuelk
86c805fd67 fixes #138 2013-03-20 14:07:22 -07:00
David G Yu
8849a9682b Fixed far public header file install rule 2013-03-19 16:40:04 -07:00
David G Yu
036ec2e189 Updated DX11 viewer to use std::string shapes. 2013-03-19 15:38:44 -07:00
Takahito Tejima
d026aca006 use std::string instead of char* for regression shapes definition,
to avoid MSVC's literal length limitation on some big shapes.
2013-03-19 14:43:21 -07:00
David G Yu
7cffcedbc3 Fixed ptexViewer to register for windowClose 2013-03-19 14:31:44 -07:00
manuelk
54856181a9 fix simpleCpu example :
- assign default widht / height to the window
- fix reshape callback
- downgrade GL profile hint to 3.3
2013-03-18 16:55:41 -07:00
manuelk
2ec61446db use sqrtf and expf to prevent auto-casts to double
fixes #139
2013-03-18 16:29:35 -07:00
manuelk
b93ab652c6 - adding param descriptions for FarMeshFactory constructor
fixes #138
2013-03-18 15:45:59 -07:00
manuelk
3ea3347128 - fix incorrect name typo
- fix incorrect function argument introduced by recent batching work

fixes #137
2013-03-18 14:09:46 -07:00
David G Yu
6f6a6aeab3 Fixed VS2010 compile errors. 2013-03-18 11:57:55 -07:00
David G Yu
f399ff2a10 Fixed VS2010 compile errors.
Also, disabled DEPTH_TEST for framebuffer blits.
2013-03-18 11:56:09 -07:00
Manuel Kraemer
a4c43b0522 fix some GLFW 3.0 issues - since we are still in beta, the API is changing a bit
- the closeWindowFun callback changed prototype (now returns void)
- keyboard functions now require the window handle (and pass it to the callback)
2013-03-16 18:44:53 -07:00
Manuel Kraemer
8e9e832f94 When OpenCL is detected, make sure all the includes / libs are tacked on the build lines 2013-03-16 18:44:07 -07:00
Manuel Kraemer
d703ba0205 fix some unused variable warnings 2013-03-16 18:43:20 -07:00
Manuel Kraemer
95f326eed1 add OpenCL include directories when Cmake detects CL for the OSD build 2013-03-16 18:41:49 -07:00
Manuel Kraemer
5c9ae5537c fix build error : size_t requires stdlib.h 2013-03-16 18:40:53 -07:00
Manuel Kraemer
9cceb15438 fix a comment : OPENCL_INCLUDE_DIRS (plural) 2013-03-16 18:38:17 -07:00
Takahito Tejima
9ec95572bb Add some features into ptexViewer: animation speed, displacement scale, bloom filter, etc 2013-03-15 18:03:22 -07:00
Takahito Tejima
f745aa2807 add paint test example 2013-03-15 12:39:44 -07:00
manuelk
50881546b4 add a cmake module to locate Intel's TBB 2013-03-14 19:35:15 -07:00
David G Yu
500bebefb4 Fixed VS2010 build warnings/errors 2013-03-08 12:07:09 -08:00
Takahito Tejima
b3a6d43ee3 fix simpleCpu to be compilable with the latest API 2013-03-08 09:05:07 -08:00
Takahito Tejima
291debd4a9 change access permissions on files 2013-03-08 08:57:42 -08:00
Takahito Tejima
fbc139d39c fix compile errors on gcd kernel 2013-03-07 22:43:47 -08:00
Takahito Tejima
8efecb0fca Batching stuffs: generalized kernel batches, table/dispatcher refactoring, multiMeshFactory, drawContext, etc.
2 client APIs are changed.
- VertexBuffer::UpdateData() takes start vertex offset
- ComputeController::Refine() takes FarKernelBatchVector

Also, ComputeContext no longer holds farmesh.
Client can free farmesh after OsdComputeContext is created.
(but still need FarKernelBatchVector to apply subdivision kernels)
2013-03-07 17:50:15 -08:00
Takahito Tejima
ced00bf107 fix crash bug when non-quad boundary face exists. 2013-03-07 14:56:14 -08:00
Manuel Kraemer
2e43675691 - remove msvcrt fromt he no-default-lib list
- comment out SECURE_SCL and ITERATOR_DEBUGGING

fixes #134
2013-03-07 14:04:29 -08:00
manuelk
d73d74f70b "const" the vertex index pointer in HbrMesh::NewFace (request from sbrew) 2013-03-06 14:31:15 -08:00
Takahito Tejima
8db3e5ab41 fix updating coarse vertices for cpu/omp kernels.
Closes #133
2013-03-05 09:49:07 -08:00
manuelk
ea1a87441f Add support for hierarchical hole edits.
- add tag parsing for h-hole in shape_utils
- re-create Renderman's test shape from the documentation (catmark_square_hedit.h)
- fix Hbr to correctly pass the hole tag from parent to child face
- fix FarSubdivisionTables to handle disconnected face-vertices without crashing

fixes #75
2013-03-01 18:27:19 -08:00
Manuel Kraemer
20b41baff8 Merge pull request #132 from andrewkww/warning_fixes
Fix a few compiler warnings

Thank you very much
2013-02-27 09:34:49 -08:00
Andrew Wong
1c9cb04095 far: Fix compiler warnings 2013-02-25 22:36:30 -05:00
Andrew Wong
df95968142 hdr_reader: Fix a few compiler warnings 2013-02-25 22:36:28 -05:00
Andrew Wong
60d81afd02 ptexTextureLoader: Fix a few compiler warnings 2013-02-25 22:29:50 -05:00
opensubdiv
dfaf8ee76e Fixed merge error. 2013-02-22 16:25:33 -08:00
manuelk
acfd8e366b - similar API changes for Maya 2014 in mayaPtexViewer
- more file permission fixes

fixes #131
2013-02-22 12:58:09 -08:00
manuelk
c3fba1708c - fix function calls incompatible w/ Maya 2014
- change permissions on cudaUtil.cpp, OpenSubdivShader.cpp

fixes #131
2013-02-22 12:31:19 -08:00
manuelk
afc7b9b9a8 - only add detected libs to the maya dependency list
- remove MAYA_tbb_LIBRARY from MayaViewer & MayaPtexViewer examples

fixes #130
2013-02-22 11:38:46 -08:00
Manuel Kraemer
88994dd3de Update README.md 2013-02-21 11:54:20 -08:00
manuelk
76008be04d rename OpenSubdivCLA.pdf 2013-02-21 11:44:16 -08:00
manuelk
c49901a11d adding the CLA document. 2013-02-21 11:03:44 -08:00
manuelk
d21de79ac1 Merge branch 'master' of github.com:PixarAnimationStudios/OpenSubdiv 2013-02-20 14:16:57 -08:00
manuelk
25f79e7ff2 - change adaptive refinement in FarMeshFactory to not refine inside holes,
while retaining a necessary 1-ring on the inside of a hole edge

- add IsInsideHole() function to HbrHalfEdge

- add HasChild() function to HbrVertex and HbrHalfedge

- add a regression shape with adjacent holes and creases (tests dart, crease & boundaries)

Note : this does not address hierarchical edits inside holes or hole tags in hierarchical edits

fixes #78
2013-02-20 14:12:09 -08:00
David G Yu
452b30f72f OsdMesh no longer owns its ComputeController
Now a ComputeController is passed as an
argument to OsdMesh::Create(). This is
a better match to the underlying object
model and can be much more efficient for
compute controllers that have expensive
resources, e.g. compiled shader kernels.

Fixes #103
2013-02-19 17:33:32 -08:00
manuelk
a1040e80d4 - fix glViewer / simpleCPU example code to work w/ GLFW 3.0
- remove testEval from build for now (breaks linux build)

fixes #117
2013-02-19 10:14:56 -08:00
prideout
30eb9ee87e typo fix 2013-02-17 08:28:48 -08:00
Philip Rideout
29a2c6bcd0 Python API now allows setting & unsetting holes. Also fixed some clang warnings. 2013-02-17 08:24:21 -08:00