Move ColorTexture from RenderableModel to ModelGeometry

This commit is contained in:
Alexander Bock
2020-08-18 16:00:32 +02:00
parent 4f2d612abe
commit d4291163ba
32 changed files with 350 additions and 386 deletions

View File

@@ -34,9 +34,9 @@ local Example_Fixed_Height = {
Body = "NEW HORIZONS",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/NewHorizonsCleanModel.obj"
},
ColorTexture = textures .. "/NHTexture.jpg",
GeometryFile = models .. "/NewHorizonsCleanModel.obj",
ColorTexture = textures .. "/NHTexture.jpg"
}
},
GUI = {
Path = "/Example"
@@ -59,9 +59,9 @@ local Example_Adaptive_Height = {
Body = "NEW HORIZONS",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/NewHorizonsCleanModel.obj"
},
ColorTexture = textures .. "/NHTexture.jpg",
GeometryFile = models .. "/NewHorizonsCleanModel.obj",
ColorTexture = textures .. "/NHTexture.jpg"
}
},
GUI = {
Path = "/Example"

View File

@@ -58,9 +58,9 @@ local Apollo11Model = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/Apollo_CSM_shrunk_rotated_xy_double_size.obj"
GeometryFile = models .. "/Apollo_CSM_shrunk_rotated_xy_double_size.obj",
ColorTexture = models .. "/gray.png"
},
ColorTexture = models .. "/gray.png",
LightSources = asset_helper.getDefaultLightSources(sun_transforms.SolarSystemBarycenter.Identifier)
},
GUI = {
@@ -177,11 +177,11 @@ local Apollo11LemDescentModel = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = lem_model.modelFolder .. "/lmremoved.obj"
GeometryFile = lem_model.modelFolder .. "/lmremoved.obj",
ColorTexture = lem_model.modelFolder .. "/LM-2_ver2clean_u1_v1.jpeg"
},
SpecularIntensity = 0.0,
RotationVector = { 273.750,28.0,309.85 },
ColorTexture = lem_model.modelFolder .. "/LM-2_ver2clean_u1_v1.jpeg",
LightSources = asset_helper.getDefaultLightSources(sun_transforms.SolarSystemBarycenter.Identifier)
},
GUI = {
@@ -207,11 +207,11 @@ local Apollo11LemLandedModel = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = lem_model.modelFolder .. "/LM-2_ver2clean.obj"
GeometryFile = lem_model.modelFolder .. "/LM-2_ver2clean.obj",
ColorTexture = lem_model.modelFolder .. "/LM-2_ver2clean_u1_v1.jpeg"
},
SpecularIntensity = 0.0,
RotationVector = { 273.750,28.0,309.85 },
ColorTexture = lem_model.modelFolder .. "/LM-2_ver2clean_u1_v1.jpeg",
LightSources = asset_helper.getDefaultLightSources(sun_transforms.SolarSystemBarycenter.Identifier)
},
GUI = {

View File

@@ -38,10 +38,10 @@ local Apollo11LemModel = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = lem_model.modelFolder .. "/LM-2_ver2clean.obj"
GeometryFile = lem_model.modelFolder .. "/LM-2_ver2clean.obj",
ColorTexture = lem_model.modelFolder .. "/LM-2_ver2clean_u1_v1.jpeg"
},
RotationVector = { 91.044090,171.229706,111.666664 },
ColorTexture = lem_model.modelFolder .. "/LM-2_ver2clean_u1_v1.jpeg",
LightSources = asset_helper.getDefaultLightSources(sun_transforms.SolarSystemBarycenter.Identifier)
},
GUI = {

View File

@@ -66,9 +66,9 @@ local Apollo15 = {
-- Geometry = {
-- Type = "MultiModelGeometry",
-- -- GeometryFile = models .. "/Apollo_Spacecraft.obj"
-- GeometryFile = models .. "/Apollo_CSM_shrunk_rotated_xy_doubble_size.obj"
-- GeometryFile = models .. "/Apollo_CSM_shrunk_rotated_xy_doubble_size.obj",
-- ColorTexture = models .. "/gray.png"
-- },
-- ColorTexture = models .. "/gray.png",
-- LightSources = LightSources,
-- DisableFaceCulling = true
-- },

View File

@@ -49,10 +49,10 @@ local Station2Boulder1Model = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/b1-v2.obj"
GeometryFile = models .. "/b1-v2.obj",
ColorTexture = models .. "/b1-v2_u1_v1.jpeg"
},
RotationVector = { 243.243256 ,206.270264, 309.677429 },
ColorTexture = models .. "/b1-v2_u1_v1.jpeg",
LightSources = LightSources,
PerformShading = false,
DisableFaceCulling = true
@@ -95,10 +95,10 @@ local Station2Boulder2Model = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/b2model.obj"
GeometryFile = models .. "/b2model.obj",
ColorTexture = models .. "/b2model_u1_v1.jpeg"
},
RotationVector = { 66.162155, 7.783780, 114.193550 },
ColorTexture = models .. "/b2model_u1_v1.jpeg",
LightSources = LightSources,
PerformShading = false,
DisableFaceCulling = true
@@ -141,10 +141,10 @@ local Station2Boulder3Model = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/b3model.obj"
GeometryFile = models .. "/b3model.obj",
ColorTexture = models .. "/b3model_u1_v1.jpeg"
},
RotationVector = { 161.513519 ,243.243256, 65.806450 },
ColorTexture = models .. "/b3model_u1_v1.jpeg",
LightSources = LightSources,
PerformShading = false,
DisableFaceCulling = true

View File

@@ -60,10 +60,10 @@ local Station6Frag1Model = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/A17-S6-frag1.obj"
GeometryFile = models .. "/A17-S6-frag1.obj",
ColorTexture = models .. "/A17-S6-frag1.png"
},
RotationVector = { 235.909088,165.000000,286.299194 },
ColorTexture = models .. "/A17-S6-frag1.png",
LightSources = LightSources,
PerformShading = false,
DisableFaceCulling = true
@@ -107,10 +107,10 @@ local Station6Frag2Model = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/station6_boulder_frag2.obj"
GeometryFile = models .. "/station6_boulder_frag2.obj",
ColorTexture = models .. "/frag2crop_u1_v1.jpeg"
},
RotationVector = { 336.959991,210.239990,325.984253 },
ColorTexture = models .. "/frag2crop_u1_v1.jpeg",
LightSources = LightSources,
PerformShading = false,
DisableFaceCulling = true,
@@ -142,10 +142,10 @@ local Station6Frag3Model = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/station6_boulder_frag3.obj"
GeometryFile = models .. "/station6_boulder_frag3.obj",
ColorTexture = models .. "/frag3crop_u1_v1.jpeg"
},
RotationVector = { 293.181824,255.000000,4.090910 },
ColorTexture = models .. "/frag3crop_u1_v1.jpeg",
LightSources = LightSources,
PerformShading = false,
DisableFaceCulling = true

