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

renamed qtgui to mtsgui for consistency

metadata
Wenzel Jakob 2011-08-07 21:01:40 -04:00
parent 2de99d873e
commit 73dfd56677
119 changed files with 272 additions and 228 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SConstruct
View File

@ -34,6 +34,8 @@ build('src/librender/SConscript')
build('src/libhw/SConscript')
# Bidirectional support library
build('src/libbidir/SConscript')
# Python binding library
build('src/mtspy/SConscript')
# ===== Build the applications =====
env = env.Clone()
@ -45,7 +47,7 @@ mainEnv = build('src/mitsuba/SConscript')
converter_objects = build('src/converter/SConscript', ['mainEnv'])
# Build the Qt-based GUI binaries
build('src/qtgui/SConscript', ['mainEnv', 'converter_objects'], duplicate=True)
build('src/mtsgui/SConscript', ['mainEnv', 'converter_objects'], duplicate=True)
# ===== Build the plugins =====

4
build/SConscript.configure
View File

@ -232,11 +232,13 @@ if hasCollada:
env.SConsignFile()
hasPython = True
# MSVC: Embed the manifest into libraries and executables
if sys.platform == 'win32':
env['LINKCOM'] = [env['LINKCOM'], 'mt.exe -nologo -manifest ${TARGET}.manifest -outputresource:$TARGET;1']
env['SHLINKCOM'] = [env['SHLINKCOM'], 'mt.exe -nologo -manifest ${TARGET}.manifest -outputresource:$TARGET;2']
env.Export('hasQt', 'hasCollada', 'resources')
env.Export('hasQt', 'hasCollada', 'hasPython', 'resources')
Return('env')

14
build/SConscript.install
View File

