AuroraMiddleware/OpenSubdiv
1
0
Fork 0
mirror of https://github.com/PixarAnimationStudios/OpenSubdiv synced 2025-01-08 07:40:17 +00:00
Code Issues Releases Wiki Activity

Fix Linux build for osdPolySmooth Maya plugin

Browse Source 
- remove unused variables
- isolate MSVC specific pragmas (these should eventually be cleaned up from the code...)
- add the plugin to the general build
This commit is contained in:
manuelk 2013-11-13 15:27:43 -08:00
parent 88bf3c618b
commit dc540e37cc
3 changed files with 92 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
examples/CMakeLists.txt
View File

@ -64,15 +64,22 @@ else()
endif() endif()
if(DXSDK_FOUND) if(DXSDK_FOUND)
add_subdirectory(dxViewer) add_subdirectory(dxViewer)
if(PTEX_FOUND) if(PTEX_FOUND)
add_subdirectory(dxPtexViewer) add_subdirectory(dxPtexViewer)
endif() endif()
endif() endif()
# XXXX manuelk : turning off the maya plugin examples for now
if(MAYA_FOUND AND (NOT APPLE)) if(MAYA_FOUND)
add_subdirectory(osdPolySmooth)
# manuelk: the following plugins are disabled until further notice
#add_subdirectory(mayaViewer) #add_subdirectory(mayaViewer)
if(PTEX_FOUND) if(PTEX_FOUND)
#add_subdirectory(mayaPtexViewer) #add_subdirectory(mayaPtexViewer)
endif() endif()

2
examples/osdPolySmooth/CMakeLists.txt
View File

@ -22,6 +22,8 @@
# language governing permissions and limitations under the Apache License. # language governing permissions and limitations under the Apache License.
# #
# *** osdPolySmooth ***
set(MAYA_FIND_QUIETLY TRUE) set(MAYA_FIND_QUIETLY TRUE)
if(NOT MAYA_FOUND) if(NOT MAYA_FOUND)

12
examples/osdPolySmooth/osdPolySmooth.cpp
View File

@ -66,8 +66,9 @@
// XXX -- Need to uncomment this unless Cmake adds this automatically // XXX -- Need to uncomment this unless Cmake adds this automatically
#include <iso646.h> // needed for "and" and "or" logic in OpenSubdiv #include <iso646.h> // needed for "and" and "or" logic in OpenSubdiv
// XXX- Revisit #if defined(_MSV_VER) and (not defined(__INTEL_COMPILER))
#pragma warning( disable : 174 593 ) #pragma warning( disable : 174 593 )
#endif
// OpenSubdiv includes // OpenSubdiv includes
#include <version.h> // XXX -- Verify the code will work without this include #include <version.h> // XXX -- Verify the code will work without this include
@ -320,7 +321,6 @@ createOsdHbrFromPoly( const MFnMesh &inMeshFn,
MStatus returnStatus; MStatus returnStatus;
// == Mesh Properties // == Mesh Properties
int numFaces = inMeshFn.numPolygons();
// ===================================== // =====================================
// Init HBR // Init HBR
@ -495,8 +495,12 @@ createOsdHbrFromPoly( const MFnMesh &inMeshFn,
} }
// Apply Creases // Apply Creases
float maxEdgeCreaseValue = applyCreaseEdges<OpenSubdiv::OsdVertex>( inMeshFn, hbrMesh ); // Subset of applyTags<T>( hbrMesh, sh ) for "crease"
float maxVertCreaseValue = applyCreaseVertices<OpenSubdiv::OsdVertex>( inMeshFn, hbrMesh ); // Subset of applyTags<T>( hbrMesh, sh ) for "corner" // Subset of applyTags<T>( hbrMesh, sh ) for "crease"
applyCreaseEdges<OpenSubdiv::OsdVertex>( inMeshFn, hbrMesh );
// Subset of applyTags<T>( hbrMesh, sh ) for "corner"
applyCreaseVertices<OpenSubdiv::OsdVertex>( inMeshFn, hbrMesh );
// Return the resulting HBR Mesh // Return the resulting HBR Mesh
// Note that boundaryMethods and hbrMesh->Finish() still need to be called // Note that boundaryMethods and hbrMesh->Finish() still need to be called