mingzailao
/
mitsuba
mirror of https://github.com/Quartenia/mitsuba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

switch to COLLADA-DOM 2.4 on OSX

metadata
Wenzel Jakob 2013-11-08 00:54:03 +01:00
parent 38ef6259a4
commit 3b8760bc71
12 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/config-macos10.6-gcc-universal.py
View File

@ -23,6 +23,6 @@ PYTHON27INCLUDE= ['/System/Library/Frameworks/Python.framework/Versions/2.7/Head
PYTHON27LIBDIR = ['/System/Library/Frameworks/Python.framework/Versions/2.7/lib'] PYTHON27LIBDIR = ['/System/Library/Frameworks/Python.framework/Versions/2.7/lib']
PYTHON27LIB = ['boost_python27', 'boost_system', 'python2.7'] PYTHON27LIB = ['boost_python27', 'boost_system', 'python2.7']
COLLADAINCLUDE = ['#dependencies/include/collada-dom', '#dependencies/include/collada-dom/1.4'] COLLADAINCLUDE = ['#dependencies/include/collada-dom', '#dependencies/include/collada-dom/1.4']
COLLADALIB = ['collada14dom23'] COLLADALIB = ['collada14dom24']
QTDIR = '#dependencies' QTDIR = '#dependencies'
FFTWLIB = ['fftw3.3'] FFTWLIB = ['fftw3.3']

2
build/config-macos10.6-gcc-x86.py
View File

@ -23,6 +23,6 @@ PYTHON27INCLUDE= ['/System/Library/Frameworks/Python.framework/Versions/2.7/Head
PYTHON27LIBDIR = ['/System/Library/Frameworks/Python.framework/Versions/2.7/lib'] PYTHON27LIBDIR = ['/System/Library/Frameworks/Python.framework/Versions/2.7/lib']
PYTHON27LIB = ['boost_python27', 'boost_system', 'python2.7'] PYTHON27LIB = ['boost_python27', 'boost_system', 'python2.7']
COLLADAINCLUDE = ['#dependencies/include/collada-dom', '#dependencies/include/collada-dom/1.4'] COLLADAINCLUDE = ['#dependencies/include/collada-dom', '#dependencies/include/collada-dom/1.4']
COLLADALIB = ['collada14dom23'] COLLADALIB = ['collada14dom24']
QTDIR = '#dependencies' QTDIR = '#dependencies'
FFTWLIB = ['fftw3.3'] FFTWLIB = ['fftw3.3']

2
build/config-macos10.6-gcc-x86_64.py
View File

@ -23,6 +23,6 @@ PYTHON27INCLUDE= ['/System/Library/Frameworks/Python.framework/Versions/2.7/Head
PYTHON27LIBDIR = ['/System/Library/Frameworks/Python.framework/Versions/2.7/lib'] PYTHON27LIBDIR = ['/System/Library/Frameworks/Python.framework/Versions/2.7/lib']
PYTHON27LIB = ['boost_python27', 'boost_system', 'python2.7'] PYTHON27LIB = ['boost_python27', 'boost_system', 'python2.7']
COLLADAINCLUDE = ['#dependencies/include/collada-dom', '#dependencies/include/collada-dom/1.4'] COLLADAINCLUDE = ['#dependencies/include/collada-dom', '#dependencies/include/collada-dom/1.4']
COLLADALIB = ['collada14dom23'] COLLADALIB = ['collada14dom24']
QTDIR = '#dependencies' QTDIR = '#dependencies'
FFTWLIB = ['fftw3.3'] FFTWLIB = ['fftw3.3']

2
build/config-macos10.6-icl-x86.py
View File

@ -24,6 +24,6 @@ PYTHON27INCLUDE= ['/System/Library/Frameworks/Python.framework/Versions/2.7/Head
PYTHON27LIBDIR = ['/System/Library/Frameworks/Python.framework/Versions/2.7/lib'] PYTHON27LIBDIR = ['/System/Library/Frameworks/Python.framework/Versions/2.7/lib']
PYTHON27LIB = ['boost_python27', 'boost_system', 'python2.7'] PYTHON27LIB = ['boost_python27', 'boost_system', 'python2.7']
COLLADAINCLUDE = ['#dependencies/include/collada-dom', '#dependencies/include/collada-dom/1.4'] COLLADAINCLUDE = ['#dependencies/include/collada-dom', '#dependencies/include/collada-dom/1.4']
COLLADALIB = ['collada14dom23'] COLLADALIB = ['collada14dom24']
QTDIR = '#dependencies' QTDIR = '#dependencies'
FFTWLIB = ['fftw3.3'] FFTWLIB = ['fftw3.3']

2
build/config-macos10.6-icl-x86_64.py
View File

@ -24,6 +24,6 @@ PYTHON27INCLUDE= ['/System/Library/Frameworks/Python.framework/Versions/2.7/Head
PYTHON27LIBDIR = ['/System/Library/Frameworks/Python.framework/Versions/2.7/lib'] PYTHON27LIBDIR = ['/System/Library/Frameworks/Python.framework/Versions/2.7/lib']
PYTHON27LIB = ['boost_python27', 'boost_system', 'python2.7'] PYTHON27LIB = ['boost_python27', 'boost_system', 'python2.7']
COLLADAINCLUDE = ['#dependencies/include/collada-dom', '#dependencies/include/collada-dom/1.4'] COLLADAINCLUDE = ['#dependencies/include/collada-dom', '#dependencies/include/collada-dom/1.4']
COLLADALIB = ['collada14dom23'] COLLADALIB = ['collada14dom24']
QTDIR = '#dependencies' QTDIR = '#dependencies'
FFTWLIB = ['fftw3.3'] FFTWLIB = ['fftw3.3']

2
build/config-macos10.7-gcc-universal.py
View File

@ -23,6 +23,6 @@ PYTHON27INCLUDE= ['/System/Library/Frameworks/Python.framework/Versions/2.7/Head
PYTHON27LIBDIR = ['/System/Library/Frameworks/Python.framework/Versions/2.7/lib'] PYTHON27LIBDIR = ['/System/Library/Frameworks/Python.framework/Versions/2.7/lib']
PYTHON27LIB = ['boost_python27', 'boost_system', 'python2.7'] PYTHON27LIB = ['boost_python27', 'boost_system', 'python2.7']
COLLADAINCLUDE = ['#dependencies/include/collada-dom', '#dependencies/include/collada-dom/1.4'] COLLADAINCLUDE = ['#dependencies/include/collada-dom', '#dependencies/include/collada-dom/1.4']
COLLADALIB = ['collada14dom23'] COLLADALIB = ['collada14dom24']
QTDIR = '#dependencies' QTDIR = '#dependencies'
FFTWLIB = ['fftw3.3'] FFTWLIB = ['fftw3.3']

2
build/config-macos10.7-gcc-x86.py
View File

@ -23,6 +23,6 @@ PYTHON27INCLUDE= ['/System/Library/Frameworks/Python.framework/Versions/2.7/Head
PYTHON27LIBDIR = ['/System/Library/Frameworks/Python.framework/Versions/2.7/lib'] PYTHON27LIBDIR = ['/System/Library/Frameworks/Python.framework/Versions/2.7/lib']
PYTHON27LIB = ['boost_python27', 'boost_system', 'python2.7'] PYTHON27LIB = ['boost_python27', 'boost_system', 'python2.7']
COLLADAINCLUDE = ['#dependencies/include/collada-dom', '#dependencies/include/collada-dom/1.4'] COLLADAINCLUDE = ['#dependencies/include/collada-dom', '#dependencies/include/collada-dom/1.4']
COLLADALIB = ['collada14dom23'] COLLADALIB = ['collada14dom24']
QTDIR = '#dependencies' QTDIR = '#dependencies'
FFTWLIB = ['fftw3.3'] FFTWLIB = ['fftw3.3']

2
build/config-macos10.7-gcc-x86_64.py
View File

@ -23,6 +23,6 @@ PYTHON27INCLUDE= ['/System/Library/Frameworks/Python.framework/Versions/2.7/Head
PYTHON27LIBDIR = ['/System/Library/Frameworks/Python.framework/Versions/2.7/lib'] PYTHON27LIBDIR = ['/System/Library/Frameworks/Python.framework/Versions/2.7/lib']
PYTHON27LIB = ['boost_python27', 'boost_system', 'python2.7'] PYTHON27LIB = ['boost_python27', 'boost_system', 'python2.7']
COLLADAINCLUDE = ['#dependencies/include/collada-dom', '#dependencies/include/collada-dom/1.4'] COLLADAINCLUDE = ['#dependencies/include/collada-dom', '#dependencies/include/collada-dom/1.4']
COLLADALIB = ['collada14dom23'] COLLADALIB = ['collada14dom24']
QTDIR = '#dependencies' QTDIR = '#dependencies'
FFTWLIB = ['fftw3.3'] FFTWLIB = ['fftw3.3']

2
build/config-macos10.7-icl-x86.py
View File

@ -24,6 +24,6 @@ PYTHON27INCLUDE= ['/System/Library/Frameworks/Python.framework/Versions/2.7/Head
PYTHON27LIBDIR = ['/System/Library/Frameworks/Python.framework/Versions/2.7/lib'] PYTHON27LIBDIR = ['/System/Library/Frameworks/Python.framework/Versions/2.7/lib']
PYTHON27LIB = ['boost_python27', 'boost_system', 'python2.7'] PYTHON27LIB = ['boost_python27', 'boost_system', 'python2.7']
COLLADAINCLUDE = ['#dependencies/include/collada-dom', '#dependencies/include/collada-dom/1.4'] COLLADAINCLUDE = ['#dependencies/include/collada-dom', '#dependencies/include/collada-dom/1.4']
COLLADALIB = ['collada14dom23'] COLLADALIB = ['collada14dom24']
QTDIR = '#dependencies' QTDIR = '#dependencies'
FFTWLIB = ['fftw3.3'] FFTWLIB = ['fftw3.3']

2
build/config-macos10.7-icl-x86_64.py
View File

@ -24,6 +24,6 @@ PYTHON27INCLUDE= ['/System/Library/Frameworks/Python.framework/Versions/2.7/Head
PYTHON27LIBDIR = ['/System/Library/Frameworks/Python.framework/Versions/2.7/lib'] PYTHON27LIBDIR = ['/System/Library/Frameworks/Python.framework/Versions/2.7/lib']
PYTHON27LIB = ['boost_python27', 'boost_system', 'python2.7'] PYTHON27LIB = ['boost_python27', 'boost_system', 'python2.7']
COLLADAINCLUDE = ['#dependencies/include/collada-dom', '#dependencies/include/collada-dom/1.4'] COLLADAINCLUDE = ['#dependencies/include/collada-dom', '#dependencies/include/collada-dom/1.4']
COLLADALIB = ['collada14dom23'] COLLADALIB = ['collada14dom24']
QTDIR = '#dependencies' QTDIR = '#dependencies'
FFTWLIB = ['fftw3.3'] FFTWLIB = ['fftw3.3']

2
build/config-macos10.8-gcc-x86_64.py
View File

@ -23,6 +23,6 @@ PYTHON27INCLUDE= ['/System/Library/Frameworks/Python.framework/Versions/2.7/Head
PYTHON27LIBDIR = ['/System/Library/Frameworks/Python.framework/Versions/2.7/lib'] PYTHON27LIBDIR = ['/System/Library/Frameworks/Python.framework/Versions/2.7/lib']
PYTHON27LIB = ['boost_python27', 'boost_system', 'python2.7'] PYTHON27LIB = ['boost_python27', 'boost_system', 'python2.7']
COLLADAINCLUDE = ['#dependencies/include/collada-dom', '#dependencies/include/collada-dom/1.4'] COLLADAINCLUDE = ['#dependencies/include/collada-dom', '#dependencies/include/collada-dom/1.4']
COLLADALIB = ['collada14dom23'] COLLADALIB = ['collada14dom24']
QTDIR = '#dependencies' QTDIR = '#dependencies'
FFTWLIB = ['fftw3.3'] FFTWLIB = ['fftw3.3']

12
src/converter/collada.cpp
View File

@ -16,8 +16,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
/* Use the new version of COLLADA DOM */ #define COLLADA_DOM_SUPPORT141
#define COLLADA_DOM_SUPPORT141 1 #define COLLADA_DOM_USING_141
#include <mitsuba/mitsuba.h> #include <mitsuba/mitsuba.h>
#include <mitsuba/render/trimesh.h> #include <mitsuba/render/trimesh.h>
@ -50,10 +50,6 @@
#include "converter.h" #include "converter.h"
#ifdef COLLADA_DOM_SUPPORT141
using namespace ColladaDOM141;
#endif
typedef std::map<std::string, std::string> StringMap; typedef std::map<std::string, std::string> StringMap;
typedef std::map<std::string, int> RefCountMap; typedef std::map<std::string, int> RefCountMap;
typedef std::multimap<std::string, AbstractAnimationTrack *> AnimationMap; typedef std::multimap<std::string, AbstractAnimationTrack *> AnimationMap;
@ -1595,9 +1591,9 @@ void GeometryConverter::convertCollada(const fs::path &inputFile,
CustomErrorHandler errorHandler; CustomErrorHandler errorHandler;
daeErrorHandler::setErrorHandler(&errorHandler); daeErrorHandler::setErrorHandler(&errorHandler);
SLog(EInfo, "Loading \"%s\" ..", inputFile.filename().string().c_str()); SLog(EInfo, "Loading \"%s\" ..", inputFile.filename().string().c_str());
#if COLLADA_DOM_SUPPORT141 #ifdef COLLADA_DOM_USING_141 1
DAE *dae = new DAE(NULL, NULL, "1.4.1"); DAE *dae = new DAE(NULL, NULL, "1.4.1");
domCOLLADA *document = dae->open141(inputFile.string()); ColladaDOM141::domCOLLADA *document = dae->open141(inputFile.string());
if (document == NULL) if (document == NULL)
SLog(EError, "Could not load \"%s\"!", inputFile.string().c_str()); SLog(EError, "Could not load \"%s\"!", inputFile.string().c_str());
#else #else