@ -1,7 +1,7 @@
import fnmatch
Import('env', 'os', 'sys', 'plugins', 'dist',
'MTS_VERSION', 'hasQt', 'hasCollada')
'MTS_VERSION', 'hasQt', 'hasCollada', 'hasPython')
installTargets = []
@ -33,7 +33,9 @@ if sys.platform == 'linux2':
installTargets += env.Install(os.path.join(distDir, 'plugins'), plugin)
install(distDir, ['libcore/libmitsuba-core.so', 'libhw/libmitsuba-hw.so',
'librender/libmitsuba-render.so', 'libbidir/libmitsuba-bidir.so'])
install(distDir, ['mitsuba/mitsuba', 'mitsuba/mtssrv', 'mitsuba/mtsutil', 'qtgui/mtsgui'])
if hasPython:
install(distDir, ['mtspy/mtspy.so'])
install(distDir, ['mitsuba/mitsuba', 'mitsuba/mtssrv', 'mitsuba/mtsutil', 'mtsgui/mtsgui'])
if hasCollada:
install(distDir, ['converter/mtsimport'])
if sys.platform == 'win32':
@ -58,6 +60,8 @@ if sys.platform == 'win32':
install(distDir, ['mitsuba/mitsuba.exe', 'mitsuba/mtssrv.exe', 'mitsuba/mtsutil.exe'])
install(distDir, ['libcore/libmitsuba-core.dll', 'libhw/libmitsuba-hw.dll',
'librender/libmitsuba-render.dll', 'libbidir/libmitsuba-bidir.dll'])
if hasPython:
install(distDir, ['mtspy/mtspy.dll'])
install(distDir, ['Iex.dll', 'Half.dll','IlmThread.dll', 'Imath.dll','IlmImf.dll','zlib1.dll',
'libpng13.dll', 'jpeg62.dll', 'pthreadVCE2.dll', 'xerces-c_3_0.dll', 'glew32mx.dll'],
prefix=dllprefix)
@ -73,7 +77,7 @@ if sys.platform == 'win32':
install(distDir, ['libmmd.dll', 'libiomp5md.dll'], prefix = env['REDIST_PATH'])
if hasQt:
install(distDir, ['qtgui/mtsgui.exe'])
install(distDir, ['mtsgui/mtsgui.exe'])
install(distDir, ['QtCore4.dll', 'QtGui4.dll', 'QtXml4.dll',
'QtNetwork4.dll', 'QtOpenGL4.dll', 'QtXmlPatterns4.dll'], prefix = env['QT4_BINPATH'])
elif sys.platform == 'darwin':
@ -91,6 +95,8 @@ elif sys.platform == 'darwin':
install(frameworkDir, ['libcore/libmitsuba-core.dylib', 'libhw/libmitsuba-hw.dylib',
'librender/libmitsuba-render.dylib', 'libbidir/libmitsuba-bidir.dylib'])
if hasPython:
install(frameworkDir, ['mtspy/mtspy.dylib'])
install(frameworkDir, [
'GLEW.framework/Resources/libs/libGLEW.dylib', 'OpenEXR.framework/Resources/lib/libHalf.6.dylib',
'OpenEXR.framework/Resources/lib/libIex.6.dylib', 'OpenEXR.framework/Resources/lib/libImath.6.dylib',
@ -102,7 +108,7 @@ elif sys.platform == 'darwin':
install(frameworkDir, [
'Collada14Dom.framework/Resources/lib/libCollada14Dom.dylib'], '#dependencies/darwin')
if hasQt:
install(os.path.join(distDir, 'Contents/MacOS'), ['qtgui/mtsgui'])
install(os.path.join(distDir, 'Contents/MacOS'), ['mtsgui/mtsgui'])
installTargets += env.OSXLibInst(frameworkDir, '/Library/Frameworks/QtCore.framework/Versions/4/QtCore')
opengl = env.OSXLibInst(frameworkDir, '/Library/Frameworks/QtOpenGL.framework/Versions/4/QtOpenGL')
xml = env.OSXLibInst(frameworkDir, '/Library/Frameworks/QtXml.framework/Versions/4/QtXml')

98
build/mitsuba-msvc2008.vcproj
View File

@ -367,57 +367,57 @@
<File RelativePath="..\.\src\phase\microflake.cpp"/>
<File RelativePath="..\.\src\phase\microflake_fiber.h"/>
</Filter>
<Filter Name="qtgui">
<File RelativePath="..\.\src\qtgui\aboutdlg.cpp"/>
<File RelativePath="..\.\src\qtgui\aboutdlg.h"/>
<File RelativePath="..\.\src\qtgui\acknowledgmentdlg.cpp"/>
<File RelativePath="..\.\src\qtgui\acknowledgmentdlg.h"/>
<File RelativePath="..\.\src\qtgui\addserverdlg.cpp"/>
<File RelativePath="..\.\src\qtgui\addserverdlg.h"/>
<File RelativePath="..\.\src\qtgui\common.h"/>
<File RelativePath="..\.\src\qtgui\glwidget.cpp"/>
<File RelativePath="..\.\src\qtgui\glwidget.h"/>
<File RelativePath="..\.\src\qtgui\importdlg.cpp"/>
<File RelativePath="..\.\src\qtgui\importdlg.h"/>
<File RelativePath="..\.\src\qtgui\loaddlg.cpp"/>
<File RelativePath="..\.\src\qtgui\loaddlg.h"/>
<File RelativePath="..\.\src\qtgui\locateresourcedlg.cpp"/>
<File RelativePath="..\.\src\qtgui\locateresourcedlg.h"/>
<File RelativePath="..\.\src\qtgui\logwidget.cpp"/>
<File RelativePath="..\.\src\qtgui\logwidget.h"/>
<File RelativePath="..\.\src\qtgui\main.cpp"/>
<File RelativePath="..\.\src\qtgui\mainwindow.cpp"/>
<File RelativePath="..\.\src\qtgui\mainwindow.h"/>
<File RelativePath="..\.\src\qtgui\preview.cpp"/>
<File RelativePath="..\.\src\qtgui\preview.h"/>
<File RelativePath="..\.\src\qtgui\previewsettingsdlg.cpp"/>
<File RelativePath="..\.\src\qtgui\previewsettingsdlg.h"/>
<File RelativePath="..\.\src\qtgui\previewsettingsdlg_cocoa.cpp"/>
<File RelativePath="..\.\src\qtgui\previewsettingsdlg_cocoa.h"/>
<File RelativePath="..\.\src\qtgui\preview_proc.cpp"/>
<File RelativePath="..\.\src\qtgui\preview_proc.h"/>
<File RelativePath="..\.\src\qtgui\programsettingsdlg.cpp"/>
<File RelativePath="..\.\src\qtgui\programsettingsdlg.h"/>
<File RelativePath="..\.\src\qtgui\rendersettingsdlg.cpp"/>
<File RelativePath="..\.\src\qtgui\rendersettingsdlg.h"/>
<Filter Name="mtsgui">
<File RelativePath="..\.\src\mtsgui\aboutdlg.cpp"/>
<File RelativePath="..\.\src\mtsgui\aboutdlg.h"/>
<File RelativePath="..\.\src\mtsgui\acknowledgmentdlg.cpp"/>
<File RelativePath="..\.\src\mtsgui\acknowledgmentdlg.h"/>
<File RelativePath="..\.\src\mtsgui\addserverdlg.cpp"/>
<File RelativePath="..\.\src\mtsgui\addserverdlg.h"/>
<File RelativePath="..\.\src\mtsgui\common.h"/>
<File RelativePath="..\.\src\mtsgui\glwidget.cpp"/>
<File RelativePath="..\.\src\mtsgui\glwidget.h"/>
<File RelativePath="..\.\src\mtsgui\importdlg.cpp"/>
<File RelativePath="..\.\src\mtsgui\importdlg.h"/>
<File RelativePath="..\.\src\mtsgui\loaddlg.cpp"/>
<File RelativePath="..\.\src\mtsgui\loaddlg.h"/>
<File RelativePath="..\.\src\mtsgui\locateresourcedlg.cpp"/>
<File RelativePath="..\.\src\mtsgui\locateresourcedlg.h"/>
<File RelativePath="..\.\src\mtsgui\logwidget.cpp"/>
<File RelativePath="..\.\src\mtsgui\logwidget.h"/>
<File RelativePath="..\.\src\mtsgui\main.cpp"/>
<File RelativePath="..\.\src\mtsgui\mainwindow.cpp"/>
<File RelativePath="..\.\src\mtsgui\mainwindow.h"/>
<File RelativePath="..\.\src\mtsgui\preview.cpp"/>
<File RelativePath="..\.\src\mtsgui\preview.h"/>
<File RelativePath="..\.\src\mtsgui\previewsettingsdlg.cpp"/>
<File RelativePath="..\.\src\mtsgui\previewsettingsdlg.h"/>
<File RelativePath="..\.\src\mtsgui\previewsettingsdlg_cocoa.cpp"/>
<File RelativePath="..\.\src\mtsgui\previewsettingsdlg_cocoa.h"/>
<File RelativePath="..\.\src\mtsgui\preview_proc.cpp"/>
<File RelativePath="..\.\src\mtsgui\preview_proc.h"/>
<File RelativePath="..\.\src\mtsgui\programsettingsdlg.cpp"/>
<File RelativePath="..\.\src\mtsgui\programsettingsdlg.h"/>
<File RelativePath="..\.\src\mtsgui\rendersettingsdlg.cpp"/>
<File RelativePath="..\.\src\mtsgui\rendersettingsdlg.h"/>
<Filter Name="resources">
</Filter>
<File RelativePath="..\.\src\qtgui\save.cpp"/>
<File RelativePath="..\.\src\qtgui\save.h"/>
<File RelativePath="..\.\src\qtgui\sceneimporter.cpp"/>
<File RelativePath="..\.\src\qtgui\sceneimporter.h"/>
<File RelativePath="..\.\src\qtgui\sceneinfodlg.cpp"/>
<File RelativePath="..\.\src\qtgui\sceneinfodlg.h"/>
<File RelativePath="..\.\src\qtgui\sceneloader.cpp"/>
<File RelativePath="..\.\src\qtgui\sceneloader.h"/>
<File RelativePath="..\.\src\qtgui\server.cpp"/>
<File RelativePath="..\.\src\qtgui\server.h"/>
<File RelativePath="..\.\src\qtgui\tabbar.cpp"/>
<File RelativePath="..\.\src\qtgui\tabbar.h"/>
<File RelativePath="..\.\src\qtgui\updatedlg.cpp"/>
<File RelativePath="..\.\src\qtgui\updatedlg.h"/>
<File RelativePath="..\.\src\qtgui\xmltreemodel.cpp"/>
<File RelativePath="..\.\src\qtgui\xmltreemodel.h"/>
<File RelativePath="..\.\src\mtsgui\save.cpp"/>
<File RelativePath="..\.\src\mtsgui\save.h"/>
<File RelativePath="..\.\src\mtsgui\sceneimporter.cpp"/>
<File RelativePath="..\.\src\mtsgui\sceneimporter.h"/>
<File RelativePath="..\.\src\mtsgui\sceneinfodlg.cpp"/>
<File RelativePath="..\.\src\mtsgui\sceneinfodlg.h"/>
<File RelativePath="..\.\src\mtsgui\sceneloader.cpp"/>
<File RelativePath="..\.\src\mtsgui\sceneloader.h"/>
<File RelativePath="..\.\src\mtsgui\server.cpp"/>
<File RelativePath="..\.\src\mtsgui\server.h"/>
<File RelativePath="..\.\src\mtsgui\tabbar.cpp"/>
<File RelativePath="..\.\src\mtsgui\tabbar.h"/>
<File RelativePath="..\.\src\mtsgui\updatedlg.cpp"/>
<File RelativePath="..\.\src\mtsgui\updatedlg.h"/>
<File RelativePath="..\.\src\mtsgui\xmltreemodel.cpp"/>
<File RelativePath="..\.\src\mtsgui\xmltreemodel.h"/>
</Filter>
<Filter Name="rfilters">
<File RelativePath="..\.\src\rfilters\box.cpp"/>

96
build/mitsuba-msvc2010.vcxproj
View File

@ -135,53 +135,53 @@
</ClInclude>
<ClInclude Include="..\.\src\phase\microflake_fiber.h">
</ClInclude>
<ClInclude Include="..\.\src\qtgui\aboutdlg.h">
<ClInclude Include="..\.\src\mtsgui\aboutdlg.h">
</ClInclude>
<ClInclude Include="..\.\src\qtgui\acknowledgmentdlg.h">
<ClInclude Include="..\.\src\mtsgui\acknowledgmentdlg.h">
</ClInclude>
<ClInclude Include="..\.\src\qtgui\addserverdlg.h">
<ClInclude Include="..\.\src\mtsgui\addserverdlg.h">
</ClInclude>
<ClInclude Include="..\.\src\qtgui\common.h">
<ClInclude Include="..\.\src\mtsgui\common.h">
</ClInclude>
<ClInclude Include="..\.\src\qtgui\glwidget.h">
<ClInclude Include="..\.\src\mtsgui\glwidget.h">
</ClInclude>
<ClInclude Include="..\.\src\qtgui\importdlg.h">
<ClInclude Include="..\.\src\mtsgui\importdlg.h">
</ClInclude>
<ClInclude Include="..\.\src\qtgui\loaddlg.h">
<ClInclude Include="..\.\src\mtsgui\loaddlg.h">
</ClInclude>
<ClInclude Include="..\.\src\qtgui\locateresourcedlg.h">
<ClInclude Include="..\.\src\mtsgui\locateresourcedlg.h">
</ClInclude>
<ClInclude Include="..\.\src\qtgui\logwidget.h">
<ClInclude Include="..\.\src\mtsgui\logwidget.h">
</ClInclude>
<ClInclude Include="..\.\src\qtgui\mainwindow.h">
<ClInclude Include="..\.\src\mtsgui\mainwindow.h">
</ClInclude>
<ClInclude Include="..\.\src\qtgui\preview.h">
<ClInclude Include="..\.\src\mtsgui\preview.h">
</ClInclude>
<ClInclude Include="..\.\src\qtgui\previewsettingsdlg.h">
<ClInclude Include="..\.\src\mtsgui\previewsettingsdlg.h">
</ClInclude>
<ClInclude Include="..\.\src\qtgui\previewsettingsdlg_cocoa.h">
<ClInclude Include="..\.\src\mtsgui\previewsettingsdlg_cocoa.h">
</ClInclude>
<ClInclude Include="..\.\src\qtgui\preview_proc.h">
<ClInclude Include="..\.\src\mtsgui\preview_proc.h">
</ClInclude>
<ClInclude Include="..\.\src\qtgui\programsettingsdlg.h">
<ClInclude Include="..\.\src\mtsgui\programsettingsdlg.h">
</ClInclude>
<ClInclude Include="..\.\src\qtgui\rendersettingsdlg.h">
<ClInclude Include="..\.\src\mtsgui\rendersettingsdlg.h">
</ClInclude>
<ClInclude Include="..\.\src\qtgui\save.h">
<ClInclude Include="..\.\src\mtsgui\save.h">
</ClInclude>
<ClInclude Include="..\.\src\qtgui\sceneimporter.h">
<ClInclude Include="..\.\src\mtsgui\sceneimporter.h">
</ClInclude>
<ClInclude Include="..\.\src\qtgui\sceneinfodlg.h">
<ClInclude Include="..\.\src\mtsgui\sceneinfodlg.h">
</ClInclude>
<ClInclude Include="..\.\src\qtgui\sceneloader.h">
<ClInclude Include="..\.\src\mtsgui\sceneloader.h">
</ClInclude>
<ClInclude Include="..\.\src\qtgui\server.h">
<ClInclude Include="..\.\src\mtsgui\server.h">
</ClInclude>
<ClInclude Include="..\.\src\qtgui\tabbar.h">
<ClInclude Include="..\.\src\mtsgui\tabbar.h">
</ClInclude>
<ClInclude Include="..\.\src\qtgui\updatedlg.h">
<ClInclude Include="..\.\src\mtsgui\updatedlg.h">
</ClInclude>
<ClInclude Include="..\.\src\qtgui\xmltreemodel.h">
<ClInclude Include="..\.\src\mtsgui\xmltreemodel.h">
</ClInclude>
<ClInclude Include="..\.\src\shapes\instance.h">
</ClInclude>
@ -769,53 +769,53 @@
</ClCompile>
<ClCompile Include="..\.\src\phase\microflake.cpp">
</ClCompile>
<ClCompile Include="..\.\src\qtgui\aboutdlg.cpp">
<ClCompile Include="..\.\src\mtsgui\aboutdlg.cpp">
</ClCompile>
<ClCompile Include="..\.\src\qtgui\acknowledgmentdlg.cpp">
<ClCompile Include="..\.\src\mtsgui\acknowledgmentdlg.cpp">
</ClCompile>
<ClCompile Include="..\.\src\qtgui\addserverdlg.cpp">
<ClCompile Include="..\.\src\mtsgui\addserverdlg.cpp">
</ClCompile>
<ClCompile Include="..\.\src\qtgui\glwidget.cpp">
<ClCompile Include="..\.\src\mtsgui\glwidget.cpp">
</ClCompile>
<ClCompile Include="..\.\src\qtgui\importdlg.cpp">
<ClCompile Include="..\.\src\mtsgui\importdlg.cpp">
</ClCompile>
<ClCompile Include="..\.\src\qtgui\loaddlg.cpp">
<ClCompile Include="..\.\src\mtsgui\loaddlg.cpp">
</ClCompile>
<ClCompile Include="..\.\src\qtgui\locateresourcedlg.cpp">
<ClCompile Include="..\.\src\mtsgui\locateresourcedlg.cpp">
</ClCompile>
<ClCompile Include="..\.\src\qtgui\logwidget.cpp">
<ClCompile Include="..\.\src\mtsgui\logwidget.cpp">
</ClCompile>
<ClCompile Include="..\.\src\qtgui\main.cpp">
<ClCompile Include="..\.\src\mtsgui\main.cpp">
</ClCompile>
<ClCompile Include="..\.\src\qtgui\mainwindow.cpp">
<ClCompile Include="..\.\src\mtsgui\mainwindow.cpp">
</ClCompile>
<ClCompile Include="..\.\src\qtgui\preview.cpp">
<ClCompile Include="..\.\src\mtsgui\preview.cpp">
</ClCompile>
<ClCompile Include="..\.\src\qtgui\previewsettingsdlg.cpp">
<ClCompile Include="..\.\src\mtsgui\previewsettingsdlg.cpp">
</ClCompile>
<ClCompile Include="..\.\src\qtgui\previewsettingsdlg_cocoa.cpp">
<ClCompile Include="..\.\src\mtsgui\previewsettingsdlg_cocoa.cpp">
</ClCompile>
<ClCompile Include="..\.\src\qtgui\preview_proc.cpp">
<ClCompile Include="..\.\src\mtsgui\preview_proc.cpp">
</ClCompile>
<ClCompile Include="..\.\src\qtgui\programsettingsdlg.cpp">
<ClCompile Include="..\.\src\mtsgui\programsettingsdlg.cpp">
</ClCompile>
<ClCompile Include="..\.\src\qtgui\rendersettingsdlg.cpp">
<ClCompile Include="..\.\src\mtsgui\rendersettingsdlg.cpp">
</ClCompile>
<ClCompile Include="..\.\src\qtgui\save.cpp">
<ClCompile Include="..\.\src\mtsgui\save.cpp">
</ClCompile>
<ClCompile Include="..\.\src\qtgui\sceneimporter.cpp">
<ClCompile Include="..\.\src\mtsgui\sceneimporter.cpp">
</ClCompile>
<ClCompile Include="..\.\src\qtgui\sceneinfodlg.cpp">
<ClCompile Include="..\.\src\mtsgui\sceneinfodlg.cpp">
</ClCompile>
<ClCompile Include="..\.\src\qtgui\sceneloader.cpp">
<ClCompile Include="..\.\src\mtsgui\sceneloader.cpp">
</ClCompile>
<ClCompile Include="..\.\src\qtgui\server.cpp">
<ClCompile Include="..\.\src\mtsgui\server.cpp">
</ClCompile>
<ClCompile Include="..\.\src\qtgui\tabbar.cpp">
<ClCompile Include="..\.\src\mtsgui\tabbar.cpp">
</ClCompile>
<ClCompile Include="..\.\src\qtgui\updatedlg.cpp">
<ClCompile Include="..\.\src\mtsgui\updatedlg.cpp">
</ClCompile>
<ClCompile Include="..\.\src\qtgui\xmltreemodel.cpp">
<ClCompile Include="..\.\src\mtsgui\xmltreemodel.cpp">
</ClCompile>
<ClCompile Include="..\.\src\rfilters\box.cpp">
</ClCompile>

196
build/mitsuba-msvc2010.vcxproj.filters
View File

@ -59,10 +59,10 @@
<Filter Include="Source Files\phase">
<UniqueIdentifier>{629f51ab-8f77-4abd-9c1c-38e13b2db010}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\qtgui">
<Filter Include="Source Files\mtsgui">
<UniqueIdentifier>{7922cc88-966d-4a2a-ad99-0f932bf0eda3}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\qtgui\resources">
<Filter Include="Source Files\mtsgui\resources">
<UniqueIdentifier>{12abdb4a-638a-4680-b01d-af8075fc74ee}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\rfilters">
@ -559,77 +559,77 @@
<ClCompile Include="..\.\src\phase\microflake.cpp">
<Filter>Source Files\phase</Filter>
</ClCompile>
<ClCompile Include="..\.\src\qtgui\aboutdlg.cpp">
<Filter>Source Files\qtgui</Filter>
<ClCompile Include="..\.\src\mtsgui\aboutdlg.cpp">
<Filter>Source Files\mtsgui</Filter>
</ClCompile>
<ClCompile Include="..\.\src\qtgui\acknowledgmentdlg.cpp">
<Filter>Source Files\qtgui</Filter>
<ClCompile Include="..\.\src\mtsgui\acknowledgmentdlg.cpp">
<Filter>Source Files\mtsgui</Filter>
</ClCompile>
<ClCompile Include="..\.\src\qtgui\addserverdlg.cpp">
<Filter>Source Files\qtgui</Filter>
<ClCompile Include="..\.\src\mtsgui\addserverdlg.cpp">
<Filter>Source Files\mtsgui</Filter>
</ClCompile>
<ClCompile Include="..\.\src\qtgui\glwidget.cpp">
<Filter>Source Files\qtgui</Filter>
<ClCompile Include="..\.\src\mtsgui\glwidget.cpp">
<Filter>Source Files\mtsgui</Filter>
</ClCompile>
<ClCompile Include="..\.\src\qtgui\importdlg.cpp">
<Filter>Source Files\qtgui</Filter>
<ClCompile Include="..\.\src\mtsgui\importdlg.cpp">
<Filter>Source Files\mtsgui</Filter>
</ClCompile>
<ClCompile Include="..\.\src\qtgui\loaddlg.cpp">
<Filter>Source Files\qtgui</Filter>
<ClCompile Include="..\.\src\mtsgui\loaddlg.cpp">
<Filter>Source Files\mtsgui</Filter>
</ClCompile>
<ClCompile Include="..\.\src\qtgui\locateresourcedlg.cpp">
<Filter>Source Files\qtgui</Filter>
<ClCompile Include="..\.\src\mtsgui\locateresourcedlg.cpp">
<Filter>Source Files\mtsgui</Filter>
</ClCompile>
<ClCompile Include="..\.\src\qtgui\logwidget.cpp">
<Filter>Source Files\qtgui</Filter>
<ClCompile Include="..\.\src\mtsgui\logwidget.cpp">
<Filter>Source Files\mtsgui</Filter>
</ClCompile>
<ClCompile Include="..\.\src\qtgui\main.cpp">
<Filter>Source Files\qtgui</Filter>
<ClCompile Include="..\.\src\mtsgui\main.cpp">
<Filter>Source Files\mtsgui</Filter>
</ClCompile>
<ClCompile Include="..\.\src\qtgui\mainwindow.cpp">
<Filter>Source Files\qtgui</Filter>
<ClCompile Include="..\.\src\mtsgui\mainwindow.cpp">
<Filter>Source Files\mtsgui</Filter>
</ClCompile>
<ClCompile Include="..\.\src\qtgui\preview.cpp">
<Filter>Source Files\qtgui</Filter>
<ClCompile Include="..\.\src\mtsgui\preview.cpp">
<Filter>Source Files\mtsgui</Filter>
</ClCompile>
<ClCompile Include="..\.\src\qtgui\previewsettingsdlg.cpp">
<Filter>Source Files\qtgui</Filter>
<ClCompile Include="..\.\src\mtsgui\previewsettingsdlg.cpp">
<Filter>Source Files\mtsgui</Filter>
</ClCompile>
<ClCompile Include="..\.\src\qtgui\previewsettingsdlg_cocoa.cpp">
<Filter>Source Files\qtgui</Filter>
<ClCompile Include="..\.\src\mtsgui\previewsettingsdlg_cocoa.cpp">
<Filter>Source Files\mtsgui</Filter>
</ClCompile>
<ClCompile Include="..\.\src\qtgui\preview_proc.cpp">
<Filter>Source Files\qtgui</Filter>
<ClCompile Include="..\.\src\mtsgui\preview_proc.cpp">
<Filter>Source Files\mtsgui</Filter>
</ClCompile>
<ClCompile Include="..\.\src\qtgui\programsettingsdlg.cpp">
<Filter>Source Files\qtgui</Filter>
<ClCompile Include="..\.\src\mtsgui\programsettingsdlg.cpp">
<Filter>Source Files\mtsgui</Filter>
</ClCompile>
<ClCompile Include="..\.\src\qtgui\rendersettingsdlg.cpp">
<Filter>Source Files\qtgui</Filter>
<ClCompile Include="..\.\src\mtsgui\rendersettingsdlg.cpp">
<Filter>Source Files\mtsgui</Filter>
</ClCompile>
<ClCompile Include="..\.\src\qtgui\save.cpp">
<Filter>Source Files\qtgui</Filter>
<ClCompile Include="..\.\src\mtsgui\save.cpp">
<Filter>Source Files\mtsgui</Filter>
</ClCompile>
<ClCompile Include="..\.\src\qtgui\sceneimporter.cpp">
<Filter>Source Files\qtgui</Filter>
<ClCompile Include="..\.\src\mtsgui\sceneimporter.cpp">
<Filter>Source Files\mtsgui</Filter>
</ClCompile>
<ClCompile Include="..\.\src\qtgui\sceneinfodlg.cpp">
<Filter>Source Files\qtgui</Filter>
<ClCompile Include="..\.\src\mtsgui\sceneinfodlg.cpp">
<Filter>Source Files\mtsgui</Filter>
</ClCompile>
<ClCompile Include="..\.\src\qtgui\sceneloader.cpp">
<Filter>Source Files\qtgui</Filter>
<ClCompile Include="..\.\src\mtsgui\sceneloader.cpp">
<Filter>Source Files\mtsgui</Filter>
</ClCompile>
<ClCompile Include="..\.\src\qtgui\server.cpp">
<Filter>Source Files\qtgui</Filter>
<ClCompile Include="..\.\src\mtsgui\server.cpp">
<Filter>Source Files\mtsgui</Filter>
</ClCompile>
<ClCompile Include="..\.\src\qtgui\tabbar.cpp">
<Filter>Source Files\qtgui</Filter>
<ClCompile Include="..\.\src\mtsgui\tabbar.cpp">
<Filter>Source Files\mtsgui</Filter>
</ClCompile>
<ClCompile Include="..\.\src\qtgui\updatedlg.cpp">
<Filter>Source Files\qtgui</Filter>
<ClCompile Include="..\.\src\mtsgui\updatedlg.cpp">
<Filter>Source Files\mtsgui</Filter>
</ClCompile>
<ClCompile Include="..\.\src\qtgui\xmltreemodel.cpp">
<Filter>Source Files\qtgui</Filter>
<ClCompile Include="..\.\src\mtsgui\xmltreemodel.cpp">
<Filter>Source Files\mtsgui</Filter>
</ClCompile>
<ClCompile Include="..\.\src\rfilters\box.cpp">
<Filter>Source Files\rfilters</Filter>
@ -804,77 +804,77 @@
<ClInclude Include="..\.\src\phase\microflake_fiber.h">
<Filter>Source Files\phase</Filter>
</ClInclude>
<ClInclude Include="..\.\src\qtgui\aboutdlg.h">
<Filter>Source Files\qtgui</Filter>
<ClInclude Include="..\.\src\mtsgui\aboutdlg.h">
<Filter>Source Files\mtsgui</Filter>
</ClInclude>
<ClInclude Include="..\.\src\qtgui\acknowledgmentdlg.h">
<Filter>Source Files\qtgui</Filter>
<ClInclude Include="..\.\src\mtsgui\acknowledgmentdlg.h">
<Filter>Source Files\mtsgui</Filter>
</ClInclude>
<ClInclude Include="..\.\src\qtgui\addserverdlg.h">
<Filter>Source Files\qtgui</Filter>
<ClInclude Include="..\.\src\mtsgui\addserverdlg.h">
<Filter>Source Files\mtsgui</Filter>
</ClInclude>
<ClInclude Include="..\.\src\qtgui\common.h">
<Filter>Source Files\qtgui</Filter>
<ClInclude Include="..\.\src\mtsgui\common.h">
<Filter>Source Files\mtsgui</Filter>
</ClInclude>
<ClInclude Include="..\.\src\qtgui\glwidget.h">
<Filter>Source Files\qtgui</Filter>
<ClInclude Include="..\.\src\mtsgui\glwidget.h">
<Filter>Source Files\mtsgui</Filter>
</ClInclude>
<ClInclude Include="..\.\src\qtgui\importdlg.h">
<Filter>Source Files\qtgui</Filter>
<ClInclude Include="..\.\src\mtsgui\importdlg.h">
<Filter>Source Files\mtsgui</Filter>
</ClInclude>
<ClInclude Include="..\.\src\qtgui\loaddlg.h">
<Filter>Source Files\qtgui</Filter>
<ClInclude Include="..\.\src\mtsgui\loaddlg.h">
<Filter>Source Files\mtsgui</Filter>
</ClInclude>
<ClInclude Include="..\.\src\qtgui\locateresourcedlg.h">
<Filter>Source Files\qtgui</Filter>
<ClInclude Include="..\.\src\mtsgui\locateresourcedlg.h">
<Filter>Source Files\mtsgui</Filter>
</ClInclude>
<ClInclude Include="..\.\src\qtgui\logwidget.h">
<Filter>Source Files\qtgui</Filter>
<ClInclude Include="..\.\src\mtsgui\logwidget.h">
<Filter>Source Files\mtsgui</Filter>
</ClInclude>
<ClInclude Include="..\.\src\qtgui\mainwindow.h">
<Filter>Source Files\qtgui</Filter>
<ClInclude Include="..\.\src\mtsgui\mainwindow.h">
<Filter>Source Files\mtsgui</Filter>
</ClInclude>
<ClInclude Include="..\.\src\qtgui\preview.h">
<Filter>Source Files\qtgui</Filter>
<ClInclude Include="..\.\src\mtsgui\preview.h">
<Filter>Source Files\mtsgui</Filter>
</ClInclude>
<ClInclude Include="..\.\src\qtgui\previewsettingsdlg.h">
<Filter>Source Files\qtgui</Filter>
<ClInclude Include="..\.\src\mtsgui\previewsettingsdlg.h">
<Filter>Source Files\mtsgui</Filter>
</ClInclude>
<ClInclude Include="..\.\src\qtgui\previewsettingsdlg_cocoa.h">
<Filter>Source Files\qtgui</Filter>
<ClInclude Include="..\.\src\mtsgui\previewsettingsdlg_cocoa.h">
<Filter>Source Files\mtsgui</Filter>
</ClInclude>
<ClInclude Include="..\.\src\qtgui\preview_proc.h">
<Filter>Source Files\qtgui</Filter>
<ClInclude Include="..\.\src\mtsgui\preview_proc.h">
<Filter>Source Files\mtsgui</Filter>
</ClInclude>
<ClInclude Include="..\.\src\qtgui\programsettingsdlg.h">
<Filter>Source Files\qtgui</Filter>
<ClInclude Include="..\.\src\mtsgui\programsettingsdlg.h">
<Filter>Source Files\mtsgui</Filter>
</ClInclude>
<ClInclude Include="..\.\src\qtgui\rendersettingsdlg.h">
<Filter>Source Files\qtgui</Filter>
<ClInclude Include="..\.\src\mtsgui\rendersettingsdlg.h">
<Filter>Source Files\mtsgui</Filter>
</ClInclude>
<ClInclude Include="..\.\src\qtgui\save.h">
<Filter>Source Files\qtgui</Filter>
<ClInclude Include="..\.\src\mtsgui\save.h">
<Filter>Source Files\mtsgui</Filter>
</ClInclude>
<ClInclude Include="..\.\src\qtgui\sceneimporter.h">
<Filter>Source Files\qtgui</Filter>
<ClInclude Include="..\.\src\mtsgui\sceneimporter.h">
<Filter>Source Files\mtsgui</Filter>
</ClInclude>
<ClInclude Include="..\.\src\qtgui\sceneinfodlg.h">
<Filter>Source Files\qtgui</Filter>
<ClInclude Include="..\.\src\mtsgui\sceneinfodlg.h">
<Filter>Source Files\mtsgui</Filter>
</ClInclude>
<ClInclude Include="..\.\src\qtgui\sceneloader.h">
<Filter>Source Files\qtgui</Filter>
<ClInclude Include="..\.\src\mtsgui\sceneloader.h">
<Filter>Source Files\mtsgui</Filter>
</ClInclude>
<ClInclude Include="..\.\src\qtgui\server.h">
<Filter>Source Files\qtgui</Filter>
<ClInclude Include="..\.\src\mtsgui\server.h">
<Filter>Source Files\mtsgui</Filter>
</ClInclude>
<ClInclude Include="..\.\src\qtgui\tabbar.h">
<Filter>Source Files\qtgui</Filter>
<ClInclude Include="..\.\src\mtsgui\tabbar.h">
<Filter>Source Files\mtsgui</Filter>
</ClInclude>
<ClInclude Include="..\.\src\qtgui\updatedlg.h">
<Filter>Source Files\qtgui</Filter>
<ClInclude Include="..\.\src\mtsgui\updatedlg.h">
<Filter>Source Files\mtsgui</Filter>
</ClInclude>
<ClInclude Include="..\.\src\qtgui\xmltreemodel.h">
<Filter>Source Files\qtgui</Filter>
<ClInclude Include="..\.\src\mtsgui\xmltreemodel.h">
<Filter>Source Files\mtsgui</Filter>
</ClInclude>
<ClInclude Include="..\.\src\shapes\instance.h">
<Filter>Source Files\shapes</Filter>

7
include/mitsuba/core/platform.h
View File

@ -74,6 +74,7 @@
#define MTS_MODULE_RENDER 2
#define MTS_MODULE_HW 3
#define MTS_MODULE_BIDIR 4
#define MTS_MODULE_PYTHON 5
#define MTS_EXPORT __declspec(dllexport)
#define MTS_IMPORT __declspec(dllimport)
@ -98,6 +99,11 @@
#else
#define MTS_EXPORT_BIDIR __declspec(dllimport)
#endif
#if MTS_BUILD_MODULE == MTS_MODULE_PYTHON
#define MTS_EXPORT_PYTHON __declspec(dllexport)
#else
#define MTS_EXPORT_PYTHON __declspec(dllimport)
#endif
#define SIZE_T_FMT "%Iu"
#define BOOST_FILESYSTEM_NO_LIB
@ -108,6 +114,7 @@
#define MTS_EXPORT_RENDER
#define MTS_EXPORT_HW
#define MTS_EXPORT_BIDIR
#define MTS_EXPORT_PYTHON
#include <stdint.h>
#define SIZE_T_FMT "%zd"

18
src/qtgui/SConscript → src/mtsgui/SConscript
View File

@ -21,7 +21,7 @@ def scanFiles(dir, accept=["*.cpp"], reject=[]) :
if hasQt:
qtEnv = mainEnv.Clone()
qtEnv.Append(CPPPATH=['#src/qtgui'])
qtEnv.Append(CPPPATH=['#src/mtsgui'])
qtEnv.EnableQt4Modules(['QtGui', 'QtCore', 'QtOpenGL', 'QtXml', 'QtXmlPatterns', 'QtNetwork'])
if sys.platform == 'win32':
index = qtEnv['CXXFLAGS'].index('_CONSOLE')
@ -35,7 +35,7 @@ if hasQt:
elif sys.platform == 'darwin':
qtEnv.Append(LINKFLAGS=['-Fdependencies/darwin', '-framework', 'BWToolkitFramework'])
bpath = env.GetBuildPath('#src/qtgui')
bpath = env.GetBuildPath('#src/mtsgui')
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
@ -57,12 +57,12 @@ if hasQt:
qtSources += qtEnv_osx.StaticObject('previewsettingsdlg_cocoa_impl.mm')
else:
qtSources = [x for x in qtSources if (not isinstance(x, str) or 'cocoa' not in x)]
qtgui = qtEnv.Program('mtsgui', qtSources)
mtsgui = qtEnv.Program('mtsgui', qtSources)
if sys.platform == 'darwin':
qtEnv.AddPostAction(qtgui, 'install_name_tool -change QtGui.framework/Versions/4/QtGui @executable_path/../Frameworks/QtGui $TARGET')
qtEnv.AddPostAction(qtgui, 'install_name_tool -change QtCore.framework/Versions/4/QtCore @executable_path/../Frameworks/QtCore $TARGET')
qtEnv.AddPostAction(qtgui, 'install_name_tool -change QtOpenGL.framework/Versions/4/QtOpenGL @executable_path/../Frameworks/QtOpenGL $TARGET')
qtEnv.AddPostAction(qtgui, 'install_name_tool -change QtXml.framework/Versions/4/QtXml @executable_path/../Frameworks/QtXml $TARGET')
qtEnv.AddPostAction(qtgui, 'install_name_tool -change QtNetwork.framework/Versions/4/QtNetwork @executable_path/../Frameworks/QtNetwork $TARGET')
qtEnv.AddPostAction(qtgui, 'install_name_tool -change QtXmlPatterns.framework/Versions/4/QtXmlPatterns @executable_path/../Frameworks/QtXmlPatterns $TARGET')
qtEnv.AddPostAction(mtsgui, 'install_name_tool -change QtGui.framework/Versions/4/QtGui @executable_path/../Frameworks/QtGui $TARGET')
qtEnv.AddPostAction(mtsgui, 'install_name_tool -change QtCore.framework/Versions/4/QtCore @executable_path/../Frameworks/QtCore $TARGET')
qtEnv.AddPostAction(mtsgui, 'install_name_tool -change QtOpenGL.framework/Versions/4/QtOpenGL @executable_path/../Frameworks/QtOpenGL $TARGET')
qtEnv.AddPostAction(mtsgui, 'install_name_tool -change QtXml.framework/Versions/4/QtXml @executable_path/../Frameworks/QtXml $TARGET')
qtEnv.AddPostAction(mtsgui, 'install_name_tool -change QtNetwork.framework/Versions/4/QtNetwork @executable_path/../Frameworks/QtNetwork $TARGET')
qtEnv.AddPostAction(mtsgui, 'install_name_tool -change QtXmlPatterns.framework/Versions/4/QtXmlPatterns @executable_path/../Frameworks/QtXmlPatterns $TARGET')

0
src/qtgui/aboutdlg.cpp → src/mtsgui/aboutdlg.cpp
View File

0
src/qtgui/aboutdlg.h → src/mtsgui/aboutdlg.h
View File

0
src/qtgui/aboutdlg.ui → src/mtsgui/aboutdlg.ui
View File

0
src/qtgui/acknowledgmentdlg.cpp → src/mtsgui/acknowledgmentdlg.cpp
View File

0
src/qtgui/acknowledgmentdlg.h → src/mtsgui/acknowledgmentdlg.h
View File

0
src/qtgui/acknowledgmentdlg.ui → src/mtsgui/acknowledgmentdlg.ui
View File

0
src/qtgui/addserverdlg.cpp → src/mtsgui/addserverdlg.cpp
View File

0
src/qtgui/addserverdlg.h → src/mtsgui/addserverdlg.h
View File

0
src/qtgui/addserverdlg.ui → src/mtsgui/addserverdlg.ui
View File

0
src/qtgui/common.h → src/mtsgui/common.h
View File

0
src/qtgui/glwidget.cpp → src/mtsgui/glwidget.cpp
View File

0
src/qtgui/glwidget.h → src/mtsgui/glwidget.h
View File

0
src/qtgui/importdlg.cpp → src/mtsgui/importdlg.cpp
View File

0
src/qtgui/importdlg.h → src/mtsgui/importdlg.h
View File

0
src/qtgui/importdlg.ui → src/mtsgui/importdlg.ui
View File

0
src/qtgui/loaddlg.cpp → src/mtsgui/loaddlg.cpp
View File

0
src/qtgui/loaddlg.h → src/mtsgui/loaddlg.h
View File

0
src/qtgui/loaddlg.ui → src/mtsgui/loaddlg.ui
View File

0
src/qtgui/locateresourcedlg.cpp → src/mtsgui/locateresourcedlg.cpp
View File

0
src/qtgui/locateresourcedlg.h → src/mtsgui/locateresourcedlg.h
View File

0
src/qtgui/locateresourcedlg.ui → src/mtsgui/locateresourcedlg.ui
View File

0
src/qtgui/logwidget.cpp → src/mtsgui/logwidget.cpp
View File

0
src/qtgui/logwidget.h → src/mtsgui/logwidget.h
View File

0
src/qtgui/main.cpp → src/mtsgui/main.cpp
View File

32
src/qtgui/mainwindow.cpp → src/mtsgui/mainwindow.cpp
View File

@ -61,7 +61,7 @@ MainWindow::MainWindow(QWidget *parent) :
m_previewSettings = NULL;
#endif
QSettings settings("mitsuba-renderer.org", "qtgui");
QSettings settings("mitsuba-renderer.org", "mtsgui");
logger->setLogLevel((ELogLevel) settings.value("verbosity", EDebug).toInt());
m_logWidget = new LogWidget(NULL);
@ -305,7 +305,7 @@ MainWindow::~MainWindow() {
}
void MainWindow::initWorkers() {
QSettings settings("mitsuba-renderer.org", "qtgui");
QSettings settings("mitsuba-renderer.org", "mtsgui");
ref<Scheduler> scheduler = Scheduler::getInstance();
int localWorkerCount = settings.value("localWorkers", getProcessorCount()).toInt();
m_workerPriority = (Thread::EThreadPriority)
@ -398,7 +398,7 @@ void MainWindow::checkForUpdates(bool manualUpdateCheck) {
void MainWindow::onNetworkFinished(QNetworkReply *reply) {
if (reply->error() == QNetworkReply::NoError) {
try {
QSettings settings("mitsuba-renderer.org", "qtgui");
QSettings settings("mitsuba-renderer.org", "mtsgui");
Version remote(QString(reply->readAll()).toStdString());
Version ignoredVersion(settings.value("ignoredVersion", "0.0.0").toString().toStdString());
Version local(MTS_VERSION);
@ -571,7 +571,7 @@ void MainWindow::on_actionOpen_triggered() {
dialog->setAcceptMode(QFileDialog::AcceptOpen);
dialog->setViewMode(QFileDialog::Detail);
dialog->setWindowModality(Qt::WindowModal);
QSettings settings("mitsuba-renderer.org", "qtgui");
QSettings settings("mitsuba-renderer.org", "mtsgui");
dialog->restoreState(settings.value("fileDialogState").toByteArray());
connect(dialog, SIGNAL(finished(int)), this, SLOT(onOpenDialogClose(int)));
m_currentChild = dialog;
@ -583,7 +583,7 @@ void MainWindow::on_actionOpen_triggered() {
}
void MainWindow::onOpenDialogClose(int reason) {
QSettings settings("mitsuba-renderer.org", "qtgui");
QSettings settings("mitsuba-renderer.org", "mtsgui");
QFileDialog *dialog = static_cast<QFileDialog *>(sender());
m_currentChild = NULL;
if (reason == QDialog::Accepted) {
@ -605,7 +605,7 @@ void MainWindow::onOpenRecent() {
}
void MainWindow::onClearRecent() {
QSettings settings("mitsuba-renderer.org", "qtgui");
QSettings settings("mitsuba-renderer.org", "mtsgui");
for (int j = 0; j < MAX_RECENT_FILES; ++j)
m_actRecent[j]->setVisible(false);
settings.setValue("recentFileList", QStringList());
@ -714,7 +714,7 @@ void MainWindow::loadFile(QString filename) {
void MainWindow::addRecentFile(QString fileName) {
/* Update recent files list */
QSettings settings("mitsuba-renderer.org", "qtgui");
QSettings settings("mitsuba-renderer.org", "mtsgui");
QStringList files = settings.value("recentFileList").toStringList();
files.removeAll(fileName);
files.prepend(fileName);
@ -731,7 +731,7 @@ void MainWindow::addRecentFile(QString fileName) {
}
void MainWindow::updateRecentFileActions() {
QSettings settings("mitsuba-renderer.org", "qtgui");
QSettings settings("mitsuba-renderer.org", "mtsgui");
QStringList files = settings.value("recentFileList").toStringList();
int numRecentFiles = qMin(files.size(), MAX_RECENT_FILES);
@ -931,7 +931,7 @@ bool MainWindow::on_tabBar_tabCloseRequested(int index) {
}
void MainWindow::closeEvent(QCloseEvent *event) {
QSettings settings("mitsuba-renderer.org", "qtgui");
QSettings settings("mitsuba-renderer.org", "mtsgui");
settings.setValue("pos", pos());
for (int i=ui->tabBar->count()-1; i>=0; --i) {
if (!on_tabBar_tabCloseRequested(i)) {
@ -1037,7 +1037,7 @@ void MainWindow::on_actionPreviewSettings_triggered() {
connect(&d, SIGNAL(diffuseSourcesChanged(bool)), ui->glView, SLOT(setDiffuseSources(bool)));
d.setMaximumSize(d.minimumSize());
d.exec();
QSettings settings("mitsuba-renderer.org", "qtgui");
QSettings settings("mitsuba-renderer.org", "mtsgui");
settings.setValue("preview_sRGB", context->srgb);
settings.setValue("preview_gamma", context->gamma);
settings.setValue("preview_exposure", context->exposure);
@ -1080,7 +1080,7 @@ void MainWindow::onPreviewSettingsClose() {
ui->actionPreviewSettings->setEnabled(hasTab);
if (hasTab) {
SceneContext *context = m_context[index];
QSettings settings("mitsuba-renderer.org", "qtgui");
QSettings settings("mitsuba-renderer.org", "mtsgui");
settings.setValue("preview_sRGB", context->srgb);
settings.setValue("preview_gamma", context->gamma);
settings.setValue("preview_exposure", context->exposure);
@ -1135,7 +1135,7 @@ void MainWindow::on_actionSettings_triggered() {
for (int i=0; i<connections.size(); ++i)
connectionData.append(connections[i].toByteArray());
QSettings settings("mitsuba-renderer.org", "qtgui");
QSettings settings("mitsuba-renderer.org", "mtsgui");
settings.setValue("verbosity", d.getLogLevel());
settings.setValue("invertMouse", d.getInvertMouse());
settings.setValue("blockSize", d.getBlockSize());
@ -1292,7 +1292,7 @@ void MainWindow::on_actionExportImage_triggered() {
"", tr("All supported formats (*.exr *.png *.jpg *.jpeg);;Linear EXR image (*.exr)"
";; Tonemapped 8-bit image (*.png *.jpg *.jpeg)"));
QSettings settings("mitsuba-renderer.org", "qtgui");
QSettings settings("mitsuba-renderer.org", "mtsgui");
dialog->setViewMode(QFileDialog::Detail);
dialog->setAcceptMode(QFileDialog::AcceptSave);
@ -1316,7 +1316,7 @@ void MainWindow::onExportDialogClose(int reason) {
int currentIndex = ui->tabBar->currentIndex();
SceneContext *ctx = m_context[currentIndex];
QSettings settings("mitsuba-renderer.org", "qtgui");
QSettings settings("mitsuba-renderer.org", "mtsgui");
QFileDialog *dialog = static_cast<QFileDialog *>(sender());
m_currentChild = NULL;
@ -1427,7 +1427,7 @@ void MainWindow::on_actionSaveAs_triggered() {
"", tr("Mitsuba scenes (*.xml)"));
m_currentChild = dialog;
QSettings settings("mitsuba-renderer.org", "qtgui");
QSettings settings("mitsuba-renderer.org", "mtsgui");
dialog->setAttribute(Qt::WA_DeleteOnClose);
dialog->setViewMode(QFileDialog::Detail);
dialog->setAcceptMode(QFileDialog::AcceptSave);
@ -1446,7 +1446,7 @@ void MainWindow::onSaveAsDialogClose(int reason) {
int currentIndex = ui->tabBar->currentIndex();
SceneContext *context = m_context[currentIndex];
QSettings settings("mitsuba-renderer.org", "qtgui");
QSettings settings("mitsuba-renderer.org", "mtsgui");
QFileDialog *dialog = static_cast<QFileDialog *>(sender());
m_currentChild = NULL;
if (reason == QDialog::Accepted) {

0
src/qtgui/mainwindow.h → src/mtsgui/mainwindow.h
View File

0
src/qtgui/mainwindow.ui → src/mtsgui/mainwindow.ui
View File

0
src/qtgui/preview.cpp → src/mtsgui/preview.cpp
View File

0
src/qtgui/preview.h → src/mtsgui/preview.h
View File

0
src/qtgui/preview_proc.cpp → src/mtsgui/preview_proc.cpp
View File

0
src/qtgui/preview_proc.h → src/mtsgui/preview_proc.h
View File

0
src/qtgui/previewsettingsdlg.cpp → src/mtsgui/previewsettingsdlg.cpp
View File

0
src/qtgui/previewsettingsdlg.h → src/mtsgui/previewsettingsdlg.h
View File

0
src/qtgui/previewsettingsdlg.ui → src/mtsgui/previewsettingsdlg.ui
View File

0
src/qtgui/previewsettingsdlg_cocoa.cpp → src/mtsgui/previewsettingsdlg_cocoa.cpp
View File

0
src/qtgui/previewsettingsdlg_cocoa.h → src/mtsgui/previewsettingsdlg_cocoa.h
View File

0
src/qtgui/previewsettingsdlg_cocoa_impl.mm → src/mtsgui/previewsettingsdlg_cocoa_impl.mm
View File

0
src/qtgui/programsettingsdlg.cpp → src/mtsgui/programsettingsdlg.cpp
View File

0
src/qtgui/programsettingsdlg.h → src/mtsgui/programsettingsdlg.h
View File

0
src/qtgui/programsettingsdlg.ui → src/mtsgui/programsettingsdlg.ui
View File

0
src/qtgui/rendersettingsdlg.cpp → src/mtsgui/rendersettingsdlg.cpp
View File

0
src/qtgui/rendersettingsdlg.h → src/mtsgui/rendersettingsdlg.h
View File

0
src/qtgui/rendersettingsdlg.ui → src/mtsgui/rendersettingsdlg.ui
View File

0
src/qtgui/resources.qrc → src/mtsgui/resources.qrc
View File

0
src/qtgui/resources/about.svg → src/mtsgui/resources/about.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

0
src/qtgui/resources/about16.png → src/mtsgui/resources/about16.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 892 B

After

Width:  |  Height:  |  Size: 892 B

0
src/qtgui/resources/add.png → src/mtsgui/resources/add.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 186 B

After

Width:  |  Height:  |  Size: 186 B

0
src/qtgui/resources/adjustsize.svg → src/mtsgui/resources/adjustsize.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

0
src/qtgui/resources/adjustsize16.png → src/mtsgui/resources/adjustsize16.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 568 B

After

Width:  |  Height:  |  Size: 568 B

0
src/qtgui/resources/appicon.png → src/mtsgui/resources/appicon.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 50 KiB

After

Width:  |  Height:  |  Size: 50 KiB

0
src/qtgui/resources/branch-closed.png → src/mtsgui/resources/branch-closed.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

0
src/qtgui/resources/branch-open.png → src/mtsgui/resources/branch-open.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

0
src/qtgui/resources/clear.png → src/mtsgui/resources/clear.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

0
src/qtgui/resources/clone.png → src/mtsgui/resources/clone.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 929 B

After

Width:  |  Height:  |  Size: 929 B

0
src/qtgui/resources/close.svg → src/mtsgui/resources/close.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

0
src/qtgui/resources/close16.png → src/mtsgui/resources/close16.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 708 B

After

Width:  |  Height:  |  Size: 708 B

0
src/qtgui/resources/controls.png → src/mtsgui/resources/controls.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 518 B

After

Width:  |  Height:  |  Size: 518 B

0
src/qtgui/resources/controls.svg → src/mtsgui/resources/controls.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.4 KiB

After

Width:  |  Height:  |  Size: 6.4 KiB

0
src/qtgui/resources/docs.xml → src/mtsgui/resources/docs.xml
View File

0
src/qtgui/resources/duplicatetab.png → src/mtsgui/resources/duplicatetab.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

0
src/qtgui/resources/duplicatetab.svg → src/mtsgui/resources/duplicatetab.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

0
src/qtgui/resources/fpreview.png → src/mtsgui/resources/fpreview.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

0
src/qtgui/resources/help.svg → src/mtsgui/resources/help.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

0
src/qtgui/resources/help16.png → src/mtsgui/resources/help16.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 911 B

After

Width:  |  Height:  |  Size: 911 B

0
src/qtgui/resources/import.svg → src/mtsgui/resources/import.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

0
src/qtgui/resources/import16.png → src/mtsgui/resources/import16.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 775 B

After

Width:  |  Height:  |  Size: 775 B

0
src/qtgui/resources/log.png → src/mtsgui/resources/log.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

0
src/qtgui/resources/logo.png → src/mtsgui/resources/logo.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

0
src/qtgui/resources/mitsuba48.png → src/mtsgui/resources/mitsuba48.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.0 KiB

After

Width:  |  Height:  |  Size: 6.0 KiB

0
src/qtgui/resources/open.svg → src/mtsgui/resources/open.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

0
src/qtgui/resources/open16.png → src/mtsgui/resources/open16.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 566 B

After

Width:  |  Height:  |  Size: 566 B

0
src/qtgui/resources/picture16.png → src/mtsgui/resources/picture16.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 331 B

After

Width:  |  Height:  |  Size: 331 B

0
src/qtgui/resources/play.png → src/mtsgui/resources/play.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

0
src/qtgui/resources/preferences.png → src/mtsgui/resources/preferences.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 964 B

After

Width:  |  Height:  |  Size: 964 B

0
src/qtgui/resources/preferences.svg → src/mtsgui/resources/preferences.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

0
src/qtgui/resources/preview.png → src/mtsgui/resources/preview.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

0
src/qtgui/resources/refresh.png → src/mtsgui/resources/refresh.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

0
src/qtgui/resources/refresh.svg → src/mtsgui/resources/refresh.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

0
src/qtgui/resources/remove.png → src/mtsgui/resources/remove.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 174 B

After

Width:  |  Height:  |  Size: 174 B

0
src/qtgui/resources/save.svg → src/mtsgui/resources/save.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

0
src/qtgui/resources/save16.png → src/mtsgui/resources/save16.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 811 B

After

Width:  |  Height:  |  Size: 811 B

0
src/qtgui/resources/saveas.svg → src/mtsgui/resources/saveas.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

0
src/qtgui/resources/saveas16.png → src/mtsgui/resources/saveas16.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 795 B

After

Width:  |  Height:  |  Size: 795 B

0
src/qtgui/resources/server.png → src/mtsgui/resources/server.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 583 B

After

Width:  |  Height:  |  Size: 583 B

0
src/qtgui/resources/settings.png → src/mtsgui/resources/settings.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

0
src/qtgui/resources/showStats.png → src/mtsgui/resources/showStats.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

0
src/qtgui/resources/stop.png → src/mtsgui/resources/stop.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

0
src/qtgui/resources/stylesheet.css → src/mtsgui/resources/stylesheet.css
View File

0
src/qtgui/resources/update.png → src/mtsgui/resources/update.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 796 B

After

Width:  |  Height:  |  Size: 796 B

0
src/qtgui/save.cpp → src/mtsgui/save.cpp
View File

0
src/qtgui/save.h → src/mtsgui/save.h
View File

0
src/qtgui/sceneimporter.cpp → src/mtsgui/sceneimporter.cpp
View File

Some files were not shown because too many files have changed in this diff Show More