mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-23 04:30:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

started building on a new renderable from scratch

Browse Source
This commit is contained in:
Elon
2019-03-28 17:24:07 -06:00
committed by ElonOlsson
parent 019faebeb0
commit 14ef2644a9
7 changed files with 922 additions and 1481 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/assets/scene/solarsystem/planets/earth/satellites/satellites_shared.asset
+78 -78
View File
@@ -49,72 +49,20 @@ local addSatelliteGroupObjects = function(group, tleFolder, shouldAddDuplicates)
return true
end
-- -------------------------------------------------------------------------------------
-- function getSat(title, file, lineNum, textureFile, group)
-- return {
-- Identifier = title,
-- Parent = transforms.EarthInertial.Identifier,
-- Renderable = {
-- Type = "RenderablePlaneImageLocal",
-- Enabled = true,
-- Size = 3e4,
-- Origin = "Center",
-- Body = "TLE",
-- Billboard = true,
-- Texture = textureFile
-- },
-- Transform = {
-- Translation = {
-- Type = "TLETranslation",
-- Body = title,
-- Observer = transforms.EarthInertial.Identifier,
-- File = file,
-- LineNumber = lineNum
-- },
-- Scale = {
-- Type = "StaticScale",
-- Scale = 1
-- }
-- },
-- Tag = { "earth_satellite_" .. group, "earth_satellite_" .. group .. "_marker" },
-- GUI = {
-- Path = "/Solar System/Planets/Earth/Satellites"
-- }
-- }
-- end
-- function getSatTrail(title, file, lineNum, per, color, group)
-- return {
-- Identifier = title .. "_trail",
-- Parent = transforms.EarthInertial.Identifier,
-- Renderable = {
-- Type = "RenderableTrailOrbit",
-- Translation = {
-- Type = "TLETranslation",
-- Body = title,
-- Observer = transforms.EarthInertial.Identifier,
-- File = file,
-- LineNumber = lineNum
-- },
-- Color = color,
-- Period = per,
-- Resolution = 160
-- },
-- Tag = { "earth_satellite_" .. group, "earth_satellite_" .. group .. "_trail"},
-- GUI = {
-- Path = "/Solar System/Planets/Earth/Satellites"
-- }
-- }
-- end
-- -------------------------------------------------------------------------------------
function test(title, file, lineNum, per, color, group)
function getSat(title, file, lineNum, textureFile, group)
return {
Identifier = title,
Parent = transforms.EarthInertial.Identifier,
Renderable = {
Type = "RenderableSatellites",
Color = color,
Period = per,
Resolution = 160,
Type = "RenderablePlaneImageLocal",
Enabled = true,
Size = 3e4,
Origin = "Center",
Body = "TLE",
Billboard = true,
Texture = textureFile
},
Transform = {
Translation = {
Type = "TLETranslation",
Body = title,
@@ -122,19 +70,71 @@ local addSatelliteGroupObjects = function(group, tleFolder, shouldAddDuplicates)
File = file,
LineNumber = lineNum
},
Size = 3e4,
Origin = "Center",
Body = "TLE",
Billboard = true,
Texture = textureFile
Scale = {
Type = "StaticScale",
Scale = 1
}
},
Tag = { "earth_satellite_" .. group, "earth_satellite_" .. group .. "_marker" },
GUI = {
Path = "/Solar System/Planets/Earth/Satellites"
}
}
end
function getSatTrail(title, file, lineNum, per, color, group)
return {
Identifier = title .. "_trail",
Parent = transforms.EarthInertial.Identifier,
Renderable = {
Type = "RenderableTrailOrbit",
Translation = {
Type = "TLETranslation",
Body = title,
Observer = transforms.EarthInertial.Identifier,
File = file,
LineNumber = lineNum
},
Color = color,
Period = per,
Resolution = 160
},
Tag = { "earth_satellite_" .. group, "earth_satellite_" .. group .. "_trail"},
GUI = {
Path = "/Solar System/Planets/Earth/Satellites"
}
}
end
-- -------------------------------------------------------------------------------------
-- function test(title, file, lineNum, per, color, group)
-- return {
-- Identifier = title,
-- Parent = transforms.EarthInertial.Identifier,
-- Renderable = {
-- Type = "RenderableSatellites",
-- Color = color,
-- Period = per,
-- Resolution = 160,
-- Translation = {
-- Type = "TLETranslation",
-- Body = title,
-- Observer = transforms.EarthInertial.Identifier,
-- File = file,
-- LineNumber = lineNum
-- },
--
-- Size = 3e4,
-- Origin = "Center",
-- Body = "TLE",
-- Billboard = true,
-- Texture = textureFile
--
-- },
-- GUI = {
-- Path = "/Solar System/Planets/Earth/Satellites"
-- }
-- }
-- end
-- -------------------------------------------------------------------------------------
local filename = group.Url:match("([^/]+)$")
@@ -186,17 +186,17 @@ local addSatelliteGroupObjects = function(group, tleFolder, shouldAddDuplicates)
if shouldAddNotes then
-- Register satellite object and trail
local test_var = test(satName, path, n, per, group.TrailColor, group.Title)
openspace.addSceneGraphNode(test_var)
table.insert(obj, test_var.Identifier)
-- local test_var = test(satName, path, n, per, group.TrailColor, group.Title)
-- openspace.addSceneGraphNode(test_var)
-- table.insert(obj, test_var.Identifier)
-- local sat_var = getSat(satName, path, n, texture, group.Title)
-- openspace.addSceneGraphNode(sat_var)
-- table.insert(obj, sat_var.Identifier)
local sat_var = getSat(satName, path, n, texture, group.Title)
openspace.addSceneGraphNode(sat_var)
table.insert(obj, sat_var.Identifier)
-- local satTrail_var = getSatTrail(satName, path, n, per, group.TrailColor, group.Title)
-- openspace.addSceneGraphNode(satTrail_var)
-- table.insert(obj, satTrail_var.Identifier)
local satTrail_var = getSatTrail(satName, path, n, per, group.TrailColor, group.Title)
openspace.addSceneGraphNode(satTrail_var)
table.insert(obj, satTrail_var.Identifier)
end
end