manuelk
320af0e553
Merge branch 'master' of github.com:PixarAnimationStudios/OpenSubdiv
2012-06-14 14:05:13 -07:00
manuelk
6206b2baad
- making the FindGlew/Glut modules more Windows friendly (and fix some issues like static linking of GLEW)
...
- add status messages for missing dependencies and what features are being disabled.
- cleanup osd cmakefile
Closes #13 .
2012-06-14 14:03:30 -07:00
Takahito Tejima
dd29d0d345
add vertexBuffer.h
...
Closes #11
2012-06-14 09:30:28 -07:00
Takahito Tejima
350d32494f
Revert "add vertexBuffer.h"
...
This reverts commit 86d36ace44
2012-06-14 09:29:31 -07:00
Takahito Tejima
86d36ace44
add vertexBuffer.h
2012-06-14 09:26:29 -07:00
manuelk
34e7586c41
First pass at cleaning up some of the cmake logic
...
Closes #10 .
2012-06-13 19:08:03 -07:00
manuelk
b3b857eec7
re-engineering the find_package strategy :
...
- use find_package(OpenMP) to test that the compiler supports OMP
(looks like the "express" versions of MSVC do not)
- if not available, make sure that osd does not register those
compute kernels (but does register the CPU standalone ones)
- similar refinements on other dependencies (Maya, CUDA) where
the build "opts in" depending on which libs are found.
some CMakeLists still need more cleanup...
Closes #9
2012-06-13 17:41:18 -07:00
manuelk
f293ac859c
fix the friend call to properly address "Match" as a struct and not a class
...
minor code formatting fixes
2012-06-13 17:14:39 -07:00
manuelk
228ffd4de6
fix some of the cmake conditionals so that windows can find custom
...
locations for dependencies (using the <lib>_LOCATION variables)
Closes #7
2012-06-13 14:30:28 -07:00
gelder
542cea718a
Updated license wording and added link to Microsoft Public License.
2012-06-13 13:15:42 -07:00
Manuel Kraemer
acad7e9c6d
Renaming member variables of the stopwatch to make this compile under windows.
...
Closes #6
2012-06-13 11:09:08 -07:00
Takahito Tejima
ae2e3c18d1
fix scheme display HUD for bilinear subdivision
2012-06-13 09:13:04 -07:00
Takahito Tejima
39a959654f
Merge branch 'master' of https://github.com/PixarAnimationStudios/OpenSubdiv
2012-06-13 09:08:10 -07:00
Manuel Kraemer
ac8c01879a
Enlarge token buffer from 15 to 50 chars to accommodate the
...
larger prman tag names.
Closes #5
2012-06-13 08:30:01 -07:00
Manuel Kraemer
4705b6dba1
Revert "Enlarging the token string to be 50 chars instead of 15 to accomodate"
...
This reverts commit b8cfe4b0bb
2012-06-13 08:29:07 -07:00
Manuel Kraemer
b8cfe4b0bb
Enlarging the token string to be 50 chars instead of 15 to accomodate
...
the longer prman tag keywords.
2012-06-13 08:18:25 -07:00
Takahito Tejima
13e815f600
follow Osd API changes
2012-06-12 16:37:40 -07:00
Takahito Tejima
4eaf554af1
follow Osd API changes
2012-06-12 16:36:53 -07:00
Takahito Tejima
851c00d04c
Added OsdVertexBuffer class. OsdMesh no longer has vertex buffer and vertex
...
specification (how many elements exists in the buffer).
client will create OsdVertexBuffer and provide it as an argument of
OsdMesh::Subdivide() function. It would be more flexible and hopefully matches
various use cases.
Since each dispatcher has to accept arbitrary vertex buffer, introduced a simple
shader registry into glslDispatcher. It will configure shaders for given vertex
elements on demand (for now, just works only for varying buffer).
Fixed cuda kernel's GL resource leakage. Since cuda GL interop seems one-way,
OsdCudaVertexBuffer manages vertex updating instead of just using
OsdGpuVertexBuffer.
Cleaned up some kernel codes and renamed ambiguous names.
2012-06-12 16:28:17 -07:00
Takahito Tejima
29b85a0e8c
Merge branch 'master' of https://github.com/PixarAnimationStudios/OpenSubdiv
...
Conflicts:
opensubdiv/osd/mesh.h
2012-06-12 16:04:12 -07:00
Takahito Tejima
340b89f99a
adding vertexbuffer class (incomplete)
2012-06-12 09:28:00 -07:00
Takahito Tejima
287bd6d629
fixing glew dependency
2012-06-11 18:36:42 -07:00
Takahito Tejima
6cae48665d
add bilinear computation for cuda kernel (not yet for CL, GLSL kernels)
2012-06-11 18:09:23 -07:00
Takahito Tejima
ee40f8d259
add bilinear compute to cpu kernel ( not yet for other kernels)
2012-06-11 17:52:32 -07:00
Takahito Tejima
23a3b7b15f
fix viewer. scheme was not set appropriately.
2012-06-11 17:26:02 -07:00
Manuel Kraemer
293b47a52c
bug fixes
2012-06-11 17:03:14 -07:00
Manuel Kraemer
fe5e1fd9a1
including the correct version file so namespaces work
2012-06-11 17:02:27 -07:00
Manuel Kraemer
6df116b236
fixing some glew & other dependencies
2012-06-11 16:58:53 -07:00
Manuel Kraemer
66820d3c5a
oops - forgot licensing header
2012-06-11 12:35:47 -07:00
Manuel Kraemer
f66c7e19c9
- adding mayaViewer as another code sample
...
- more work on the glutViewr example
- fixing some compiling / linking issues for osd
2012-06-11 11:53:35 -07:00
Manuel Kraemer
c2f42fa239
fixing error message for IlmBase dependency
2012-06-11 11:20:36 -07:00
Manuel Kraemer
94cf1e4d41
second checkpoint of the glutViewer : mostly code-complete now, but not functional yet
2012-06-11 07:55:21 -07:00
Manuel Kraemer
03e474f422
resolving some symbol problems : these functions don't link in the sample code with the new namespace scheme - they apparently have to be declared extern "C"
2012-06-11 07:54:26 -07:00
Manuel Kraemer
36dc03f3b0
fix memory allocation problem : vertex size is 3 floats...
2012-06-11 07:53:10 -07:00
Manuel Kraemer
b121bf69e3
adding cmake rule to install Osd public headers
2012-06-11 06:55:06 -07:00
Manuel Kraemer
284a2884bb
checkpoint for the glutViewer in the example code (not functional yet)
2012-06-10 19:59:04 -07:00
Manuel Kraemer
624baf4738
minor cosmetic changes to far regression
2012-06-09 14:23:49 -07:00
Manuel Kraemer
fb709d9fa6
adding CUDA kernels
2012-06-09 14:22:57 -07:00
Manuel Kraemer
a4a5bc253a
adding support for optional GLSL compute kernels
2012-06-09 13:40:48 -07:00
Manuel Kraemer
9988aad7f4
code formatting / quick cleanup pass
2012-06-09 11:12:34 -07:00
Manuel Kraemer
92b1930927
adding OsdVertex to the OpenSubdiv namespace
2012-06-09 09:23:28 -07:00
Manuel Kraemer
03a78f07e9
switching some size_t to int's to prevent some cross-platforms issues (Fedora in this particular case)
2012-06-08 22:20:37 -07:00
Manuel Kraemer
1b399ce81a
adding stub for example code (glutViewer & Maya viewport plugin soon to come)
2012-06-08 22:00:48 -07:00
Manuel Kraemer
b5f3b8260e
Merge branch 'master' of github.com:PixarAnimationStudios/OpenSubdiv
2012-06-08 17:07:30 -07:00
Manuel Kraemer
a055967056
first pass at osd module - no GLSL / CUDA / CL kernels yet
2012-06-08 17:06:35 -07:00
Takahito Tejima
2ccf6dfe42
added viewer instruction.
2012-06-08 16:15:08 -07:00
Manuel Kraemer
d7ef589ebb
Merge branch 'master' of github.com:PixarAnimationStudios/OpenSubdiv
2012-06-08 14:55:26 -07:00
Manuel Kraemer
52f2b55423
oops
2012-06-08 14:54:57 -07:00
Manuel Kraemer
86a7a3d9d5
Update master
2012-06-08 11:30:50 -07:00
Manuel Kraemer
e9cb9b1048
Merge branch 'master' of github.com:PixarAnimationStudios/OpenSubdiv
2012-06-08 11:19:49 -07:00