View File

@@ -49,10 +49,10 @@ local Station7BoulderModel = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/b7model.obj"
GeometryFile = models .. "/b7model.obj",
ColorTexture = models .. "/b7model_u1_v1.jpeg"
},
RotationVector = { 1.945950,274.378387,212.903214 },
ColorTexture = models .. "/b7model_u1_v1.jpeg",
LightSources = LightSources,
PerformShading = false,
DisableFaceCulling = true

View File

@@ -36,11 +36,11 @@ local Apollo17LemModel = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = model.modelFolder .. "/LM-2_ver2clean.obj"
GeometryFile = model.modelFolder .. "/LM-2_ver2clean.obj",
ColorTexture = model.modelFolder .. "/LM-2_ver2clean_u1_v1.jpeg"
},
SpecularIntensity = 0.0,
RotationVector = { 110.255219,171.229706,126.666664 },
ColorTexture = model.modelFolder .. "/LM-2_ver2clean_u1_v1.jpeg",
LightSources = asset_helper.getDefaultLightSources(sun_transforms.SolarSystemBarycenter.Identifier)
},
GUI = {

View File

@@ -652,9 +652,9 @@ local Dawn = {
Body = "DAWN",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/mainbodydawn.obj"
GeometryFile = models .. "/mainbodydawn.obj",
ColorTexture = textures .. "/gray.png"
},
ColorTexture = textures .. "/gray.png",
LightSources = LightSources
},
GUI = {
@@ -684,9 +684,9 @@ local DawnSolarArray1 = {
Body = "DAWN",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/solarpanelleft.obj"
GeometryFile = models .. "/solarpanelleft.obj",
ColorTexture = textures .. "/gray.png"
},
ColorTexture = textures .. "/gray.png",
LightSources = LightSources
},
GUI = {
@@ -715,9 +715,9 @@ local DawnSolarArray2 = {
Body = "DAWN",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/solarpanelright.obj"
GeometryFile = models .. "/solarpanelright.obj",
ColorTexture = textures .. "/gray.png"
},
ColorTexture = textures .. "/gray.png",
LightSources = LightSources
},
GUI = {

View File

@@ -47,10 +47,10 @@ local Vesta = {
Type = "RenderableModelProjection",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/VestaComet_5000.obj"
GeometryFile = models .. "/VestaComet_5000.obj",
ColorTexture = textures .. "/dummy.jpg"
},
BoundingSphereRadius = 10.0,
ColorTexture = textures .. "/dummy.jpg",
Projection = {
Sequence = images,
SequenceType = "image-sequence",

View File

@@ -41,9 +41,9 @@ local Gaia = {
Body = "GAIA",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = model .. "/gaia.obj"
GeometryFile = model .. "/gaia.obj",
ColorTexture = textures .. "/gaia-baked.png"
},
ColorTexture = textures .. "/gaia-baked.png",
LightSources = {
{
Type = "SceneGraphLightSource",

View File

@@ -169,9 +169,9 @@ local Insight_Entry_CapsuleA = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_cruise_cone .. "/cruise_insight_doubleside2_newcapsule_diffuse.obj"
GeometryFile = models_cruise_cone .. "/cruise_insight_doubleside2_newcapsule_diffuse.obj",
ColorTexture = models_cruise_cone .. "/insight_newcapsule_diffuse.jpg"
},
ColorTexture = models_cruise_cone .. "/insight_newcapsule_diffuse.jpg",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -194,9 +194,9 @@ local Insight_Entry_Capsule_Ring = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_cruise_cone .. "/insight_cruise_cone_ring_foil_gold.obj"
GeometryFile = models_cruise_cone .. "/insight_cruise_cone_ring_foil_gold.obj",
ColorTexture = models_cruise_cone .. "/foil_gold_ramp.png"
},
ColorTexture = models_cruise_cone .. "/foil_gold_ramp.png",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -219,9 +219,9 @@ local Insight_Entry_Capsule_Plugs = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_cruise_cone .. "/insight_cruise_cone_capsule_diffuse.obj"
GeometryFile = models_cruise_cone .. "/insight_cruise_cone_capsule_diffuse.obj",
ColorTexture = models_cruise_cone .. "/insight_capsule_diffuse.png"
},
ColorTexture = models_cruise_cone .. "/insight_capsule_diffuse.png",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -244,9 +244,9 @@ local Insight_Entry_Heatshield = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_cruise_cone .. "/insight_cruise_heatshield_foil_gold.obj"
GeometryFile = models_cruise_cone .. "/insight_cruise_heatshield_foil_gold.obj",
ColorTexture = models_cruise_cone .. "/foil_gold_ramp.png"
},
ColorTexture = models_cruise_cone .. "/foil_gold_ramp.png",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -269,9 +269,9 @@ local Insight_Parachute_0 = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_chutes .. "/insight_chute_frame01_diff1.obj"
GeometryFile = models_chutes .. "/insight_chute_frame01_diff1.obj",
ColorTexture = models_chutes .. "/chute_diff.png"
},
ColorTexture = models_chutes .. "/chute_diff.png",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -294,9 +294,9 @@ local Insight_Parachute_Cords_0 = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_chutes .. "/insight_chute_frame01_cords1.obj"
GeometryFile = models_chutes .. "/insight_chute_frame01_cords1.obj",
ColorTexture = models_chutes .. "/foil_gold_ramp.png"
},
ColorTexture = models_chutes .. "/foil_gold_ramp.png",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -319,9 +319,9 @@ local Insight_Parachute_20 = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_chutes .. "/insight_chute_frame20_diff1.obj"
GeometryFile = models_chutes .. "/insight_chute_frame20_diff1.obj",
ColorTexture = models_chutes .. "/chute_diff.png"
},
ColorTexture = models_chutes .. "/chute_diff.png",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -344,9 +344,9 @@ local Insight_Parachute_Cords_20 = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_chutes .. "/insight_chute_frame20_cords1.obj"
GeometryFile = models_chutes .. "/insight_chute_frame20_cords1.obj",
ColorTexture = models_chutes .. "/foil_gold_ramp.png"
},
ColorTexture = models_chutes .. "/foil_gold_ramp.png",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -369,9 +369,9 @@ local Insight_Parachute_40 = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_chutes .. "/chute_doubleside_frame40_diff.obj"
GeometryFile = models_chutes .. "/chute_doubleside_frame40_diff.obj",
ColorTexture = models_chutes .. "/chute_diff.png"
},
ColorTexture = models_chutes .. "/chute_diff.png",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -394,9 +394,9 @@ local Insight_Parachute_Cords_40 = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_chutes .. "/insight_chute_frame40_cords1.obj"
GeometryFile = models_chutes .. "/insight_chute_frame40_cords1.obj",
ColorTexture = models_chutes .. "/foil_gold_ramp.png"
},
ColorTexture = models_chutes .. "/foil_gold_ramp.png",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -419,9 +419,9 @@ local Insight_Lander_A001 = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_AO01.obj"
GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_AO01.obj",
ColorTexture = models_lander_lander_deck .. "/InSIGHT_AO_01.jpg"
},
ColorTexture = models_lander_lander_deck .. "/InSIGHT_AO_01.jpg",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -444,9 +444,9 @@ local Insight_Lander_A002 = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_AO02.obj"
GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_AO02.obj",
ColorTexture = models_lander_lander_deck .. "/InSIGHT_AO_02.jpg"
},
ColorTexture = models_lander_lander_deck .. "/InSIGHT_AO_02.jpg",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -469,9 +469,9 @@ local Insight_Lander_A003 = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_AO03.obj"
GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_AO03.obj",
ColorTexture = models_lander_lander_deck .. "/InSIGHT_AO_03.jpg"
},
ColorTexture = models_lander_lander_deck .. "/InSIGHT_AO_03.jpg",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -494,9 +494,9 @@ local Insight_Lander_A004 = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_AO04.obj"
GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_AO04.obj",
ColorTexture = models_lander_lander_deck .. "/InSIGHT_AO_04.jpg"
},
ColorTexture = models_lander_lander_deck .. "/InSIGHT_AO_04.jpg",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -519,9 +519,9 @@ local Insight_Lander_A005 = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_AO05.obj"
GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_AO05.obj",
ColorTexture = models_lander_lander_deck .. "/InSIGHT_AO_05.jpg"
},
ColorTexture = models_lander_lander_deck .. "/InSIGHT_AO_05.jpg",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -544,9 +544,9 @@ local Insight_Lander_A006 = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_AO06.obj"
GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_AO06.obj",
ColorTexture = models_lander_lander_deck .. "/InSIGHT_AO_06.jpg"
},
ColorTexture = models_lander_lander_deck .. "/InSIGHT_AO_06.jpg",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -569,9 +569,9 @@ local Insight_Lander_A007 = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_AO07.obj"
GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_AO07.obj",
ColorTexture = models_lander_lander_deck .. "/InSIGHT_AO_07.jpg"
},
ColorTexture = models_lander_lander_deck .. "/InSIGHT_AO_07.jpg",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -594,9 +594,9 @@ local Insight_Lander_A008 = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_AO08.obj"
GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_AO08.obj",
ColorTexture = models_lander_lander_deck .. "/InSIGHT_AO_08.jpg"
},
ColorTexture = models_lander_lander_deck .. "/InSIGHT_AO_08.jpg",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -619,9 +619,9 @@ local Insight_Lander_foil1 = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_foil1.obj"
GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_foil1.obj",
ColorTexture = models_lander_lander_deck .. "/foil_silver_ramp.jpg"
},
ColorTexture = models_lander_lander_deck .. "/foil_silver_ramp.jpg",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -644,9 +644,9 @@ local Insight_Lander_Tex01 = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_tex01.obj"
GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_tex01.obj",
ColorTexture = models_lander_lander_deck .. "/InSIGHT_tex_01.jpg"
},
ColorTexture = models_lander_lander_deck .. "/InSIGHT_tex_01.jpg",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -669,9 +669,9 @@ local Insight_Lander_Tex02 = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_tex02.obj"
GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_tex02.obj",
ColorTexture = models_lander_lander_deck .. "/InSIGHT_tex_02.jpg"
},
ColorTexture = models_lander_lander_deck .. "/InSIGHT_tex_02.jpg",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -694,9 +694,9 @@ local Insight_Legs_Stowed_tex = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_lander_legs_stow .. "/insight_lander_legs_stow_tex01.obj"
GeometryFile = models_lander_legs_stow .. "/insight_lander_legs_stow_tex01.obj",
ColorTexture = models_lander_legs_stow .. "/InSIGHT_tex_01.jpg"
},
ColorTexture = models_lander_legs_stow .. "/InSIGHT_tex_01.jpg",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -719,9 +719,9 @@ local Insight_Legs_Stowed_AO06 = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_lander_legs_stow .. "/insight_lander_legs_stow_AO06.obj"
GeometryFile = models_lander_legs_stow .. "/insight_lander_legs_stow_AO06.obj",
ColorTexture = models_lander_legs_stow .. "/InSIGHT_AO_06.jpg"
},
ColorTexture = models_lander_legs_stow .. "/InSIGHT_AO_06.jpg",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -744,9 +744,9 @@ local Insight_Legs_Deployed_tex = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_lander_legs_deploy .. "/insight_lander_legs_deploy_tex01.obj"
GeometryFile = models_lander_legs_deploy .. "/insight_lander_legs_deploy_tex01.obj",
ColorTexture = models_lander_legs_deploy .. "/InSIGHT_tex_01.jpg"
},
ColorTexture = models_lander_legs_deploy .. "/InSIGHT_tex_01.jpg",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -769,9 +769,9 @@ local Insight_Legs_Deployed_AO06 = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_lander_legs_deploy .. "/insight_lander_legs_deploy_AO06.obj"
GeometryFile = models_lander_legs_deploy .. "/insight_lander_legs_deploy_AO06.obj",
ColorTexture = models_lander_legs_deploy .. "/InSIGHT_AO_06.jpg"
},
ColorTexture = models_lander_legs_deploy .. "/InSIGHT_AO_06.jpg",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -794,9 +794,9 @@ local Insight_Panels_Stowed_tex = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_lander_panels_stow .. "/insight_lander_panels_stow_tex01.obj"
GeometryFile = models_lander_panels_stow .. "/insight_lander_panels_stow_tex01.obj",
ColorTexture = models_lander_panels_stow .. "/InSIGHT_tex_01.jpg"
},
ColorTexture = models_lander_panels_stow .. "/InSIGHT_tex_01.jpg",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -819,9 +819,9 @@ local Insight_Panels_Stowed_tex2 = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_lander_panels_stow .. "/insight_lander_panels_stow_tex02.obj"
GeometryFile = models_lander_panels_stow .. "/insight_lander_panels_stow_tex02.obj",
ColorTexture = models_lander_panels_stow .. "/InSIGHT_tex_02.jpg"
},
ColorTexture = models_lander_panels_stow .. "/InSIGHT_tex_02.jpg",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -844,9 +844,9 @@ local Insight_Panels_Stowed_AO01 = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_lander_panels_stow .. "/insight_lander_panels_stow_AO01.obj"
GeometryFile = models_lander_panels_stow .. "/insight_lander_panels_stow_AO01.obj",
ColorTexture = models_lander_panels_stow .. "/InSIGHT_AO_01.jpg"
},
ColorTexture = models_lander_panels_stow .. "/InSIGHT_AO_01.jpg",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -869,9 +869,9 @@ local Insight_Panels_Deployed_tex = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_lander_panels_deploy .. "/insight_lander_panels_deploy_tex01.obj"
GeometryFile = models_lander_panels_deploy .. "/insight_lander_panels_deploy_tex01.obj",
ColorTexture = models_lander_panels_deploy .. "/InSIGHT_tex_01.jpg"
},
ColorTexture = models_lander_panels_deploy .. "/InSIGHT_tex_01.jpg",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -894,9 +894,9 @@ local Insight_Panels_Deployed_tex2 = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_lander_panels_deploy .. "/insight_lander_panels_deploy_tex02.obj"
GeometryFile = models_lander_panels_deploy .. "/insight_lander_panels_deploy_tex02.obj",
ColorTexture = models_lander_panels_deploy .. "/InSIGHT_tex_02.jpg"
},
ColorTexture = models_lander_panels_deploy .. "/InSIGHT_tex_02.jpg",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -919,9 +919,9 @@ local Insight_Panels_Deployed_AO06 = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_lander_panels_deploy .. "/insight_lander_panels_deploy_AO01.obj"
GeometryFile = models_lander_panels_deploy .. "/insight_lander_panels_deploy_AO01.obj",
ColorTexture = models_lander_panels_deploy .. "/InSIGHT_AO_01.jpg"
},
ColorTexture = models_lander_panels_deploy .. "/InSIGHT_AO_01.jpg",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},

