build script fixes, add ldflags build option
update and enhance demos
fix bug in 4x grid oversampling
warn if writePNG called while compiled without libpng
make shapes in ShapeList const
and add many other const needed due to snowball effect
slightly optimize Camera::makeRayPacket using _mm_shuffle_ps
make Vector SIMD vectorization disabled by default (causes problems)
fix bug in implicit reflection of transmissive surfaces,
when surface's reflection parameter is set to zero
Help("""Targets: all - build everything, libs - build all libraries demos - build all demos models - download/prepare all models docs - compile doxygen documentation libs = (static-lib, python-module) static-lib - ray tracer library to link with python-module - ray tracer module for Python demos = (python-demos, cc-demos) python-demos - Python demos, this depends on python-module cc-demos - C++ demos models = (local-models, download-models) local-models - prepare local models download-models - download models which are not locally available no-docs = (libs, demos, models) - everything but docs no-download = (libs, demos, local-models) - everything but docs and downloadable modelsDefault target is no-download.Options:""")import os, sysEnsurePythonVersion(2, 3)EnsureSConsVersion(0, 97)Decider('MD5-timestamp')SConsignFile('build/.sconsign.dblite')if sys.platform == 'win32': tools = ['mingw']else: tools = ['default']env = Environment(tools = tools, CPPPATH = ['.','#include'])opt = Options(['build/.optioncache'])opt.AddOptions( BoolOption('simd', 'allow SSE intrinsics', True), ('precision', 'floating point number precision (single/double)', "single"), ('flags', 'add additional compiler flags', ""), BoolOption('force_flags', "use only flags specified by 'flags' option (do not autodetect arch/sse flags)", False), ('ldflags', 'add additional linker flags', ""), BoolOption('profile', "enable gcc's profiling support (-pg)", False),)if env['PLATFORM'] == 'win32': opt.AddOptions( BoolOption('mingw', 'use Mingw and GCC compiler, if available', False), ('pythonpath', 'path to Python installation', 'C:\\Python%c%c' % (sys.version[0], sys.version[2])), )else: opt.AddOptions( BoolOption('intelc', 'use Intel C++ Compiler, if available', False), )opt.Update(env)opt.Save('build/.optioncache', env)Help(opt.GenerateHelpText(env))### configureplatform = 'unknown'def CheckPlatform(context): global platform context.Message('Platform is... ') if sys.platform[:5] == 'linux': platform = 'linux' elif env['PLATFORM'] == 'posix': platform = 'posix' elif env['PLATFORM'] == 'win32': platform = 'win32' context.Result(platform) return Trueintelcversion = ''def CheckIntelC(context): global intelc, intelcversion context.Message('Checking for IntelC compiler... ') intelc = Tool("intelc").exists(env) == True if intelc: testenv = Environment() Tool("intelc").generate(testenv) intelcversion = str(testenv['INTEL_C_COMPILER_VERSION']/10.) context.Result(intelcversion) else: context.Result(intelc) return intelcdef CheckGCC(context): global gcc, gccversion context.Message('Checking for GCC compiler... ') gcc = "g++" in env['TOOLS'] if gcc: gccversion = env['CCVERSION'] context.Result(gccversion) else: gccversion = '' context.Result(False) return gccdef CheckMSVC(context): global msvc, msvcversion context.Message('Checking for MSVC compiler... ') testenv = Environment() msvc = "msvc" in testenv['TOOLS'] if msvc: msvcversion = testenv['MSVS_VERSION'] context.Result(msvcversion) else: msvcversion = '' context.Result(False) return msvcdef CheckCPUFlags(context): global cpu, cpuflags_gcc, cpuflags_intelc context.Message('Checking CPU arch and flags... ') env.Execute('@$CC tools/cpuflags.c -o tools/cpuflags') (cpu, cpuflags_gcc, cpuflags_intelc) = os.popen('tools'+os.sep+'cpuflags %s %s' % (''.join(gccversion.rsplit('.',1)), intelcversion) ).read().split('\n')[:3] context.Result(cpu) return Trueconf_dir = "#/build/.sconf_temp"log_file="#/build/config.log"config_h="#/include/config.h"conf = Configure(env, conf_dir=conf_dir, log_file=log_file, config_h=config_h, custom_tests = { 'CheckPlatform' : CheckPlatform, 'CheckCPUFlags' : CheckCPUFlags, 'CheckIntelC' : CheckIntelC, 'CheckGCC' : CheckGCC, 'CheckMSVC' : CheckMSVC})conf.CheckPlatform()conf.CheckGCC()if platform == 'win32': conf.CheckMSVC() intelc = Falseelse: conf.CheckIntelC() msvc=Falseif intelc and (not gcc or conf.env['intelc']): Tool('intelc').generate(conf.env) cc = 'intelc'elif msvc and (not gcc or not conf.env['mingw']): Tool('default').generate(conf.env) conf.Define("MSVC") cc = 'msvc'elif gcc: cc = 'gcc'else: cc = 'none'if cc == 'intelc' or cc == 'gcc': conf.CheckCPUFlags()if platform == 'win32' and cc == 'gcc': conf.env.Append(LIBPATH=["C:/mingw/lib", "C:/msys/mingw/lib"]) conf.env.Append(CPPPATH=["C:/mingw/include", "C:/msys/mingw/include"])add_flags = ''if cc == 'gcc': add_flags += cpuflags_gcc + ' -ffast-math 'if cc == 'intelc': add_flags += cpuflags_intelc + ' 'if cc == 'msvc': add_flags += '/fp:fast ' if conf.env['simd']: add_flags += '/arch:SSE 'if conf.env['force_flags']: add_flags = conf.env['flags'] + ' 'else: add_flags += conf.env['flags'] + ' 'if conf.env['precision'] == 'double': conf.Define("PYRIT_DOUBLE")if not conf.env['simd'] or conf.env['precision'] == 'double': conf.Define("NO_SIMD")if cc == 'intelc': conf.env.Append(CCFLAGS="-O3 -w1 " + add_flags)elif cc == 'gcc': conf.env.Append(CCFLAGS="-O3 -Wall -pipe " + add_flags) # Other useful flags: # -Wunsafe-loop-optimizations -Wpointer-arith -Wcast-align -Wconversion # -Wmissing-noreturn -Winline -Wdisabled-optimizationelif cc == 'msvc': conf.env.Append(CCFLAGS="/Ox /Ob2 /GS- /Gy /GF /GR- /Zp16 /MD /EHsc /vmb " + add_flags)else: print "No supported compiler found." Exit(1)print "Using compiler: " + ccprint "Additional flags: " + add_flagsif conf.env['profile'] and cc == 'gcc': conf.env.Append(CCFLAGS="-pg", LINKFLAGS="-pg")if conf.env['ldflags']: conf.env.Append(LINKFLAGS=conf.env['ldflags'])# configure pthreadpthread = Trueif platform == 'win32': if cc == 'msvc': if not conf.CheckLib('pthreadVC2'): pthread = False elif cc == 'gcc': if not conf.CheckLib('pthreadGC2'): pthread = Falseelse: conf.env.Append(CCFLAGS="-pthread ")if not pthread: print 'Error: Cannot build without pthread.' Exit(1)# configure libpngif conf.CheckLibWithHeader('libpng', 'png.h', 'C'): conf.Define('HAVE_PNG')env = conf.Finish()# configure Pythonpyenv = env.Clone()have_python = Trueif platform == 'win32': pythonver = '%c%c' % (sys.version[0], sys.version[2]) pythonlib = 'python'+pythonver pythonpath = [env['pythonpath'], 'C:\\Program Files\\Python'+pythonver] pyenv.Append(CPPPATH=[s+'\\include' for s in pythonpath]) pyenv.Append(LIBPATH=[s+'\\libs' for s in pythonpath]) pyenv.Replace(SHLIBSUFFIX='.pyd') conf = Configure(pyenv, conf_dir=conf_dir, log_file=log_file, config_h=config_h) if not conf.CheckLib(pythonlib): have_python = False pyenv = conf.Finish()else: try: pyenv.ParseConfig('python-config --includes --libs') except: have_python = Falseif not have_python: print "Error: Python is required." Exit(1)# configure SDLsdlenv = env.Clone()if cc == 'msvc': sdlenv.Append(LIBS=['SDL', 'SDLmain']) sdlenv.Append(LINKFLAGS="/SUBSYSTEM:WINDOWS")else: try: sdlenv.ParseConfig('sh sdl-config --cflags') sdlenv.ParseConfig('sh sdl-config --libs') except: passdef CheckSDL(context): global have_sdl context.Message('Checking for SDL... ') if context.TryLink("#include <SDL.h>\n"+ "int main(int argc,char **argv){return 0;}", '.cc'): context.Result(1) return True else: context.Result("no (some demos won't be built)") return Falseconf = Configure(sdlenv, conf_dir=conf_dir, log_file=log_file, config_h=config_h, custom_tests = {'CheckSDL' : CheckSDL} )have_sdl = conf.CheckSDL()sdlenv = conf.Finish()### build targetsExport('env pyenv sdlenv have_sdl cc')lib = SConscript('src/SConscript', build_dir='build/lib', duplicate=0, exports={'buildmodule':False})pymodule = SConscript('src/SConscript', build_dir='build/pymodule', duplicate=0, exports={'buildmodule':True})SConscript('ccdemos/SConscript', build_dir='build/ccdemos', duplicate=0, exports='lib')SConscript('demos/SConscript', exports='pymodule')SConscript('tests/SConscript', build_dir='build/tests', duplicate=0, exports='lib')SConscript('models/SConscript')env.Alias('demos', ['cc-demos', 'python-demos'])env.Alias('libs', ['static-lib', 'python-module'])env.Alias('docs', Command('docs/html', [], 'doxygen'))env.Clean('docs', ['docs/html'])env.Alias('no-docs', ['libs', 'demos', 'models'])env.Alias('no-download', ['libs', 'demos', 'local-models'])env.Alias('all', ['no-docs', 'docs'])env.Alias('pyrit', 'no-download')Default('pyrit')