diff -Naur data.old/cars/M7/SConscript data/cars/M7/SConscript --- data.old/cars/M7/SConscript 2008-02-19 09:49:36.000000000 +0100 +++ data/cars/M7/SConscript 2008-02-19 12:23:58.000000000 +0100 @@ -28,4 +28,5 @@ install = env.Install(Dir(env.subst('$data_directory/cars/M7')), src) env.Alias('install', install) +SConscript('sounds/SConscript') SConscript('textures/SConscript') diff -Naur data.old/cars/M7/sounds/SConscript data/cars/M7/sounds/SConscript --- data.old/cars/M7/sounds/SConscript 1970-01-01 01:00:00.000000000 +0100 +++ data/cars/M7/sounds/SConscript 2008-02-19 11:57:43.000000000 +0100 @@ -0,0 +1,25 @@ +#-------------# +# Import Vars # +#-------------# +Import('*') + +import glob + +#---------# +# Sources # +#---------# +src = glob.glob("*.wav") + +#---------------------------------# +# Distribute to src_dir & bin_dir # +#---------------------------------# +dist_files = ['SConscript'] + src + +env.Distribute (src_dir, dist_files) +env.Distribute (bin_dir, src) + +#--------------------# +# Install data files # +#--------------------# +install = env.Install(Dir(env.subst('$data_directory/cars/M7/sounds')), src) +env.Alias('install', install) diff -Naur data.old/cars/XS/textures/SConscript data/cars/XS/textures/SConscript --- data.old/cars/XS/textures/SConscript 2008-02-19 09:49:36.000000000 +0100 +++ data/cars/XS/textures/SConscript 2008-02-19 11:10:30.000000000 +0100 @@ -7,6 +7,7 @@ # Sources # #---------# src = Split("""body.png + body-misc1.png body00.png body01.png body02.png @@ -17,10 +18,13 @@ body07.png brake.png glass.png + glass-misc1.png interior.png shadow.png wheel_front.png - wheel_rear.png""") + wheel_front-misc1.png + wheel_rear.png + wheel_rear-misc1.png""") #---------------------------------# # Distribute to src_dir & bin_dir # diff -Naur data.old/SConscript data/SConscript --- data.old/SConscript 2008-02-19 09:49:36.000000000 +0100 +++ data/SConscript 2008-02-19 10:19:29.000000000 +0100 @@ -19,6 +19,7 @@ SConscript('cars/SConscript') SConscript('lists/SConscript') SConscript('settings/SConscript') +SConscript('shaders/SConscript') SConscript('skins/SConscript') SConscript('sounds/SConscript') SConscript('textures/SConscript') diff -Naur data.old/shaders/bloompass/SConscript data/shaders/bloompass/SConscript --- data.old/shaders/bloompass/SConscript 1970-01-01 01:00:00.000000000 +0100 +++ data/shaders/bloompass/SConscript 2008-02-19 09:54:25.000000000 +0100 @@ -0,0 +1,23 @@ +#-------------# +# Import Vars # +#-------------# +Import('*') + +#---------# +# Sources # +#---------# +src = Split("""fragment.glsl vertex.glsl""") + +#---------------------------------# +# Distribute to src_dir & bin_dir # +#---------------------------------# +dist_files = ['SConscript'] + src + +env.Distribute (src_dir, dist_files) +env.Distribute (bin_dir, src) + +#--------------------# +# Install data files # +#--------------------# +install = env.Install(Dir(env.subst('$data_directory/shaders/bloompass')), src) +env.Alias('install', install) diff -Naur data.old/shaders/blurpass/SConscript data/shaders/blurpass/SConscript --- data.old/shaders/blurpass/SConscript 1970-01-01 01:00:00.000000000 +0100 +++ data/shaders/blurpass/SConscript 2008-02-19 10:27:15.000000000 +0100 @@ -0,0 +1,23 @@ +#-------------# +# Import Vars # +#-------------# +Import('*') + +#---------# +# Sources # +#---------# +src = Split("""fragment.glsl vertex.glsl""") + +#---------------------------------# +# Distribute to src_dir & bin_dir # +#---------------------------------# +dist_files = ['SConscript'] + src + +env.Distribute (src_dir, dist_files) +env.Distribute (bin_dir, src) + +#--------------------# +# Install data files # +#--------------------# +install = env.Install(Dir(env.subst('$data_directory/shaders/blurpass')), src) +env.Alias('install', install) diff -Naur data.old/shaders/depthgen/SConscript data/shaders/depthgen/SConscript --- data.old/shaders/depthgen/SConscript 1970-01-01 01:00:00.000000000 +0100 +++ data/shaders/depthgen/SConscript 2008-02-19 10:27:08.000000000 +0100 @@ -0,0 +1,23 @@ +#-------------# +# Import Vars # +#-------------# +Import('*') + +#---------# +# Sources # +#---------# +src = Split("""fragment.glsl vertex.glsl""") + +#---------------------------------# +# Distribute to src_dir & bin_dir # +#---------------------------------# +dist_files = ['SConscript'] + src + +env.Distribute (src_dir, dist_files) +env.Distribute (bin_dir, src) + +#--------------------# +# Install data files # +#--------------------# +install = env.Install(Dir(env.subst('$data_directory/shaders/depthgen')), src) +env.Alias('install', install) diff -Naur data.old/shaders/full/SConscript data/shaders/full/SConscript --- data.old/shaders/full/SConscript 1970-01-01 01:00:00.000000000 +0100 +++ data/shaders/full/SConscript 2008-02-19 10:27:01.000000000 +0100 @@ -0,0 +1,23 @@ +#-------------# +# Import Vars # +#-------------# +Import('*') + +#---------# +# Sources # +#---------# +src = Split("""fragment.glsl vertex.glsl""") + +#---------------------------------# +# Distribute to src_dir & bin_dir # +#---------------------------------# +dist_files = ['SConscript'] + src + +env.Distribute (src_dir, dist_files) +env.Distribute (bin_dir, src) + +#--------------------# +# Install data files # +#--------------------# +install = env.Install(Dir(env.subst('$data_directory/shaders/full')), src) +env.Alias('install', install) diff -Naur data.old/shaders/full-noshadow/SConscript data/shaders/full-noshadow/SConscript --- data.old/shaders/full-noshadow/SConscript 1970-01-01 01:00:00.000000000 +0100 +++ data/shaders/full-noshadow/SConscript 2008-02-19 10:26:53.000000000 +0100 @@ -0,0 +1,23 @@ +#-------------# +# Import Vars # +#-------------# +Import('*') + +#---------# +# Sources # +#---------# +src = Split("""fragment.glsl vertex.glsl""") + +#---------------------------------# +# Distribute to src_dir & bin_dir # +#---------------------------------# +dist_files = ['SConscript'] + src + +env.Distribute (src_dir, dist_files) +env.Distribute (bin_dir, src) + +#--------------------# +# Install data files # +#--------------------# +install = env.Install(Dir(env.subst('$data_directory/shaders/full-noshadow')), src) +env.Alias('install', install) diff -Naur data.old/shaders/hblur_rect/SConscript data/shaders/hblur_rect/SConscript --- data.old/shaders/hblur_rect/SConscript 1970-01-01 01:00:00.000000000 +0100 +++ data/shaders/hblur_rect/SConscript 2008-02-19 10:26:43.000000000 +0100 @@ -0,0 +1,23 @@ +#-------------# +# Import Vars # +#-------------# +Import('*') + +#---------# +# Sources # +#---------# +src = Split("""fragment.glsl vertex.glsl""") + +#---------------------------------# +# Distribute to src_dir & bin_dir # +#---------------------------------# +dist_files = ['SConscript'] + src + +env.Distribute (src_dir, dist_files) +env.Distribute (bin_dir, src) + +#--------------------# +# Install data files # +#--------------------# +install = env.Install(Dir(env.subst('$data_directory/shaders/hblur_rect')), src) +env.Alias('install', install) diff -Naur data.old/shaders/SConscript data/shaders/SConscript --- data.old/shaders/SConscript 1970-01-01 01:00:00.000000000 +0100 +++ data/shaders/SConscript 2008-02-19 09:52:25.000000000 +0100 @@ -0,0 +1,26 @@ +#-------------# +# Import Vars # +#-------------# +Import('*') + +#-----------------------# +# Distribute to src_dir # +#-----------------------# +env.Distribute (src_dir, 'SConscript') + +#----------------# +# Subdirectories # +#----------------# +Export(['env', 'src_dir', 'bin_dir']) + +SConscript('bloompass/SConscript') +SConscript('depthgen/SConscript') +SConscript('full-noshadow/SConscript') +SConscript('simple/SConscript') +SConscript('blurpass/SConscript') +SConscript('full/SConscript') +SConscript('hblur_rect/SConscript') +SConscript('shadowpass/SConscript') +SConscript('simplerect/SConscript') +SConscript('vblur_rect/SConscript') +#SConscript('temp/SConscript') diff -Naur data.old/shaders/shadowpass/SConscript data/shaders/shadowpass/SConscript --- data.old/shaders/shadowpass/SConscript 1970-01-01 01:00:00.000000000 +0100 +++ data/shaders/shadowpass/SConscript 2008-02-19 10:26:35.000000000 +0100 @@ -0,0 +1,23 @@ +#-------------# +# Import Vars # +#-------------# +Import('*') + +#---------# +# Sources # +#---------# +src = Split("""fragment.glsl vertex.glsl""") + +#---------------------------------# +# Distribute to src_dir & bin_dir # +#---------------------------------# +dist_files = ['SConscript'] + src + +env.Distribute (src_dir, dist_files) +env.Distribute (bin_dir, src) + +#--------------------# +# Install data files # +#--------------------# +install = env.Install(Dir(env.subst('$data_directory/shaders/shadowpass')), src) +env.Alias('install', install) diff -Naur data.old/shaders/simple/SConscript data/shaders/simple/SConscript --- data.old/shaders/simple/SConscript 1970-01-01 01:00:00.000000000 +0100 +++ data/shaders/simple/SConscript 2008-02-19 10:26:27.000000000 +0100 @@ -0,0 +1,23 @@ +#-------------# +# Import Vars # +#-------------# +Import('*') + +#---------# +# Sources # +#---------# +src = Split("""fragment.glsl vertex.glsl""") + +#---------------------------------# +# Distribute to src_dir & bin_dir # +#---------------------------------# +dist_files = ['SConscript'] + src + +env.Distribute (src_dir, dist_files) +env.Distribute (bin_dir, src) + +#--------------------# +# Install data files # +#--------------------# +install = env.Install(Dir(env.subst('$data_directory/shaders/simple')), src) +env.Alias('install', install) diff -Naur data.old/shaders/simplerect/SConscript data/shaders/simplerect/SConscript --- data.old/shaders/simplerect/SConscript 1970-01-01 01:00:00.000000000 +0100 +++ data/shaders/simplerect/SConscript 2008-02-19 10:26:20.000000000 +0100 @@ -0,0 +1,23 @@ +#-------------# +# Import Vars # +#-------------# +Import('*') + +#---------# +# Sources # +#---------# +src = Split("""fragment.glsl vertex.glsl""") + +#---------------------------------# +# Distribute to src_dir & bin_dir # +#---------------------------------# +dist_files = ['SConscript'] + src + +env.Distribute (src_dir, dist_files) +env.Distribute (bin_dir, src) + +#--------------------# +# Install data files # +#--------------------# +install = env.Install(Dir(env.subst('$data_directory/shaders/simplerect')), src) +env.Alias('install', install) diff -Naur data.old/shaders/temp/SConscript data/shaders/temp/SConscript --- data.old/shaders/temp/SConscript 1970-01-01 01:00:00.000000000 +0100 +++ data/shaders/temp/SConscript 2008-02-19 10:26:14.000000000 +0100 @@ -0,0 +1,23 @@ +#-------------# +# Import Vars # +#-------------# +Import('*') + +#---------# +# Sources # +#---------# +src = Split("""fragment.glsl vertex.glsl""") + +#---------------------------------# +# Distribute to src_dir & bin_dir # +#---------------------------------# +dist_files = ['SConscript'] + src + +env.Distribute (src_dir, dist_files) +env.Distribute (bin_dir, src) + +#--------------------# +# Install data files # +#--------------------# +install = env.Install(Dir(env.subst('$data_directory/shaders/temp')), src) +env.Alias('install', install) diff -Naur data.old/shaders/vblur_rect/SConscript data/shaders/vblur_rect/SConscript --- data.old/shaders/vblur_rect/SConscript 1970-01-01 01:00:00.000000000 +0100 +++ data/shaders/vblur_rect/SConscript 2008-02-19 10:25:59.000000000 +0100 @@ -0,0 +1,23 @@ +#-------------# +# Import Vars # +#-------------# +Import('*') + +#---------# +# Sources # +#---------# +src = Split("""fragment.glsl vertex.glsl""") + +#---------------------------------# +# Distribute to src_dir & bin_dir # +#---------------------------------# +dist_files = ['SConscript'] + src + +env.Distribute (src_dir, dist_files) +env.Distribute (bin_dir, src) + +#--------------------# +# Install data files # +#--------------------# +install = env.Install(Dir(env.subst('$data_directory/shaders/vblur_rect')), src) +env.Alias('install', install) diff -Naur data.old/skins/simple/textures/SConscript data/skins/simple/textures/SConscript --- data.old/skins/simple/textures/SConscript 2008-02-19 09:49:36.000000000 +0100 +++ data/skins/simple/textures/SConscript 2008-02-19 10:39:56.000000000 +0100 @@ -9,6 +9,8 @@ src = Split("""box.png libsplash.png logo.png + loading0.png + loading1.png mouse.png newfontt3.png refmap.png diff -Naur data.old/skins/simple/textures/widgets/SConscript data/skins/simple/textures/widgets/SConscript --- data.old/skins/simple/textures/widgets/SConscript 2008-02-19 09:49:36.000000000 +0100 +++ data/skins/simple/textures/widgets/SConscript 2008-02-19 11:17:40.000000000 +0100 @@ -9,6 +9,9 @@ src = Split("""axis_field.png joy_cursor.png joy_cal_box.png + tab_active.png + tab_page_background.png + tab_inactive.png tog_on_up.png tog_on_down.png tog_off_up.png diff -Naur data.old/skins/x1/textures/SConscript data/skins/x1/textures/SConscript --- data.old/skins/x1/textures/SConscript 2008-02-19 09:49:36.000000000 +0100 +++ data/skins/x1/textures/SConscript 2008-02-19 12:14:26.000000000 +0100 @@ -9,6 +9,8 @@ src = Split("""box.png libsplash.png logo.png + loading0.png + loading1.png mouse.png newfontt3.png refmap.png diff -Naur data.old/skins/x1/textures/widgets/SConscript data/skins/x1/textures/widgets/SConscript --- data.old/skins/x1/textures/widgets/SConscript 2008-02-19 09:49:36.000000000 +0100 +++ data/skins/x1/textures/widgets/SConscript 2008-02-19 12:14:10.000000000 +0100 @@ -9,6 +9,9 @@ src = Split("""axis_field.png joy_cursor.png joy_cal_box.png + tab_active.png + tab_page_background.png + tab_inactive.png tog_on_up.png tog_on_down.png tog_off_up.png diff -Naur data.old/textures/effects/SConscript data/textures/effects/SConscript --- data.old/textures/effects/SConscript 1970-01-01 01:00:00.000000000 +0100 +++ data/textures/effects/SConscript 2008-02-19 11:08:52.000000000 +0100 @@ -0,0 +1,24 @@ +#-------------# +# Import Vars # +#-------------# +Import('*') + +#---------# +# Sources # +#---------# +src = Split("""noise.png + white.png""") + +#---------------------------------# +# Distribute to src_dir & bin_dir # +#---------------------------------# +dist_files = ['SConscript'] + src + +env.Distribute (src_dir, dist_files) +env.Distribute (bin_dir, src) + +#--------------------# +# Install data files # +#--------------------# +install = env.Install(Dir(Dir(env.subst('$data_directory/textures/effects'))), src) +env.Alias('install', install) diff -Naur data.old/textures/SConscript data/textures/SConscript --- data.old/textures/SConscript 2008-02-19 09:49:33.000000000 +0100 +++ data/textures/SConscript 2008-02-19 11:07:55.000000000 +0100 @@ -13,6 +13,7 @@ #----------------# Export(['env', 'src_dir', 'bin_dir']) +SConscript('effects/SConscript') SConscript('hud/SConscript') SConscript('icons/SConscript') SConscript('smoke/SConscript') diff -Naur data.old/textures/weather/SConscript data/textures/weather/SConscript --- data.old/textures/weather/SConscript 2008-02-19 09:49:33.000000000 +0100 +++ data/textures/weather/SConscript 2008-02-19 11:09:23.000000000 +0100 @@ -10,6 +10,7 @@ clouds.png cubelighting.png cubereflection.png + cubereflection-nosun.png cubelighting-car.png moon.png raindrop.tga