View File

@@ -159,9 +159,9 @@ local Juno = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = model .. "/Juno.obj"
GeometryFile = model .. "/Juno.obj",
ColorTexture = textures .. "/gray.png"
},
ColorTexture = textures .. "/gray.png",
ModelTransform = RotationMatrix,
LightSources = assetHelper.getDefaultLightSources(sunTransforms.SolarSystemBarycenter.Identifier)
},

View File

@@ -94,9 +94,9 @@ local MessengerProbeBlack = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MessengerProbe_black.obj"
GeometryFile = models .. "/MessengerProbe_black.obj",
ColorTexture = models .. "/Tex_black.png"
},
ColorTexture = models .. "/Tex_black.png",
ModelTransform = RotationMatrix,
LightSources = LightSources
},
@@ -113,9 +113,9 @@ local MessengerProbeFoil = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MessengerProbe_foil.obj"
GeometryFile = models .. "/MessengerProbe_foil.obj",
ColorTexture = models .. "/foil_n2.png"
},
ColorTexture = models .. "/foil_n2.png",
ModelTransform = RotationMatrix,
LightSources = LightSources
},
@@ -132,9 +132,9 @@ local MessengerProbeHeatShield = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MessengerProbe_heatShield.obj"
GeometryFile = models .. "/MessengerProbe_heatShield.obj",
ColorTexture = models .. "/AO_heatshield4.png"
},
ColorTexture = models .. "/AO_heatshield4.png",
ModelTransform = RotationMatrix,
LightSources = LightSources
},
@@ -151,9 +151,9 @@ local MessengerProbeMetal = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MessengerProbe_metal.obj"
GeometryFile = models .. "/MessengerProbe_metal.obj",
ColorTexture = models .. "/Tex_grey.png"
},
ColorTexture = models .. "/Tex_grey.png",
ModelTransform = RotationMatrix,
LightSources = LightSources
},
@@ -171,9 +171,9 @@ local MessengerProbePanels = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MessengerProbe_panels.obj"
GeometryFile = models .. "/MessengerProbe_panels.obj",
ColorTexture = models .. "/Messenger_tex.png"
},
ColorTexture = models .. "/Messenger_tex.png",
ModelTransform = RotationMatrix,
LightSources = LightSources
},

