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

Update assets for new model loading structure

Browse Source 
* Update Ghoul
This commit is contained in:
Malin Ejdbo
2021-02-03 10:19:35 +01:00
parent 73fd118ee2
commit c6b3b409ff
21 changed files with 160 additions and 794 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
data/assets/scene/milkyway/objects/orionnebula/nebula.asset
View File

@@ -59,11 +59,7 @@ local OrionNebulaModel = {
},
Renderable = {
Type = "RenderableModel",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = sync .. "/orion_nebula.obj",
ColorTexture = sync .. "/heic0601a_masked.png"
}},
GeometryFile = sync .. "/orion_nebula.obj",
Opacity = 1.0,
DisableFaceCulling = false,
SpecularIntensity = 0.0,
@@ -92,11 +88,7 @@ local OrionNebulaShocksModel = {
},
Renderable = {
Type = "RenderableModel",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = sync .. "/orishocks.obj",
ColorTexture = "${DATA}/colors/pink.png"
}},
GeometryFile = sync .. "/orishocks.obj",
Opacity = 1.0,
DisableFaceCulling = false,
SpecularIntensity = 0.0,
@@ -125,11 +117,7 @@ local OrionNebulaProplydsModel = {
},
Renderable = {
Type = "RenderableModel",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = sync .. "/proplyds.obj",
ColorTexture = "${DATA}/colors/pink.png"
}},
GeometryFile = sync .. "/proplyds.obj",
Opacity = 1.0,
DisableFaceCulling = false,
SpecularIntensity = 0.0,

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -61,11 +61,7 @@ local Body = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_BODY_new_1.obj",
ColorTexture = textures .. "/tex_01.png"
}},
GeometryFile = models .. "/MSL_BODY_new_1.obj",
LightSources = LightSources,
PerformShading = false,
},
@@ -83,11 +79,7 @@ local Body_detail = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_BODY_new_1_new_detail.obj",
ColorTexture = textures .. "/tex_01.png"
}},
GeometryFile = models .. "/MSL_BODY_new_1_new_detail.obj",
LightSources = LightSources,
PerformShading = false,
},
@@ -104,11 +96,7 @@ local Body_staticParts_1 = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_BODY_new_2.obj",
ColorTexture = textures .. "/tex_02.png"
}},
GeometryFile = models .. "/MSL_BODY_new_2.obj",
LightSources = LightSources,
PerformShading = false
},
@@ -124,11 +112,7 @@ local Body_staticParts_2 = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_BODY_new_3.obj",
ColorTexture = textures .. "/tex_03.png"
}},
GeometryFile = models .. "/MSL_BODY_new_3.obj",
LightSources = LightSources,
PerformShading = false
},
@@ -144,11 +128,7 @@ local Body_staticParts_3 = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_BODY_new_4.obj",
ColorTexture = textures .. "/tex_04.png"
}},
GeometryFile = models .. "/MSL_BODY_new_4.obj",
LightSources = LightSources,
PerformShading = false
},
@@ -164,11 +144,7 @@ local Body_staticParts_4 = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_BODY_new_5.obj",
ColorTexture = textures .. "/tex_05.png"
}},
GeometryFile = models .. "/MSL_BODY_new_5.obj",
LightSources = LightSources,
PerformShading = false
},
@@ -184,11 +160,7 @@ local Body_staticParts_5 = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_BODY_new_A0.obj",
ColorTexture = textures .. "/parts_AO.png"
}},
GeometryFile = models .. "/MSL_BODY_new_A0.obj",
LightSources = LightSources,
PerformShading = false
},
@@ -205,11 +177,7 @@ local RA_Shoulder_AZ = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_SHOULDER_AZ_new.obj",
ColorTexture = textures .. "/tex_03.png"
}},
GeometryFile = models .. "/MSL_RA_SHOULDER_AZ_new.obj",
LightSources = LightSources,
PerformShading = false
},
@@ -225,11 +193,7 @@ local RA_Shoulder_AZ_detail_1 = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_SHOULDER_AZ_detail_1.obj",
ColorTexture = textures .. "/tex_05.png"
}},
GeometryFile = models .. "/MSL_RA_SHOULDER_AZ_detail_1.obj",
LightSources = LightSources,
PerformShading = false
},
@@ -245,11 +209,7 @@ local RA_Shoulder_AZ_detail_2 = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_SHOULDER_AZ_detail_2.obj",
ColorTexture = textures .. "/tex_01.png"
}},
GeometryFile = models .. "/MSL_RA_SHOULDER_AZ_detail_2.obj",
LightSources = LightSources,
PerformShading = false
},
@@ -266,11 +226,7 @@ local RA_Shoulder_EL_1 = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_SHOULDER_EL_1.obj",
ColorTexture = textures .. "/tex_01.png"
}},
GeometryFile = models .. "/MSL_RA_SHOULDER_EL_1.obj",
LightSources = LightSources,
PerformShading = false
},
@@ -287,11 +243,7 @@ local RA_Shoulder_EL_detail_1 = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_SHOULDER_EL_detail_1.obj",
ColorTexture = textures .. "/tex_04.png"
}},
GeometryFile = models .. "/MSL_RA_SHOULDER_EL_detail_1.obj",
LightSources = LightSources,
PerformShading = false
},
@@ -307,11 +259,7 @@ local RA_Shoulder_EL_detail_2 = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_SHOULDER_EL_detail_2.obj",
ColorTexture = textures .. "/tex_05.png"
}},
GeometryFile = models .. "/MSL_RA_SHOULDER_EL_detail_2.obj",
LightSources = LightSources,
PerformShading = false
},
@@ -329,11 +277,7 @@ local RA_Shoulder_EL_2 = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_SHOULDER_EL_2.obj",
ColorTexture = textures .. "/tex_03.png"
}},
GeometryFile = models .. "/MSL_RA_SHOULDER_EL_2.obj",
LightSources = LightSources,
PerformShading = false
},
@@ -350,11 +294,7 @@ local RA_Elbow_1 = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_ELBOW_1.obj",
ColorTexture = textures .. "/tex_01.png"
}},
GeometryFile = models .. "/MSL_RA_ELBOW_1.obj",
LightSources = LightSources,
PerformShading = false
},
@@ -370,11 +310,7 @@ local RA_Elbow_detail_1 = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_ELBOW_detail_1.obj",
ColorTexture = textures .. "/tex_04.png",
}},
GeometryFile = models .. "/MSL_RA_ELBOW_detail_1.obj",
LightSources = LightSources,
PerformShading = false
},
@@ -390,11 +326,7 @@ local RA_Elbow_detail_2 = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_ELBOW_detail_2.obj",
ColorTexture = textures .. "/tex_05.png"
}},
GeometryFile = models .. "/MSL_RA_ELBOW_detail_2.obj",
LightSources = LightSources,
PerformShading = false
},
@@ -411,11 +343,7 @@ local RA_Elbow_2 = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_ELBOW_2.obj",
ColorTexture = textures .. "/tex_03.png"
}},
GeometryFile = models .. "/MSL_RA_ELBOW_2.obj",
LightSources = LightSources,
PerformShading = false
},
@@ -433,11 +361,7 @@ local RA_Wrist = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_TURRET_new_1.obj",
ColorTexture = textures .. "/tex_03.png"
}},
GeometryFile = models .. "/MSL_RA_TURRET_new_1.obj",
LightSources = LightSources,
PerformShading = false
},
@@ -453,11 +377,7 @@ local RA_Wrist_details = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_TURRET_new_1_details.obj",
ColorTexture = textures .. "/tex_01.png"
}},
GeometryFile = models .. "/MSL_RA_TURRET_new_1_details.obj",
LightSources = LightSources,
PerformShading = false
},
@@ -474,11 +394,7 @@ local RA_Turret = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_TURRET_new_2.obj",
ColorTexture = textures .. "/tex_04.png"
}},
GeometryFile = models .. "/MSL_RA_TURRET_new_2.obj",
LightSources = LightSources,
PerformShading = false
},
@@ -495,11 +411,7 @@ local RA_Turret_details_1 = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_TURRET_new_2_detail_1.obj",
ColorTexture = textures .. "/tex_05.png"
}},
GeometryFile = models .. "/MSL_RA_TURRET_new_2_detail_1.obj",
LightSources = LightSources,
PerformShading = false
},
@@ -515,11 +427,7 @@ local RA_Turret_details_2 = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_TURRET_new_2_detail_2.obj",
ColorTexture = textures .. "/tex_03.png"
}},
GeometryFile = models .. "/MSL_RA_TURRET_new_2_detail_2.obj",
LightSources = LightSources,
PerformShading = false
},
@@ -536,11 +444,7 @@ local RSM_root = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RSM_ROOT.obj",
ColorTexture = textures .. "/tex_04.png"
}},
GeometryFile = models .. "/MSL_RSM_ROOT.obj",
LightSources = LightSources,
PerformShading = false
},
@@ -556,11 +460,7 @@ local RSM_AZ = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RSM_AZ.obj",
ColorTexture = textures .. "/tex_04.png"
}},
GeometryFile = models .. "/MSL_RSM_AZ.obj",
LightSources = LightSources,
PerformShading = false
},
@@ -576,11 +476,7 @@ local RSM_EL = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RSM_EL.obj",
ColorTexture = textures .. "/tex_04.png"
}},
GeometryFile = models .. "/MSL_RSM_EL.obj",
LightSources = LightSources,
PerformShading = false
},
@@ -597,11 +493,7 @@ local HGA_AZ = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_HGA_AZ_0ANGLE.obj",
ColorTexture = textures .. "/tex_02.png"
}},
GeometryFile = models .. "/MSL_HGA_AZ_0ANGLE.obj",
LightSources = LightSources,
PerformShading = false
},
@@ -617,11 +509,7 @@ local HGA_EL = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_HGA_EL.obj",
ColorTexture = textures .. "/tex_02.png"
}},
GeometryFile = models .. "/MSL_HGA_EL.obj",
LightSources = LightSources,
PerformShading = false
},
@@ -638,11 +526,7 @@ local SAM_Cover_1 = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_SAM_FIXED_COVER_1.obj",
ColorTexture = textures .. "/MSLTextureTest.png"
}},
GeometryFile = models .. "/MSL_SAM_FIXED_COVER_1.obj",
LightSources = LightSources,
PerformShading = false
},
@@ -658,11 +542,7 @@ local SAM_Cover_2 = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_SAM_FIXED_COVER_2.obj",
ColorTexture = textures .. "/MSLTextureTest.png"
}},
GeometryFile = models .. "/MSL_SAM_FIXED_COVER_2.obj",
LightSources = LightSources,
PerformShading = false
},
@@ -678,11 +558,7 @@ local CHEMIN_Bottom = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_CHEMIN.obj",
ColorTexture = textures .. "/MSLTextureTest.png"
}},
GeometryFile = models .. "/MSL_CHEMIN.obj",
LightSources = LightSources,
PerformShading = false
},
@@ -699,11 +575,7 @@ local Wheel_Base = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_BASE.obj",
ColorTexture = textures .. "/tex_02.png"
}},
GeometryFile = models .. "/MSL_WHEEL_BASE.obj",
LightSources = LightSources,
PerformShading = false
},
@@ -718,11 +590,7 @@ local Wheel_Base_2 = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_BASE_2.obj",
ColorTexture = textures .. "/tex_03.png"
}},
GeometryFile = models .. "/MSL_WHEEL_BASE_2.obj",
LightSources = LightSources,
PerformShading = false
},
@@ -739,11 +607,7 @@ local Wheel_Leg_1_L = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_LEG_1_L.obj",
ColorTexture = textures .. "/tex_03.png"
}},
GeometryFile = models .. "/MSL_WHEEL_LEG_1_L.obj",
LightSources = LightSources,
PerformShading = false
},
@@ -759,11 +623,7 @@ local Wheel_Leg_1A_L_detail = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_LEG_1A_L_detail.obj",
ColorTexture = textures .. "/tex_05.png"
}},
GeometryFile = models .. "/MSL_WHEEL_LEG_1A_L_detail.obj",
LightSources = LightSources,
PerformShading = false
},
@@ -779,11 +639,7 @@ local Wheel_Leg_1B_L_detail = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_LEG_1B_L_detail.obj",
ColorTexture = textures .. "/tex_05.png"
}},
GeometryFile = models .. "/MSL_WHEEL_LEG_1B_L_detail.obj",
LightSources = LightSources,
PerformShading = false
},
@@ -799,11 +655,7 @@ local Wheel_Leg_2_L = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_LEG_2_L_new.obj",
ColorTexture = textures .. "/tex_03.png"
}},
GeometryFile = models .. "/MSL_WHEEL_LEG_2_L_new.obj",
LightSources = LightSources,
PerformShading = false
},
@@ -819,11 +671,7 @@ local Wheel_Wrist_F_L = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_WRIST_F_L.obj",
ColorTexture = textures .. "/tex_02.png"
}},
GeometryFile = models .. "/MSL_WHEEL_WRIST_F_L.obj",
LightSources = LightSources,
PerformShading = false
},
@@ -839,11 +687,7 @@ local Wheel_Wrist_hub_F_L = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_WRIST_1B_F_L.obj",
ColorTexture = textures .. "/tex_02.png"
}},
GeometryFile = models .. "/MSL_WHEEL_WRIST_1B_F_L.obj",
LightSources = LightSources,
PerformShading = false
},
@@ -859,11 +703,7 @@ local Wheel_F_L = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_L.obj",
ColorTexture = textures .. "/tex_03.png"
}},
GeometryFile = models .. "/MSL_WHEEL_L.obj",
LightSources = LightSources,
PerformShading = false
},
@@ -879,11 +719,7 @@ local Wheel_C_L = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_L.obj",
ColorTexture = textures .. "/tex_03.png"
}},
GeometryFile = models .. "/MSL_WHEEL_L.obj",
LightSources = LightSources,
PerformShading = false
},
@@ -899,11 +735,7 @@ local Wheel_Wrist_B_L = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_WRIST_B_L.obj",
ColorTexture = textures .. "/tex_02.png"
}},
GeometryFile = models .. "/MSL_WHEEL_WRIST_B_L.obj",
LightSources = LightSources,
PerformShading = false
},
@@ -919,11 +751,7 @@ local Wheel_Wrist_hub_B_L = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_WRIST_1B_B_L.obj",
ColorTexture = textures .. "/tex_02.png"
}},
GeometryFile = models .. "/MSL_WHEEL_WRIST_1B_B_L.obj",
LightSources = LightSources,
PerformShading = false,
},
@@ -940,11 +768,7 @@ local Wheel_B_L = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_L.obj",
ColorTexture = textures .. "/tex_03.png"
}},
GeometryFile = models .. "/MSL_WHEEL_L.obj",
LightSources = LightSources,
PerformShading = false
},
@@ -961,11 +785,7 @@ local Wheel_Leg_1_R = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_LEG_1_R.obj",
ColorTexture = textures .. "/tex_03.png"
}},
GeometryFile = models .. "/MSL_WHEEL_LEG_1_R.obj",
LightSources = LightSources,
PerformShading = false
},
@@ -981,11 +801,7 @@ local Wheel_Leg_1A_R_detail = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_LEG_1A_R_detail.obj",
ColorTexture = textures .. "/tex_05.png"
}},
GeometryFile = models .. "/MSL_WHEEL_LEG_1A_R_detail.obj",
LightSources = LightSources,
PerformShading = false
},
@@ -1001,11 +817,7 @@ local Wheel_Leg_1B_R_detail = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_LEG_1B_R_detail.obj",
ColorTexture = textures .. "/tex_05.png"
}},
GeometryFile = models .. "/MSL_WHEEL_LEG_1B_R_detail.obj",
LightSources = LightSources,
PerformShading = false
},
@@ -1021,11 +833,7 @@ local Wheel_Leg_2_R = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_LEG_2_R_new.obj",
ColorTexture = textures .. "/tex_03.png"
}},
GeometryFile = models .. "/MSL_WHEEL_LEG_2_R_new.obj",
LightSources = LightSources,
PerformShading = false
},
@@ -1041,12 +849,7 @@ local Wheel_Wrist_F_R = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_WRIST_F_R.obj",
--GeometryFile = models .. "/MSL_WHEEL_WRIST_F_L.obj",
ColorTexture = textures .. "/tex_02.png"
}},
GeometryFile = models .. "/MSL_WHEEL_WRIST_F_R.obj",
LightSources = LightSources,
PerformShading = false
},
@@ -1062,11 +865,7 @@ local Wheel_Wrist_hub_F_R = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_WRIST_1B_F_R.obj",
ColorTexture = textures .. "/tex_02.png",
}},
GeometryFile = models .. "/MSL_WHEEL_WRIST_1B_F_R.obj",
LightSources = LightSources,
PerformShading = false
},
@@ -1082,11 +881,7 @@ local Wheel_F_R = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_R.obj",
ColorTexture = textures .. "/tex_03.png"
}},
GeometryFile = models .. "/MSL_WHEEL_R.obj",
LightSources = LightSources,
PerformShading = false
},
@@ -1102,11 +897,7 @@ local Wheel_C_R = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_R.obj",
ColorTexture = textures .. "/tex_03.png"
}},
GeometryFile = models .. "/MSL_WHEEL_R.obj",
LightSources = LightSources,
PerformShading = false
},
@@ -1122,11 +913,7 @@ local Wheel_Wrist_B_R = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_WRIST_1A_B_R.obj",
ColorTexture = textures .. "/tex_02.png"
}},
GeometryFile = models .. "/MSL_WHEEL_WRIST_1A_B_R.obj",
LightSources = LightSources,
PerformShading = false
},
@@ -1142,11 +929,7 @@ local Wheel_Wrist_hub_B_R = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_WRIST_1B_B_R.obj",
ColorTexture = textures .. "/tex_02.png"
}},
GeometryFile = models .. "/MSL_WHEEL_WRIST_1B_B_R.obj",
LightSources = LightSources,
PerformShading = false
},
@@ -1162,11 +945,7 @@ local Wheel_B_R = {
Renderable = {
Type = "RenderableModel",
Body = "MARS SCIENCE LABORATORY",
Geometry = {{
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_R.obj",
ColorTexture = textures .. "/tex_03.png"
}},
GeometryFile = models .. "/MSL_WHEEL_R.obj",
LightSources = LightSources,
PerformShading = false
},

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

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

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

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

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

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

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

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

177
data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset
View File

@@ -59,153 +59,36 @@ local initializeAndAddNodes = function()
},
Renderable = {
Type = "RenderableModel",
Geometry = {
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/0.obj",
ColorTexture = models .. "/0.png"
},
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/1.obj",
ColorTexture = models .. "/1.png"
},
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/2.obj",
ColorTexture = models .. "/2.png"
},
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/3.obj",
ColorTexture = models .. "/3.png"
},
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/4.obj",
ColorTexture = models .. "/4.png"
},
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/5.obj",
ColorTexture = models .. "/5.png"
},
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/6.obj",
ColorTexture = models .. "/6.png"
},
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/7.obj",
ColorTexture = models .. "/7.png"
},
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/8.obj",
ColorTexture = models .. "/8.png"
},
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/10.obj",
ColorTexture = models .. "/10.png"
},
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/11.obj",
ColorTexture = models .. "/11.png"
},
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/13.obj",
ColorTexture = models .. "/13.png"
},
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/14.obj",
ColorTexture = models .. "/14.png"
},
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/15.obj",
ColorTexture = models .. "/15.png"
},
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/16.obj",
ColorTexture = models .. "/16.png"
},
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/17.obj",
ColorTexture = models .. "/17.png"
},
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/19.obj",
ColorTexture = models .. "/19.png"
},
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/21.obj",
ColorTexture = models .. "/21.png"
},
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/22.obj",
ColorTexture = models .. "/22.png"
},
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/23.obj",
ColorTexture = models .. "/23.png"
},
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/24.obj",
ColorTexture = models .. "/24.png"
},
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/25.obj",
ColorTexture = models .. "/25.png"
},
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/foilsilver.obj",
ColorTexture = models .. "/foilsilver.png"
},
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/olive.obj",
ColorTexture = models .. "/olive.png"
},
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/basemetal.obj",
ColorTexture = models .. "/basemetal.png"
},
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/white_20.obj",
ColorTexture = models .. "/white_20.png"
},
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/plasticblack.obj",
ColorTexture = models .. "/plasticblack.png"
},
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/ecostresswhite.obj",
ColorTexture = models .. "/ecostresswhite.png"
},
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/plain.obj",
ColorTexture = models .. "/plain.png"
},
GeometryFile = {
models .. "/0.obj",
models .. "/1.obj",
models .. "/2.obj",
models .. "/3.obj",
models .. "/4.obj",
models .. "/5.obj",
models .. "/6.obj",
models .. "/7.obj",
models .. "/8.obj",
models .. "/10.obj",
models .. "/11.obj",
models .. "/13.obj",
models .. "/14.obj",
models .. "/15.obj",
models .. "/16.obj",
models .. "/17.obj",
models .. "/19.obj",
models .. "/21.obj",
models .. "/22.obj",
models .. "/23.obj",
models .. "/24.obj",
models .. "/25.obj",
models .. "/foilsilver.obj",
models .. "/olive.obj",
models .. "/basemetal.obj",
models .. "/white_20.obj",
models .. "/plasticblack.obj",
models .. "/ecostresswhite.obj",
models .. "/plain.obj"
},
LightSources = {
{

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

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

2
ext/ghoul

Submodule ext/ghoul updated: fceb85f50e...13a4c05ba8