mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-06 20:38:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

update for modelgeometry; fix for pioneer sync

Browse Source
This commit is contained in:
Micah
2020-10-09 16:28:22 -04:00
parent 102454089a
commit 0f667685da
27 changed files with 297 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
data/assets/examples/globetranslation.asset
View File

@@ -32,11 +32,11 @@ local Example_Fixed_Height = {
Renderable = {
Type = "RenderableModel",
Body = "NEW HORIZONS",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/NewHorizonsCleanModel.obj",
ColorTexture = textures .. "/NHTexture.jpg"
}
}}
},
GUI = {
Path = "/Example"
@@ -57,11 +57,11 @@ local Example_Adaptive_Height = {
Renderable = {
Type = "RenderableModel",
Body = "NEW HORIZONS",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/NewHorizonsCleanModel.obj",
ColorTexture = textures .. "/NHTexture.jpg"
}
}}
},
GUI = {
Path = "/Example"

12
data/assets/scene/solarsystem/missions/apollo/11/apollo11.asset
View File

@@ -56,11 +56,11 @@ local Apollo11Model = {
},
Renderable = {
Type = "RenderableModel",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/Apollo_CSM_shrunk_rotated_xy_double_size.obj",
ColorTexture = models .. "/gray.png"
},
}},
LightSources = asset_helper.getDefaultLightSources(sun_transforms.SolarSystemBarycenter.Identifier)
},
GUI = {
@@ -175,11 +175,11 @@ local Apollo11LemDescentModel = {
},
Renderable = {
Type = "RenderableModel",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
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 },
LightSources = asset_helper.getDefaultLightSources(sun_transforms.SolarSystemBarycenter.Identifier)
@@ -205,11 +205,11 @@ local Apollo11LemLandedModel = {
},
Renderable = {
Type = "RenderableModel",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
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 },
LightSources = asset_helper.getDefaultLightSources(sun_transforms.SolarSystemBarycenter.Identifier)

4
data/assets/scene/solarsystem/missions/apollo/11/lem.asset
View File

@@ -36,11 +36,11 @@ local Apollo11LemModel = {
},
Renderable = {
Type = "RenderableModel",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
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 },
LightSources = asset_helper.getDefaultLightSources(sun_transforms.SolarSystemBarycenter.Identifier)
},

4
data/assets/scene/solarsystem/missions/apollo/15/apollo15.asset
View File

@@ -63,12 +63,12 @@ local Apollo15 = {
-- Parent = Apollo15.Identifier,
-- Renderable = {
-- Type = "RenderableModel",
-- Geometry = {
-- Geometry = {{
-- Type = "MultiModelGeometry",
-- -- GeometryFile = models .. "/Apollo_Spacecraft.obj"
-- GeometryFile = models .. "/Apollo_CSM_shrunk_rotated_xy_doubble_size.obj",
-- ColorTexture = models .. "/gray.png"
-- },
-- }},
-- LightSources = LightSources,
-- DisableFaceCulling = true
-- },

12
data/assets/scene/solarsystem/missions/apollo/17/bouldersstation2.asset
View File

@@ -47,11 +47,11 @@ local Station2Boulder1Model = {
},
Renderable = {
Type = "RenderableModel",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/b1-v2.obj",
ColorTexture = models .. "/b1-v2_u1_v1.jpeg"
},
}},
RotationVector = { 243.243256 ,206.270264, 309.677429 },
LightSources = LightSources,
PerformShading = false,
@@ -93,11 +93,11 @@ local Station2Boulder2Model = {
},
Renderable = {
Type = "RenderableModel",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/b2model.obj",
ColorTexture = models .. "/b2model_u1_v1.jpeg"
},
}},
RotationVector = { 66.162155, 7.783780, 114.193550 },
LightSources = LightSources,
PerformShading = false,
@@ -139,11 +139,11 @@ local Station2Boulder3Model = {
},
Renderable = {
Type = "RenderableModel",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/b3model.obj",
ColorTexture = models .. "/b3model_u1_v1.jpeg"
},
}},
RotationVector = { 161.513519 ,243.243256, 65.806450 },
LightSources = LightSources,
PerformShading = false,

12
data/assets/scene/solarsystem/missions/apollo/17/bouldersstation6.asset
View File

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

4
data/assets/scene/solarsystem/missions/apollo/17/bouldersstation7.asset
View File

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

4
data/assets/scene/solarsystem/missions/apollo/17/lem.asset
View File

@@ -34,11 +34,11 @@ local Apollo17LemModel = {
},
Renderable = {
Type = "RenderableModel",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
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 },
LightSources = asset_helper.getDefaultLightSources(sun_transforms.SolarSystemBarycenter.Identifier)

12
data/assets/scene/solarsystem/missions/dawn/dawn.asset
View File

