Merge remote branch 'origin/master'

2024-10-05 11:50:52 +01:00 · 2016-11-28 15:29:03 -08:00 · 2016-11-28 15:29:03 -08:00 · 5b90456530
commit 5b90456530
parent 6fa1c47dd6 d22677f7d5
254 changed files with 60 additions and 816 deletions
--- a/Models/ACRIMSAT2/ACRIMSAT_05.blend
+++ b/Models/ACRIMSAT2/ACRIMSAT_05.blend
--- a/Models/ACRIMSAT2/texture/foil_gold_ramp.png
+++ b/Models/ACRIMSAT2/texture/foil_gold_ramp.png
--- a/Models/ACRIMSAT2/texture/foil_n.png
+++ b/Models/ACRIMSAT2/texture/foil_n.png
--- a/Models/ACRIMSAT2/texture/foil_silver_ramp.png
+++ b/Models/ACRIMSAT2/texture/foil_silver_ramp.png
--- a/Models/ACRIMSAT2/texture/tex_01.psd
+++ b/Models/ACRIMSAT2/texture/tex_01.psd
--- a/(A)/Aqua.fbx
+++ b/(A)/Aqua.fbx
--- a/(C)/__MACOSX/._Aqua-Composite-Full.lwo
+++ b/(C)/__MACOSX/._Aqua-Composite-Full.lwo
--- a/(A)/__MACOSX/._Aquarius-2010-Composite.lwo
+++ b/(A)/__MACOSX/._Aquarius-2010-Composite.lwo
--- a/Models/Aura/__MACOSX/._Aura_2013-2.lwo
+++ b/Models/Aura/__MACOSX/._Aura_2013-2.lwo
--- a/Island/__MACOSX/._Block_Island_08152013.stl
+++ b/Island/__MACOSX/._Block_Island_08152013.stl
--- a/(A)/__MACOSX/._Cloudsat1-composite.lwo
+++ b/(A)/__MACOSX/._Cloudsat1-composite.lwo
--- a/Models/CloudSat
+++ b/Models/CloudSat
--- a//__MACOSX/._Cloudsat.fbx
+++ b//__MACOSX/._Cloudsat.fbx
--- a/Models/Cluster/__MACOSX/._Cluster.lwo
+++ b/Models/Cluster/__MACOSX/._Cluster.lwo
--- a/(CYGNSS)/cygnss_solid_deployed_10_inch.stl
+++ b/(CYGNSS)/cygnss_solid_deployed_10_inch.stl
--- a/System/fss.3ds
+++ b/System/fss.3ds
--- a/System/spstob_f.tga
+++ b/System/spstob_f.tga
--- a/Models/GeoTailSAT/__MACOSX/._GeoTailSAT.lwo
+++ b/Models/GeoTailSAT/__MACOSX/._GeoTailSAT.lwo
--- a/Explorer-3/__MACOSX/isee-3/._.DS_Store
+++ b/Explorer-3/__MACOSX/isee-3/._.DS_Store
--- a/Photometer/__MACOSX/kepler_BA/._.DS_Store
+++ b/Photometer/__MACOSX/kepler_BA/._.DS_Store
--- a/Photometer/__MACOSX/kepler_BA/._KeplerBeautyShotforJPLweb.mb
+++ b/Photometer/__MACOSX/kepler_BA/._KeplerBeautyShotforJPLweb.mb
--- a/Photometer/__MACOSX/kepler_BA/._kepler.mb
+++ b/Photometer/__MACOSX/kepler_BA/._kepler.mb
--- a/Photometer/__MACOSX/kepler_BA/._keplermodel.ma
+++ b/Photometer/__MACOSX/kepler_BA/._keplermodel.ma
--- a/Photometer/__MACOSX/kepler_BA/._photometer.obj
+++ b/Photometer/__MACOSX/kepler_BA/._photometer.obj
--- a/Photometer/__MACOSX/kepler_BA/._solararray.obj
+++ b/Photometer/__MACOSX/kepler_BA/._solararray.obj
--- a/Models/Kepler-2016/README.txt
+++ b/Models/Kepler-2016/README.txt
--- a/Horizons/__MACOSX/new-horizons/._.DS_Store
+++ b/Horizons/__MACOSX/new-horizons/._.DS_Store
--- a/Horizons/__MACOSX/new-horizons/._7399_05_rp_antenna.stl
+++ b/Horizons/__MACOSX/new-horizons/._7399_05_rp_antenna.stl
--- a/Horizons/__MACOSX/new-horizons/._7399_05_rp_body.stl
+++ b/Horizons/__MACOSX/new-horizons/._7399_05_rp_body.stl
--- a/Horizons/__MACOSX/new-horizons/._7399_05_rp_body_l.stl
+++ b/Horizons/__MACOSX/new-horizons/._7399_05_rp_body_l.stl
--- a/Horizons/__MACOSX/new-horizons/._7399_05_rp_body_r.stl
+++ b/Horizons/__MACOSX/new-horizons/._7399_05_rp_body_r.stl
--- a/Horizons/__MACOSX/new-horizons/._7399_05_rp_rtg.stl
+++ b/Horizons/__MACOSX/new-horizons/._7399_05_rp_rtg.stl
--- a/Horizons/__MACOSX/new-horizons/._B-SIZE_NEW_HORIZONS.pdf
+++ b/Horizons/__MACOSX/new-horizons/._B-SIZE_NEW_HORIZONS.pdf
--- a/Horizons/__MACOSX/new-horizons/._NH
+++ b/Horizons/__MACOSX/new-horizons/._NH
--- a/fbx/SLS_Block1_3dmodel_01.FBX
+++ b/fbx/SLS_Block1_3dmodel_01.FBX
--- a/obj/SLS_Block1_3dmodel_02.mtl
+++ b/obj/SLS_Block1_3dmodel_02.mtl
@ -1,784 +0,0 @@
-# 3ds Max Wavefront OBJ Exporter v0.97b - (c)2007 guruware
-# File Created: 05.05.2015 15:16:50
-
-newmtl Material__9949600
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.0510 0.0510 0.0510
-	Kd 0.1529 0.1529 0.1529
-	Ks 0.2700 0.2700 0.2700
-	Ke 0.0000 0.0000 0.0000
-
-newmtl Material__7
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 0.1922 0.4745 0.5451
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-	map_Ka Map__1318_Composite.tga
-	map_Kd Map__1318_Composite.tga
-
-newmtl RingMap
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 0.0039 0.0039 0.0039
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-
-newmtl Sliver
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 0.3686 0.3686 0.3686
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-
-newmtl SLS_WHITE_Metal
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 0.9961 0.9922 0.9882
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-
-newmtl 12___Default
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 0.6824 0.6824 0.6824
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-
-newmtl Material__9949691
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 0.0784 0.0784 0.0784
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-
-newmtl Material__9949601
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 0.5880 0.5880 0.5880
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-
-newmtl Material__9949602
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 0.5880 0.5880 0.5880
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-
-newmtl Material__9949603
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 0.5880 0.5880 0.5880
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-
-newmtl Material__9949604
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 0.5880 0.5880 0.5880
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-
-newmtl Material__9949605
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 0.5880 0.5880 0.5880
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-
-newmtl Material__9949606
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 0.5880 0.5880 0.5880
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-
-newmtl SLS_WHITE
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 0.9961 0.9922 0.9882
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-	map_Ka Map__1418_VRayDirt.tga
-	map_Kd Map__1418_VRayDirt.tga
-
-newmtl Bot_Feed_Brace
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5882 0.5882 0.5882
-	Kd 0.5882 0.5882 0.5882
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-
-newmtl FeedLineBrace
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 0.5000 0.5000 0.5000
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-
-newmtl black
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 0.0784 0.0784 0.0784
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-
-newmtl Burh_Metal
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 0.8353 0.8353 0.8353
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-
-newmtl InterTank_white
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 0.9961 0.9922 0.9882
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-	map_Ka Map__1463_Composite.tga
-	map_Kd Map__1463_Composite.tga
-
-newmtl FlatBlack
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.0000 0.0000 0.0000
-	Kd 0.0000 0.0000 0.0000
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-
-newmtl TopFeedLine_Cap
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 0.5000 0.5000 0.5000
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-
-newmtl Material__9949596
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 0.9961 0.9922 0.9882
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-
-newmtl MLT_Green
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 0.4863 0.4824 0.1686
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-	map_Ka Map__1419_VRayDirt.tga
-	map_Kd Map__1419_VRayDirt.tga
-
-newmtl Tank_W_Foam
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 0.9294 0.9059 0.8275
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-	map_bump -bm 0.3000 Map__1_Noise.tga
-
-newmtl LVSA
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 0.9961 0.9922 0.9882
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-	map_Ka Map__1437_Composite.tga
-	map_Kd Map__1437_Composite.tga
-
-newmtl Tan
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 0.9882 0.9490 0.8353
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-
-newmtl Red
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 0.5647 0.1373 0.1059
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-
-newmtl Black_Strips
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 0.0588 0.0588 0.0588
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-
-newmtl Yellow
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 0.9922 0.9176 0.6196
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-	map_bump -bm 0.1400 Map__1414_Noise.tga
-
-newmtl SLS_SRB_AFT_WHITE
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 0.9961 0.9922 0.9882
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-	map_bump -bm 0.2500 Map__1415_Noise.tga
-
-newmtl Nozzle_inside
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 0.1059 0.1059 0.1059
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-
-newmtl Metal
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 0.1137 0.1137 0.1137
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-
-newmtl CapsMaps
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 0.0627 0.0471 0.0235
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-
-newmtl CapBase
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 1.0000 1.0000 1.0000
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-
-newmtl WH_Metal_VRay
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 1.0000 1.0000 1.0000
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-
-newmtl Booster_Dirt
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 0.8863 0.8863 0.8863
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-	map_Ka D:\Projects\NASA\Block_OML_Crew&Cargo20120910\SLS_10003_70t_20120910\SRB_Dirt.jpg
-	map_Kd D:\Projects\NASA\Block_OML_Crew&Cargo20120910\SLS_10003_70t_20120910\SRB_Dirt.jpg
-
-newmtl Material__122
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 0.5880 0.5880 0.5880
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-
-newmtl radiators
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 0.1294 0.0941 0.0627
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-	map_Ka D:\Projects\NASA\Block_OML_Crew&Cargo20120910\SLS_10003_70t_20120910\SATpanelOFFICIAL4copy.jpg
-	map_Kd D:\Projects\NASA\Block_OML_Crew&Cargo20120910\SLS_10003_70t_20120910\SATpanelOFFICIAL4copy.jpg
-	map_bump D:\Projects\NASA\Block_OML_Crew&Cargo20120910\SLS_10003_70t_20120910\SATpanelOFFICIAL4copy.jpg
-	bump D:\Projects\NASA\Block_OML_Crew&Cargo20120910\SLS_10003_70t_20120910\SATpanelOFFICIAL4copy.jpg
-
-newmtl RedShade
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 0.6588 0.1176 0.1176
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-	map_bump -bm 0.3000 Map__647_Noise.tga
-
-newmtl Map7
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 0.8039 0.8039 0.8039
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-
-newmtl Map08
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 0.5059 0.5059 0.5059
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-
-newmtl Material__123
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 0.5880 0.5880 0.5880
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-
-newmtl Shade_a112
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 0.2353 0.2353 0.2353
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-
-newmtl Material__9949510
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 0.8863 0.8863 0.8863
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-	map_Ka D:\LargeScaleSmoke_tutorial\SRB_Dirt.jpg
-	map_Kd D:\LargeScaleSmoke_tutorial\SRB_Dirt.jpg
-
-newmtl MisWhiteDirt_Map200
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 0.7961 0.5176 0.1608
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-
-newmtl nozzzle_inside
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 0.0706 0.0706 0.0706
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-
-newmtl Metal_ChromeFast
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 0.4392 0.4392 0.4392
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-
-newmtl Material__9949666
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 0.9490 0.8431 0.4196
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-
-newmtl 07___Default
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 0.2275 0.1255 0.0314
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-
-newmtl Material__9949704
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 0.0118 0.0118 0.0118
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-
-newmtl Material__9949531
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 0.9804 0.9804 0.9882
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-
-newmtl SLS_WHITE_LG
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 0.9961 0.9922 0.9882
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-	map_Ka Map__1437_Composite.tga
-	map_Kd Map__1437_Composite.tga
-
-newmtl Ring2
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 0.6588 0.6588 0.6588
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-
-newmtl Terry_yellowGold2
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 0.8471 0.7176 0.2039
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-	map_bump D:\Projects\NASA\Block_OML_DAC3_20142701\SLS_10005_DAC3_70t\FoilB.jpg
-	bump D:\Projects\NASA\Block_OML_DAC3_20142701\SLS_10005_DAC3_70t\FoilB.jpg
-
-newmtl Ring
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 0.6588 0.6588 0.6588
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-
-newmtl wire_000000000
-	Ns 32
-	d 1
-	Tr 0
-	Tf 1 1 1
-	illum 2
-	Ka 0.0000 0.0000 0.0000
-	Kd 0.0000 0.0000 0.0000
-	Ks 0.3500 0.3500 0.3500
-
-newmtl 01___Default
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 0.9961 0.9922 0.9882
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-
-newmtl Chrome
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 0.8235 0.8235 0.8235
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-
-newmtl NozzleBK
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 0.1176 0.1176 0.1176
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-
-newmtl SLS_Gray
-	Ns 21.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.4549 0.4549 0.4549
-	Kd 0.4549 0.4549 0.4549
-	Ks 0.3960 0.3960 0.3960
-	Ke 0.0000 0.0000 0.0000
-
-newmtl WhiteMetal
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 1.0000 1.0000 1.0000
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-
-newmtl ESM_Panels
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 0.9961 0.9922 0.9882
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
-	map_Ka Map__1453_Composite.tga
-	map_Kd Map__1453_Composite.tga
-
-newmtl Material__9949753
-	Ns 10.0000
-	Ni 1.5000
-	d 1.0000
-	Tr 0.0000
-	Tf 1.0000 1.0000 1.0000 
-	illum 2
-	Ka 0.5880 0.5880 0.5880
-	Kd 0.4863 0.4824 0.1686
-	Ks 0.0000 0.0000 0.0000
-	Ke 0.0000 0.0000 0.0000
--- a/tga/Map__1318_Composite.tga
+++ b/tga/Map__1318_Composite.tga
--- a/tga/Map__1414_Noise.tga
+++ b/tga/Map__1414_Noise.tga
--- a/tga/Map__1415_Noise.tga
+++ b/tga/Map__1415_Noise.tga
--- a/tga/Map__1418_VRayDirt.tga
+++ b/tga/Map__1418_VRayDirt.tga
--- a/tga/Map__1419_VRayDirt.tga
+++ b/tga/Map__1419_VRayDirt.tga
--- a/tga/Map__1437_Composite.tga
+++ b/tga/Map__1437_Composite.tga
--- a/tga/Map__1453_Composite.tga
+++ b/tga/Map__1453_Composite.tga
--- a/tga/Map__1463_Composite.tga
+++ b/tga/Map__1463_Composite.tga
--- a/tga/Map__1_Noise.tga
+++ b/tga/Map__1_Noise.tga
--- a/tga/Map__647_Noise.tga
+++ b/tga/Map__647_Noise.tga
--- a/Res)/__MACOSX/shuttle-parts-hi-res/._.DS_Store
+++ b/Res)/__MACOSX/shuttle-parts-hi-res/._.DS_Store
--- a/Res)/__MACOSX/shuttle-parts-hi-res/ET/._Textures
+++ b/Res)/__MACOSX/shuttle-parts-hi-res/ET/._Textures
--- a/Res)/__MACOSX/shuttle-parts-hi-res/ET/._et_all.3ds
+++ b/Res)/__MACOSX/shuttle-parts-hi-res/ET/._et_all.3ds
--- a/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._OMS-pod-prt.jpg
+++ b/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._OMS-pod-prt.jpg
--- a/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._OMS-pod-stb.jpg
+++ b/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._OMS-pod-stb.jpg
--- a/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._Thumbs.db
+++ b/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._Thumbs.db
--- a/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._baytile.jpg
+++ b/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._baytile.jpg
--- a/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._belly-flap.jpg
+++ b/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._belly-flap.jpg
--- a/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._belly.jpg
+++ b/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._belly.jpg
--- a/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._bulkhead-aft.jpg
+++ b/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._bulkhead-aft.jpg
--- a/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._bulkhead-fwd.jpg
+++ b/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._bulkhead-fwd.jpg
--- a/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._canada.tif
+++ b/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._canada.tif
--- a/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._canadam.tif
+++ b/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._canadam.tif
--- a/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._et
+++ b/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._et
--- a/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._et
+++ b/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._et
--- a/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._et_b.tif
+++ b/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._et_b.tif
--- a/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._et_b_txt.tif
+++ b/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._et_b_txt.tif
--- a/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._fskirt01.bmp
+++ b/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._fskirt01.bmp
--- a/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._fusolage-aft-engines-b.jpg
+++ b/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._fusolage-aft-engines-b.jpg
--- a/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._fusolage-aft-engines.jpg
+++ b/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._fusolage-aft-engines.jpg
--- a/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._reflection1.tif
+++ b/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._reflection1.tif
--- a/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._reflection2.tif
+++ b/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._reflection2.tif
--- a/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._reflection3.tif
+++ b/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._reflection3.tif
--- a/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._shut-doors-side.jpg
+++ b/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._shut-doors-side.jpg
--- a/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._shut-doors-top.jpg
+++ b/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._shut-doors-top.jpg
--- a/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._side-prt-A.tif
+++ b/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._side-prt-A.tif
--- a/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._side-prt-D.tif
+++ b/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._side-prt-D.tif
--- a/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._side-prt.jpg
+++ b/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._side-prt.jpg
--- a/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._side-stb-A.tif
+++ b/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._side-stb-A.tif
--- a/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._side-stb-D.tif
+++ b/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._side-stb-D.tif
--- a/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._side-stb.jpg
+++ b/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._side-stb.jpg
--- a/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._tile-patch.jpg
+++ b/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._tile-patch.jpg
--- a/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._wireframe.srf
+++ b/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._wireframe.srf
--- a/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._wrinkles-b.tif
+++ b/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._wrinkles-b.tif
--- a/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._wrinkles.tif
+++ b/Res)/__MACOSX/shuttle-parts-hi-res/ET/Textures/._wrinkles.tif
--- a/Res)/__MACOSX/shuttle-parts-hi-res/EVA-suit-model-only/._.DS_Store
+++ b/Res)/__MACOSX/shuttle-parts-hi-res/EVA-suit-model-only/._.DS_Store
--- a/Res)/__MACOSX/shuttle-parts-hi-res/EVA-suit-model-only/._EVA.3ds
+++ b/Res)/__MACOSX/shuttle-parts-hi-res/EVA-suit-model-only/._EVA.3ds
--- a/Res)/__MACOSX/shuttle-parts-hi-res/SRB/._.DS_Store
+++ b/Res)/__MACOSX/shuttle-parts-hi-res/SRB/._.DS_Store
--- a/Res)/__MACOSX/shuttle-parts-hi-res/SRB/._Textures
+++ b/Res)/__MACOSX/shuttle-parts-hi-res/SRB/._Textures
--- a/Res)/__MACOSX/shuttle-parts-hi-res/SRB/._srb.3ds
+++ b/Res)/__MACOSX/shuttle-parts-hi-res/SRB/._srb.3ds
--- a/Res)/__MACOSX/shuttle-parts-hi-res/SRB/Textures/._OMS-pod-prt.jpg
+++ b/Res)/__MACOSX/shuttle-parts-hi-res/SRB/Textures/._OMS-pod-prt.jpg
--- a/Res)/__MACOSX/shuttle-parts-hi-res/SRB/Textures/._OMS-pod-stb.jpg
+++ b/Res)/__MACOSX/shuttle-parts-hi-res/SRB/Textures/._OMS-pod-stb.jpg
--- a/Res)/__MACOSX/shuttle-parts-hi-res/SRB/Textures/._Thumbs.db
+++ b/Res)/__MACOSX/shuttle-parts-hi-res/SRB/Textures/._Thumbs.db
--- a/Res)/__MACOSX/shuttle-parts-hi-res/SRB/Textures/._baytile.jpg
+++ b/Res)/__MACOSX/shuttle-parts-hi-res/SRB/Textures/._baytile.jpg
--- a/Res)/__MACOSX/shuttle-parts-hi-res/SRB/Textures/._belly-flap.jpg
+++ b/Res)/__MACOSX/shuttle-parts-hi-res/SRB/Textures/._belly-flap.jpg
--- a/Res)/__MACOSX/shuttle-parts-hi-res/SRB/Textures/._belly.jpg
+++ b/Res)/__MACOSX/shuttle-parts-hi-res/SRB/Textures/._belly.jpg
--- a/Res)/__MACOSX/shuttle-parts-hi-res/SRB/Textures/._bulkhead-aft.jpg
+++ b/Res)/__MACOSX/shuttle-parts-hi-res/SRB/Textures/._bulkhead-aft.jpg
--- a/Res)/__MACOSX/shuttle-parts-hi-res/SRB/Textures/._bulkhead-fwd.jpg
+++ b/Res)/__MACOSX/shuttle-parts-hi-res/SRB/Textures/._bulkhead-fwd.jpg
--- a/Res)/__MACOSX/shuttle-parts-hi-res/SRB/Textures/._canada.tif
+++ b/Res)/__MACOSX/shuttle-parts-hi-res/SRB/Textures/._canada.tif
--- a/Res)/__MACOSX/shuttle-parts-hi-res/SRB/Textures/._canadam.tif
+++ b/Res)/__MACOSX/shuttle-parts-hi-res/SRB/Textures/._canadam.tif
--- a/Res)/__MACOSX/shuttle-parts-hi-res/SRB/Textures/._fskirt01.bmp
+++ b/Res)/__MACOSX/shuttle-parts-hi-res/SRB/Textures/._fskirt01.bmp
--- a/Res)/__MACOSX/shuttle-parts-hi-res/SRB/Textures/._fusolage-aft-engines-b.jpg
+++ b/Res)/__MACOSX/shuttle-parts-hi-res/SRB/Textures/._fusolage-aft-engines-b.jpg
--- a/Res)/__MACOSX/shuttle-parts-hi-res/SRB/Textures/._fusolage-aft-engines.jpg
+++ b/Res)/__MACOSX/shuttle-parts-hi-res/SRB/Textures/._fusolage-aft-engines.jpg
--- a/Res)/__MACOSX/shuttle-parts-hi-res/SRB/Textures/._reflection1.tif
+++ b/Res)/__MACOSX/shuttle-parts-hi-res/SRB/Textures/._reflection1.tif
--- a/Show More
+++ b/Show More