View File

@@ -16,9 +16,9 @@ local Labels = {
Body = "NEW HORIZONS",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/Labels.obj"
GeometryFile = models .. "/Labels.obj",
ColorTexture = textures .. "/labels.png"
},
ColorTexture = textures .. "/labels.png",
AmbientIntensity = 0.8
},
GUI = {

View File

@@ -24,9 +24,9 @@ local NewHorizons = {
Body = "NEW HORIZONS",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/NewHorizonsCleanModel.obj"
GeometryFile = models .. "/NewHorizonsCleanModel.obj",
ColorTexture = textures .. "/NHTexture.jpg"
},
ColorTexture = textures .. "/NHTexture.jpg",
AmbientIntensity = 0.0,
DiffuseIntensity = 1.0,
SpecularIntensity = 1.0,

View File

@@ -36,9 +36,9 @@ local Bennu = {
Body = BENNU_BODY,
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/BennuTextured.obj"
GeometryFile = models .. "/BennuTextured.obj",
ColorTexture = textures .. "/gray.png"
},
ColorTexture = textures .. "/gray.png",
Projection = {
Sequence = asset.localResource('InstrumentTimes'),
SequenceType = "instrument-times",

View File

@@ -218,9 +218,9 @@ local OsirisRex = {
Body = "OSIRIS-REX",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/orx_base_resized_12_sep_2016.obj"
GeometryFile = models .. "/orx_base_resized_12_sep_2016.obj",
ColorTexture = textures .. "/osirisTex.png"
},
ColorTexture = textures .. "/osirisTex.png",
LightSources = LightSources
},
GUI = {
@@ -248,9 +248,9 @@ local PolyCam = {
Body = "OSIRIS-REX",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/orx_polycam_resized_12_sep_2016.obj"
GeometryFile = models .. "/orx_polycam_resized_12_sep_2016.obj",
ColorTexture = textures .. "/osirisTex.png"
},
ColorTexture = textures .. "/osirisTex.png",
LightSources = LightSources
},
GUI = {
@@ -267,9 +267,9 @@ local Rexis = {
Body = "OSIRIS-REX",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/orx_rexis_resized_12_sep_2016.obj"
GeometryFile = models .. "/orx_rexis_resized_12_sep_2016.obj",
ColorTexture = textures .. "/osirisTex.png"
},
ColorTexture = textures .. "/osirisTex.png",
LightSources = LightSources
},
Transform = {

View File

@@ -63,9 +63,9 @@ local Body = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_BODY_new_1.obj"
GeometryFile = models .. "/MSL_BODY_new_1.obj",
ColorTexture = textures .. "/tex_01.png"
},
ColorTexture = textures .. "/tex_01.png",
LightSources = LightSources,
PerformShading = false,
},
@@ -85,9 +85,9 @@ local Body_detail = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_BODY_new_1_new_detail.obj"
GeometryFile = models .. "/MSL_BODY_new_1_new_detail.obj",
ColorTexture = textures .. "/tex_01.png"
},
ColorTexture = textures .. "/tex_01.png",
LightSources = LightSources,
PerformShading = false,
},
@@ -106,9 +106,9 @@ local Body_staticParts_1 = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_BODY_new_2.obj"
GeometryFile = models .. "/MSL_BODY_new_2.obj",
ColorTexture = textures .. "/tex_02.png"
},
ColorTexture = textures .. "/tex_02.png",
LightSources = LightSources,
PerformShading = false
},
@@ -126,9 +126,9 @@ local Body_staticParts_2 = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_BODY_new_3.obj"
GeometryFile = models .. "/MSL_BODY_new_3.obj",
ColorTexture = textures .. "/tex_03.png"
},
ColorTexture = textures .. "/tex_03.png",
LightSources = LightSources,
PerformShading = false
},
@@ -146,9 +146,9 @@ local Body_staticParts_3 = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_BODY_new_4.obj"
GeometryFile = models .. "/MSL_BODY_new_4.obj",
ColorTexture = textures .. "/tex_04.png"
},
ColorTexture = textures .. "/tex_04.png",
LightSources = LightSources,
PerformShading = false
},
@@ -166,9 +166,9 @@ local Body_staticParts_4 = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_BODY_new_5.obj"
GeometryFile = models .. "/MSL_BODY_new_5.obj",
ColorTexture = textures .. "/tex_05.png"
},
ColorTexture = textures .. "/tex_05.png",
LightSources = LightSources,
PerformShading = false
},
@@ -186,9 +186,9 @@ local Body_staticParts_5 = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_BODY_new_A0.obj"
GeometryFile = models .. "/MSL_BODY_new_A0.obj",
ColorTexture = textures .. "/parts_AO.png"
},
ColorTexture = textures .. "/parts_AO.png",
LightSources = LightSources,
PerformShading = false
},
@@ -207,9 +207,9 @@ local RA_Shoulder_AZ = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_SHOULDER_AZ_new.obj"
GeometryFile = models .. "/MSL_RA_SHOULDER_AZ_new.obj",
ColorTexture = textures .. "/tex_03.png"
},
ColorTexture = textures .. "/tex_03.png",
LightSources = LightSources,
PerformShading = false
},
@@ -227,9 +227,9 @@ local RA_Shoulder_AZ_detail_1 = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_SHOULDER_AZ_detail_1.obj"
GeometryFile = models .. "/MSL_RA_SHOULDER_AZ_detail_1.obj",
ColorTexture = textures .. "/tex_05.png"
},
ColorTexture = textures .. "/tex_05.png",
LightSources = LightSources,
PerformShading = false
},
@@ -247,9 +247,9 @@ local RA_Shoulder_AZ_detail_2 = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_SHOULDER_AZ_detail_2.obj"
GeometryFile = models .. "/MSL_RA_SHOULDER_AZ_detail_2.obj",
ColorTexture = textures .. "/tex_01.png"
},
ColorTexture = textures .. "/tex_01.png",
LightSources = LightSources,
PerformShading = false
},
@@ -268,9 +268,9 @@ local RA_Shoulder_EL_1 = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_SHOULDER_EL_1.obj"
GeometryFile = models .. "/MSL_RA_SHOULDER_EL_1.obj",
ColorTexture = textures .. "/tex_01.png"
},
ColorTexture = textures .. "/tex_01.png",
LightSources = LightSources,
PerformShading = false
},
@@ -289,9 +289,9 @@ local RA_Shoulder_EL_detail_1 = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_SHOULDER_EL_detail_1.obj"
GeometryFile = models .. "/MSL_RA_SHOULDER_EL_detail_1.obj",
ColorTexture = textures .. "/tex_04.png"
},
ColorTexture = textures .. "/tex_04.png",
LightSources = LightSources,
PerformShading = false
},
@@ -309,9 +309,9 @@ local RA_Shoulder_EL_detail_2 = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_SHOULDER_EL_detail_2.obj"
GeometryFile = models .. "/MSL_RA_SHOULDER_EL_detail_2.obj",
ColorTexture = textures .. "/tex_05.png"
},
ColorTexture = textures .. "/tex_05.png",
LightSources = LightSources,
PerformShading = false
},
@@ -331,9 +331,9 @@ local RA_Shoulder_EL_2 = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_SHOULDER_EL_2.obj"
GeometryFile = models .. "/MSL_RA_SHOULDER_EL_2.obj",
ColorTexture = textures .. "/tex_03.png"
},
ColorTexture = textures .. "/tex_03.png",
LightSources = LightSources,
PerformShading = false
},
@@ -352,9 +352,9 @@ local RA_Elbow_1 = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_ELBOW_1.obj"
GeometryFile = models .. "/MSL_RA_ELBOW_1.obj",
ColorTexture = textures .. "/tex_01.png"
},
ColorTexture = textures .. "/tex_01.png",
LightSources = LightSources,
PerformShading = false
},
@@ -372,9 +372,9 @@ local RA_Elbow_detail_1 = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_ELBOW_detail_1.obj"
GeometryFile = models .. "/MSL_RA_ELBOW_detail_1.obj",
ColorTexture = textures .. "/tex_04.png",
},
ColorTexture = textures .. "/tex_04.png",
LightSources = LightSources,
PerformShading = false
},
@@ -392,9 +392,9 @@ local RA_Elbow_detail_2 = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_ELBOW_detail_2.obj"
GeometryFile = models .. "/MSL_RA_ELBOW_detail_2.obj",
ColorTexture = textures .. "/tex_05.png"
},
ColorTexture = textures .. "/tex_05.png",
LightSources = LightSources,
PerformShading = false
},
@@ -413,9 +413,9 @@ local RA_Elbow_2 = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_ELBOW_2.obj"
GeometryFile = models .. "/MSL_RA_ELBOW_2.obj",
ColorTexture = textures .. "/tex_03.png"
},
ColorTexture = textures .. "/tex_03.png",
LightSources = LightSources,
PerformShading = false
},
@@ -435,9 +435,9 @@ local RA_Wrist = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_TURRET_new_1.obj"
GeometryFile = models .. "/MSL_RA_TURRET_new_1.obj",
ColorTexture = textures .. "/tex_03.png"
},
ColorTexture = textures .. "/tex_03.png",
LightSources = LightSources,
PerformShading = false
},
@@ -455,9 +455,9 @@ local RA_Wrist_details = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_TURRET_new_1_details.obj"
GeometryFile = models .. "/MSL_RA_TURRET_new_1_details.obj",
ColorTexture = textures .. "/tex_01.png"
},
ColorTexture = textures .. "/tex_01.png",
LightSources = LightSources,
PerformShading = false
},
@@ -476,9 +476,9 @@ local RA_Turret = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_TURRET_new_2.obj"
GeometryFile = models .. "/MSL_RA_TURRET_new_2.obj",
ColorTexture = textures .. "/tex_04.png"
},
ColorTexture = textures .. "/tex_04.png",
LightSources = LightSources,
PerformShading = false
},
@@ -497,9 +497,9 @@ local RA_Turret_details_1 = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_TURRET_new_2_detail_1.obj"
GeometryFile = models .. "/MSL_RA_TURRET_new_2_detail_1.obj",
ColorTexture = textures .. "/tex_05.png"
},
ColorTexture = textures .. "/tex_05.png",
LightSources = LightSources,
PerformShading = false
},
@@ -517,9 +517,9 @@ local RA_Turret_details_2 = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_TURRET_new_2_detail_2.obj"
GeometryFile = models .. "/MSL_RA_TURRET_new_2_detail_2.obj",
ColorTexture = textures .. "/tex_03.png"
},
ColorTexture = textures .. "/tex_03.png",
LightSources = LightSources,
PerformShading = false
},
@@ -538,10 +538,9 @@ local RSM_root = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RSM_ROOT.obj"
GeometryFile = models .. "/MSL_RSM_ROOT.obj",
ColorTexture = textures .. "/tex_04.png"
},
ColorTexture = textures .. "/tex_04.png",
LightSources = LightSources,
PerformShading = false
},
@@ -559,9 +558,9 @@ local RSM_AZ = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RSM_AZ.obj"
GeometryFile = models .. "/MSL_RSM_AZ.obj",
ColorTexture = textures .. "/tex_04.png"
},
ColorTexture = textures .. "/tex_04.png",
LightSources = LightSources,
PerformShading = false
},
@@ -579,9 +578,9 @@ local RSM_EL = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RSM_EL.obj"
GeometryFile = models .. "/MSL_RSM_EL.obj",
ColorTexture = textures .. "/tex_04.png"
},
ColorTexture = textures .. "/tex_04.png",
LightSources = LightSources,
PerformShading = false
},
@@ -600,9 +599,9 @@ local HGA_AZ = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_HGA_AZ_0ANGLE.obj"
GeometryFile = models .. "/MSL_HGA_AZ_0ANGLE.obj",
ColorTexture = textures .. "/tex_02.png"
},
ColorTexture = textures .. "/tex_02.png",
LightSources = LightSources,
PerformShading = false
},
@@ -620,9 +619,9 @@ local HGA_EL = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_HGA_EL.obj"
GeometryFile = models .. "/MSL_HGA_EL.obj",
ColorTexture = textures .. "/tex_02.png"
},
ColorTexture = textures .. "/tex_02.png",
LightSources = LightSources,
PerformShading = false
},
@@ -641,9 +640,9 @@ local SAM_Cover_1 = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_SAM_FIXED_COVER_1.obj"
GeometryFile = models .. "/MSL_SAM_FIXED_COVER_1.obj",
ColorTexture = textures .. "/MSLTextureTest.png"
},
ColorTexture = textures .. "/MSLTextureTest.png",
LightSources = LightSources,
PerformShading = false
},
@@ -661,9 +660,9 @@ local SAM_Cover_2 = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_SAM_FIXED_COVER_2.obj"
GeometryFile = models .. "/MSL_SAM_FIXED_COVER_2.obj",
ColorTexture = textures .. "/MSLTextureTest.png"
},
ColorTexture = textures .. "/MSLTextureTest.png",
LightSources = LightSources,
PerformShading = false
},
@@ -681,9 +680,9 @@ local CHEMIN_Bottom = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_CHEMIN.obj"
GeometryFile = models .. "/MSL_CHEMIN.obj",
ColorTexture = textures .. "/MSLTextureTest.png"
},
ColorTexture = textures .. "/MSLTextureTest.png",
LightSources = LightSources,
PerformShading = false
},
@@ -702,9 +701,9 @@ local Wheel_Base = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_BASE.obj"
GeometryFile = models .. "/MSL_WHEEL_BASE.obj",
ColorTexture = textures .. "/tex_02.png"
},
ColorTexture = textures .. "/tex_02.png",
LightSources = LightSources,
PerformShading = false
},
@@ -721,9 +720,9 @@ local Wheel_Base_2 = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_BASE_2.obj"
GeometryFile = models .. "/MSL_WHEEL_BASE_2.obj",
ColorTexture = textures .. "/tex_03.png"
},
ColorTexture = textures .. "/tex_03.png",
LightSources = LightSources,
PerformShading = false
},
@@ -742,9 +741,9 @@ local Wheel_Leg_1_L = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_LEG_1_L.obj"
GeometryFile = models .. "/MSL_WHEEL_LEG_1_L.obj",
ColorTexture = textures .. "/tex_03.png"
},
ColorTexture = textures .. "/tex_03.png",
LightSources = LightSources,
PerformShading = false
},
@@ -762,9 +761,9 @@ local Wheel_Leg_1A_L_detail = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_LEG_1A_L_detail.obj"
GeometryFile = models .. "/MSL_WHEEL_LEG_1A_L_detail.obj",
ColorTexture = textures .. "/tex_05.png"
},
ColorTexture = textures .. "/tex_05.png",
LightSources = LightSources,
PerformShading = false
},
@@ -782,9 +781,9 @@ local Wheel_Leg_1B_L_detail = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_LEG_1B_L_detail.obj"
GeometryFile = models .. "/MSL_WHEEL_LEG_1B_L_detail.obj",
ColorTexture = textures .. "/tex_05.png"
},
ColorTexture = textures .. "/tex_05.png",
LightSources = LightSources,
PerformShading = false
},
@@ -802,9 +801,9 @@ local Wheel_Leg_2_L = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_LEG_2_L_new.obj"
GeometryFile = models .. "/MSL_WHEEL_LEG_2_L_new.obj",
ColorTexture = textures .. "/tex_03.png"
},
ColorTexture = textures .. "/tex_03.png",
LightSources = LightSources,
PerformShading = false
},
@@ -822,9 +821,9 @@ local Wheel_Wrist_F_L = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_WRIST_F_L.obj"
GeometryFile = models .. "/MSL_WHEEL_WRIST_F_L.obj",
ColorTexture = textures .. "/tex_02.png"
},
ColorTexture = textures .. "/tex_02.png",
LightSources = LightSources,
PerformShading = false
},
@@ -842,9 +841,9 @@ local Wheel_Wrist_hub_F_L = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_WRIST_1B_F_L.obj"
GeometryFile = models .. "/MSL_WHEEL_WRIST_1B_F_L.obj",
ColorTexture = textures .. "/tex_02.png"
},
ColorTexture = textures .. "/tex_02.png",
LightSources = LightSources,
PerformShading = false
},
@@ -862,9 +861,9 @@ local Wheel_F_L = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_L.obj"
GeometryFile = models .. "/MSL_WHEEL_L.obj",
ColorTexture = textures .. "/tex_03.png"
},
ColorTexture = textures .. "/tex_03.png",
LightSources = LightSources,
PerformShading = false
},
@@ -882,9 +881,9 @@ local Wheel_C_L = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_L.obj"
GeometryFile = models .. "/MSL_WHEEL_L.obj",
ColorTexture = textures .. "/tex_03.png"
},
ColorTexture = textures .. "/tex_03.png",
LightSources = LightSources,
PerformShading = false
},
@@ -902,9 +901,9 @@ local Wheel_Wrist_B_L = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_WRIST_B_L.obj"
GeometryFile = models .. "/MSL_WHEEL_WRIST_B_L.obj",
ColorTexture = textures .. "/tex_02.png"
},
ColorTexture = textures .. "/tex_02.png",
LightSources = LightSources,
PerformShading = false
},
@@ -922,9 +921,9 @@ local Wheel_Wrist_hub_B_L = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_WRIST_1B_B_L.obj"
GeometryFile = models .. "/MSL_WHEEL_WRIST_1B_B_L.obj",
ColorTexture = textures .. "/tex_02.png"
},
ColorTexture = textures .. "/tex_02.png",
LightSources = LightSources,
PerformShading = false,
},
@@ -943,9 +942,9 @@ local Wheel_B_L = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_L.obj"
GeometryFile = models .. "/MSL_WHEEL_L.obj",
ColorTexture = textures .. "/tex_03.png"
},
ColorTexture = textures .. "/tex_03.png",
LightSources = LightSources,
PerformShading = false
},
@@ -964,9 +963,9 @@ local Wheel_Leg_1_R = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_LEG_1_R.obj"
GeometryFile = models .. "/MSL_WHEEL_LEG_1_R.obj",
ColorTexture = textures .. "/tex_03.png"
},
ColorTexture = textures .. "/tex_03.png",
LightSources = LightSources,
PerformShading = false
},
@@ -984,9 +983,9 @@ local Wheel_Leg_1A_R_detail = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_LEG_1A_R_detail.obj"
GeometryFile = models .. "/MSL_WHEEL_LEG_1A_R_detail.obj",
ColorTexture = textures .. "/tex_05.png"
},
ColorTexture = textures .. "/tex_05.png",
LightSources = LightSources,
PerformShading = false
},
@@ -1004,9 +1003,9 @@ local Wheel_Leg_1B_R_detail = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_LEG_1B_R_detail.obj"
GeometryFile = models .. "/MSL_WHEEL_LEG_1B_R_detail.obj",
ColorTexture = textures .. "/tex_05.png"
},
ColorTexture = textures .. "/tex_05.png",
LightSources = LightSources,
PerformShading = false
},
@@ -1024,9 +1023,9 @@ local Wheel_Leg_2_R = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_LEG_2_R_new.obj"
GeometryFile = models .. "/MSL_WHEEL_LEG_2_R_new.obj",
ColorTexture = textures .. "/tex_03.png"
},
ColorTexture = textures .. "/tex_03.png",
LightSources = LightSources,
PerformShading = false
},
@@ -1044,10 +1043,10 @@ local Wheel_Wrist_F_R = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_WRIST_F_R.obj"
--GeometryFile = models .. "/MSL_WHEEL_WRIST_F_L.obj"
GeometryFile = models .. "/MSL_WHEEL_WRIST_F_R.obj",
--GeometryFile = models .. "/MSL_WHEEL_WRIST_F_L.obj",
ColorTexture = textures .. "/tex_02.png"
},
ColorTexture = textures .. "/tex_02.png",
LightSources = LightSources,
PerformShading = false
},
@@ -1065,9 +1064,9 @@ local Wheel_Wrist_hub_F_R = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_WRIST_1B_F_R.obj"
GeometryFile = models .. "/MSL_WHEEL_WRIST_1B_F_R.obj",
ColorTexture = textures .. "/tex_02.png",
},
ColorTexture = textures .. "/tex_02.png",
LightSources = LightSources,
PerformShading = false
},
@@ -1085,9 +1084,9 @@ local Wheel_F_R = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_R.obj"
GeometryFile = models .. "/MSL_WHEEL_R.obj",
ColorTexture = textures .. "/tex_03.png"
},
ColorTexture = textures .. "/tex_03.png",
LightSources = LightSources,
PerformShading = false
},
@@ -1105,9 +1104,9 @@ local Wheel_C_R = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_R.obj"
GeometryFile = models .. "/MSL_WHEEL_R.obj",
ColorTexture = textures .. "/tex_03.png"
},
ColorTexture = textures .. "/tex_03.png",
LightSources = LightSources,
PerformShading = false
},
@@ -1125,9 +1124,9 @@ local Wheel_Wrist_B_R = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_WRIST_1A_B_R.obj"
GeometryFile = models .. "/MSL_WHEEL_WRIST_1A_B_R.obj",
ColorTexture = textures .. "/tex_02.png"
},
ColorTexture = textures .. "/tex_02.png",
LightSources = LightSources,
PerformShading = false
},
@@ -1145,9 +1144,9 @@ local Wheel_Wrist_hub_B_R = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_WRIST_1B_B_R.obj"
GeometryFile = models .. "/MSL_WHEEL_WRIST_1B_B_R.obj",
ColorTexture = textures .. "/tex_02.png"
},
ColorTexture = textures .. "/tex_02.png",
LightSources = LightSources,
PerformShading = false
},
@@ -1165,9 +1164,9 @@ local Wheel_B_R = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_R.obj"
GeometryFile = models .. "/MSL_WHEEL_R.obj",
ColorTexture = textures .. "/tex_03.png"
},
ColorTexture = textures .. "/tex_03.png",
LightSources = LightSources,
PerformShading = false
},