@@ -650,11 +650,11 @@ local Dawn = {
Renderable = {
Type = "RenderableModel",
Body = "DAWN",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/mainbodydawn.obj",
ColorTexture = textures .. "/gray.png"
},
}},
LightSources = LightSources
},
GUI = {
@@ -682,11 +682,11 @@ local DawnSolarArray1 = {
Renderable = {
Type = "RenderableModel",
Body = "DAWN",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/solarpanelleft.obj",
ColorTexture = textures .. "/gray.png"
},
}},
LightSources = LightSources
},
GUI = {
@@ -713,11 +713,11 @@ local DawnSolarArray2 = {
Renderable = {
Type = "RenderableModel",
Body = "DAWN",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/solarpanelright.obj",
ColorTexture = textures .. "/gray.png"
},
}},
LightSources = LightSources
},
GUI = {

4
data/assets/scene/solarsystem/missions/dawn/vesta.asset
View File

@@ -45,11 +45,11 @@ local Vesta = {
},
Renderable = {
Type = "RenderableModelProjection",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/VestaComet_5000.obj",
ColorTexture = textures .. "/dummy.jpg"
},
}},
BoundingSphereRadius = 10.0,
Projection = {
Sequence = images,

4
data/assets/scene/solarsystem/missions/gaia/gaia.asset
View File

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

124
data/assets/scene/solarsystem/missions/insight/edl.asset
View File

@@ -167,11 +167,11 @@ local Insight_Entry_CapsuleA = {
Parent = Insight.Identifier,
Renderable = {
Type = "RenderableModel",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models_cruise_cone .. "/cruise_insight_doubleside2_newcapsule_diffuse.obj",
ColorTexture = models_cruise_cone .. "/insight_newcapsule_diffuse.jpg"
},
}},
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -192,11 +192,11 @@ local Insight_Entry_Capsule_Ring = {
Parent = Insight.Identifier,
Renderable = {
Type = "RenderableModel",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models_cruise_cone .. "/insight_cruise_cone_ring_foil_gold.obj",
ColorTexture = models_cruise_cone .. "/foil_gold_ramp.png"
},
}},
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -217,11 +217,11 @@ local Insight_Entry_Capsule_Plugs = {
Parent = Insight.Identifier,
Renderable = {
Type = "RenderableModel",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models_cruise_cone .. "/insight_cruise_cone_capsule_diffuse.obj",
ColorTexture = models_cruise_cone .. "/insight_capsule_diffuse.png"
},
}},
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -242,11 +242,11 @@ local Insight_Entry_Heatshield = {
Parent = Insight.Identifier,
Renderable = {
Type = "RenderableModel",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models_cruise_cone .. "/insight_cruise_heatshield_foil_gold.obj",
ColorTexture = models_cruise_cone .. "/foil_gold_ramp.png"
},
}},
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -267,11 +267,11 @@ local Insight_Parachute_0 = {
Parent = Insight.Identifier,
Renderable = {
Type = "RenderableModel",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models_chutes .. "/insight_chute_frame01_diff1.obj",
ColorTexture = models_chutes .. "/chute_diff.png"
},
}},
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -292,11 +292,11 @@ local Insight_Parachute_Cords_0 = {
Parent = Insight.Identifier,
Renderable = {
Type = "RenderableModel",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models_chutes .. "/insight_chute_frame01_cords1.obj",
ColorTexture = models_chutes .. "/foil_gold_ramp.png"
},
}},
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -317,11 +317,11 @@ local Insight_Parachute_20 = {
Parent = Insight.Identifier,
Renderable = {
Type = "RenderableModel",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models_chutes .. "/insight_chute_frame20_diff1.obj",
ColorTexture = models_chutes .. "/chute_diff.png"
},
}},
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -342,11 +342,11 @@ local Insight_Parachute_Cords_20 = {
Parent = Insight.Identifier,
Renderable = {
Type = "RenderableModel",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models_chutes .. "/insight_chute_frame20_cords1.obj",
ColorTexture = models_chutes .. "/foil_gold_ramp.png"
},
}},
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -367,11 +367,11 @@ local Insight_Parachute_40 = {
Parent = Insight.Identifier,
Renderable = {
Type = "RenderableModel",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models_chutes .. "/chute_doubleside_frame40_diff.obj",
ColorTexture = models_chutes .. "/chute_diff.png"
},
}},
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -392,11 +392,11 @@ local Insight_Parachute_Cords_40 = {
Parent = Insight.Identifier,
Renderable = {
Type = "RenderableModel",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models_chutes .. "/insight_chute_frame40_cords1.obj",
ColorTexture = models_chutes .. "/foil_gold_ramp.png"
},
}},
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -417,11 +417,11 @@ local Insight_Lander_A001 = {
Parent = Insight.Identifier,
Renderable = {
Type = "RenderableModel",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_AO01.obj",
ColorTexture = models_lander_lander_deck .. "/InSIGHT_AO_01.jpg"
},
}},
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -442,11 +442,11 @@ local Insight_Lander_A002 = {
Parent = Insight.Identifier,
Renderable = {
Type = "RenderableModel",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_AO02.obj",
ColorTexture = models_lander_lander_deck .. "/InSIGHT_AO_02.jpg"
},
}},
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -467,11 +467,11 @@ local Insight_Lander_A003 = {
Parent = Insight.Identifier,
Renderable = {
Type = "RenderableModel",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_AO03.obj",
ColorTexture = models_lander_lander_deck .. "/InSIGHT_AO_03.jpg"
},
}},
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -492,11 +492,11 @@ local Insight_Lander_A004 = {
Parent = Insight.Identifier,
Renderable = {
Type = "RenderableModel",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_AO04.obj",
ColorTexture = models_lander_lander_deck .. "/InSIGHT_AO_04.jpg"
},
}},
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -517,11 +517,11 @@ local Insight_Lander_A005 = {
Parent = Insight.Identifier,
Renderable = {
Type = "RenderableModel",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_AO05.obj",
ColorTexture = models_lander_lander_deck .. "/InSIGHT_AO_05.jpg"
},
}},
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -542,11 +542,11 @@ local Insight_Lander_A006 = {
Parent = Insight.Identifier,
Renderable = {
Type = "RenderableModel",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_AO06.obj",
ColorTexture = models_lander_lander_deck .. "/InSIGHT_AO_06.jpg"
},
}},
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -567,11 +567,11 @@ local Insight_Lander_A007 = {
Parent = Insight.Identifier,
Renderable = {
Type = "RenderableModel",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_AO07.obj",
ColorTexture = models_lander_lander_deck .. "/InSIGHT_AO_07.jpg"
},
}},
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -592,11 +592,11 @@ local Insight_Lander_A008 = {
Parent = Insight.Identifier,
Renderable = {
Type = "RenderableModel",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_AO08.obj",
ColorTexture = models_lander_lander_deck .. "/InSIGHT_AO_08.jpg"
},
}},
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -617,11 +617,11 @@ local Insight_Lander_foil1 = {
Parent = Insight.Identifier,
Renderable = {
Type = "RenderableModel",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_foil1.obj",
ColorTexture = models_lander_lander_deck .. "/foil_silver_ramp.jpg"
},
}},
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -642,11 +642,11 @@ local Insight_Lander_Tex01 = {
Parent = Insight.Identifier,
Renderable = {
Type = "RenderableModel",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_tex01.obj",
ColorTexture = models_lander_lander_deck .. "/InSIGHT_tex_01.jpg"
},
}},
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -667,11 +667,11 @@ local Insight_Lander_Tex02 = {
Parent = Insight.Identifier,
Renderable = {
Type = "RenderableModel",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_tex02.obj",
ColorTexture = models_lander_lander_deck .. "/InSIGHT_tex_02.jpg"
},
}},
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -692,11 +692,11 @@ local Insight_Legs_Stowed_tex = {
Parent = Insight.Identifier,
Renderable = {
Type = "RenderableModel",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models_lander_legs_stow .. "/insight_lander_legs_stow_tex01.obj",
ColorTexture = models_lander_legs_stow .. "/InSIGHT_tex_01.jpg"
},
}},
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -717,11 +717,11 @@ local Insight_Legs_Stowed_AO06 = {
Parent = Insight.Identifier,
Renderable = {
Type = "RenderableModel",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models_lander_legs_stow .. "/insight_lander_legs_stow_AO06.obj",
ColorTexture = models_lander_legs_stow .. "/InSIGHT_AO_06.jpg"
},
}},
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -742,11 +742,11 @@ local Insight_Legs_Deployed_tex = {
Parent = Insight.Identifier,
Renderable = {
Type = "RenderableModel",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models_lander_legs_deploy .. "/insight_lander_legs_deploy_tex01.obj",
ColorTexture = models_lander_legs_deploy .. "/InSIGHT_tex_01.jpg"
},
}},
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -767,11 +767,11 @@ local Insight_Legs_Deployed_AO06 = {
Parent = Insight.Identifier,
Renderable = {
Type = "RenderableModel",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models_lander_legs_deploy .. "/insight_lander_legs_deploy_AO06.obj",
ColorTexture = models_lander_legs_deploy .. "/InSIGHT_AO_06.jpg"
},
}},
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -792,11 +792,11 @@ local Insight_Panels_Stowed_tex = {
Parent = Insight.Identifier,
Renderable = {
Type = "RenderableModel",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models_lander_panels_stow .. "/insight_lander_panels_stow_tex01.obj",
ColorTexture = models_lander_panels_stow .. "/InSIGHT_tex_01.jpg"
},
}},
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -817,11 +817,11 @@ local Insight_Panels_Stowed_tex2 = {
Parent = Insight.Identifier,
Renderable = {
Type = "RenderableModel",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models_lander_panels_stow .. "/insight_lander_panels_stow_tex02.obj",
ColorTexture = models_lander_panels_stow .. "/InSIGHT_tex_02.jpg"
},
}},
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -842,11 +842,11 @@ local Insight_Panels_Stowed_AO01 = {
Parent = Insight.Identifier,
Renderable = {
Type = "RenderableModel",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models_lander_panels_stow .. "/insight_lander_panels_stow_AO01.obj",
ColorTexture = models_lander_panels_stow .. "/InSIGHT_AO_01.jpg"
},
}},
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -867,11 +867,11 @@ local Insight_Panels_Deployed_tex = {
Parent = Insight.Identifier,
Renderable = {
Type = "RenderableModel",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models_lander_panels_deploy .. "/insight_lander_panels_deploy_tex01.obj",
ColorTexture = models_lander_panels_deploy .. "/InSIGHT_tex_01.jpg"
},
}},
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -892,11 +892,11 @@ local Insight_Panels_Deployed_tex2 = {
Parent = Insight.Identifier,
Renderable = {
Type = "RenderableModel",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models_lander_panels_deploy .. "/insight_lander_panels_deploy_tex02.obj",
ColorTexture = models_lander_panels_deploy .. "/InSIGHT_tex_02.jpg"
},
}},
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -917,11 +917,11 @@ local Insight_Panels_Deployed_AO06 = {
Parent = Insight.Identifier,
Renderable = {
Type = "RenderableModel",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models_lander_panels_deploy .. "/insight_lander_panels_deploy_AO01.obj",
ColorTexture = models_lander_panels_deploy .. "/InSIGHT_AO_01.jpg"
},
}},
ModelTransform = RotationMatrix,
LightSources = LightSources,
},

