Commit Graph

473 Commits

Author SHA1 Message Date
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
Philip Rideout
1402f670f1 Merge pull request #124 from nyue/master
Fix referencing of python directory for source of custom command
2013-02-16 17:17:34 -08:00
Manuel Kraemer
076801c1b0 Merge pull request #123 from jcowles/master
Update simpleCpu to use GLFW

looking good - i'll try to run it through its paces next week.

thanks :)
2013-02-16 16:51:27 -08:00
Nicholas Yue
231476b48c Fix directory path to working directory of python in custom command, use ${CMAKE_SOURCE_DIR} instead of .. for consistency 2013-02-17 11:28:05 +11:00
Jeremy Cowles
1befe72c9f glViewer: exit when the window is closed 2013-02-16 13:26:46 -08:00
Jeremy Cowles
3f96f9872a Removed last remnants of glut from simpleCpu comments 2013-02-16 13:15:29 -08:00
jcowles
eb1652bc26 Fixed core profile setup in simpleCpu for linux 2013-02-16 13:10:00 -08:00
Jeremy Cowles
70502cceab Disabled string drawing from simpleCpu 2013-02-16 12:19:04 -08:00
Jeremy Cowles
cd8405a47a Added stdio.h for printf in simpleCpu/main.cpp 2013-02-16 12:05:15 -08:00
Jeremy Cowles
e9b29cda95 Updated simpleCpu to use GLFW for all platforms 2013-02-16 12:03:21 -08:00
Jeremy Cowles
5a7e33a792 Renamed mainGlut.cpp to mainGlfw.cpp in simpleCpu 2013-02-16 11:28:25 -08:00
Dirk Van Gelder
f7181d2f9d Get evalTest and simpleCpu to build again, changing glut references to glfw. 2013-02-15 18:32:10 -08:00
Manuel Kraemer
6f87feca2b typo : there is no space between /wd and the warning #
fixes #120
2013-02-14 09:44:11 -08:00
manuelk
a52c70ab8b First pass implementation of holes :
- make sure HBR passes down the hole tag to children when subdividing faces
- minor API modification : allow to unset the hole flag on a face
- modify uniform / adaptive FarMeshFactory to be aware of the flag
- make the FarSubdivisionTableFactory assert when finding unconnected HBR vertices (as it should)

* Uniform subdivision :
    The refinement scheme only creates faces & vertices necessary
    to maintain the one-ring around the edges of a hole, so this solution
    is quite efficient.

* Adaptive subdivision :
    At the moment we are still performing full topological analysis on holes and
    only skipping patches associated to holes. This is sub-optimal in 2 ways :
        1. the topological analysis can potentially be cranking on a lot of unnecessary
           geometry
        2. even though we may not be drawing the patches, the compute stage is still
           applying kernels on all the control vertices of these patches.
    We will have to revisit feature adaptive subdivision & holes, so keep the issue active.

fixes #78
2013-02-13 14:34:33 -08:00
Manuel Kraemer
20946b8923 Merge pull request #120 from andrewkww/vs2012_warnings_vc_headers
cmake: ignore MSVC C4350 and C4548 warnings
2013-02-12 17:27:02 -08:00