View File

@@ -34,9 +34,9 @@ local Pioneer10 = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = modelFolder .. "/Pioneer.obj"
GeometryFile = modelFolder .. "/Pioneer.obj",
ColorTexture = modelFolder .. "/gray.png"
},
ColorTexture = modelFolder .. "/gray.png",
LightSources = assetHelper.getDefaultLightSources(sunTransforms.SolarSystemBarycenter.Identifier)
},
GUI = {

View File

@@ -37,9 +37,9 @@ local Pioneer11 = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = modelFolder .. "/Pioneer.obj"
GeometryFile = modelFolder .. "/Pioneer.obj",
ColorTexture = modelFolder .. "/gray.png"
},
ColorTexture = modelFolder .. "/gray.png",
LightSources = assetHelper.getDefaultLightSources(sunTransforms.SolarSystemBarycenter.Identifier)
},
GUI = {

View File

@@ -56,9 +56,9 @@ local Comet67P = {
Type = "RenderableModelProjection",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/67P_rotated_5_130.obj"
GeometryFile = models .. "/67P_rotated_5_130.obj",
ColorTexture = textures .. "/gray.jpg"
},
ColorTexture = textures .. "/gray.jpg",
Projection = {
Sequence = { imagesDestination },
SequenceType = "image-sequence",

View File

@@ -140,9 +140,9 @@ local RosettaBlackFoil = {
Body = "ROSETTA",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/black_foil.obj"
GeometryFile = models .. "/black_foil.obj",
ColorTexture = textures .. "/foil_silver_ramp.png"
},
ColorTexture = textures .. "/foil_silver_ramp.png",
ModelTransform = RotationMatrix,
LightSources = LightSources
},
@@ -160,9 +160,9 @@ local RosettaBlackParts = {
Body = "ROSETTA",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/black_parts.obj"
GeometryFile = models .. "/black_parts.obj",
ColorTexture = textures .. "/foil_silver_ramp.png"
},
ColorTexture = textures .. "/foil_silver_ramp.png",
ModelTransform = RotationMatrix,
LightSources = LightSources
},
@@ -180,9 +180,9 @@ local RosettaDish = {
Body = "ROSETTA",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/dish.obj"
GeometryFile = models .. "/dish.obj",
ColorTexture = textures .. "/dish_AO.png"
},
ColorTexture = textures .. "/dish_AO.png",
ModelTransform = RotationMatrix,
LightSources = LightSources
},
@@ -200,9 +200,9 @@ local RosettaParts = {
Body = "ROSETTA",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/parts.obj"
GeometryFile = models .. "/parts.obj",
ColorTexture = textures .. "/parts2_AO.png"
},
ColorTexture = textures .. "/parts2_AO.png",
ModelTransform = RotationMatrix,
LightSources = LightSources
},
@@ -220,9 +220,9 @@ local RosettaSilverFoil = {
Body = "ROSETTA",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/silver_foil.obj"
GeometryFile = models .. "/silver_foil.obj",
ColorTexture = textures .. "/foil_silver_ramp.png"
},
ColorTexture = textures .. "/foil_silver_ramp.png",
ModelTransform = RotationMatrix,
LightSources = LightSources
},
@@ -240,9 +240,9 @@ local RosettaVents = {
Body = "ROSETTA",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/vents.obj"
GeometryFile = models .. "/vents.obj",
ColorTexture = textures .. "/tex_01.png"
},
ColorTexture = textures .. "/tex_01.png",
ModelTransform = RotationMatrix,
LightSources = LightSources
},
@@ -260,9 +260,9 @@ local RosettaWingA = {
Body = "ROSETTA",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .."/wingA.obj"
GeometryFile = models .."/wingA.obj",
ColorTexture = textures .. "/tex_01.png"
},
ColorTexture = textures .. "/tex_01.png",
ModelTransform = RotationMatrix,
LightSources = LightSources
},
@@ -280,9 +280,9 @@ local RosettaWingB = {
Body = "ROSETTA",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/wingB.obj"
GeometryFile = models .. "/wingB.obj",
ColorTexture = textures .. "/tex_01.png"
},
ColorTexture = textures .. "/tex_01.png",
ModelTransform = RotationMatrix,
LightSources = LightSources
},
@@ -300,9 +300,9 @@ local RosettaYellowFoil = {
Body = "ROSETTA",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/yellow_foil.obj"
GeometryFile = models .. "/yellow_foil.obj",
ColorTexture = textures .. "/foil_gold_ramp.png"
},
ColorTexture = textures .. "/foil_gold_ramp.png",
ModelTransform = RotationMatrix,
LightSources = LightSources
},
@@ -349,9 +349,9 @@ local PhilaeFoil = {
Body = "ROSETTA",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/lander_foil.obj"
GeometryFile = models .. "/lander_foil.obj",
ColorTexture = textures .. "/foil_silver_ramp.png"
},
ColorTexture = textures .. "/foil_silver_ramp.png",
ModelTransform = RotationMatrix,
LightSources = LightSources
},
@@ -369,9 +369,9 @@ local PhilaeLids = {
Body = "ROSETTA",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/lander_lids.obj"
GeometryFile = models .. "/lander_lids.obj",
ColorTexture = textures .. "/parts2_AO.png"
},
ColorTexture = textures .. "/parts2_AO.png",
ModelTransform = RotationMatrix,
LightSources = LightSources
},
@@ -389,9 +389,9 @@ local PhilaeParts = {
Body = "ROSETTA",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/lander_parts.obj"
GeometryFile = models .. "/lander_parts.obj",
ColorTexture = textures .. "/foil_silver_ramp.png"
},
ColorTexture = textures .. "/foil_silver_ramp.png",
ModelTransform = RotationMatrix,
LightSources = LightSources
},
@@ -409,9 +409,9 @@ local PhilaeSolarPanels = {
Body = "ROSETTA",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/lander_solarp.obj"
GeometryFile = models .. "/lander_solarp.obj",
ColorTexture = textures .. "/tex_01.png"
},
ColorTexture = textures .. "/tex_01.png",
ModelTransform = RotationMatrix,
LightSources = LightSources
},