4
data/assets/scene/solarsystem/missions/juno/juno.asset
View File

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

20
data/assets/scene/solarsystem/missions/messenger/messengerSC.asset
View File

@@ -92,11 +92,11 @@ local MessengerProbeBlack = {
Parent = Messenger.Identifier,
Renderable = {
Type = "RenderableModel",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MessengerProbe_black.obj",
ColorTexture = models .. "/Tex_black.png"
},
}},
ModelTransform = RotationMatrix,
LightSources = LightSources
},
@@ -111,11 +111,11 @@ local MessengerProbeFoil = {
Parent = Messenger.Identifier,
Renderable = {
Type = "RenderableModel",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MessengerProbe_foil.obj",
ColorTexture = models .. "/foil_n2.png"
},
}},
ModelTransform = RotationMatrix,
LightSources = LightSources
},
@@ -130,11 +130,11 @@ local MessengerProbeHeatShield = {
Parent = Messenger.Identifier,
Renderable = {
Type = "RenderableModel",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MessengerProbe_heatShield.obj",
ColorTexture = models .. "/AO_heatshield4.png"
},
}},
ModelTransform = RotationMatrix,
LightSources = LightSources
},
@@ -149,11 +149,11 @@ local MessengerProbeMetal = {
Parent = Messenger.Identifier,
Renderable = {
Type = "RenderableModel",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MessengerProbe_metal.obj",
ColorTexture = models .. "/Tex_grey.png"
},
}},
ModelTransform = RotationMatrix,
LightSources = LightSources
},
@@ -169,11 +169,11 @@ local MessengerProbePanels = {
Parent = Messenger.Identifier,
Renderable = {
Type = "RenderableModel",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MessengerProbe_panels.obj",
ColorTexture = models .. "/Messenger_tex.png"
},
}},
ModelTransform = RotationMatrix,
LightSources = LightSources
},

