@@ -5,31 +5,7 @@ SUBDIRS = lib bin doc plugins -EXTRA_DIST = examples/plane.gto \ - examples/cube.gto \ - python/gtoContainer/gtoContainer.py \ - python/gtoContainer/example.py \ - python/gtoContainer/gtomerge.py \ - plugins/python/setup.py \ - plugins/python/src/gtoHeader.cpp \ - plugins/python/src/gtoHeader.h \ - plugins/python/src/gtomodule.cpp \ - plugins/python/src/gtomodule.h \ - plugins/python/src/gtoReader.cpp \ - plugins/python/src/gtoReader.h \ - plugins/python/src/gtoWriter.cpp \ - plugins/python/src/gtoWriter.h \ - plugins/python/examples/example.py \ - plugins/python/examples/example2.py \ - plugins/maya/GtoInDataBase.h \ - plugins/maya/GtoInNURBS.h \ - plugins/maya/GtoInObject.h \ - plugins/maya/GtoInParticle.h \ - plugins/maya/GtoInPoly.h \ - plugins/maya/GtoInReader.h \ - plugins/maya/GtoInSet.h \ - plugins/maya/GtoInTransform.h \ - plugins/maya/GtoIO.h \ - plugins/maya/GtoOut.h \ - plugins/maya/version.h \ - plugins/maya/gtoExportOptions.mel +EXTRA_DIST = examples/ \ + plugins/python \ + plugins/gelato \ + plugins/houdini Makefile.am @@ -1,4 +1,31 @@ +* Version 3.5.1 + + o Fixed autoconf/automake: + + * Should always work if maya/rman are disabled (the default) + + * Removed checking for specific versions of maya & compiler + combinations--there's too many to check them all. + + * Tries to use the 'buildconfig' file included in the Maya distro when + building maya plugins. This should make supporting different + versions and platforms a lot easier. + + * Rman is not tested recently, but is much simpler than maya, so it + should work + + o Added gtoDB python module, as a faster replacement for gtoContainer.py + + * gtoDB is written in swig. The cpp file is in the dist, so swig itself + is only needed if the .i files are changed. + + o gtoIO and GtoDeformer build, but GtoCacheEmitter, GtoParticleDisplay, and + GtoParticleExport are missing dependencies from the Tweak source tree. + I'm leaving them in the distro in case someone wants to use them as a + starting point. Maybe someday they'll get fixed. + + * Version 3.5 o Added houndini geo converter and four new maya plugins: GtoDeformer, NEWS @@ -107,18 +107,11 @@ Or just drop us a line telling us you're using it. 3. Notes on building: - 1. Currently, the Maya plugin is known to work on Maya 4.0, 4.5, and 5.0 on - Linux. We will someday be distributing a Windows version as well. We - suspect that it could be made to work on OSX if we had the right - compiler... - - 2. Building the Maya 4.x plugins on Linux requires gcc 2.96, Maya 5.x - requires gcc 3.2 or higher. - - 3. The Python module is known to work with Python 2.2.x on Linux and OSX. - It ought to work with other versions, but it's not tested. + 1. Currently, the Maya plugins are known to work on Maya 7 - 2008 on + Linux & OSX. As far as we know, they work on Windows too, but you'll + have to figure out how to build them yourself. - 4. If you want to build the Python module, you have to do so manually for + 2. If you want to build the Python modules, you have to do so manually for now: cd plugins/python ./setup.py build @@ -126,10 +119,11 @@ Or just drop us a line telling us you're using it. ./setup.py install exit - 5. The Renderman® plugin should (theoretically) work with any + 3. The Renderman® plugin should (theoretically) work with any Renderman®-compliant renderer. So far it has been used extensively - with Entropy, and has been compiled (but not really tested) for - prman 11.1 on RedHat 7 + with Entropy, and prman 13.* on FC4. - 6. The houdini ggto geo converter may require houdini 9 or better and - the SDK + 4. The houdini ggto geo converter may require houdini 9 or better and + the SDK. The current Makefile is currently non-functional, and is + included as a hint. Hopefully we'll get it into autoconf before + too long. README @@ -1 +1,2 @@ -This is release version 3.5 + +This is release version 3.5.1 RELEASE_VERSION @@ -41,7 +41,7 @@ fi dnl ********************** Processing starts here... -AC_INIT(Gto, 3.5.0) +AC_INIT(Gto, 3.5.1) dnl AC_PREREQ(2.57) AC_CONFIG_AUX_DIR(config) @@ -57,34 +57,17 @@ if test `uname` = Darwin ; then LDFLAGS="$LDFLAGS -L/sw/lib" fi -SHARED_VERSION_INFO="3:2:0" +SHARED_VERSION_INFO="3:5:1" AC_DISABLE_SHARED() AC_PROG_LIBTOOL() -if test $MAYA_LOCATION; then :; else - MAYA_LOCATION=/usr/aw/maya -fi - -AC_SUBST(gto_maya_location,$MAYA_LOCATION) - -if test $RMANTREE; then - AC_SUBST(gto_rman_location,$RMANTREE) -else - if test $ENTROPYHOME; then - AC_SUBST(gto_rman_location,$ENTROPYHOME) - else - AC_SUBST(gto_rman_location,"/usr/local/prman") - fi -fi - - dnl ********************** ./configure options *********************** AC_ARG_WITH([maya-dir], [AC_HELP_STRING([--with-maya-dir=DIR], [Maya install location])], [gto_maya_location=$withval]) - +AC_SUBST(gto_maya_location,$gto_maya_location) AC_ARG_ENABLE([maya-plugin], [AC_HELP_STRING([--enable-maya-plugin], @@ -98,6 +81,7 @@ AC_ARG_WITH([rman-dir], [AC_HELP_STRING([--with-rman-dir=DIR], [Renderman® install location])], [gto_rman_location=$withval]) +AC_SUBST(gto_rman_location,$gto_rman_location) AC_ARG_ENABLE([rman-plugin], [AC_HELP_STRING([--enable-rman-plugin], @@ -138,6 +122,7 @@ if test "$ac_cv_cxx_have_stl" = yes; then :; else AC_MSG_ERROR(STL Support is required) fi +AC_SUBST([CYCLE_OBJ]) if test `uname` = Linux; then # Keeps maya includes from complaining about deprecated #pragmas AC_DEFINE( LINUX ) @@ -159,190 +144,36 @@ AC_MSG_CHECKING(for ios_base) dnl ********************** Maya Checks *********************** if test "$gto_build_maya" = yes; then -maya_version=0 - -AC_MSG_CHECKING(for Maya 4.x) -AC_RUN_IFELSE([AC_LANG_PROGRAM( - [ - #define _BOOL - #include "${MAYA_LOCATION}/include/maya/MTypes.h" - ],[ - if( !( MAYA_API_VERSION >= 400 && MAYA_API_VERSION < 500 ) ) return 1; - ])], -[AC_MSG_RESULT(yes) - maya_version=4], -[AC_MSG_RESULT(no) -]) # end AC_RUN_IFELSE - -AC_MSG_CHECKING(for Maya 5.x) -AC_RUN_IFELSE([AC_LANG_PROGRAM( - [ - #define _BOOL - #include "${MAYA_LOCATION}/include/maya/MTypes.h" - ],[ - if( !( MAYA_API_VERSION >= 500 && MAYA_API_VERSION < 600 ) ) return 1; - ])], -[AC_MSG_RESULT(yes) -AC_DEFINE( REQUIRE_IOSTREAM ) -maya_version=5], -[AC_MSG_RESULT(no) -]) # end AC_RUN_IFELSE - -AC_MSG_CHECKING(for Maya 6.x) -AC_RUN_IFELSE([AC_LANG_PROGRAM( - [ - #define _BOOL - #include "${MAYA_LOCATION}/include/maya/MTypes.h" - ],[ - if( !( MAYA_API_VERSION >= 600 && MAYA_API_VERSION < 700 ) ) return 1; - ])], -[AC_MSG_RESULT(yes) -AC_DEFINE( REQUIRE_IOSTREAM ) -maya_version=6], -[AC_MSG_RESULT(no) -]) # end AC_RUN_IFELSE - -AC_MSG_CHECKING(for Maya 7.x) -AC_RUN_IFELSE([AC_LANG_PROGRAM( - [ - #define _BOOL - #include "${MAYA_LOCATION}/include/maya/MTypes.h" - ],[ - if( !( MAYA_API_VERSION >= 700 && MAYA_API_VERSION < 800 ) ) return 1; - ])], -[AC_MSG_RESULT(yes) -AC_DEFINE( REQUIRE_IOSTREAM ) -maya_version=7], -[AC_MSG_RESULT(no) -]) # end AC_RUN_IFELSE - - -if test `uname` = Linux; then - -if test "$maya_version" = 4; then - AC_MSG_CHECKING([for gcc 2.96]) - AC_RUN_IFELSE([AC_LANG_PROGRAM([],[ - if( ! ( ( __GNUC__ == 2 ) - && ( __GNUC_MINOR__ == 96 ) ) ) return 1;])], - [AC_MSG_RESULT(yes)], - [AC_MSG_ERROR( -[ - -Building the Maya 4.x plugin requires gcc 2.96 - -If you are using RedHat 8.0 or 9.0, install the following RPMs, -and re-run configure with CXX=g++296. - - compat-gcc-7.3-2.96 - compat-gcc-c++-7.3-2.96 - compat-libstdc++-7.3-2.96 - compat-libstdc++-devel-7.3-2.96 -]) # end AC_MSG_ERROR -]) # end AC_RUN_IFELSE - -fi # end test $maya_version = 4... - -if test "$maya_version" = 5; then - AC_MSG_CHECKING([for gcc 3.2+]) - AC_RUN_IFELSE([AC_LANG_PROGRAM([],[ - if( ! ( ( __GNUC__ == 3 ) - && ( __GNUC_MINOR__ >= 2 ) ) ) return 1;])], - [AC_MSG_RESULT(yes)], - [AC_MSG_ERROR( -[ - -Building the Maya 5.x plugin requires gcc 3.2 or higher. - -]) # end AC_MSG_ERROR -]) # end AC_RUN_IFELSE - -fi # end test $maya_version = 5... - -if test "$maya_version" = 6; then - AC_MSG_CHECKING([for gcc 3.3.x]) - AC_RUN_IFELSE([AC_LANG_PROGRAM([],[ - if( ! ( ( __GNUC__ == 3 ) - && ( __GNUC_MINOR__ == 3 ) - && ( __GNUC_PATCHLEVEL__ >= 4 ) ) ) return 1;])], - [AC_MSG_RESULT(yes)], - [AC_MSG_ERROR( -[ - -Building the Maya 6.x plugin requires gcc 3.3.x (where x is 4 or higher). - -]) # end AC_MSG_ERROR -]) # end AC_RUN_IFELSE - -fi # end test $maya_version = 6... - -if test "$maya_version" = 7; then - AC_MSG_CHECKING([for gcc 3.3.x]) - AC_RUN_IFELSE([AC_LANG_PROGRAM([],[ - if( ! ( ( __GNUC__ == 3 ) - && ( __GNUC_MINOR__ == 3 ) - && ( __GNUC_PATCHLEVEL__ >= 4 ) ) ) return 1;])], - [AC_MSG_RESULT(yes)], - [AC_MSG_ERROR( -[ - -Building the Maya 7.x plugin requires gcc 3.3.x (where x is 4 or higher). - -]) # end AC_MSG_ERROR -]) # end AC_RUN_IFELSE - -fi # end test $maya_version = 7... - -if test $maya_version = 0; then -AC_MSG_ERROR("No valid installation of Maya was found") -fi + if test -e $gto_maya_location/include/maya/MGlobal.h ; then + AC_SUBST(DEVKIT_LOCATION,$gto_maya_location) + else + if test -e $gto_maya_location/../../devkit/include/maya/MGlobal.h ; then + AC_SUBST(DEVKIT_LOCATION,$gto_maya_location/../../devkit) + else + AC_MSG_ERROR("No valid installation of Maya was found.") + fi + fi + AC_MSG_RESULT([Using Maya Location: $gto_maya_location]) + AC_SUBST(MAYA_LOCATION,$gto_maya_location) else -AC_MSG_WARN([ - -The Maya plugin currently only builds on Linux. It has been -gotten to work on Windows, but we haven't ported all the changes -required back to the main source tree yet. If you can get this -to work on OSX or IRIX, please let us know! - -]) - -fi # end if test `uname`... -fi # end if test "x$gto_build_maya"... - -if test "$gto_build_maya" = yes; then -AC_MSG_RESULT([Using Maya Location: $gto_maya_location]) + AC_SUBST(DEVKIT_LOCATION,../config) fi - dnl ********************** Renderman Checks *********************** if test "$gto_build_rman" = yes; then -# AC_MSG_CHECKING([for gcc 2.96]) -# AC_RUN_IFELSE([AC_LANG_PROGRAM([],[ -# if( ! ( ( __GNUC__ == 2 ) -# && ( __GNUC_MINOR__ == 96 ) ) ) return 1;])], -# [AC_MSG_RESULT(yes)], -# [AC_MSG_WARN( "Building the Renderman® plugin requires using gcc 2.96 (I think!)")]) - -if test -e $gto_rman_location/include/ri.h; then :; else -AC_MSG_ERROR("No valid installation of Renderman® was found.") -fi -AC_SUBST(rman_libs,"") -if test -e $gto_rman_location/lib/librib.a; then - rman_libs="$gto_rman_location/lib/librib.a $gto_rman_location/lib/libprmutil.a $gto_rman_location/lib/libtarget.a $gto_rman_location/lib/libzip.a" +if test -e $gto_rman_location/include/ri.h; then + AC_MSG_RESULT([Using Renderman® Location: $gto_rman_location]) else - if test -e $gto_rman_location/lib/libribout.a; then - rman_libs=$gto_rman_location/lib/libribout.a - else - AC_MSG_ERROR("No valid installation of Renderman was found.") - fi + AC_MSG_ERROR("No valid installation of Renderman® was found.") fi -AC_MSG_RESULT([Using Renderman® Location: $gto_rman_location]) fi + dnl ********************** Texi checks AC_CHECK_PROG(HTMLGEN,texi2html, @@ -369,6 +200,25 @@ AC_CONFIG_FILES([Makefile lib/Makefile plugins/Makefile plugins/maya/Makefile - plugins/rman/Makefile]) + plugins/maya/GtoDeformer/Makefile + plugins/maya/gtoIO/Makefile + plugins/rman/Makefile + ]) AC_OUTPUT + +echo +echo "Configuration: " +if test "$gto_build_maya" = yes; then +echo " Maya Plugins: yes" +echo " Using Maya build config: $DEVKIT_LOCATION/plug-ins/buildconfig" +else +echo " Maya Plugins: no" +fi + +if test "$gto_build_rman" = yes; then +echo " Renderman Plugins: yes" +else +echo " Renderman Plugins: no" +fi +echo configure.in @@ -28,7 +28,8 @@ Property::Property(const std::string& n, size_t s, size_t w, bool allocate) - : name(n), interp(i), type(t), size(s), width(w), voidData(0) + : name(n), interp(i), type(t), size(s), width(w), voidData(0), + _allocated(allocate) { if (allocate) { @@ -48,7 +49,8 @@ Property::Property(const std::string& n, size_t s, size_t w, bool allocate) - : name(n), interp(""), type(t), size(s), width(w), voidData(0) + : name(n), interp(""), type(t), size(s), width(w), voidData(0), + _allocated(allocate) { if (allocate) { @@ -65,13 +67,16 @@ Property::Property(const std::string& n, Property::~Property() { - if (type == Gto::String) + if (_allocated) { - delete [] stringData; - } - else - { - delete [] (char*)voidData; + if (type == Gto::String) + { + delete [] stringData; + } + else + { + delete [] (char*)voidData; + } } } @@ -172,10 +177,10 @@ RawDataBaseReader::property(const string& name, const string& interp, const PropertyInfo& info) { - //Object *o = reinterpret_cast<Object*>(info.component->object->objectData); Component *c = reinterpret_cast<Component*>(info.component->componentData); Property *p = new Property(name, interp, - (DataType)info.type, info.size, info.width); + (DataType)info.type, info.size, info.width, + false); c->properties.push_back(p); return Request(true, p); } @@ -183,17 +188,16 @@ RawDataBaseReader::property(const string& name, void* RawDataBaseReader::data(const PropertyInfo& info, size_t bytes) { - //Object *o = reinterpret_cast<Object*>(info.component->object->objectData); - //Component *c = reinterpret_cast<Component*>(info.component->componentData); Property *p = reinterpret_cast<Property*>(info.propertyData); - if( bytes == 0 ) + if (bytes == 0) { p->voidData = NULL; } else { p->voidData = new char[bytes]; + p->_allocated = true; } return p->voidData; } @@ -201,8 +205,6 @@ RawDataBaseReader::data(const PropertyInfo& info, size_t bytes) void RawDataBaseReader::dataRead(const PropertyInfo& info) { - //Object *o = reinterpret_cast<Object*>(info.component->object->objectData); - //Component *c = reinterpret_cast<Component*>(info.component->componentData); Property *p = reinterpret_cast<Property*>(info.propertyData); p->size = info.size; @@ -212,6 +214,7 @@ RawDataBaseReader::dataRead(const PropertyInfo& info) int* ints = p->int32Data; size_t numItems = p->size * p->width; p->stringData = new string[numItems]; + p->_allocated = true; for (size_t i=0; i < numItems; i++) { lib/Gto/RawData.cpp @@ -58,6 +58,7 @@ struct Property Gto::DataType type; size_t size; size_t width; + bool _allocated; union { lib/Gto/RawData.h @@ -3,5 +3,13 @@ #******************************************************************************* ## Process this file with automake to produce Makefile.in -SUBDIRS = maya rman +SUBDIRS = + +if GTO_BUILD_MAYA +SUBDIRS += maya +endif + +if GTO_BUILD_RMAN +SUBDIRS += rman +endif plugins/Makefile.am @@ -3,15 +3,16 @@ #******************************************************************************* ## Process this file with automake to produce Makefile.in -AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(gto_maya_location)/include +include $(DEVKIT_LOCATION)/plug-ins/buildconfig -AM_CXXFLAGS = -fno-exceptions -D_BOOL -D__USER__=\"$$USER\" +AM_CPPFLAGS = -I$(top_srcdir)/lib \ + $(CFLAGS) + +AM_CXXFLAGS = -fno-exceptions -D__USER__=\"$$USER\" plugindir = $(gto_maya_location)/bin/plug-ins meldir = $(gto_maya_location)/scripts/others -if GTO_BUILD_MAYA - dist_mel_SCRIPTS = gtoCacheEmitter.mel plugin_PROGRAMS = GtoCacheEmitter.so @@ -20,8 +21,8 @@ GtoCacheEmitter_so_SOURCES = GtoCacheEmitter.cpp noinst_HEADERS = GtoCacheEmitter.h -GtoCacheEmitter_so_LDFLAGS = -shared \ - -L$(top_builddir)/lib/Gto \ +GtoCacheEmitter_so_LDFLAGS = $(LFLAGS) \ + -L$(top_srcdir)/lib/Gto \ -L$(gto_maya_location)/lib \ -lGto \ -lImage \ @@ -29,4 +30,3 @@ GtoCacheEmitter_so_LDFLAGS = -shared \ -lOpenMayaAnim \ -lOpenMayaRender -endif plugins/maya/GtoCacheEmitter/Makefile.am @@ -3,18 +3,19 @@ #******************************************************************************* ## Process this file with automake to produce Makefile.in -AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(gto_maya_location)/include +include $(DEVKIT_LOCATION)/plug-ins/buildconfig -AM_CXXFLAGS = -fno-exceptions -D_BOOL -D__USER__=\"$$USER\" +AM_CPPFLAGS = -I$(top_srcdir)/lib \ + $(CFLAGS) + +AM_CXXFLAGS = -fno-exceptions -D__USER__=\"$$USER\" plugindir = $(gto_maya_location)/bin/plug-ins meldir = $(gto_maya_location)/scripts/others -if GTO_BUILD_MAYA - dist_mel_SCRIPTS = AEGtoDefomerCommon.mel \ - AEGtoDefomerTemplate.mel \ - applyGtoDeformer.mel + AEGtoDefomerTemplate.mel \ + applyGtoDeformer.mel plugin_PROGRAMS = GtoDeformer.so @@ -24,13 +25,45 @@ GtoDeformer_so_SOURCES = GtoDeformer.cpp \ noinst_HEADERS = GtoDeformer.h GtoPointReader.h -GtoDeformer_so_LDFLAGS = -shared \ - -L$(top_builddir)/lib/Gto \ +GtoDeformer_so_LDFLAGS = $(LFLAGS) \ + -L$(top_srcdir)/lib/Gto \ -L$(gto_maya_location)/lib \ -lGto \ - -lImage \ -lOpenMaya \ - -lOpenMayaAnim \ - -lOpenMayaRender + -lOpenMayaAnim + + +plugin_DATA = $(DEVKIT_LOCATION)/plug-ins/buildconfig + +####################################################################### -endif +# include $(DEVKIT_LOCATION)/plug-ins/buildconfig +# +# AM_CPPFLAGS = -I$(top_srcdir)/lib \ +# $(CFLAGS) +# +# AM_CXXFLAGS = -fno-exceptions -D__USER__=\"$$USER\" +# +# plugindir = $(gto_maya_location)/bin/plug-ins +# meldir = $(gto_maya_location)/scripts/others +# +# dist_mel_SCRIPTS = AEGtoDefomerCommon.mel \ +# AEGtoDefomerTemplate.mel \ +# applyGtoDeformer.mel +# +# plugin_PROGRAMS = GtoDeformer.so +# +# GtoDeformer_so_SOURCES = GtoDeformer.cpp \ +# GtoPointReader.cpp \ +# pluginMain.cpp +# +# noinst_HEADERS = GtoDeformer.h GtoPointReader.h +# +# GtoDeformer_so_LDFLAGS = $(LFLAGS) \ +# -L$(top_srcdir)/lib/Gto \ +# -L$(gto_maya_location)/lib \ +# -lGto \ +# -lImage \ +# -lOpenMaya \ +# -lOpenMayaAnim \ +# -lOpenMayaRender plugins/maya/GtoDeformer/Makefile.am @@ -3,15 +3,16 @@ #******************************************************************************* ## Process this file with automake to produce Makefile.in -AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(gto_maya_location)/include +include $(DEVKIT_LOCATION)/plug-ins/buildconfig -AM_CXXFLAGS = -fno-exceptions -D_BOOL -D__USER__=\"$$USER\" +AM_CPPFLAGS = -I$(top_srcdir)/lib \ + $(CFLAGS) + +AM_CXXFLAGS = -fno-exceptions -D__USER__=\"$$USER\" plugindir = $(gto_maya_location)/bin/plug-ins meldir = $(gto_maya_location)/scripts/others -if GTO_BUILD_MAYA - dist_mel_SCRIPTS = AEGtoParticleDisplayCommon.mel \ AEGtoParticleDisplayTemplate.mel AEGtoParticleDisplayInclude.mel \ doGtoParticleDisplay.mel @@ -22,13 +23,11 @@ GtoParticleDisplay_so_SOURCES = GtoParticleDisplay.cpp pluginMain.cpp noinst_HEADERS = GtoParticleDisplay.h -GtoParticleDisplay_so_LDFLAGS = -shared \ - -L$(top_builddir)/lib/Gto \ +GtoParticleDisplay_so_LDFLAGS = $(LFLAGS) \ + -L$(top_srcdir)/lib/Gto \ -L$(gto_maya_location)/lib \ -lGto \ -lImage \ -lOpenMaya \ -lOpenMayaAnim \ -lOpenMayaRender - -endif plugins/maya/GtoParticleDisplay/Makefile.am @@ -3,15 +3,16 @@ #******************************************************************************* ## Process this file with automake to produce Makefile.in -AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(gto_maya_location)/include +include $(DEVKIT_LOCATION)/plug-ins/buildconfig -AM_CXXFLAGS = -fno-exceptions -D_BOOL -D__USER__=\"$$USER\" +AM_CPPFLAGS = -I$(top_srcdir)/lib \ + $(CFLAGS) + +AM_CXXFLAGS = -fno-exceptions -D__USER__=\"$$USER\" plugindir = $(gto_maya_location)/bin/plug-ins meldir = $(gto_maya_location)/scripts/others -if GTO_BUILD_MAYA - dist_mel_SCRIPTS = GtoParticleExportUI.mel plugin_PROGRAMS = GtoParticleExport.so @@ -21,13 +22,11 @@ ParticleBucket.cpp noinst_HEADERS = GtoParticleExport.h ParticleAttribute.h ParticleBucket.h -GtoParticleExport_so_LDFLAGS = -shared \ - -L$(top_builddir)/lib/Gto \ +GtoParticleExport_so_LDFLAGS = $(LFLAGS) \ + -L$(top_srcdir)/lib/Gto \ -L$(gto_maya_location)/lib \ -lGto \ -lImage \ -lOpenMaya \ -lOpenMayaAnim \ -lOpenMayaRender - -endif plugins/maya/GtoParticleExport/Makefile.am @@ -3,6 +3,9 @@ #******************************************************************************* ## Process this file with automake to produce Makefile.in -SUBDIRS = GtoDeformer GtoCacheEmitter GtoParticleDisplay GtoParticleExport \ - gtoIO +SUBDIRS = GtoDeformer \ + gtoIO +# GtoParticleExport +# GtoParticleDisplay +# GtoCacheEmitter plugins/maya/Makefile.am @@ -350,4 +350,12 @@ bool GtoMayaAttribute::canExport( MPlug &plug, int depth ) } +// ***************************************************************************** +bool GtoMayaAttribute::sortByComponent(const GtoMayaAttribute* s1, + const GtoMayaAttribute* s2 ) +{ + if( ! ( s1 && s2 ) ) return false; + return (s1->componentName() < s2->componentName()); +} + } // End namespace GtoIOPlugin plugins/maya/gtoIO/GtoMayaAttribute.cpp @@ -33,6 +33,9 @@ public: static bool canExport( MPlug &plug, int depth=0 ); + static bool sortByComponent(const GtoMayaAttribute* s1, + const GtoMayaAttribute* s2 ); + private: MObjectHandle m_nodeObj; MObjectHandle m_attrObj; @@ -49,15 +52,6 @@ private: typedef std::vector<GtoMayaAttribute *> GtoMayaAttributes; typedef std::vector<const GtoMayaAttribute *> ConstGtoMayaAttributes; -static struct -{ - bool operator()( GtoMayaAttribute* s1, GtoMayaAttribute* s2 ) const - { - if( ! ( s1 && s2 ) ) return false; - return (s1->componentName() < s2->componentName()); - } -} sortByComponent; - } // End namespace GtoIOPlugin plugins/maya/gtoIO/GtoMayaAttribute.h @@ -512,7 +512,8 @@ void GtoExporter::output( MDagPath &dp, bool data, int recursionLevel ) findTransformAttributes( dp, attrs ); } - std::sort( attrs->begin(), attrs->end(), sortByComponent ); + std::sort( attrs->begin(), attrs->end(), + GtoMayaAttribute::sortByComponent ); } plugins/maya/gtoIO/GtoOut.cpp @@ -3,15 +3,16 @@ #******************************************************************************* ## Process this file with automake to produce Makefile.in -AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(gto_maya_location)/include +include $(DEVKIT_LOCATION)/plug-ins/buildconfig -AM_CXXFLAGS = -fno-exceptions -D_BOOL -D__USER__=\"$$USER\" +AM_CPPFLAGS = -I$(top_srcdir)/lib \ + $(CFLAGS) + +AM_CXXFLAGS = -fno-exceptions -D__USER__=\"$$USER\" plugindir = $(gto_maya_location)/bin/plug-ins meldir = $(gto_maya_location)/scripts/others -if GTO_BUILD_MAYA - dist_mel_SCRIPTS = gtoExportOptions.mel plugin_PROGRAMS = GtoIO.so @@ -24,6 +25,7 @@ GtoIO_so_SOURCES = GtoInDataBase.cpp \ GtoInReader.cpp \ GtoInSet.cpp \ GtoInTransform.cpp \ + GtoInCamera.cpp \ GtoIO.cpp \ GtoOut.cpp \ version.cpp \ @@ -39,6 +41,7 @@ noinst_HEADERS = GtoInDataBase.h \ GtoInReader.h \ GtoInSet.h \ GtoInTransform.h \ + GtoInCamera.h \ GtoIO.h \ GtoOut.h \ version.h \ @@ -46,7 +49,7 @@ noinst_HEADERS = GtoInDataBase.h \ GtoAnimCurve.h \ TwkMaya.h -GtoIO_so_LDFLAGS = -shared \ +GtoIO_so_LDFLAGS = $(LFLAGS) \ -L$(top_srcdir)/lib/Gto \ -L$(gto_maya_location)/lib \ -lGto \ @@ -55,4 +58,4 @@ GtoIO_so_LDFLAGS = -shared \ -lOpenMayaAnim \ -lOpenMayaRender -endif +plugin_DATA = $(DEVKIT_LOCATION)/plug-ins/buildconfig plugins/maya/gtoIO/Makefile.am @@ -23,24 +23,7 @@ #include <maya/MTypes.h> // Check for correct compiler version -#ifndef WIN32 - #if MAYA_API_VERSION < 500 - #if ! ( ( __GNUC__ == 2 ) \ - && ( __GNUC_MINOR__ == 96 ) \ - && ( __GNUC_PATCHLEVEL__ == 0 ) ) - #error ------------------------------------------ - #error This plugin must be compiled with gcc 2.96 - #error ------------------------------------------ - #endif - #else - #if ! ( ( __GNUC__ == 3 ) \ - && ( __GNUC_MINOR__ >= 2 ) ) - #error ------------------------------------------ - #error This plugin must be compiled with gcc 3.2+ - #error ------------------------------------------ - #endif - #endif -#else +#ifdef WIN32 // Work around stupid microsoft bugs #pragma warning (disable : 4786) #define for if(0);else for plugins/maya/gtoIO/version.h @@ -1,16 +1,7 @@ -#!/usr/bin/env python2 -#******************************************************************************* -# Copyright (c) 2001-2003 Tweak Inc. All rights reserved. -#******************************************************************************* +#!/usr/bin/env python import sys -# -# You can get this module from: http://cgkit.sourceforge.net/ -# If you can't get it, just change all the vec3(x,x,x) to (x,x,x) in this file -# -from cgtypes import * - import gto print gto.__doc__ @@ -59,9 +50,9 @@ writer.endObject() # tuple(mat4(1)) It will be silently transposed (a bug in the # cgtypes code?). ADDING it to a tuple or list is fine: (mat4(1),) # -adata = ( (1.0, 2.8), (3.6, 4.4), (5.2, 6), 7, vec3( 8, 9, 10 ) ) +adata = ( (1.0, 2.8), (3.6, 4.4), (5.2, 6), 7, ( 8, 9, 10 ) ) bdata = [ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ] -cdata = ( mat4(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16), ) +cdata = ( (1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16), ) # All strings MUST be registered before beginData() is called. intern() # can accept individual strings, tuples, or lists. Dupes are OK. Try it. @@ -86,7 +77,7 @@ writer.propertyData( strings ) writer.propertyData( adata ) writer.propertyData( adata ) writer.propertyData( bdata ) -writer.propertyData( ( vec3( 1, 2, 3 ), vec3( 4, 5, 6 ) ) ) +writer.propertyData( ( ( 1, 2, 3 ), ( 4, 5, 6 ) ) ) writer.endData() # Close the file. Since Python uses garbage collection, you can never be plugins/python/examples/example.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python import sys import gc plugins/python/examples/example2.py @@ -2,22 +2,35 @@ from distutils.core import setup, Extension +gtoDB_module = Extension('_gtoDB', + sources=['src/gtoDB/gtoDB.cpp'], + include_dirs=["../../lib/Gto"], + library_dirs=["../../lib/Gto/.libs"], + libraries=["Gto", "z"], + extra_compile_args=["-Wno-unused-variable"], + ) + +gto_module = Extension( "gto", + [ "src/gto/gtoHeader.cpp", + "src/gto/gtomodule.cpp", + "src/gto/gtoReader.cpp", + "src/gto/gtoWriter.cpp" ], + include_dirs=["../../lib"], + library_dirs=["../../lib/Gto/.libs"], + libraries=["Gto", "z"], + extra_compile_args=["-Wno-unused-variable"], + ) + setup( name="gto", - version="3.00", + version="3.51", description="Gto I/O module", author="Tweak Films", - author_email="gto@tweakfilms.com", - url="http://www.tweakfilms.com/", - ext_modules = [ Extension( "gto", - [ "src/gtoHeader.cpp", - "src/gtomodule.cpp", - "src/gtoReader.cpp", - "src/gtoWriter.cpp" ], - include_dirs=["../../lib"], - library_dirs=["../../lib/Gto/.libs"], - libraries=["Gto", "z"], - extra_compile_args=["-Wno-unused-variable"], - ) + author_email="gto@tweaksoftware.com", + url="http://sourceforge.net/projects/gto/", + package_dir = {'': 'src/gtoDB'}, + py_modules = [ "gtoDB" ], + ext_modules = [ gto_module, + gtoDB_module, ], data_files = [( 'examples', [ "examples/example.py", "examples/example2.py" ]) plugins/python/setup.py c098a52dbba91d1e5f0b93b648daf868b4d47181 Michael Root mike@pubert.local http://github.com/jimhourihan/gto/commit/cf7160fd3bc5a38819a3fe4c5d6661b692dcba87 cf7160fd3bc5a38819a3fe4c5d6661b692dcba87 2008-09-28T11:16:20-07:00 2008-09-28T11:16:20-07:00 More 3.5.1 changes, see NEWS for details cbb220514b5aaed31b0b2c2752dc65e309a80f0f Michael Root mike@pubert.local