View File

@@ -82,9 +82,9 @@ local Voyager1Main = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/voyager-main.obj"
GeometryFile = models .. "/voyager-main.obj",
ColorTexture = models .. "/voyager-main.jpg"
},
ColorTexture = models .. "/voyager-main.jpg",
ModelTransform = RotationMatrix,
LightSources = LightSources
},
@@ -101,9 +101,9 @@ local Voyager1Antenna = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/voyager-antenna.obj"
GeometryFile = models .. "/voyager-antenna.obj",
ColorTexture = models .. "/voyager-antenna.png"
},
ColorTexture = models .. "/voyager-antenna.png",
ModelTransform = RotationMatrix,
LightSources = LightSources
},

View File

@@ -85,9 +85,9 @@ local Voyager2Main = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/voyager-main.obj"
GeometryFile = models .. "/voyager-main.obj",
ColorTexture = models .. "/voyager-main.jpg"
},
ColorTexture = models .. "/voyager-main.jpg",
ModelTransform = RotationMatrix,
LightSources = LightSources
},
@@ -104,9 +104,9 @@ local Voyager2Antenna = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/voyager-antenna.obj"
GeometryFile = models .. "/voyager-antenna.obj",
ColorTexture = models .. "/voyager-antenna.png"
},
ColorTexture = models .. "/voyager-antenna.png",
ModelTransform = RotationMatrix,
LightSources = LightSources
},

View File

@@ -182,9 +182,9 @@ local createModelPart = function (parent, sunLightSourceNode, models, geometry,
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/" .. geometry .. ".obj"
GeometryFile = models .. "/" .. geometry .. ".obj",
ColorTexture = models .. "/" .. texture
},
ColorTexture = models .. "/" .. texture,
LightSources = lightSources,
PerformShading = performShading,
DisableFaceCulling = true