4
data/assets/scene/solarsystem/missions/newhorizons/label.asset
View File

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

4
data/assets/scene/solarsystem/missions/newhorizons/model.asset
View File

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

4
data/assets/scene/solarsystem/missions/osirisrex/bennu.asset
View File

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

12
data/assets/scene/solarsystem/missions/osirisrex/model.asset
View File

@@ -216,11 +216,11 @@ local OsirisRex = {
Renderable = {
Type = "RenderableModel",
Body = "OSIRIS-REX",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/orx_base_resized_12_sep_2016.obj",
ColorTexture = textures .. "/osirisTex.png"
},
}},
LightSources = LightSources
},
GUI = {
@@ -246,11 +246,11 @@ local PolyCam = {
Renderable = {
Type = "RenderableModel",
Body = "OSIRIS-REX",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/orx_polycam_resized_12_sep_2016.obj",
ColorTexture = textures .. "/osirisTex.png"
},
}},
LightSources = LightSources
},
GUI = {
@@ -265,11 +265,11 @@ local Rexis = {
Renderable = {
Type = "RenderableModel",
Body = "OSIRIS-REX",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/orx_rexis_resized_12_sep_2016.obj",
ColorTexture = textures .. "/osirisTex.png"
},
}},
LightSources = LightSources
},
Transform = {

220
data/assets/scene/solarsystem/missions/perseverance/model.asset
View File

@@ -61,11 +61,11 @@ local Body = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_BODY_new_1.obj",
ColorTexture = textures .. "/tex_01.png"
},
}},
LightSources = LightSources,
PerformShading = false,
},
@@ -83,11 +83,11 @@ local Body_detail = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_BODY_new_1_new_detail.obj",
ColorTexture = textures .. "/tex_01.png"
},
}},
LightSources = LightSources,
PerformShading = false,
},
@@ -104,11 +104,11 @@ local Body_staticParts_1 = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_BODY_new_2.obj",
ColorTexture = textures .. "/tex_02.png"
},
}},
LightSources = LightSources,
PerformShading = false
},
@@ -124,11 +124,11 @@ local Body_staticParts_2 = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_BODY_new_3.obj",
ColorTexture = textures .. "/tex_03.png"
},
}},
LightSources = LightSources,
PerformShading = false
},
@@ -144,11 +144,11 @@ local Body_staticParts_3 = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_BODY_new_4.obj",
ColorTexture = textures .. "/tex_04.png"
},
}},
LightSources = LightSources,
PerformShading = false
},
@@ -164,11 +164,11 @@ local Body_staticParts_4 = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_BODY_new_5.obj",
ColorTexture = textures .. "/tex_05.png"
},
}},
LightSources = LightSources,
PerformShading = false
},
@@ -184,11 +184,11 @@ local Body_staticParts_5 = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_BODY_new_A0.obj",
ColorTexture = textures .. "/parts_AO.png"
},
}},
LightSources = LightSources,
PerformShading = false
},
@@ -205,11 +205,11 @@ local RA_Shoulder_AZ = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_SHOULDER_AZ_new.obj",
ColorTexture = textures .. "/tex_03.png"
},
}},
LightSources = LightSources,
PerformShading = false
},
@@ -225,11 +225,11 @@ local RA_Shoulder_AZ_detail_1 = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_SHOULDER_AZ_detail_1.obj",
ColorTexture = textures .. "/tex_05.png"
},
}},
LightSources = LightSources,
PerformShading = false
},
@@ -245,11 +245,11 @@ local RA_Shoulder_AZ_detail_2 = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_SHOULDER_AZ_detail_2.obj",
ColorTexture = textures .. "/tex_01.png"
},
}},
LightSources = LightSources,
PerformShading = false
},
@@ -266,11 +266,11 @@ local RA_Shoulder_EL_1 = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_SHOULDER_EL_1.obj",
ColorTexture = textures .. "/tex_01.png"
},
}},
LightSources = LightSources,
PerformShading = false
},
@@ -287,11 +287,11 @@ local RA_Shoulder_EL_detail_1 = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_SHOULDER_EL_detail_1.obj",
ColorTexture = textures .. "/tex_04.png"
},
}},
LightSources = LightSources,
PerformShading = false
},
@@ -307,11 +307,11 @@ local RA_Shoulder_EL_detail_2 = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_SHOULDER_EL_detail_2.obj",
ColorTexture = textures .. "/tex_05.png"
},
}},
LightSources = LightSources,
PerformShading = false
},
@@ -329,11 +329,11 @@ local RA_Shoulder_EL_2 = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_SHOULDER_EL_2.obj",
ColorTexture = textures .. "/tex_03.png"
},
}},
LightSources = LightSources,
PerformShading = false
},
@@ -350,11 +350,11 @@ local RA_Elbow_1 = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_ELBOW_1.obj",
ColorTexture = textures .. "/tex_01.png"
},
}},
LightSources = LightSources,
PerformShading = false
},
@@ -370,11 +370,11 @@ local RA_Elbow_detail_1 = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_ELBOW_detail_1.obj",
ColorTexture = textures .. "/tex_04.png",
},
}},
LightSources = LightSources,
PerformShading = false
},
@@ -390,11 +390,11 @@ local RA_Elbow_detail_2 = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_ELBOW_detail_2.obj",
ColorTexture = textures .. "/tex_05.png"
},
}},
LightSources = LightSources,
PerformShading = false
},
@@ -411,11 +411,11 @@ local RA_Elbow_2 = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_ELBOW_2.obj",
ColorTexture = textures .. "/tex_03.png"
},
}},
LightSources = LightSources,
PerformShading = false
},
@@ -433,11 +433,11 @@ local RA_Wrist = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_TURRET_new_1.obj",
ColorTexture = textures .. "/tex_03.png"
},
}},
LightSources = LightSources,
PerformShading = false
},
@@ -453,11 +453,11 @@ local RA_Wrist_details = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_TURRET_new_1_details.obj",
ColorTexture = textures .. "/tex_01.png"
},
}},
LightSources = LightSources,
PerformShading = false
},
@@ -474,11 +474,11 @@ local RA_Turret = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_TURRET_new_2.obj",
ColorTexture = textures .. "/tex_04.png"
},
}},
LightSources = LightSources,
PerformShading = false
},
@@ -495,11 +495,11 @@ local RA_Turret_details_1 = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_TURRET_new_2_detail_1.obj",
ColorTexture = textures .. "/tex_05.png"
},
}},
LightSources = LightSources,
PerformShading = false
},
@@ -515,11 +515,11 @@ local RA_Turret_details_2 = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_TURRET_new_2_detail_2.obj",
ColorTexture = textures .. "/tex_03.png"
},
}},
LightSources = LightSources,
PerformShading = false
},
@@ -536,11 +536,11 @@ local RSM_root = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RSM_ROOT.obj",
ColorTexture = textures .. "/tex_04.png"
},
}},
LightSources = LightSources,
PerformShading = false
},
@@ -556,11 +556,11 @@ local RSM_AZ = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RSM_AZ.obj",
ColorTexture = textures .. "/tex_04.png"
},
}},
LightSources = LightSources,
PerformShading = false
},
@@ -576,11 +576,11 @@ local RSM_EL = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RSM_EL.obj",
ColorTexture = textures .. "/tex_04.png"
},
}},
LightSources = LightSources,
PerformShading = false
},
@@ -597,11 +597,11 @@ local HGA_AZ = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_HGA_AZ_0ANGLE.obj",
ColorTexture = textures .. "/tex_02.png"
},
}},
LightSources = LightSources,
PerformShading = false
},
@@ -617,11 +617,11 @@ local HGA_EL = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_HGA_EL.obj",
ColorTexture = textures .. "/tex_02.png"
},
}},
LightSources = LightSources,
PerformShading = false
},
@@ -638,11 +638,11 @@ local SAM_Cover_1 = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_SAM_FIXED_COVER_1.obj",
ColorTexture = textures .. "/MSLTextureTest.png"
},
}},
LightSources = LightSources,
PerformShading = false
},
@@ -658,11 +658,11 @@ local SAM_Cover_2 = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_SAM_FIXED_COVER_2.obj",
ColorTexture = textures .. "/MSLTextureTest.png"
},
}},
LightSources = LightSources,
PerformShading = false
},
@@ -678,11 +678,11 @@ local CHEMIN_Bottom = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_CHEMIN.obj",
ColorTexture = textures .. "/MSLTextureTest.png"
},
}},
LightSources = LightSources,
PerformShading = false
},
@@ -699,11 +699,11 @@ local Wheel_Base = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_BASE.obj",
ColorTexture = textures .. "/tex_02.png"
},
}},
LightSources = LightSources,
PerformShading = false
},
@@ -718,11 +718,11 @@ local Wheel_Base_2 = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_BASE_2.obj",
ColorTexture = textures .. "/tex_03.png"
},
}},
LightSources = LightSources,
PerformShading = false
},
@@ -739,11 +739,11 @@ local Wheel_Leg_1_L = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_LEG_1_L.obj",
ColorTexture = textures .. "/tex_03.png"
},
}},
LightSources = LightSources,
PerformShading = false
},
@@ -759,11 +759,11 @@ local Wheel_Leg_1A_L_detail = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_LEG_1A_L_detail.obj",
ColorTexture = textures .. "/tex_05.png"
},
}},
LightSources = LightSources,
PerformShading = false
},
@@ -779,11 +779,11 @@ local Wheel_Leg_1B_L_detail = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_LEG_1B_L_detail.obj",
ColorTexture = textures .. "/tex_05.png"
},
}},
LightSources = LightSources,
PerformShading = false
},
@@ -799,11 +799,11 @@ local Wheel_Leg_2_L = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_LEG_2_L_new.obj",
ColorTexture = textures .. "/tex_03.png"
},
}},
LightSources = LightSources,
PerformShading = false
},
@@ -819,11 +819,11 @@ local Wheel_Wrist_F_L = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_WRIST_F_L.obj",
ColorTexture = textures .. "/tex_02.png"
},
}},
LightSources = LightSources,
PerformShading = false
},
@@ -839,11 +839,11 @@ local Wheel_Wrist_hub_F_L = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_WRIST_1B_F_L.obj",
ColorTexture = textures .. "/tex_02.png"
},
}},
LightSources = LightSources,
PerformShading = false
},
@@ -859,11 +859,11 @@ local Wheel_F_L = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_L.obj",
ColorTexture = textures .. "/tex_03.png"
},
}},
LightSources = LightSources,
PerformShading = false
},
@@ -879,11 +879,11 @@ local Wheel_C_L = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_L.obj",
ColorTexture = textures .. "/tex_03.png"
},
}},
LightSources = LightSources,
PerformShading = false
},
@@ -899,11 +899,11 @@ local Wheel_Wrist_B_L = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_WRIST_B_L.obj",
ColorTexture = textures .. "/tex_02.png"
},
}},
LightSources = LightSources,
PerformShading = false
},
@@ -919,11 +919,11 @@ local Wheel_Wrist_hub_B_L = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_WRIST_1B_B_L.obj",
ColorTexture = textures .. "/tex_02.png"
},
}},
LightSources = LightSources,
PerformShading = false,
},
@@ -940,11 +940,11 @@ local Wheel_B_L = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_L.obj",
ColorTexture = textures .. "/tex_03.png"
},
}},
LightSources = LightSources,
PerformShading = false
},
@@ -961,11 +961,11 @@ local Wheel_Leg_1_R = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_LEG_1_R.obj",
ColorTexture = textures .. "/tex_03.png"
},
}},
LightSources = LightSources,
PerformShading = false
},
@@ -981,11 +981,11 @@ local Wheel_Leg_1A_R_detail = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_LEG_1A_R_detail.obj",
ColorTexture = textures .. "/tex_05.png"
},
}},
LightSources = LightSources,
PerformShading = false
},
@@ -1001,11 +1001,11 @@ local Wheel_Leg_1B_R_detail = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_LEG_1B_R_detail.obj",
ColorTexture = textures .. "/tex_05.png"
},
}},
LightSources = LightSources,
PerformShading = false
},
@@ -1021,11 +1021,11 @@ local Wheel_Leg_2_R = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_LEG_2_R_new.obj",
ColorTexture = textures .. "/tex_03.png"
},
}},
LightSources = LightSources,
PerformShading = false
},
@@ -1041,12 +1041,12 @@ local Wheel_Wrist_F_R = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_WRIST_F_R.obj",
--GeometryFile = models .. "/MSL_WHEEL_WRIST_F_L.obj",
ColorTexture = textures .. "/tex_02.png"
},
}},
LightSources = LightSources,
PerformShading = false
},
@@ -1062,11 +1062,11 @@ local Wheel_Wrist_hub_F_R = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_WRIST_1B_F_R.obj",
ColorTexture = textures .. "/tex_02.png",
},
}},
LightSources = LightSources,
PerformShading = false
},
@@ -1082,11 +1082,11 @@ local Wheel_F_R = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_R.obj",
ColorTexture = textures .. "/tex_03.png"
},
}},
LightSources = LightSources,
PerformShading = false
},
@@ -1102,11 +1102,11 @@ local Wheel_C_R = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_R.obj",
ColorTexture = textures .. "/tex_03.png"
},
}},
LightSources = LightSources,
PerformShading = false
},
@@ -1122,11 +1122,11 @@ local Wheel_Wrist_B_R = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_WRIST_1A_B_R.obj",
ColorTexture = textures .. "/tex_02.png"
},
}},
LightSources = LightSources,
PerformShading = false
},
@@ -1142,11 +1142,11 @@ local Wheel_Wrist_hub_B_R = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_WRIST_1B_B_R.obj",
ColorTexture = textures .. "/tex_02.png"
},
}},
LightSources = LightSources,
PerformShading = false
},
@@ -1162,11 +1162,11 @@ local Wheel_B_R = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_R.obj",
ColorTexture = textures .. "/tex_03.png"
},
}},
LightSources = LightSources,
PerformShading = false
},

