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

86 lines
3.8 KiB
Python
Raw Normal View History

some work towards animated transformation support
2012-10-26 14:15:32 +08:00
Import('env', 'os', 'glob', 'sys', 'hasQt', 'hasCollada', 'hasBreakpad', 'mainEnv',
A batch of changes that have piled up: - Cleaner build system organization (1 SConscript file per directory instead of a single huge file) - Robustness improvements to the KD-tree construction code (now does a better job at handling degenerate triangles) - Switched to an epsilon-free KD-tree traversal loop using Havran's T_{AB}^rec algorithm - Generalization of the KD-tree construction code (now supports plugging in arbitrary tree construction heuristics) - Addition of some utility code (LRU cache, adaptive Gauss-Lobatto quadrature, etc.) - Generic dense matrix class that supports arbitrary dimensions - Pixel traversal within image blocks now uses a space-filling curve ordering - Added support for several noise functions from PBRT - Cleanups of various top-level interfaces (Luminaires, Phase functions, BSDFs, Participating media, etc.) - Robustness improvements to the participating media code (faster + now does a better job at dielectric boundaries) - Added a basic tonemapping utility (can be invoked via mtsutil)
2011-02-03 16:15:25 +08:00
'resources', 'converter_objects')
# For running Uic & Moc (below)
def recursiveDirs(root) :
MS projects have moved
2011-06-01 08:20:53 +08:00
return filter((lambda a : a.rfind(".svn") == -1), [a[0] for a in os.walk(root)])
A batch of changes that have piled up: - Cleaner build system organization (1 SConscript file per directory instead of a single huge file) - Robustness improvements to the KD-tree construction code (now does a better job at handling degenerate triangles) - Switched to an epsilon-free KD-tree traversal loop using Havran's T_{AB}^rec algorithm - Generalization of the KD-tree construction code (now supports plugging in arbitrary tree construction heuristics) - Addition of some utility code (LRU cache, adaptive Gauss-Lobatto quadrature, etc.) - Generic dense matrix class that supports arbitrary dimensions - Pixel traversal within image blocks now uses a space-filling curve ordering - Added support for several noise functions from PBRT - Cleanups of various top-level interfaces (Luminaires, Phase functions, BSDFs, Participating media, etc.) - Robustness improvements to the participating media code (faster + now does a better job at dielectric boundaries) - Added a basic tonemapping utility (can be invoked via mtsutil)
2011-02-03 16:15:25 +08:00
def unique(list) :
MS projects have moved
2011-06-01 08:20:53 +08:00
return dict.fromkeys(list).keys()
A batch of changes that have piled up: - Cleaner build system organization (1 SConscript file per directory instead of a single huge file) - Robustness improvements to the KD-tree construction code (now does a better job at handling degenerate triangles) - Switched to an epsilon-free KD-tree traversal loop using Havran's T_{AB}^rec algorithm - Generalization of the KD-tree construction code (now supports plugging in arbitrary tree construction heuristics) - Addition of some utility code (LRU cache, adaptive Gauss-Lobatto quadrature, etc.) - Generic dense matrix class that supports arbitrary dimensions - Pixel traversal within image blocks now uses a space-filling curve ordering - Added support for several noise functions from PBRT - Cleanups of various top-level interfaces (Luminaires, Phase functions, BSDFs, Participating media, etc.) - Robustness improvements to the participating media code (faster + now does a better job at dielectric boundaries) - Added a basic tonemapping utility (can be invoked via mtsutil)
2011-02-03 16:15:25 +08:00
def scanFiles(dir, accept=["*.cpp"], reject=[]) :
MS projects have moved
2011-06-01 08:20:53 +08:00
sources = []
paths = recursiveDirs(dir)
for path in paths:
for pattern in accept :
sources+=glob.glob(path + "/" + pattern)
for pattern in reject:
sources = filter((lambda a : a.rfind(pattern) == -1), sources)
sources = map((lambda a : os.path.basename(a)), sources)
return unique(sources)
A batch of changes that have piled up: - Cleaner build system organization (1 SConscript file per directory instead of a single huge file) - Robustness improvements to the KD-tree construction code (now does a better job at handling degenerate triangles) - Switched to an epsilon-free KD-tree traversal loop using Havran's T_{AB}^rec algorithm - Generalization of the KD-tree construction code (now supports plugging in arbitrary tree construction heuristics) - Addition of some utility code (LRU cache, adaptive Gauss-Lobatto quadrature, etc.) - Generic dense matrix class that supports arbitrary dimensions - Pixel traversal within image blocks now uses a space-filling curve ordering - Added support for several noise functions from PBRT - Cleanups of various top-level interfaces (Luminaires, Phase functions, BSDFs, Participating media, etc.) - Robustness improvements to the participating media code (faster + now does a better job at dielectric boundaries) - Added a basic tonemapping utility (can be invoked via mtsutil)
2011-02-03 16:15:25 +08:00
The epic 0.4.0 merge of the bidirectional branch -- sorry not to do this in smaller batches, but doing so would have been an incredible amount of work. A through description of the changes will be made available on the blog this week.
2012-09-28 00:43:51 +08:00
A batch of changes that have piled up: - Cleaner build system organization (1 SConscript file per directory instead of a single huge file) - Robustness improvements to the KD-tree construction code (now does a better job at handling degenerate triangles) - Switched to an epsilon-free KD-tree traversal loop using Havran's T_{AB}^rec algorithm - Generalization of the KD-tree construction code (now supports plugging in arbitrary tree construction heuristics) - Addition of some utility code (LRU cache, adaptive Gauss-Lobatto quadrature, etc.) - Generic dense matrix class that supports arbitrary dimensions - Pixel traversal within image blocks now uses a space-filling curve ordering - Added support for several noise functions from PBRT - Cleanups of various top-level interfaces (Luminaires, Phase functions, BSDFs, Participating media, etc.) - Robustness improvements to the participating media code (faster + now does a better job at dielectric boundaries) - Added a basic tonemapping utility (can be invoked via mtsutil)
2011-02-03 16:15:25 +08:00
if hasQt:
qtEnv = mainEnv.Clone()
renamed qtgui to mtsgui for consistency
2011-08-08 09:01:40 +08:00
qtEnv.Append(CPPPATH=['#src/mtsgui'])
The epic 0.4.0 merge of the bidirectional branch -- sorry not to do this in smaller batches, but doing so would have been an incredible amount of work. A through description of the changes will be made available on the blog this week.
2012-09-28 00:43:51 +08:00
if qtEnv.has_key('QTINCLUDE'):
qtEnv.Prepend(CPPPATH=qtEnv['QTINCLUDE'])
Added an XSLT-based scene 'upgrade' tool to handle content from old versions of Mitsuba. Some of the documentation was improved, and there are now example bump map renderings.
2011-07-17 06:28:28 +08:00
qtEnv.EnableQt4Modules(['QtGui', 'QtCore', 'QtOpenGL', 'QtXml', 'QtXmlPatterns', 'QtNetwork'])
The epic 0.4.0 merge of the bidirectional branch -- sorry not to do this in smaller batches, but doing so would have been an incredible amount of work. A through description of the changes will be made available on the blog this week.
2012-09-28 00:43:51 +08:00
A batch of changes that have piled up: - Cleaner build system organization (1 SConscript file per directory instead of a single huge file) - Robustness improvements to the KD-tree construction code (now does a better job at handling degenerate triangles) - Switched to an epsilon-free KD-tree traversal loop using Havran's T_{AB}^rec algorithm - Generalization of the KD-tree construction code (now supports plugging in arbitrary tree construction heuristics) - Addition of some utility code (LRU cache, adaptive Gauss-Lobatto quadrature, etc.) - Generic dense matrix class that supports arbitrary dimensions - Pixel traversal within image blocks now uses a space-filling curve ordering - Added support for several noise functions from PBRT - Cleanups of various top-level interfaces (Luminaires, Phase functions, BSDFs, Participating media, etc.) - Robustness improvements to the participating media code (faster + now does a better job at dielectric boundaries) - Added a basic tonemapping utility (can be invoked via mtsutil)
2011-02-03 16:15:25 +08:00
if sys.platform == 'win32':
index = qtEnv['CXXFLAGS'].index('_CONSOLE')
del qtEnv['CXXFLAGS'][index-1]
del qtEnv['CXXFLAGS'][index-1]
index = qtEnv['LINKFLAGS'].index('/SUBSYSTEM:CONSOLE')
del qtEnv['LINKFLAGS'][index]
some SCons-related improvements
2012-12-09 13:57:27 +08:00
qtEnv.Append(CXXFLAGS=['/D', '_WINDOWS', '/D', 'MTS_CUSTOM_QTMAIN', '/D', 'MTSGUI_STATIC_QFILEDIALOG=1'])
A batch of changes that have piled up: - Cleaner build system organization (1 SConscript file per directory instead of a single huge file) - Robustness improvements to the KD-tree construction code (now does a better job at handling degenerate triangles) - Switched to an epsilon-free KD-tree traversal loop using Havran's T_{AB}^rec algorithm - Generalization of the KD-tree construction code (now supports plugging in arbitrary tree construction heuristics) - Addition of some utility code (LRU cache, adaptive Gauss-Lobatto quadrature, etc.) - Generic dense matrix class that supports arbitrary dimensions - Pixel traversal within image blocks now uses a space-filling curve ordering - Added support for several noise functions from PBRT - Cleanups of various top-level interfaces (Luminaires, Phase functions, BSDFs, Participating media, etc.) - Robustness improvements to the participating media code (faster + now does a better job at dielectric boundaries) - Added a basic tonemapping utility (can be invoked via mtsutil)
2011-02-03 16:15:25 +08:00
qtEnv.Append(LINKFLAGS=['/SUBSYSTEM:WINDOWS'])
The epic 0.4.0 merge of the bidirectional branch -- sorry not to do this in smaller batches, but doing so would have been an incredible amount of work. A through description of the changes will be made available on the blog this week.
2012-09-28 00:43:51 +08:00
if hasBreakpad:
qtEnv.Append(CPPPATH=['#dependencies/include/breakpad'])
qtEnv.Append(LIBS=['breakpad_common', 'breakpad_exception_handler', 'breakpad_crash_generation_client',
'breakpad_crash_report_sender', 'wininet'])
A batch of changes that have piled up: - Cleaner build system organization (1 SConscript file per directory instead of a single huge file) - Robustness improvements to the KD-tree construction code (now does a better job at handling degenerate triangles) - Switched to an epsilon-free KD-tree traversal loop using Havran's T_{AB}^rec algorithm - Generalization of the KD-tree construction code (now supports plugging in arbitrary tree construction heuristics) - Addition of some utility code (LRU cache, adaptive Gauss-Lobatto quadrature, etc.) - Generic dense matrix class that supports arbitrary dimensions - Pixel traversal within image blocks now uses a space-filling curve ordering - Added support for several noise functions from PBRT - Cleanups of various top-level interfaces (Luminaires, Phase functions, BSDFs, Participating media, etc.) - Robustness improvements to the participating media code (faster + now does a better job at dielectric boundaries) - Added a basic tonemapping utility (can be invoked via mtsutil)
2011-02-03 16:15:25 +08:00
elif sys.platform == 'darwin':
The epic 0.4.0 merge of the bidirectional branch -- sorry not to do this in smaller batches, but doing so would have been an incredible amount of work. A through description of the changes will be made available on the blog this week.
2012-09-28 00:43:51 +08:00
qtEnv.Append(LINKFLAGS=['-Fdependencies/frameworks', '-framework',
linker fix
2012-10-01 10:21:52 +08:00
'BWToolkitFramework', '-framework', 'Security', '-framework', 'CoreFoundation'])
The epic 0.4.0 merge of the bidirectional branch -- sorry not to do this in smaller batches, but doing so would have been an incredible amount of work. A through description of the changes will be made available on the blog this week.
2012-09-28 00:43:51 +08:00
if hasBreakpad:
qtEnv.Append(LINKFLAGS=['-framework', 'Breakpad'])
fixed compilation on osx 10.6
2013-11-04 03:56:16 +08:00
# Qt 4 headers cause a lot of warnings on clang/OSX -- turn them off
if qtEnv['CXX'] == 'clang++':
qtEnv.Append(CPPFLAGS=['-Wno-unused-private-field', '-Wno-uninitialized'])
The epic 0.4.0 merge of the bidirectional branch -- sorry not to do this in smaller batches, but doing so would have been an incredible amount of work. A through description of the changes will be made available on the blog this week.
2012-09-28 00:43:51 +08:00
qtEnv.Append(LINKFLAGS=['-Xlinker', '-rpath', '-Xlinker', '@executable_path/../Frameworks'])
A batch of changes that have piled up: - Cleaner build system organization (1 SConscript file per directory instead of a single huge file) - Robustness improvements to the KD-tree construction code (now does a better job at handling degenerate triangles) - Switched to an epsilon-free KD-tree traversal loop using Havran's T_{AB}^rec algorithm - Generalization of the KD-tree construction code (now supports plugging in arbitrary tree construction heuristics) - Addition of some utility code (LRU cache, adaptive Gauss-Lobatto quadrature, etc.) - Generic dense matrix class that supports arbitrary dimensions - Pixel traversal within image blocks now uses a space-filling curve ordering - Added support for several noise functions from PBRT - Cleanups of various top-level interfaces (Luminaires, Phase functions, BSDFs, Participating media, etc.) - Robustness improvements to the participating media code (faster + now does a better job at dielectric boundaries) - Added a basic tonemapping utility (can be invoked via mtsutil)
2011-02-03 16:15:25 +08:00
renamed qtgui to mtsgui for consistency
2011-08-08 09:01:40 +08:00
bpath = env.GetBuildPath('#src/mtsgui')
MS projects have moved
2011-06-01 08:20:53 +08:00
qtInterfaces = [qtEnv.Uic4(uic) for uic in scanFiles(bpath, ['*.ui'])]
qtResources = [qtEnv.Qrc(qrc) for qrc in scanFiles(bpath, ['*.qrc'])]
qtSources = scanFiles(bpath, ['*.cpp']) + qtResources + resources
A batch of changes that have piled up: - Cleaner build system organization (1 SConscript file per directory instead of a single huge file) - Robustness improvements to the KD-tree construction code (now does a better job at handling degenerate triangles) - Switched to an epsilon-free KD-tree traversal loop using Havran's T_{AB}^rec algorithm - Generalization of the KD-tree construction code (now supports plugging in arbitrary tree construction heuristics) - Addition of some utility code (LRU cache, adaptive Gauss-Lobatto quadrature, etc.) - Generic dense matrix class that supports arbitrary dimensions - Pixel traversal within image blocks now uses a space-filling curve ordering - Added support for several noise functions from PBRT - Cleanups of various top-level interfaces (Luminaires, Phase functions, BSDFs, Participating media, etc.) - Robustness improvements to the participating media code (faster + now does a better job at dielectric boundaries) - Added a basic tonemapping utility (can be invoked via mtsutil)
2011-02-03 16:15:25 +08:00
if hasCollada:
MS projects have moved
2011-06-01 08:20:53 +08:00
qtSources += converter_objects
A batch of changes that have piled up: - Cleaner build system organization (1 SConscript file per directory instead of a single huge file) - Robustness improvements to the KD-tree construction code (now does a better job at handling degenerate triangles) - Switched to an epsilon-free KD-tree traversal loop using Havran's T_{AB}^rec algorithm - Generalization of the KD-tree construction code (now supports plugging in arbitrary tree construction heuristics) - Addition of some utility code (LRU cache, adaptive Gauss-Lobatto quadrature, etc.) - Generic dense matrix class that supports arbitrary dimensions - Pixel traversal within image blocks now uses a space-filling curve ordering - Added support for several noise functions from PBRT - Cleanups of various top-level interfaces (Luminaires, Phase functions, BSDFs, Participating media, etc.) - Robustness improvements to the participating media code (faster + now does a better job at dielectric boundaries) - Added a basic tonemapping utility (can be invoked via mtsutil)
2011-02-03 16:15:25 +08:00
if env.has_key('COLLADALIBDIR'):
qtEnv.Prepend(LIBPATH=env['COLLADALIBDIR'])
if env.has_key('COLLADALIB'):
qtEnv.Prepend(LIBS=env['COLLADALIB'])
some work towards animated transformation support
2012-10-26 14:15:32 +08:00
A batch of changes that have piled up: - Cleaner build system organization (1 SConscript file per directory instead of a single huge file) - Robustness improvements to the KD-tree construction code (now does a better job at handling degenerate triangles) - Switched to an epsilon-free KD-tree traversal loop using Havran's T_{AB}^rec algorithm - Generalization of the KD-tree construction code (now supports plugging in arbitrary tree construction heuristics) - Addition of some utility code (LRU cache, adaptive Gauss-Lobatto quadrature, etc.) - Generic dense matrix class that supports arbitrary dimensions - Pixel traversal within image blocks now uses a space-filling curve ordering - Added support for several noise functions from PBRT - Cleanups of various top-level interfaces (Luminaires, Phase functions, BSDFs, Participating media, etc.) - Robustness improvements to the participating media code (faster + now does a better job at dielectric boundaries) - Added a basic tonemapping utility (can be invoked via mtsutil)
2011-02-03 16:15:25 +08:00
if sys.platform == 'darwin':
OSX fixes
2011-08-20 09:17:13 +08:00
mainEnv_osx = mainEnv.Clone()
python improvements
2011-08-21 12:30:49 +08:00
qtEnv_osx = qtEnv.Clone()
OSX fixes
2011-08-20 09:17:13 +08:00
mainEnv_osx.ConfigureForObjectiveCPP()
OSX build improvements
2011-08-16 14:18:38 +08:00
qtEnv_osx.ConfigureForObjectiveCPP()
OSX fixes
2011-08-20 09:17:13 +08:00
mainEnv_osx.Program('symlinks_install', ['symlinks_install.c'])
The epic 0.4.0 merge of the bidirectional branch -- sorry not to do this in smaller batches, but doing so would have been an incredible amount of work. A through description of the changes will be made available on the blog this week.
2012-09-28 00:43:51 +08:00
qtEnv_osx['CXXFLAGS'].append(['-Fdependencies/frameworks', '-framework', 'BWToolkitFramework', '-framework', 'Breakpad'])
MS projects have moved
2011-06-01 08:20:53 +08:00
qtSources += qtEnv_osx.StaticObject('previewsettingsdlg_cocoa_impl.mm')
The epic 0.4.0 merge of the bidirectional branch -- sorry not to do this in smaller batches, but doing so would have been an incredible amount of work. A through description of the changes will be made available on the blog this week.
2012-09-28 00:43:51 +08:00
if hasBreakpad:
qtSources += qtEnv_osx.StaticObject('breakpad.mm')
A batch of changes that have piled up: - Cleaner build system organization (1 SConscript file per directory instead of a single huge file) - Robustness improvements to the KD-tree construction code (now does a better job at handling degenerate triangles) - Switched to an epsilon-free KD-tree traversal loop using Havran's T_{AB}^rec algorithm - Generalization of the KD-tree construction code (now supports plugging in arbitrary tree construction heuristics) - Addition of some utility code (LRU cache, adaptive Gauss-Lobatto quadrature, etc.) - Generic dense matrix class that supports arbitrary dimensions - Pixel traversal within image blocks now uses a space-filling curve ordering - Added support for several noise functions from PBRT - Cleanups of various top-level interfaces (Luminaires, Phase functions, BSDFs, Participating media, etc.) - Robustness improvements to the participating media code (faster + now does a better job at dielectric boundaries) - Added a basic tonemapping utility (can be invoked via mtsutil)
2011-02-03 16:15:25 +08:00
else:
MS projects have moved
2011-06-01 08:20:53 +08:00
qtSources = [x for x in qtSources if (not isinstance(x, str) or 'cocoa' not in x)]
some SCons-related improvements
2012-12-09 13:57:27 +08:00
renamed qtgui to mtsgui for consistency
2011-08-08 09:01:40 +08:00
mtsgui = qtEnv.Program('mtsgui', qtSources)
A batch of changes that have piled up: - Cleaner build system organization (1 SConscript file per directory instead of a single huge file) - Robustness improvements to the KD-tree construction code (now does a better job at handling degenerate triangles) - Switched to an epsilon-free KD-tree traversal loop using Havran's T_{AB}^rec algorithm - Generalization of the KD-tree construction code (now supports plugging in arbitrary tree construction heuristics) - Addition of some utility code (LRU cache, adaptive Gauss-Lobatto quadrature, etc.) - Generic dense matrix class that supports arbitrary dimensions - Pixel traversal within image blocks now uses a space-filling curve ordering - Added support for several noise functions from PBRT - Cleanups of various top-level interfaces (Luminaires, Phase functions, BSDFs, Participating media, etc.) - Robustness improvements to the participating media code (faster + now does a better job at dielectric boundaries) - Added a basic tonemapping utility (can be invoked via mtsutil)
2011-02-03 16:15:25 +08:00
if sys.platform == 'darwin':
The epic 0.4.0 merge of the bidirectional branch -- sorry not to do this in smaller batches, but doing so would have been an incredible amount of work. A through description of the changes will be made available on the blog this week.
2012-09-28 00:43:51 +08:00
qtEnv.AddPostAction(mtsgui, 'install_name_tool -change QtGui.framework/Versions/4/QtGui @rpath/QtGui $TARGET')
qtEnv.AddPostAction(mtsgui, 'install_name_tool -change QtCore.framework/Versions/4/QtCore @rpath/QtCore $TARGET')
qtEnv.AddPostAction(mtsgui, 'install_name_tool -change QtOpenGL.framework/Versions/4/QtOpenGL @rpath/QtOpenGL $TARGET')
qtEnv.AddPostAction(mtsgui, 'install_name_tool -change QtXml.framework/Versions/4/QtXml @rpath/QtXml $TARGET')
qtEnv.AddPostAction(mtsgui, 'install_name_tool -change QtNetwork.framework/Versions/4/QtNetwork @rpath/QtNetwork $TARGET')
qtEnv.AddPostAction(mtsgui, 'install_name_tool -change QtXmlPatterns.framework/Versions/4/QtXmlPatterns @rpath/QtXmlPatterns $TARGET')
A batch of changes that have piled up: - Cleaner build system organization (1 SConscript file per directory instead of a single huge file) - Robustness improvements to the KD-tree construction code (now does a better job at handling degenerate triangles) - Switched to an epsilon-free KD-tree traversal loop using Havran's T_{AB}^rec algorithm - Generalization of the KD-tree construction code (now supports plugging in arbitrary tree construction heuristics) - Addition of some utility code (LRU cache, adaptive Gauss-Lobatto quadrature, etc.) - Generic dense matrix class that supports arbitrary dimensions - Pixel traversal within image blocks now uses a space-filling curve ordering - Added support for several noise functions from PBRT - Cleanups of various top-level interfaces (Luminaires, Phase functions, BSDFs, Participating media, etc.) - Robustness improvements to the participating media code (faster + now does a better job at dielectric boundaries) - Added a basic tonemapping utility (can be invoked via mtsutil)
2011-02-03 16:15:25 +08:00