17
data/assets/scene/solarsystem/missions/pioneer/pioneer10.asset
View File

@@ -1,12 +1,7 @@
local assetHelper = asset.require('util/asset_helper')
local sunTransforms = asset.require('scene/solarsystem/sun/transforms')
local model = asset.require("scene/solarsystem/missions/pioneer/pioneermodel")
local modelFolder = asset.syncedResource({
Name = "Pioneer 10/11 Models",
Type = "HttpSynchronization",
Identifier = "pioneer_10_11_model",
Version = 2
})
local kernelsFolder = asset.syncedResource({
Name = "Pioneer Kernels",
@@ -30,15 +25,7 @@ local Pioneer10 = {
Kernels = kernelsList
},
},
Renderable = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = modelFolder .. "/Pioneer.obj",
ColorTexture = modelFolder .. "/gray.png"
},
LightSources = assetHelper.getDefaultLightSources(sunTransforms.SolarSystemBarycenter.Identifier)
},
Renderable = model.PioneerModel,
GUI = {
Name = "Pioneer 10",
Path = "/Solar System/Missions/Pioneer/10"

17
data/assets/scene/solarsystem/missions/pioneer/pioneer11.asset
View File

@@ -1,12 +1,7 @@
local assetHelper = asset.require('util/asset_helper')
local sunTransforms = asset.require('scene/solarsystem/sun/transforms')
local model = asset.require("scene/solarsystem/missions/pioneer/pioneermodel")
local modelFolder = asset.syncedResource({
Name = "Pioneer 10/11 Models",
Type = "HttpSynchronization",
Identifier = "pioneer_10_11_model",
Version = 2
})
local kernelsFolder = asset.syncedResource({
Name = "Pioneer Kernels",
@@ -33,15 +28,7 @@ local Pioneer11 = {
Kernels = kernelsList
},
},
Renderable = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = modelFolder .. "/Pioneer.obj",
ColorTexture = modelFolder .. "/gray.png"
},
LightSources = assetHelper.getDefaultLightSources(sunTransforms.SolarSystemBarycenter.Identifier)
},
Renderable = model.PioneerModel,
GUI = {
Name = "Pioneer 11",
Path = "/Solar System/Missions/Pioneer/11"

23
data/assets/scene/solarsystem/missions/pioneer/pioneermodel.asset Normal file
View File

@@ -0,0 +1,23 @@
local assetHelper = asset.require('util/asset_helper')
local modelFolder = asset.syncedResource({
Name = "Pioneer 10/11 Models",
Type = "HttpSynchronization",
Identifier = "pioneer_10_11_model",
Version = 2
})
local ModelRenderable = {
Type = "RenderableModel",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = modelFolder .. "/Pioneer.obj",
ColorTexture = modelFolder .. "/gray.png"
}},
LightSources = assetHelper.getDefaultLightSources(
sunTransforms.SolarSystemBarycenter.Identifier
)
}
asset.export("PioneerModel", ModelRenderable)

4
data/assets/scene/solarsystem/missions/rosetta/67p.asset
View File

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

52
data/assets/scene/solarsystem/missions/rosetta/rosetta.asset
View File

@@ -138,11 +138,11 @@ local RosettaBlackFoil = {
Renderable = {
Type = "RenderableModel",
Body = "ROSETTA",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/black_foil.obj",
ColorTexture = textures .. "/foil_silver_ramp.png"
},
}},
ModelTransform = RotationMatrix,
LightSources = LightSources
},
@@ -158,11 +158,11 @@ local RosettaBlackParts = {
Renderable = {
Type = "RenderableModel",
Body = "ROSETTA",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/black_parts.obj",
ColorTexture = textures .. "/foil_silver_ramp.png"
},
}},
ModelTransform = RotationMatrix,
LightSources = LightSources
},
@@ -178,11 +178,11 @@ local RosettaDish = {
Renderable = {
Type = "RenderableModel",
Body = "ROSETTA",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/dish.obj",
ColorTexture = textures .. "/dish_AO.png"
},
}},
ModelTransform = RotationMatrix,
LightSources = LightSources
},
@@ -198,11 +198,11 @@ local RosettaParts = {
Renderable = {
Type = "RenderableModel",
Body = "ROSETTA",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/parts.obj",
ColorTexture = textures .. "/parts2_AO.png"
},
}},
ModelTransform = RotationMatrix,
LightSources = LightSources
},
@@ -218,11 +218,11 @@ local RosettaSilverFoil = {
Renderable = {
Type = "RenderableModel",
Body = "ROSETTA",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/silver_foil.obj",
ColorTexture = textures .. "/foil_silver_ramp.png"
},
}},
ModelTransform = RotationMatrix,
LightSources = LightSources
},
@@ -238,11 +238,11 @@ local RosettaVents = {
Renderable = {
Type = "RenderableModel",
Body = "ROSETTA",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/vents.obj",
ColorTexture = textures .. "/tex_01.png"
},
}},
ModelTransform = RotationMatrix,
LightSources = LightSources
},
@@ -258,11 +258,11 @@ local RosettaWingA = {
Renderable = {
Type = "RenderableModel",
Body = "ROSETTA",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .."/wingA.obj",
ColorTexture = textures .. "/tex_01.png"
},
}},
ModelTransform = RotationMatrix,
LightSources = LightSources
},
@@ -278,11 +278,11 @@ local RosettaWingB = {
Renderable = {
Type = "RenderableModel",
Body = "ROSETTA",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/wingB.obj",
ColorTexture = textures .. "/tex_01.png"
},
}},
ModelTransform = RotationMatrix,
LightSources = LightSources
},
@@ -298,11 +298,11 @@ local RosettaYellowFoil = {
Renderable = {
Type = "RenderableModel",
Body = "ROSETTA",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/yellow_foil.obj",
ColorTexture = textures .. "/foil_gold_ramp.png"
},
}},
ModelTransform = RotationMatrix,
LightSources = LightSources
},
@@ -347,11 +347,11 @@ local PhilaeFoil = {
Renderable = {
Type = "RenderableModel",
Body = "ROSETTA",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/lander_foil.obj",
ColorTexture = textures .. "/foil_silver_ramp.png"
},
}},
ModelTransform = RotationMatrix,
LightSources = LightSources
},
@@ -367,11 +367,11 @@ local PhilaeLids = {
Renderable = {
Type = "RenderableModel",
Body = "ROSETTA",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/lander_lids.obj",
ColorTexture = textures .. "/parts2_AO.png"
},
}},
ModelTransform = RotationMatrix,
LightSources = LightSources
},
@@ -387,11 +387,11 @@ local PhilaeParts = {
Renderable = {
Type = "RenderableModel",
Body = "ROSETTA",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/lander_parts.obj",
ColorTexture = textures .. "/foil_silver_ramp.png"
},
}},
ModelTransform = RotationMatrix,
LightSources = LightSources
},
@@ -407,11 +407,11 @@ local PhilaeSolarPanels = {
Renderable = {
Type = "RenderableModel",
Body = "ROSETTA",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/lander_solarp.obj",
ColorTexture = textures .. "/tex_01.png"
},
}},
ModelTransform = RotationMatrix,
LightSources = LightSources
},

4
data/assets/scene/solarsystem/missions/voyager/voyager1.asset
View File

@@ -80,11 +80,11 @@ local Voyager1Main = {
Parent = Voyager1.Identifier,
Renderable = {
Type = "RenderableModel",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/voyager-main.obj",
ColorTexture = models .. "/voyager-main.jpg"
},
}},
ModelTransform = RotationMatrix,
LightSources = LightSources
},

4
data/assets/scene/solarsystem/missions/voyager/voyager2.asset
View File

@@ -102,11 +102,11 @@ local Voyager2Antenna = {
Parent = Voyager2.Identifier,
Renderable = {
Type = "RenderableModel",
Geometry = {
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/voyager-antenna.obj",
ColorTexture = models .. "/voyager-antenna.png"
},
}},
ModelTransform = RotationMatrix,
LightSources = LightSources
},

4
data/assets/util/asset_helper.asset
View File

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