Merge branch 'master' of https://github.com/OpenSpace/OpenSpace into thesis/2020/software-integration

# Conflicts:
#	openspace.cfg
This commit is contained in:
aniisaaden
2020-10-13 10:23:10 +02:00
555 changed files with 10527 additions and 4560 deletions

View File

@@ -31,7 +31,6 @@ set(OPENSPACE_VERSION_MINOR 15)
set(OPENSPACE_VERSION_PATCH 2)
set(OPENSPACE_VERSION_STRING "Beta-7")
set(OPENSPACE_BASE_DIR "${PROJECT_SOURCE_DIR}")
set(OPENSPACE_CMAKE_EXT_DIR "${OPENSPACE_BASE_DIR}/support/cmake")
set(GHOUL_BASE_DIR "${OPENSPACE_BASE_DIR}/ext/ghoul")
@@ -134,6 +133,11 @@ if (MSVC)
set(GHOUL_OPTIMIZATION_ENABLE_OTHER_OPTIMIZATIONS ${OPENSPACE_OPTIMIZATION_ENABLE_OTHER_OPTIMIZATIONS} CACHE BOOL "" FORCE)
endif ()
if (UNIX AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -stdlib=libc++")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++ -lc++ -lc++abi")
endif ()
include(src/CMakeLists.txt)
##########################################################################################

112
Jenkinsfile vendored
View File

@@ -67,7 +67,7 @@ def moduleCMakeFlags() {
def flags = '';
for (module in modules) {
flags += "-D OPENSPACE_MODULE_${module.toUpperCase()}=ON "
flags += "-DOPENSPACE_MODULE_${module.toUpperCase()}=ON "
}
return flags;
}
@@ -78,35 +78,69 @@ def moduleCMakeFlags() {
// Pipeline start
//
parallel master: {
node('master') {
stage('master/scm') {
parallel tools: {
node('tools') {
stage('tools/scm') {
deleteDir();
gitHelper.checkoutGit(url, branch);
gitHelper.checkoutGit(url, branch, false);
helper.createDirectory('build');
}
stage('master/cppcheck/create') {
sh 'cppcheck --enable=all --xml --xml-version=2 -i ext --suppressions-list=support/cppcheck/suppressions.txt include modules src tests 2> build/cppcheck.xml';
}
stage('master/cloc/create') {
sh 'cloc --by-file --exclude-dir=build,data,ext --xml --out=build/cloc.xml --force-lang-def=support/cloc/langDef --quiet .';
}
stage('tools/cppcheck') {
sh(
script: 'cppcheck --enable=all --xml --xml-version=2 -i ext --suppressions-list=support/cppcheck/suppressions.txt include modules src tests 2> build/cppcheck.xml',
label: 'CPPCheck'
)
recordIssues(
id: 'tools-cppcheck',
tool: cppCheck()
)
}
}
},
linux: {
node('linux') {
stage('linux/scm') {
linux_gcc: {
node('linux' && 'gcc') {
stage('linux-gcc/scm') {
deleteDir();
gitHelper.checkoutGit(url, branch);
}
stage('linux-gcc/build(make)') {
def cmakeCompileOptions = moduleCMakeFlags();
cmakeCompileOptions += ' -DMAKE_BUILD_TYPE=Release';
// Not sure why the linking of OpenSpaceTest takes so long
compileHelper.build(compileHelper.Make(), compileHelper.Gcc(), cmakeCompileOptions, 'OpenSpace', 'build-make');
compileHelper.recordCompileIssues(compileHelper.Gcc());
}
stage('linux-gcc/build(ninja)') {
def cmakeCompileOptions = moduleCMakeFlags();
cmakeCompileOptions += '-DMAKE_BUILD_TYPE=Release';
// Not sure why the linking of OpenSpaceTest takes so long
compileHelper.build(compileHelper.Ninja(), compileHelper.Gcc(), cmakeCompileOptions, 'OpenSpace', 'build-ninja');
}
stage('linux-gcc/test') {
// testHelper.runUnitTests('build/OpenSpaceTest');
}
} // node('linux')
},
linux_clang: {
node('linux' && 'clang') {
stage('linux-clang/scm') {
deleteDir()
gitHelper.checkoutGit(url, branch);
}
stage('linux/build') {
stage('linux-clang/build(make)') {
def cmakeCompileOptions = moduleCMakeFlags()
cmakeCompileOptions += ' -DMAKE_BUILD_TYPE=Release'
// Not sure why the linking of OpenSpaceTest takes so long
compileHelper.build(compileHelper.Make(), compileHelper.Gcc(), moduleCMakeFlags(), 'OpenSpace', 'build-all');
compileHelper.build(compileHelper.Make(), compileHelper.Clang(), cmakeCompileOptions, 'OpenSpace', 'build-make');
compileHelper.recordCompileIssues(compileHelper.Clang());
}
stage('linux/warnings') {
// compileHelper.recordCompileIssues(compileHelper.Gcc());
stage('linux-clang/build(ninja)') {
def cmakeCompileOptions = moduleCMakeFlags()
cmakeCompileOptions += '-DMAKE_BUILD_TYPE=Release'
// Not sure why the linking of OpenSpaceTest takes so long
compileHelper.build(compileHelper.Ninja(), compileHelper.Clang(), cmakeCompileOptions, 'OpenSpace', 'build-ninja');
}
stage('linux/test') {
stage('linux-clang/test') {
// testHelper.runUnitTests('build/OpenSpaceTest');
}
} // node('linux')
@@ -118,11 +152,12 @@ windows: {
deleteDir();
gitHelper.checkoutGit(url, branch);
}
stage('windows/build') {
compileHelper.build(compileHelper.VisualStudio(), compileHelper.VisualStudio(), moduleCMakeFlags(), '', 'build-all');
stage('windows/build(msvc)') {
compileHelper.build(compileHelper.VisualStudio(), compileHelper.VisualStudio(), moduleCMakeFlags(), '', 'build-msvc');
compileHelper.recordCompileIssues(compileHelper.VisualStudio());
}
stage('windows/warnings') {
// compileHelper.recordCompileIssues(compileHelper.VisualStudio());
stage('windows/build(ninja)') {
compileHelper.build(compileHelper.Ninja(), compileHelper.VisualStudio(), moduleCMakeFlags(), '', 'build-ninja');
}
stage('windows/test') {
// Currently, the unit tests are failing on Windows
@@ -131,36 +166,21 @@ windows: {
} // node('windows')
}
},
osx: {
node('osx') {
stage('osx/scm') {
macos: {
node('macos') {
stage('macos/scm') {
deleteDir();
gitHelper.checkoutGit(url, branch);
}
stage('osx/build') {
compileHelper.build(compileHelper.Xcode(), compileHelper.Clang(), moduleCMakeFlags(), '', 'build-all');
stage('macos/build(make)') {
compileHelper.build(compileHelper.Make(), compileHelper.Clang(), moduleCMakeFlags(), '', 'build-make');
}
stage('osx/warnings') {
// compileHelper.recordCompileIssues(compileHelper.Clang());
stage('macos/build(xcode)') {
compileHelper.build(compileHelper.Xcode(), compileHelper.Xcode(), moduleCMakeFlags(), '', 'build-xcode');
}
stage('osx/test') {
stage('macos/test') {
// Currently, the unit tests are crashing on OS X
// testHelper.runUnitTests('build/Debug/OpenSpaceTest')
}
} // node('osx')
}
//
// Post-build actions
//
node('master') {
stage('master/cppcheck/publish') {
// publishCppcheck(pattern: 'build/cppcheck.xml');
}
stage('master/cloc/publish') {
sloccountPublish(encoding: '', pattern: 'build/cloc.xml');
}
stage('master/notifications') {
slackHelper.sendChangeSetSlackMessage(currentBuild);
}
}

View File

@@ -43,30 +43,6 @@ asset.require('customization/globebrowsing')
-- Keybindings that are specific for this scene
local Keybindings = {
{
Key = "b",
Name = "Toggle background",
Command = propertyHelper.invert('Scene.MilkyWay.Renderable.Enabled') ..
propertyHelper.invert('Scene.Stars.Renderable.Enabled'),
Documentation = "Toggle background (Stars and Milkyway).",
GuiPath = "/Rendering",
Local = false
},
{
Key = "g",
Name = "Toggle background/shading",
Command = propertyHelper.invert('Scene.MilkyWay.Renderable.Enabled') ..
propertyHelper.invert('Scene.Stars.Renderable.Enabled') ..
propertyHelper.invert('Scene.Earth.Renderable.Layers.NightLayers.Earth_at_Night_2012.Enabled') ..
propertyHelper.invert('Scene.EarthAtmosphere.Renderable.Enabled') ..
propertyHelper.invert('Scene.MarsAtmosphere.Renderable.Enabled') ..
propertyHelper.invert('Scene.Earth.Renderable.Layers.WaterMasks.MODIS_Water_Mask.Enabled') ..
propertyHelper.invert('Scene.Moon.Renderable.Enabled') ..
propertyHelper.invert('Scene.Sun.Renderable.Enabled'),
Documentation = "Toogles background and shading mode on the Earth and Mars alongside visibility of the Moon and the Sun",
GuiPath = "/Rendering",
Local = false
},
{
Key = "h",
Name="Toggle Trails",

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"

View File

@@ -28,15 +28,16 @@ asset.onInitialize(function ()
end
helper.setCurrentSlide(deck, 1)
openspace.bindKey("RIGHT", "nextSlide()", "Next slide", "Next slide", "/Slides")
openspace.bindKey("LEFT", "previousSlide()", "Previous slide", "Previous slide", "/Slides")
openspace.bindKey("UP", "toggleSlides()", "Toggle slides", "Toggle slides", "/Slides")
openspace.bindKey("KP_6", "nextSlide()", "Next slide", "Next slide", "/Slides")
openspace.bindKey("KP_4", "previousSlide()", "Previous slide", "Previous slide", "/Slides")
openspace.bindKey("KP_0", "toggleSlides()", "Toggle slides", "Toggle slides", "/Slides")
end)
asset.onDeinitialize(function()
openspace.clearKey("RIGHT")
openspace.clearKey("LEFT")
openspace.clearKey("KP_6")
openspace.clearKey("KP_4")
openspace.clearKey("KP_0")
helper.removeDeck(deck)
end)

View File

@@ -35,10 +35,34 @@ local object = {
},
GUI = {
Name = "2dF Galaxies",
Path = "/Universe/Galaxies"
Path = "/Universe/Galaxies",
Description = [[Census 229,293 galaxies. DU Version 1.7. <br>
The Two-degree Field (2dF) Survey was a project designed to map portions of the
extragalactic universe. The 2dF instrument was mounted on the 3.9-meter
(12.8-foot) Anglo-Australian Telescope (AAT), located 450 km (280 miles)
northwest of Sydney. The telescope has a two-degree field of view on the sky,
enabling large parts of the sky to be observed at one time. For each pointing of
the telescope, the instrument can acquire up to 400 spectra simultaneously via
optical fibers that feed into two spectrographs. Each spectrograph sees light
that is between 350 nm and 800 nm, spanning the visible spectrum. <br><br> The
2dF survey has three main components: the North Galactic Pole strip, the South
Galactic Pole strip, and the random fields that surround the South Galactic Pole
strip. The galaxy survey is composed of about 230,000 galaxies with brightness and
redshift measurements. (Description from URL) <br><br> Data Reference: 2dF Galaxy
Redshift Survey (2dFGRS Team, 1998-2003)]]
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { object })
asset.meta = {
Name = "2dF Galaxies",
Version = "2.0",
Description = [[Digital Universe asset for the The Two-degree Field (2dF) Survey.]],
Author = "Brian Abbott (AMNH), Eric Gawiser (Rutgers U)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "2dF"
}

View File

@@ -37,10 +37,28 @@ local object = {
},
GUI = {
Name = "2MASS Galaxies",
Path = "/Universe/Galaxies"
Path = "/Universe/Galaxies",
Description = [[ The Two Micron All-Sky Survey (2MASS) is an infrared survey
of the sky published in 2003. Because it is looking in the infrared, and
this is a composite of the 2MASS point-source catalog, most of the light
from this survey is starlight. In visible light, clouds of gas and dust
obscure our view. However, in infrared, the longer wavelengths of light can
penetrate these clouds without being scattered, thereby revealing stars
that would normally be hidden to our eye. (Description from URL)]],
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { object })
asset.meta = {
Name = "2MASS Galaxies",
Version = "1.0",
Description = [[ Digital Universe asset for the Two Micron All-Sky Survey (2MASS)
survey]],
Author = "Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "2MASS"
}

View File

@@ -35,10 +35,31 @@ local object = {
},
GUI = {
Name = "6dF Galaxies",
Path = "/Universe/Galaxies"
Path = "/Universe/Galaxies",
Description = [[Census 109,569 galaxies. DU Version 1.4.<br> The Six-degree Field
(6dF) Galaxy Survey mapped nearly half the sky from the Anglo-Australian
Observatory. Unlike previous datasets, this one is not all-sky, meaning there
are patches of sky that are not covered. In this case, the entire northern
hemisphere has no coverage at all. This catalog overlaps with the Tully
dataset, and there is a noticeable difference in the quality of these
datasets. Tully is much tighter and the structure is more apparent, while the
6dF data are more spread out. This is because of local motions within galaxy
clusters have not been corrected in these data. (Description from URL)
<br><br> Data Reference: The 6dF Galaxy Survey Redshift Catalogue
(Jones+, 2009)]]
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { object })
asset.meta = {
Name = "6dF Galaxies",
Version = "2.0",
Description = [[Digital Universe asset for The Six-degree Field (6dF) Galaxy Survey]],
Author = "Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "6dF"
}

View File

@@ -43,10 +43,32 @@ local object = {
},
GUI = {
Name = "Abell Galaxy Clusters",
Path = "/Universe/Galaxies"
Path = "/Universe/Galaxies",
Description = [[Census 2,246 galaxies. DU Version 1.4. <br> The Abell catalog
includes all the nearby, and not so nearby, galaxy clusters. The northern
hemisphere survey, published in 1958, was compiled by George Abell (19271983)
from the Palomar Sky Survey plates. A subsequent southern hemisphere catalog
was published posthumously in 1989. Further analysis by Brent Tully determined
their distance and three-dimensional distribution. Each point in this data set
represents a cluster of tens to hundreds (possibly even thousands) of
galaxies, similar to the Virgo or Fornax Clusters. You will notice some points
are assigned colors while most are gray. The data set also has an arbitrary
cut-off for completeness, resulting in the rectangular shape of the data set.
(Description from URL) <br><br> Data Reference: Abell Clusters of Rich
Galaxies, Brent Tully (U Hawaii), Stuart Levy (NCSA/UIUC)]],
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { object })
asset.meta = {
Name = "Abell Galaxy Clusters",
Version = "2.0",
Description = [[Digital Universe asset for The Abell catalog]],
Author = "Stuart Levy (NCSA/UIUC), Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "Abell"
}

View File

@@ -25,10 +25,26 @@ local object = {
},
GUI = {
Name = "Stars Labels - Alternate",
Path = "/Milky Way/Stars"
Path = "/Milky Way/Stars",
Description = [[Census 3,550 star names. DU Version 1.7. <br>The main star data
identify the accepted IAU star names for the brightest stars. However, astronomers
have long cataloged thousands of stars beyond the brightest ones we see. Several
attempts over thousands of years to name all the visible stars have led to two
main catalogs: Johann Bayer's Catalog from 1603 and John Flamsteed's Catalog
published in 1725. (Description from URL) <br><br> Data Reference: Various
sources]],
}
}
asset.meta = {
Name = "Stars Labels - Alternate",
Version = "1.0",
Description = [[Digital Universe asset for alternate start labels]],
Author = "Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "StarLabelsAlternate"
}
assetHelper.registerSceneGraphNodesAndExport(asset, { object })

View File

@@ -89,6 +89,7 @@ local planck = {
FadeInThreshold = 0.4
},
GUI = {
Name = "Planck",
Path = "/Universe/Cosmic Microwave Background"
}
}
@@ -246,3 +247,19 @@ assetHelper.registerSceneGraphNodesAndExport(asset, {
wmap, cbe, planck, multiverse_planck_1, multiverse_planck_2, multiverse_planck_3,
multiverse_planck_4, Halpha
})
asset.meta = {
Name = "Background Radiation",
Version = "2.0",
Description = [[Various AllSky images for the Milky Way and observable Universe.
Included: Wilkinson Microwave Anisotropy Probe (WMAP), Cosmic Background Explorer,
Planck, Planck Multiverse 1-4, and H Alpha <br><br> Data Reference: Planck/ESA and
the Planck Collaboration, Wilkinson Microwave Anisotropy Probe/NASA, Doug
Finkbeiner (Princeton)]],
Author = "Brian Abbott (AMNH), OpenSpace Team",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "WMAP,CBE,Planck,PlanckMultiverse1,PlanckMultiverse2" ..
"PlanckMultiverse3,PlanckMultiverse4,HAlpha"
}

View File

@@ -31,10 +31,24 @@ local object = {
},
GUI = {
Name = "Galaxy Cluster Labels",
Path = "/Universe/Galaxies"
Path = "/Universe/Galaxies",
Description = [[Census 15 galaxy cluster labels. DU Version 1.2. <br>The Galaxy
clusters dataset is a series of labels that mark where the large clusters of
galaxies are in the nearby universe. These labels must be used in conjunction
with the Tully galaxy group.(Description from URL) <br><br> Data Reference:
Brian Abbott (AMNH)]],
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { object })
asset.meta = {
Name = "Galaxy Clusters Labels",
Version = "1.0",
Description = [[Digital Universe asset for Galaxy Clusters]],
Author = "Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "GalaxyClusterLabels"
}

View File

@@ -36,10 +36,22 @@ local object = {
},
GUI = {
Name = "Constellation Bounds",
Path = "/Milky Way/Constellations"
Path = "/Milky Way/Constellations",
Description = [[A Spherical mesh dividing the sky into regions that fit the
constellations.]],
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { object })
asset.meta = {
Name = "Constellation Bounds",
Version = "1.0",
Description = [[DU asset providing a Spherical mesh dividing the sky into regions that
fit the constellations.]],
Author = "Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "ConstellationBounds"
}

View File

@@ -48,10 +48,29 @@ local constellations = {
Unit = "pc"
},
GUI = {
Path = "/Milky Way/Constellations"
Name = "Constellations",
Path = "/Milky Way/Constellations",
Description = [[Census 88 constellations and labels. DU Version 2.3. <br> These
modern constellations are largely based on those of the Babylonians and
Greeks; however, most cultures have their own figures and stories of the sky.
More than half the official constellations adopted by scientists in 1930 were
known to the ancients over 2,000 years ago. Each star falls into one of these
88 regions. Of course, today we know the stars in any given constellation do
not necessarily have any physical relationship with one another. One star may
be nearby, while an adjacent star in the sky may be far away.(Description
from URL) <br><br> Data Reference: various]],
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { constellationsExtragalactic, constellations })
asset.meta = {
Name = "Constellations",
Version = "1.0",
Description = [[Digital Universe asset for constellation lines]],
Author = "Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "Constellations,ConstellationsExtragalactic"
}

View File

@@ -51,7 +51,8 @@ local deepSkyPoints = {
},
GUI = {
Name = "Deep Sky Objects Points",
Path = "/Universe/Galaxies"
Path = "/Universe/Galaxies",
Description = [[Point cloud and labels for Deep Sky Objects]]
}
}
@@ -80,8 +81,30 @@ local deepSkyImages = {
},
GUI = {
Name = "Deep Sky Objects Images",
Path = "/Universe/Galaxies"
Path = "/Universe/Galaxies",
Description = [[Census: 63 images and labels. DU Version 1.3. <br> These data are
2-D images of Messier objects placed in 3-D space. Not only do we place these
images at the proper location and give them the correct orientation, we also
size them accurately so that you can fly to the globular cluster M13, for
example, and see just how small the cluster of hundreds of thousands of stars
is relative to the rest of the Galaxy. Included Messier Objects by number are:
6, 7, 11, 16, 18, 21, 23-26, 29, 34-39, 41, 46-48, 50, 52, 67, 93, 103, 2-5,
9, 10, 12-15, 19, 22, 28, 30, 53-56, 68-72, 75, 79, 80, 92, 107, 27, 57, 76,
97, 8, 17, 20, 78, 1 (Description from URL) <br><br> Data Reference: Largely
NOAO and various other sources (each image has a ref)]],
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { deepSkyPoints, deepSkyImages })
asset.meta = {
Name = "Deep Sky Objects Images",
Version = "1.0",
Description = [[Digital Universe asset for Deep Sky Objects and their Images]],
Author = "Nate Greenstein, Matt Everhart, Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "DeepSkyObjects,DeepSkyObjectsImages"
}

View File

@@ -41,10 +41,36 @@ local object = {
},
GUI = {
Name = "Brown Dwarfs",
Path = "/Milky Way"
Path = "/Milky Way",
Description = [[Census: 785 L dwarfs, 101 T dwarfs, 17 Y dwarfs. DU Version 6.4.
<br> In astronomy, there are dwarf stars-red, white, and brown-dwarf novae,
and even dwarf galaxies. As you might imagine, astronomers use the term dwarf
when they refer to the smaller objects in any given class. For decades it was
believed that M stars were the coolest stars in the Galaxy. Some M stars,
called red dwarfs, make up 70% of the stars in the Galaxy, including our
nearest known neighbor, Proxima Centauri. However, a new class of objects,
even cooler than M stars, was recently discovered and given a spectral type
of L. L-type objects straddle the boundary between red dwarfs and brown
dwarfs, the latter of which are not massive enough to ignite the nuclear
processes necessary for it to shine as a star. L-type objects are typically
very dim stars or brown dwarfs. Even cooler than L-type objects are T-type
objects. These are mostly brown dwarfs and resemble large, massive,
Jupiter-like objects, too large to be planets and typically too small to be
stars. Beyond the T dwarfs are the Y-type objects, which are even more
dim.(Description from URL) <br><br> Data Reference: The Brown Dwarf Kinematics
Project (Faherty+ 2019)]]
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { object })
asset.meta = {
Name = "Brown Dwarfs",
Version = "2.0",
Description = [[Digital Universe asset for Brown Dwarfs]],
Author = "Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "Dwarfs"
}

View File

@@ -39,10 +39,27 @@ local object = {
EnablePixelSizeControl = true,
},
GUI = {
Path = "/Milky Way/Exoplanets"
Name = "Exoplanets",
Path = "/Milky Way/Exoplanets",
Description = [[Census: 4,055 planets in 3,023 systems. DU Version 20.11. <br>
Extrasolar planets, or exoplanets, are a relatively new phenomenon in
astronomy. While many astronomers believed in their existence, no
observational evidence was available until 1995. Since that time, scientists
have discovered thousands of systems consisting of one or more planets around
a host star.(Description from URL) <br><br> Data Reference: NASA Exoplanet
Archive (CalTech/NASA)]],
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { object })
asset.meta = {
Name = "Exoplanets",
Version = "1.0",
Description = [[Digital Universe asset for Exoplanets]],
Author = "Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "Exoplanets"
}

View File

@@ -38,10 +38,42 @@ local object = {
},
GUI = {
Name = "Globular Clusters",
Path = "/Milky Way"
Path = "/Milky Way",
Description = [[Census: 157 globular clusters. DU Version 2.6. <br>Globular star
clusters are gravitationally bound groups of 100,000 to 1 million stars. They
are compact, spherical “balls” of stars with very high stellar densities in
their centers (stars near their center are within a light year of one
another). These clusters are typically 30 to 100 light years in diameter. If
Earth were located inside one of these clusters, our sky would be lit by an
abundance of stars brighter than the Sun. The globular clusters form one of
the most complete data sets in the Atlas. Data for the clusters represent
almost all the clusters in our Galaxy—several on the opposite side of Galactic
center may be invisible to us. The clusters orbit the Milky Way in random
orientations, as comets orbit the Sun.(Description from URL) <br><br> Data
Reference: Properties of Galactic Globular Clusters, C. Francis+
(U Cambridge)]],
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { object })
asset.meta = {
Name = "Globular Clusters",
Version = "2.0",
Description = [[Census: 157 globular clusters. DU Version 2.6. Globular star clusters
are gravitationally bound groups of 100,000 to 1 million stars. They are compact,
spherical “balls” of stars with very high stellar densities in their centers (stars
near their center are within a light year of one another). These clusters are
typically 30 to 100 light years in diameter. If Earth were located inside one of these
clusters, our sky would be lit by an abundance of stars brighter than the Sun. The
globular clusters form one of the most complete data sets in the Atlas. Data for the
clusters represent almost all the clusters in our Galaxy—several on the opposite side
of Galactic center may be invisible to us. The clusters orbit the Milky Way in random
orientations, as comets orbit the Sun.(Description from URL) <br><br> Data Reference:
Properties of Galactic Globular Clusters, C. Francis+ (U Cambridge)]],
Author = "Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "GlobularClusters"
}

View File

@@ -533,3 +533,23 @@ assetHelper.registerSceneGraphNodesAndExport(asset, {
galacticLabels, plane1ld, plane1lm, plane1ly, plane10ly, plane100ly, plane1kly,
plane10kly, plane100kly, plane1Mly, plane10Mly, plane100Mly, plane20Gly
})
asset.meta = {
Name = "Grids",
Version = "2.0",
Description = [[Various grids for showing size reference. Included: 10,000 light year
grid, 10 light year grid, 20 billion light year grid, 10 million light year grid,
100 light year grid, 100 million light year grid, Ecliptic Coordinate Sphere
(500-light-year radius), Galactic Coordinate Sphere (1000-light-year radius),
Galaxy Coordinate Grid, Celestial Coordinates / Radio Sphere (dynamic radius), 1
billion light year grid, Celestial Coordinate Sphere (1000000-light-year radius),
1,000 light year grid, 1 million light year grid, 1 light year grid]],
Author = "Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "RadioSphere,OortSphere,EclipticSphere,EclipticSphereLabels,Equatorial,"
.. "EquatorialSphereLabels,GalacticSphere,GalacticSphereLabels,1ldGrid,1lmGrid,"
.. "1lyGrid,10lyGrid,100lyGrid,1klyGrid,10klyGrid,100klyGrid,1MlyGrid,10MlyGrid,"
.. "100MlyGrid,20GlyGrid"
}

View File

@@ -32,10 +32,23 @@ local object = {
},
GUI = {
Name = "Galaxy Group Labels",
Path = "/Universe/Galaxies"
Path = "/Universe/Galaxies",
Description = [[Census: 62 galaxy group labels. DU Version 1.2. <br> The Galaxy
Groups data are a set of labels that mark the nearby galaxy groups. The Milky Way
is in the Local Group, and we are surrounded by many other groups.(Description
from URL) <br><br> Data Reference: Brian Abbott (AMNH)]]
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { object })
asset.meta = {
Name = "Galaxy Group Labels",
Version = "1.0",
Author = "Brian Abbott (AMNH)",
Description = [[Digital Universe asset for Galaxy Groups]],
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "NearbyGalaxyGroups"
}

View File

@@ -38,10 +38,30 @@ local object = {
},
GUI = {
Name = "HII Regions",
Path = "/Milky Way"
Path = "/Milky Way",
Description = [[Census: 1,271 nebulae. DU Version 4.6. <br> H ii (pronounced
H-two) regions are stellar nurseries for newborn stars. Stars are born from
condensing clouds of hydrogen gas. As these clouds condense, the densities
become high enough to form stars. From Earth's perspective, you'll notice that
the H ii regions all lie close to the Galactic plane. This is not an accident
of nature. These star-forming regions lie in the plane of the Galaxy because
that is where star formation occurs in spiral galaxies such as our Milky Way.
Because of this, they are great tracers of the spiral arms of the Galaxy, and
were instrumental in our understanding of the Galaxy's overall structure
(Description from URL) <br><br> Data Reference: The WISE catalog of Galactic
HII Regions (Anderson+, 2014)]],
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { object })
asset.meta = {
Name = "HII Regions",
Version = "1.0",
Description = [[Digital Universe asset for HII Regions]],
Author = "Carter Emmart, Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "HIIRegions"
}

View File

@@ -34,10 +34,29 @@ local object = {
},
GUI = {
Name = "Kepler Planetary Candidates",
Path = "/Milky Way/Exoplanets"
Path = "/Milky Way/Exoplanets",
Description = [[Census: 3,254 stars. DU Version 9.3. <br> The exoplanet candidate
stars are likely hosts for exoplanets. These are stars plucked from NASA's Kepler
and TESS space telescopes. The Kepler mission was designed to stare at one spot,
roughly twelve degrees across, in the constellation Cygnus. By staring at one
spot, the spacecraft could monitor over 500,000 stars in that field for subtle
variations in brightness.The data included here are the stars that are considered
good candidates to host planets. Rather than represent them photo-realistically,
with accurate colors, we choose to visualize them as generic, pure yellow stars.
(Description from URL) <br><br> Data Reference: NASA Exoplanet Archive
(CalTech/NASA)]],
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { object })
asset.meta = {
Name = "Kepler Planetary Candidates",
Version = "2.0",
Description = [[Digital Universe asset for Kepler Planetary Candidates]],
Author = "Brian Abbott, Emily Rice, and Jason No (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "KeplerPlanetaryCandidates"
}

View File

@@ -39,10 +39,30 @@ local object = {
},
GUI = {
Name = "Local Group",
Path = "/Universe/Galaxies"
Path = "/Universe/Galaxies",
Description = [[Census: 102 galaxies. DU Version 6.4. <br> A group of galaxies is
a small number of large galaxies that are typically surrounded by a large
number of small galaxies. The Milky Way belongs to the Local Group, and is one
of roughly 100 galaxies in that group. The Milky Way, the Andromeda Galaxy
(also known as Messier 31, or M31), and the Triangulum Galaxy (M33) are three
of the largest galaxies in the Local Group. Each is a spiral galaxy containing
hundreds of billions of stars. Surrounding the Milky Way and Andromeda are a
bevy of dwarf galaxies-smaller, often irregular galaxies, that contain
hundreds of millions to a few billion stars. (Description from URL) <br><br>
Data Reference: Properties of dwarf galaxies in the Local Group
(McConnachie+, 2012)]],
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { object })
asset.meta = {
Name = "Local Group",
Version = "2.0",
Description = [[Digital Universe asset for the Local Goup]],
Author = "Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "LocalDwarfGalaxies"
}

View File

@@ -1,60 +1,6 @@
local assetHelper = asset.require('util/asset_helper')
local sphereTextures = asset.syncedResource({
Name = "Milky Way Sphere Textures",
Type = "HttpSynchronization",
Identifier = "milkyway_textures",
Version = 2
})
local planeTextures = asset.syncedResource({
Name = "Milky Way Plane Textures",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_milkyway_textures",
Version = 2
})
local planeSpeck = asset.syncedResource({
Name = "Milky Way Plane Speck",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_milkyway_speck",
Version = 1
})
local homespeck = asset.syncedResource({
Name = "Home Speck File",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_home_speck",
Version = 1
})
local sphere = {
Identifier = "MilkyWay",
Transform = {
Rotation = {
Type = "StaticRotation",
Rotation = {0, 0, 3.14159265359}
}
},
Renderable = {
Type = "RenderableSphere",
Size = 9.2E21,
Segments = 40,
Opacity = 0.35,
Texture = sphereTextures .. "/DarkUniverse_mellinger_4k.jpg",
Orientation = "Inside",
UseAdditiveBlending = true,
MirrorTexture = true,
FadeOutThreshold = 0.0015,
Background = true
},
GUI = {
Name = "Milky Way Sphere",
Path = "/Milky Way"
}
}
local dataPaths = asset.require("scene/digitaluniverse/milkyway_data")
local plane = {
Identifier = "MilkyWayGalaxyImage",
@@ -65,58 +11,38 @@ local plane = {
Color = { 1.0, 1.0, 1.0 },
Opacity = 0.99,
ScaleFactor = 2.8,
File = planeSpeck .. "/galaxy.speck",
TexturePath = planeTextures,
File = dataPaths.SpeckPath .. "/galaxy.speck",
TexturePath = dataPaths.TexturesPath,
Luminosity = "size",
ScaleLuminosity = 1.0,
-- Fade in value in the same unit as "Unit"
FadeInDistances = { 3000.0, 50000.0 },
PlaneMinSize = 5.0,
Unit = "pc"
},
GUI = {
Name = "Milky Way Galaxy Image",
Path = "/Universe/Galaxies"
Path = "/Universe/Galaxies",
Description = [[Census: 1 image. DU Version 2.2. <br> The exterior view of the
Milky Way is simply a two-dimensional image. The image is that of NGC 1232, a
galaxy thought to resemble our Milky Way. The image has been properly sized
and approximately oriented to function as a placeholder, allowing one to see
the context of the Galaxy relative to other data in the atlas. The features
you see in the image, of course, do not represent our Galaxy, per se, but
resemble similar features found in our Galaxy.(Description from URL)
<br><br> Data Reference: European Southern Observatory]]
}
}
local homeLabel = {
Identifier = "HomeLabel",
Renderable = {
Type = "RenderableBillboardsCloud",
Enabled = false,
Color = { 1.0, 0.4, 0.2 },
Opacity = 0.99,
ScaleFactor = 500.0,
--File = homespeck .. "/home.speck",
-- Texture = textures .. "/point3.png",
DrawLabels = true,
LabelFile = homespeck .. "/home.label",
TextColor = { 0.8, 0.8, 0.8 },
TextSize = 20.50,
TextMinSize = 16.0,
TransformationMatrix = {
-0.7357425748, 0.67726129641, 0.0, 0.0,
-0.074553778365, -0.080991471307, 0.9939225904, 0.0,
0.67314530211, 0.73127116582, 0.11008126223, 0.0,
0.0, 0.0, 0.0, 1.0
},
Unit = "Mpc",
-- Fade in value in the same unit as "Unit"
FadeInDistances = { 0.05, 1.0 },
-- Max size in pixels
BillboardMaxSize = 8.22,
BillboardMinSize = 0.0,
--CorrectionSizeEndDistance = 22.0,
--CorrectionSizeFactor = 10.45
EnablePixelSizeControl = true
},
GUI = {
Name = "Home Label",
Path = "/Universe/Galaxies"
}
assetHelper.registerSceneGraphNodesAndExport(asset, { plane })
asset.meta = {
Name = "MilkyWay Galaxy",
Version = "2.0",
Description = [[Digital Universe asset containt 2D image of the MilkyWay. For
extragalactic viewing]],
Author = "Brian Abbott, Carter Emmart (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "MilkyWayGalaxyImage"
}
assetHelper.registerSceneGraphNodesAndExport(asset, { sphere, plane, homeLabel })

View File

@@ -0,0 +1,63 @@
local assetHelper = asset.require('util/asset_helper')
local dataPaths = asset.require("scene/digitaluniverse/milkyway_data")
local plane = {
Identifier = "MilkyWayGalaxyArmLabelsImage",
Parent = "Root",
Renderable = {
Type = "RenderablePlanesCloud",
Enabled = false,
Color = { 1.0, 1.0, 1.0 },
Opacity = 0.99,
ScaleFactor = 2.8,
File = dataPaths.SpeckPath .. "/galaxyArmLabels.speck",
TexturePath = dataPaths.TexturesPath,
Luminosity = "size",
ScaleLuminosity = 1.0,
FadeInDistances = { 3000.0, 50000.0 },
PlaneMinSize = 5.0,
Unit = "pc"
},
GUI = {
Name = "Milky Way Arms Labels",
Path = "/Universe/Galaxies",
Description = [[ Census: 1 image. DU Version: 1.2. This image contains labels for
the Milky Way's spiral arms. We label them in this manner ("hard coding" the
labels into an image rather than having native labels) so that they can retain
their size, shape, and location as they overlay the galaxy. (Description from
Digital Universe Data Profiles)]],
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { plane })
asset.meta = {
Name = "Milky Way Arms Labels",
Version = "1.0",
Description = [[ Image with arm labels for the Milky Way galaxy]],
Author = "Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = [[ Copyright &#169; American Museum of Natural History. All rights reserved.
<br><br> Downloading the Atlas: AMNH offers the Atlas free of charge via our
website, http://www.haydenplanetarium.org/. The User is free to download and/or
duplicate verbatim copies of the Atlas provided this license and copyright
information accompany the Atlas. <br><br> Modifying the Atlas: The user is free to
modify the Atlas by either adding data or altering existing data, provided it is
for personal use only. Once the user modifies the Atlas, it is no longer part of
AMNH's Atlas and cannot be used publicly alongside or within the Atlas without
written permission from AMNH. <br><br> Distributing the Atlas: The user is
forbidden to distribute and use the Atlas for profit, as part of a software and/or
production system that will subsequently be redistributed, or for public
consumption (via print, electronic media, or broadcast/produced pieces) without
written permission from AMNH. <br><br> Neither the names of American Museum of
Natural History and Hayden Planetarium nor the names of their contributors may be
used to endorse or promote products derived from this Atlas without specific,
prior written permission. <br><br> The Atlas is free but is offered WITHOUT ANY
WARRANTY of any kind. We provide the Atlas as is and take no responsibility for
any damage resulting from the use of this Atlas. The entire risk as to the quality
and performance of this product is with the user. <br><br> For more information,
please visit http://www.haydenplanetarium.org/universe]],
Identifiers = "MilkyWayGalaxyArmLabelsImage"
}

View File

@@ -0,0 +1,16 @@
local planeTextures = asset.syncedResource({
Name = "Milky Way Plane Textures",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_milkyway_textures",
Version = 2
})
local planeSpeck = asset.syncedResource({
Name = "Milky Way Plane Speck",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_milkyway_speck",
Version = 1
})
asset.export("TexturesPath", planeTextures)
asset.export("SpeckPath", planeSpeck)

View File

@@ -0,0 +1,57 @@
--milkyway_label.asset
local assetHelper = asset.require('util/asset_helper')
local homespeck = asset.syncedResource({
Name = "Home Speck File",
Type = "HttpSynchronization",
Identifier = "digitaluniverse_home_speck",
Version = 1
})
local homeLabel = {
Identifier = "HomeLabel",
Renderable = {
Type = "RenderableBillboardsCloud",
Enabled = false,
Color = { 1.0, 0.4, 0.2 },
Opacity = 0.99,
ScaleFactor = 500.0,
DrawLabels = true,
LabelFile = homespeck .. "/home.label",
TextColor = { 0.8, 0.8, 0.8 },
TextSize = 20.50,
TextMinSize = 16.0,
TransformationMatrix = {
-0.7357425748, 0.67726129641, 0.0, 0.0,
-0.074553778365, -0.080991471307, 0.9939225904, 0.0,
0.67314530211, 0.73127116582, 0.11008126223, 0.0,
0.0, 0.0, 0.0, 1.0
},
Unit = "Mpc",
FadeInDistances = { 0.05, 1.0 },
BillboardMaxSize = 8.22,
BillboardMinSize = 0.0,
EnablePixelSizeControl = true
},
GUI = {
Name = "Home Label",
Path = "/Universe/Galaxies",
Description = [[Label for the Milky Way titled "Home", sided for the galactic
level]],
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { homeLabel })
asset.meta = {
Name = "Home Label",
Version = "1.0",
Description = [[Label for the Milky Way titled "Home", sided for the galactic level]],
Author = "OpenSpace Team",
URL = "http://openspaceproject.com",
License = "MIT license",
Identifiers = "HomeLabel"
}

View File

@@ -0,0 +1,52 @@
local assetHelper = asset.require('util/asset_helper')
local sphereTextures = asset.syncedResource({
Name = "Milky Way Sphere Textures",
Type = "HttpSynchronization",
Identifier = "milkyway_textures",
Version = 2
})
local sphere = {
Identifier = "MilkyWay",
Transform = {
Rotation = {
Type = "StaticRotation",
Rotation = {0, 0, 3.14159265359}
}
},
Renderable = {
Type = "RenderableSphere",
Size = 9.2E21,
Segments = 40,
Opacity = 0.35,
Texture = sphereTextures .. "/DarkUniverse_mellinger_4k.jpg",
Orientation = "Inside",
UseAdditiveBlending = true,
MirrorTexture = true,
FadeOutThreshold = 0.0015,
Background = true
},
GUI = {
Name = "Milky Way Sphere",
Path = "/Milky Way",
Description = [[All sky image of the Milky Way that is visible when inside. Fades
out when zooming away from the Milky Way]],
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { sphere })
asset.meta = {
Name = "Milky Way Galaxy Sphere",
Version = "2.0",
Description = [[All sky image of the Milky Way]],
Author = "OpenSpace Team",
URL = "http://openspaceproject.com",
License = "MIT license",
Identifiers = "MilkyWay"
}

View File

@@ -42,10 +42,30 @@ local object = {
},
GUI = {
Name = "OB Associations",
Path = "/Milky Way"
Path = "/Milky Way",
Description = [[Census: 61 OB associations. DU Version 2.4. <br> OB associations
are young groups of stars that were formed within a giant molecular cloud, but
have dispersed after the original gas and dust from the cloud was blown away
by the star's radiation pressure. Although an association's stars are no
longer gravitationally bound to one another, they share a common motion in
space because they were formed from the same cloud. This allows astronomers to
easily determine OB association membership stars. These objects are color
coded by their spiral arm membership. Blue associations trace the Sagittarius
Arm. Purple associations are in the local Orion Spur. Orange associations are
in the Perseus Arm (Description from URL) <br><br> Data Reference: New List of
OB Associations (Melnik+)]],
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { object })
asset.meta = {
Name = "OB Associations",
Version = "2.0",
Description = [[Digital Universe asset for OB Associations]],
Author = "Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "OBAssociations"
}

View File

@@ -38,10 +38,30 @@ local object = {
},
GUI = {
Name = "Open Star Clusters",
Path = "/Milky Way"
Path = "/Milky Way",
Description = [[Census: 2,040 clusters. DU Version 5.7. <br> OB associations are
young groups of stars that were formed within a giant molecular cloud, but
have dispersed after the original gas and dust from the cloud was blown away
by the star's radiation pressure. Although an association's stars are no
longer gravitationally bound to one another, they share a common motion in
space because they were formed from the same cloud. This allows astronomers to
easily determine OB association membership stars. These objects are color
coded by their spiral arm membership. Blue associations trace the Sagittarius
Arm. Purple associations are in the local Orion Spur. Orange associations are
in the Perseus Arm (Description from URL) <br><br> Data Reference: Optically
visible open clusters and Candidates (Dias+ 2002-2015)]],
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { object })
asset.meta = {
Name = "Open Star Clusters",
Version = "2.0",
Description = [[Digital Universe asset for Open Star Clusters]],
Author = "Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "OpenStarClusters"
}

View File

@@ -38,10 +38,27 @@ local object = {
},
GUI = {
Name = "Planetary Nebulae",
Path = "/Milky Way"
Path = "/Milky Way",
Description = [[Census: 283 nebulae. DU Version 2.8. <br> A planetary nebula is an
expanding shell of gas ejected from a star late in its life cycle. Appearing
like greenish disks to a telescopic observer, planetary nebulae received their
name from their resemblance to the gaseous planets of our solar system. In no
way are they related to planets, rather, they are products of dying stars.
(Description from URL) <br><br> Data Reference: Planetary Nebulae distances
in Gaia DR2 (Kimeswenger+, 2018), Strasbourg-ESO Catalog of Planetary Nebulae
(Acker+ 1992)]],
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { object })
asset.meta = {
Name = "Planetary Nebulae",
Version = "2.0",
Description = [[Digital Universe asset for Planetary Nebulae]],
Author = "Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "PlanetaryNebulae"
}

View File

@@ -37,10 +37,32 @@ local object = {
EnablePixelSizeControl = false
},
GUI = {
Path = "/Milky Way"
Name = "Pulsars",
Path = "/Milky Way",
Description = [[Census: 2,498 pulsars. DU Version 5.6. <br> Upon death, stars
leave behind one of three possible remnants: a white dwarf, a neutron star, or
a black hole. Stars that are more massive than the sun will often become
neutron stars in a violent explosion called a supernova. During a supernova,
the core of the star collapses under such high pressure that the electrons,
which normally remain outside the atomic nucleus, are forced to combine with
the protons in the nucleus. Atomic nuclei break apart, producing what is
called a degenerate state of matter. The collapse is halted when the material
cannot be packed any tighter. At this point, the star has a radius of about
10-15 kilometers. The density of this material is so high that a teaspoonful
would weigh about 100 million tons on Earth. (Description from URL) <br><br>
Data Reference: ATNF Pulsar Catalogue, (Manchester+, 2005)]],
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { object })
asset.meta = {
Name = "Pulsars",
Version = "2.0",
Description = [[Digital Universe asset for Pulsars.]],
Author = "Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "Pulsars"
}

View File

@@ -35,10 +35,28 @@ local object = {
EnablePixelSizeControl = true
},
GUI = {
Path = "/Universe"
Name = "Quasars",
Path = "/Universe",
Description = [[Census: 569,442 quasars. DU Version 2.2. <br>
Quasars are the most distant objects we can see. They are extremely active
galaxies that contain supermassive black holes which are gobbling up material
at a furious rate. The Million Quasars Catalogue is an aggregate catalog of
several surveys, including 2dF and Sloan. So, it should not be surprising that
the shape of these data mimic the shape of the Sloan and 2dF galaxy surveys,
with large parts of the sky unobserved.(Description from URL) <br><br> Data
Reference: The Million Quasars catalog (Flesch, 2017)]]
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { object })
asset.meta = {
Name = "Quasars",
Version = "2.0",
Description = [[Digital Universe asset for Quasars.]],
Author = "Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "Quasars"
}

View File

@@ -44,10 +44,34 @@ local object = {
},
GUI = {
Name = "Sloan Digital Sky Survey",
Path = "/Universe/Galaxies"
Path = "/Universe/Galaxies",
Description = [[Census: 2,600,258 galaxies. DU Version 10.6.<br> The Sloan Digital
Sky Survey (SDSS) is an ambitious project to image about 35% of the sky, deep
into the universe. The survey measured the position and brightness of almost 1
billion objects, and obtained spectra to more than 4 million objects. This is
not an all-sky survey, so there are large parts of the sky that remain
unobserved, which produces the bow tie distribution and the black areas where
there surely are galaxies, but we have yet to observe them. These galaxies
appear to extend beyond the 2dF survey to distances that exceed 5 billion
light years. However, the weblike structure of clusters, filaments, and voids
seems to fade by about 2 billion light years. Beyond this distance, the
completeness of the survey drops so that only the intrinsically bright
galaxies are visible. The weblike cosmic structure is echoed in these data,
with orange clusters standing out among the less dense aqua-colored galaxies
and the less dense regions of green-colored galaxies. (Description from URL)
<br><br> Data Reference: Sloan Digital Sky Survey (http://www.sdss.org/)]]
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { object })
asset.meta = {
Name = "Sloan Digital Sky Survey",
Version = "2.0",
Description = [[Digital Universe asset for The Sloan Digital Sky Survey (SDSS).]],
Author = "Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "SloanDigitalSkySurvey"
}

View File

@@ -26,10 +26,21 @@ local object = {
},
GUI = {
Name = "Stars Labels",
Path = "/Milky Way/Stars"
Path = "/Milky Way/Stars",
Description = [[Labels for stars in the Milky Way. See 'Stars' for more
info.]],
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { object })
asset.meta = {
Name = "Star Labels",
Version = "2.0",
Description = [[Digital Universe asset for labels of the stars.]],
Author = "Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "StarsLabels"
}

View File

@@ -28,7 +28,8 @@ local sunOrbit = {
},
GUI = {
Name = "Sun Orbit",
Path = "/Milky Way/Stars/Stars Orbits"
Path = "/Milky Way/Stars/Stars Orbits",
Description = [["Orbits of the Sun around the Milky Way"]]
}
}
@@ -50,7 +51,8 @@ local barnardsOrbit = {
},
GUI = {
Name = "Barnards Orbit",
Path = "/Milky Way/Stars/Stars Orbits"
Path = "/Milky Way/Stars/Stars Orbits",
Description = [["Orbits of Barnard's Star around the Milky Way"]]
}
}
@@ -72,7 +74,8 @@ local kapteynsOrbit = {
},
GUI = {
Name = "Kapteyns Orbit",
Path = "/Milky Way/Stars/Stars Orbits"
Path = "/Milky Way/Stars/Stars Orbits",
Description = [["Orbits of Kapteyn's Star around the Milky Way"]]
}
}
@@ -94,7 +97,8 @@ local lacaille9352Orbit = {
},
GUI = {
Name = "Lacaille 9352 Orbit",
Path = "/Milky Way/Stars/Stars Orbits"
Path = "/Milky Way/Stars/Stars Orbits",
Description = [["Orbits of Lacaille9352 around the Milky Way"]]
}
}
@@ -116,7 +120,8 @@ local lSR1826Orbit = {
},
GUI = {
Name = "LSR1826+3014 Orbit",
Path = "/Milky Way/Stars/Stars Orbits"
Path = "/Milky Way/Stars/Stars Orbits",
Description = [["Orbits of LSR1826+3014 around the Milky Way"]]
}
}
@@ -138,7 +143,8 @@ local lSRJ0822Orbit = {
},
GUI = {
Name = "LSRJ0822+1700 Orbit",
Path = "/Milky Way/Stars/Stars Orbits"
Path = "/Milky Way/Stars/Stars Orbits",
Description = [["Orbits of LSRJ0822+1700 around the Milky Way"]]
}
}
@@ -160,7 +166,8 @@ local pM_J13420Orbit = {
},
GUI = {
Name = "PM_J13420-3415 Orbit",
Path = "/Milky Way/Stars/Stars Orbits"
Path = "/Milky Way/Stars/Stars Orbits",
Description = [["Orbits of PM_J13420-3415 around the Milky Way"]]
}
}
@@ -168,3 +175,18 @@ assetHelper.registerSceneGraphNodesAndExport(asset, {
sunOrbit, barnardsOrbit, pM_J13420Orbit, lSRJ0822Orbit, lSR1826Orbit,
lacaille9352Orbit, kapteynsOrbit
})
asset.meta = {
Name = "Star Orbits",
Version = "1.0",
Description = [[Select Star Orbital paths that delineate their trajectory around the
Milky Way over 1 billion years into the future. Included: Sun, Barnards, Kapteyns,
Lacaille 9352, LSR1826+3014, LSRJ0822+1700, PM_J13420-3415. <br><br> Data
Reference: Sebastien Lepine (AMNH)]],
Author = "Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "SunOrbit,BarnardsOrbit,KapteynsOrbit,pM_J13420Orbit,LSR1826Orbit," ..
"LSRJ0822Orbit,lacaille9352Orbit"
}

View File

@@ -43,7 +43,15 @@ local stars = {
RenderMethod = "Texture Based" -- or PSF
},
GUI = {
Path = "/Milky Way/Stars"
Name = "Stars",
Path = "/Milky Way/Stars",
Description = [[Census: 117,003 stars with 321 labels.<br> DU Version 7.8. This
star catalog is a combination of all available star catalogs, wherein we
choose the best distance available to place the stars around the Sun as
accurately as is possible. (Description from URL) <br><br> Data Reference:
XHIP: An Extended Hipparcos Compilation (Anderson E., Francis C. 2012);
Hipparcos Catalog (European Space Agency 1997); Gliese Catalog (Gliese and
Jahriess 1991)]],
}
}
@@ -62,8 +70,21 @@ local sunstar = {
},
GUI = {
Name = "Sun",
Path = "/Milky Way/Stars"
Path = "/Milky Way/Stars",
Description = [[Individual star to represent the sun when outside of the solar
system]]
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { stars, sunstar })
asset.meta = {
Name = "Stars",
Version = "2.0",
Description = [[Digital Universe asset for the stars.]],
Author = "Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "Stars"
}

View File

@@ -38,10 +38,25 @@ local object = {
},
GUI = {
Name = "Galaxy Superclusters",
Path = "/Universe/Galaxies"
Path = "/Universe/Galaxies",
Description = [[Census: 33 labels. DU Version 1.3.<br> The superclusters dataset
is a set of labels that mark the major galaxy superclusters in the local universe.
They correspond to, and should be viewed with, the Abell clusters. Astronomers
estimate there are 10 million superclusters in the observable universe.
(Description from URL) <br><br> Data Reference: Superclusters of Abell and X-ray
clusters (Einasto+, 2001)]]
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { object })
asset.meta = {
Name = "Galaxy Superclusters",
Version = "2.0",
Description = [[Digital Universe asset for Galaxy Superclusters.]],
Author = "Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "GalaxySuperclusters"
}

View File

@@ -40,10 +40,24 @@ local object = {
},
GUI = {
Name = "Supernova Remnants",
Path = "/Milky Way"
Path = "/Milky Way",
Description = [[Census: 112 supernova remnants.<br> DU Version 3.7. A supernova
remnant is the ejected gas that results from a supernova. It glows for a
cosmically short period of time before mixing with the interstellar medium.
(Description from URL) <br><br> Data Reference: The First Fermi LAT SNR
Catalog (Acero+, 2016)]],
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { object })
asset.meta = {
Name = "Supernova Remnants",
Version = "2.0",
Description = [[Digital Universe asset for Supernova Remnants.]],
Author = "Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "SupernovaRemnants"
}

View File

@@ -32,7 +32,7 @@ local tullyPoints = {
ColorOption = { "prox5Mpc" },
ColorRange = { { 1.0, 30.0 } },
LabelFile = speck .. "/tully.label",
DrawLabels = true,
DrawLabels = false,
TextColor = { 0.7, 0.7, 0.7 },
TextSize = 19.36,
TextMinSize = 8.2,
@@ -54,7 +54,23 @@ local tullyPoints = {
},
GUI = {
Name = "Tully Galaxies",
Path = "/Universe/Galaxies"
Path = "/Universe/Galaxies",
Description = [[Census: 30,059 galaxies. DU Version 1.5.<br> The Tully Catalog is
the most polished, accurate catalog of nearby galaxies. It includes over 30,000
galaxies in the local universe that surround the Milky Way. This catalog
demonstrates the large-scale structure of the universe exceptionally well. And,
each galaxy has a representative image reflecting its morphological type, and is
properly sized and inclined. Size and shape. The data form a cube, which is an
arbitrary cutoff based on the completeness of these data. Beyond this, data from
these sources are not as reliable, so effort is made to show a complete picture,
albeit limited by observations (for example, we cannot see dwarf galaxies much
beyond the Local Group). The size of the cube is roughly 1 billion light years on
a diagonal (so the farthest galaxies in the dataset are about 1 billion light
years from the Milky Way), or about 700 million light years per side.
<br><br>Colors. Orange denotes more dense regions of the local universe, aqua is
given to galaxies in an intermediate-density area, and green is given to lower
density regions.(Description from URL) <br><br> Data Reference: Tully Galaxy
Catalog: Brent Tully (U Hawaii), Stuart Levy (NCSA/UIUC)]]
}
}
@@ -83,9 +99,30 @@ local tullyImages = {
},
GUI = {
Name = "Tully Galaxies Images",
Path = "/Universe/Galaxies"
Path = "/Universe/Galaxies",
Description = [[Each galaxy is represented by an image
that represents its morphological type (spiral, elliptical, etc.). Most of these
come from The Galaxy Catalog. A handful of nearby galaxies are represented by
their actual images, which come mostly from the National Optical Astronomy
Observatory (NOAO). Each of these images has been altered from its original state.
These images were taken from Earth on some of the worlds largest telescopes, so
foreground stars from our own Galaxy appear in each image. We are representing
galaxies in extragalactic space, so we have removed the stars from each image.
(Description from URL) <br><br> Data Reference: Tully Galaxy Catalog: Brent Tully
(U Hawaii), Stuart Levy (NCSA/UIUC)]]
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { tullyPoints, tullyImages })
asset.meta = {
Name = "Tully Galaxies",
Version = "3.0",
Description = [[Digital Universe asset for Tully Galaxies, including point cloud and
images.]],
Author = "Stuart Levy (NCSA/UIUC), Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "TullyGalaxies,TullyGalaxiesImages"
}

View File

@@ -25,10 +25,30 @@ local object = {
Unit = "Mpc"
},
GUI = {
Path = "/Universe/Galaxies"
Name = "Voids",
Path = "/Universe/Galaxies",
Description = [[ Census: 24 cosmic voids. DU Version 1.2. <br>Cosmic voids are
vast, empty spaces where there are either no galaxies, or very few galaxies.
They are associated with cold spots in the cosmic microwave background (CMB)
light, the earliest picture we have of the universe (see page 58). Those cold
spots in the CMB evolved into large voids, some as much as 300 million light
years in diameter. Labels roughly denote the location of cosmic voids in the
Tully galaxies. Voids are only visible with motion cuing as you spin around
these data. The labels help to guide the eye and provide sign posts for the
largest voids in our cosmic neighborhood. (Description from URL) <br><br> Data
Reference: various sources]]
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { object })
asset.meta = {
Name = "Voids",
Version = "2.0",
Author = "Brian Abbott (AMNH)",
Description = [[Digital Universe asset for Cosmic voids.]],
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "Voids"
}

View File

@@ -5,11 +5,11 @@ local images = asset.syncedResource({
Name = "Constellation Images",
Type = "HttpSynchronization",
Identifier = "constellation_images",
Version = 1
Version = 2
})
--function that reads the file
local createConstellations = function (guiPath, constellationfile)
local createConstellations = function (baseIdentifier, guiPath, constellationfile)
local genConstellations = {};
--skip the first line
local notFirstLine = false;
@@ -33,7 +33,8 @@ local createConstellations = function (guiPath, constellationfile)
group = (group == '' and globe or group)
local aconstellation = {
Identifier = guiPath .. '-' .. name,
-- Identifier = guiPath .. '-' .. name,
Identifier = baseIdentifier .. '-' .. abbreviation,
Parent = transforms.SolarSystemBarycenter.Identifier,
Transform = {
Translation = {
@@ -83,7 +84,7 @@ local nodes = {}
asset.onInitialize(function ()
local constellationsCSV = images .. "/constellation_data.csv"
nodes = createConstellations('Constellation Art', constellationsCSV)
nodes = createConstellations('ConstellationArt', 'Constellation Art', constellationsCSV)
for _, n in ipairs(nodes) do
openspace.addSceneGraphNode(n);
end
@@ -101,6 +102,6 @@ asset.meta = {
Version = "1.0",
Description = "Artistic images depicting the constellations",
Author = "James Hedberg",
URL = "jameshedberg.com",
URL = "http://jameshedberg.com",
License = "CC-BY"
}

View File

@@ -1,85 +0,0 @@
Data about Constellations columns are: group, name, x, y, z, scale, imageName, rotX, rotY, rotZ, centerStar
normal,Ori,Orion,-550.8742,-259.3621,-188.9620,1.5,Ori.png,1.128407,1.058407,1.668407,HD37128
zodiac,Tau,Taurus,-18.7277,-0.3175,-6.9092,1.2,Tau.png,1.198407,0.908407,1.378407,Aldebran
zodiac,Ari,Aries,-13.2892,9.4519,-11.9378,0.8,Ari.png,0.668407,0.538407,0.518407,Hamal
zodiac,Gem,Gemini,-362.5493,-102.2245,79.4030,0.85,Gem.png,-0.731593,2.268407,-0.451593,Mekbuda
zodiac,Cnc,Cancer,-30.9209,-16.4584,22.6601,0.8,Cnc.png,-1.151593,1.888407,-1.041593,HD74442
zodiac,Leo,Leo,-17.9030,-13.2719,31.4196,1.33,Leo.png,-0.131593,2.448407,0.418407,HD89484
zodiac,Vir,Virgo,36.5809,-35.1877,62.3341,1.5,Vir.png,-0.371593,3.138407,0.518407,HD116658
zodiac,Lib,Libra,17.5393,-6.2768,14.5916,1.0,Lib.png,-1.011593,3.138407,1.318407,HD130819
zodiac,Sco,Scorpius,137.4378,-19.4456,37.3606,1.2,Sco.png,1.698407,-1.001593,-1.751593,HD148478
zodiac,Sgr,Sagittarius,66.2304,11.1498,-14.8095,1.2,Sgr.png,1.728407,-1.321593,-1.751593,HD175191
zodiac,Cap,Capricornus,32.9799,20.0621,-29.3945,1.3,Cap.png,1.158407,-0.881593,-0.561593,HD200761
zodiac,Aqr,Aquarius,86.5090,149.4078,-155.8102,1.2,Aqr.png,-2.921593,-2.391593,-2.551593,-2.511593
zodiac,Psc,Pisces,-28.0235,45.3150,-76.8893,1.6,Psc.png,0.458407,-0.001593,0.618407,HD4656
northern,Uma,Ursa Major,-12.0503,7.1931,19.8974,1.6,UMa.png,0.748407,2.398407,0.658407,HD95418
northern,Dra,Draco,-1.4340,20.6566,23.5098,1.9,Dra.png,0.658407,-2.541593,1.058407,HD137759
southern,Ant,Antila,-0.2233,-103.8908,42.7940,1.3,Ant.png,1.848407,0.198407,-3.141593,HD90610
southern,Crv,Corvus,8.0442,-16.8858,19.3984,1.1,Crv.png,2.198407,-0.041593,-2.221593,HD108767
southern,Cet,Cetus,-28.7960,7.2425,-73.6693,1.5,Cet.png,0.238407,0.368407,0.688407,HD11353
southern,Cha,Chameleon,53.5121,-108.3624,-38.1807,1.1,Cha.png,-1.801593,2.738407,0.448407,HD92305
northern,Cam,Camelopardalis,-304.8155,179.0620,71.1454,1.7,Cam.png,2.128407,1.228407,1.478407,HD31910
equatorial,Aql,Aquila,11.7741,9.7467,-1.6418,1.0,Aql.png,-2.601593,-2.511593,-3.141593,HD182640
southern,Aps,Apus,31.6370,-32.5620,-16.5786,1.1,Aps.png,-1.691593,-2.281593,0.838407,HD149324
northern,Lyn,Lynx,-98.3174,4.4830,67.2289,1.2,Lyn.png,1.688407,1.768407,1.668407,HD70272
southern,Phe,Phoenix,5.0172,-4.2096,-22.8088,1.5,Phe.png,-3.141593,3.138407,-3.141593,HD6595
northern,Cyg,Cygnus,78.7445,375.2440,12.4995,1.4,Cyg.png,1.668407,-0.931593,-0.261593,HD194093
southern,Cen,Centaurus,20.1398,-33.1830,9.5915,2.7,Cen.png,-1.291593,3.088407,0.458407,HD110304
northern,Aur,Auriga,-12.3062,3.8595,1.0302,1.5,Aur.png,1.378407,1.108407,1.178407,HD34029
northern,Peg,Pegasus,0.9791,32.5947,-27.7339,2.42,Peg.png,0.918407,-0.221593,-0.191593,HD218045
southern,Hya,Hydra,-2.9043,-33.5496,25.8962,3,Hya.png,-0.531593,2.838407,0.368407,HD93813
southern,Oct,Octans,22.0434,-27.8601,-24.3108,1.0,Oct.png,-0.911593,0.398407,1.198407,HD214846
southern,Nor,Norma,34.9251,-17.5643,0.0068,1.0,Nor.png,-1.631593,-2.421593,1.298407,HD146686
southern,Mus,Musca,48.8888,-79.2952,-10.2828,1.25,Mus.png,-1.871593,3.138407,0.358407,HD109668
southern,Hyi,Hydrus,3.2767,-4.7183,-4.7829,1.1,Hyi.png,2.438407,-3.141593,-2.381593,HD2151
northern,Lac,Lacerta,-6.0878,30.5794,-3.6064,1.0,Lac.png,-1.521593,-2.391593,3.138407,HD213558
equatorial,Lep,Lepus,-212.6297,-184.4909,-132.1156,1.0,Lep.png,-1.801593,-2.351593,-0.861593,HD36673
southern,Lup,Lupus,129.1166,-102.2983,33.3251,1.2,Lup.png,-1.191593,-2.391593,0.798407,HD129056
southern,Men,Mensa,2.4149,-8.5586,-4.8892,1.0,Men.png,-2.101593,-2.781593,0.828407,HD43834
southern,Mic,Microscopium,51.0335,11.1671,-44.3692,1.0,Mic.png,0.728407,-0.831593,-0.561593,HD199951
equatorial,Mon,Monoceros,-93.0725,-66.8909,8.6548,1.2,Mon.png,-1.331593,1.988407,-0.891593,HD55185
southern,Pav,Pavo,4.4549,-2.5959,-3.2739,1.3,Pav.png,-2.391593,-2.171593,1.648407,HD190248
southern,Ind,Indus,133.6149,-53.5569,-115.9552,1.5,Ind.png,-2.031593,-1.491593,1.758407,HD198700
northern,LMi,Leo Minor,-23.3948,-2.5770,38.0756,1.1,LMi.png,-3.141593,0.478407,-2.201593,HD90537
northern,Lyr,Lyra,2.8086,6.7630,2.5555,1.0,Lyr.png,-1.831593,-2.091593,3.141500,HD172167
northern,Her,Hercules,14.0526,14.9773,12.5478,1.3,Her.png,-1.511593,-1.811593,2.288407,HD156164
southern,Gru,Grus,18.6528,-3.2893,-24.6602,1.3,Gru.png,-3.141593,-2.511593,-2.901593,HD209952
southern,Crt,Crater,1.5886,-43.9831,40.3390,1.3,Crt.png,-0.521593,3.140000,0.588407,HD98430
northern,Del,Delphinus,14.8599,24.6150,-8.0550,1.2,Del.png,1.308407,-0.951593,-0.241593,HD196524
southern,Dor,Dorado,-0.6460,-9.3172,-6.9654,1.2,Dor.png,2.118407,1.768407,-2.901593,HD33262
northern,Equ,Equuleus,27.7363,41.7071,-27.4371,1.2,Equ.png,-1.801593,-2.511593,2.558407,HD202447
southern,Eri,Eridanus,-37.5153,-23.5231,-65.6368,2.1,Eri.png,0.128407,0.698407,0.998407,HD20720
southern,For,Fornax,-14.0351,-17.8282,-46.5514,1.4,For.png,3.138407,2.678407,-2.351593,HD17652
southern,Hor,Horologium,2.1021,-27.1310,-40.5136,1.2,Hor.png,-3.141593,2.468407,-2.191593,HD16920
southern,Pyx,Pyxis,-66.7424,-248.9639,26.0445,1.2,Pyx.png,1.838407,-1.651593,2.708407,HD74575
southern,Ret,Reticulum,2.8130,-37.2904,-33.2644,1.5,Ret.png,1.998407,2.188407,-2.591593,HD27256
northern,Sge,Sagitta,44.3886,70.9446,-7.6264,1.2,Sge.png,-0.741593,-2.231593,2.108407,HD189319
southern,Scl,Sculptor,21.6545,-6.8861,-166.5240,1.3,Scl.png,-0.071593,-0.221593,0.638407,HD2429
southern,Sct,Scutum,48.8939,21.5158,-0.1629,1.2,Sct.png,1.188407,-1.271593,-0.971593,HD171443
southern,Tuc,Tucana,35.3950,-20.2535,-45.2324,1.1,Tuc.png,-0.351593,-0.161593,0.308407,HD211416
northern,Tri,Triangulum,-26.6263,21.9119,-16.2254,1.2,Tri.png,1.168407,0.218407,0.558407,HD13161
southern,TrA,Triangulum Australe,96.2283,-76.4459,-33.5257,1.2,TrA.png,-1.991593,-2.491593,1.128407,HD150798
southern,Tel,Telescopium,72.3444,-14.5016,-20.0248,1.2,Tel.png,-0.461593,-1.731593,0.298407,HD169467
southern,Ara,Ara,164.9273,-75.6246,-35.3100,1.1,Ara.png,-1.381593,-2.131593,1.048407,HD157244
southern,Cae,Caelum,-6.0961,-13.7926,-13.3392,1.0,Cae.png,-0.661593,0.948407,0.418407,HD29875
southern,CMa,Canis Major,-1.7693,-1.9125,-0.4074,1.3,CMa.png,1.128407,1.048407,1.878407,HD48915
northern,CMi,Canis Minor,-2.8348,-1.8906,0.7881,1.2,CMi.png,2.538407,1.138407,-3.141593,HD61421
southern,Vol,Volans,37.6000,-182.7856,-62.6559,1.2,Vol.png,-2.441593,1.988407,-0.351593,HD68520
northern,UMi,Ursa Minor,-11.3527,27.2100,25.1835,1.3,UMi.png,-2.491593,-0.581593,-2.381593,HD131873
northern,And,Andromdeda,-32.8276,43.3946,-27.8475,1.6,And.png,-2.021593,-3.141593,-2.521593,HD6860
northern,Boo,Bootes,11.2468,14.9864,30.4945,2.0,Boo.png,-3.141593,-0.601593,-2.361593,HD135722
northern,Vul,Vulpecula,46.7540,77.7780,5.3953,1.1,Vul.png,-2.301593,-2.061593,-3.141593,HD131873
northern,CVn,Canes Venatici,-3.1198,5.7935,33.1368,1.3,CVn.png,0.148407,3.138407,0.428407,HD112413
southern,Cir,Circinus,11.4255,-11.6937,-1.3129,1.0,Cir.png,1.448407,-0.391593,-2.211593,HD128898
northern,Com,Coma Berenices,1.9257,-1.2062,12.2465,1.4,Com.png,3.138407,-0.051593,-2.711593,HD114378
southern,CrA,Corona Australis,146.1322,-4.7492,-53.7124,1.0,CrA.png,-3.141593,-2.021593,-3.141593,HD178345
northern,CrB,Corona Borealis,33.5737,32.0314,52.9729,1.3,CrB.png,-3.141593,-0.601593,-2.271593,HD143107
northern,Cas,Cassiopeia,-36.3073,59.4424,-7.6926,1.4,Cas.png,-1.431593,3.128407,-2.331593,HD3712
northern,Cep,Cepheus,-2.8178,14.4985,2.3848,1.7,Cep.png,-1.331593,-2.291593,-2.931593,HD203280
southern,Car,Carina Vela Puppis,14.1325,-188.6018,-42.2785,2.0,Car.png,2.078407,1.048407,-3.111593,HD71129
northern,Col,Columba,-11.2568,-20.5973,-11.9895,1.0,Col.png,2.518407,1.358407,-2.981593,HD39425
northern,Per,Perseus,-139.8202,79.8063,-16.2631,1.3,Per.png,-1.751593,2.428407,-2.411593,HD22928
northern,Oph,Ophiuchus,127.9419,14.0822,56.2015,3.2,Oph.png,2.178407,-0.781593,-1.681593,HD149757
southern,PsA,Piscis Austrinus,99.9977,47.6679,-199.6345,1.0,PsA.png,3.138407,-2.541593,-2.881593,HD214748
southern,Cru,Crux,49.3509,-85.0446,-0.6223,1.1,Cru.png,1.718407,0.048407,-2.741593,HD108248
southern,Pic,Pictor,-4.5417,-45.5649,-27.1768,1.0,Pic.png,2.568407,2.138407,-2.081593,HD39523
1 Data about Constellations columns are: group, name, x, y, z, scale, imageName, rotX, rotY, rotZ, centerStar
2 normal,Ori,Orion,-550.8742,-259.3621,-188.9620,1.5,Ori.png,1.128407,1.058407,1.668407,HD37128
3 zodiac,Tau,Taurus,-18.7277,-0.3175,-6.9092,1.2,Tau.png,1.198407,0.908407,1.378407,Aldebran
4 zodiac,Ari,Aries,-13.2892,9.4519,-11.9378,0.8,Ari.png,0.668407,0.538407,0.518407,Hamal
5 zodiac,Gem,Gemini,-362.5493,-102.2245,79.4030,0.85,Gem.png,-0.731593,2.268407,-0.451593,Mekbuda
6 zodiac,Cnc,Cancer,-30.9209,-16.4584,22.6601,0.8,Cnc.png,-1.151593,1.888407,-1.041593,HD74442
7 zodiac,Leo,Leo,-17.9030,-13.2719,31.4196,1.33,Leo.png,-0.131593,2.448407,0.418407,HD89484
8 zodiac,Vir,Virgo,36.5809,-35.1877,62.3341,1.5,Vir.png,-0.371593,3.138407,0.518407,HD116658
9 zodiac,Lib,Libra,17.5393,-6.2768,14.5916,1.0,Lib.png,-1.011593,3.138407,1.318407,HD130819
10 zodiac,Sco,Scorpius,137.4378,-19.4456,37.3606,1.2,Sco.png,1.698407,-1.001593,-1.751593,HD148478
11 zodiac,Sgr,Sagittarius,66.2304,11.1498,-14.8095,1.2,Sgr.png,1.728407,-1.321593,-1.751593,HD175191
12 zodiac,Cap,Capricornus,32.9799,20.0621,-29.3945,1.3,Cap.png,1.158407,-0.881593,-0.561593,HD200761
13 zodiac,Aqr,Aquarius,86.5090,149.4078,-155.8102,1.2,Aqr.png,-2.921593,-2.391593,-2.551593,-2.511593
14 zodiac,Psc,Pisces,-28.0235,45.3150,-76.8893,1.6,Psc.png,0.458407,-0.001593,0.618407,HD4656
15 northern,Uma,Ursa Major,-12.0503,7.1931,19.8974,1.6,UMa.png,0.748407,2.398407,0.658407,HD95418
16 northern,Dra,Draco,-1.4340,20.6566,23.5098,1.9,Dra.png,0.658407,-2.541593,1.058407,HD137759
17 southern,Ant,Antila,-0.2233,-103.8908,42.7940,1.3,Ant.png,1.848407,0.198407,-3.141593,HD90610
18 southern,Crv,Corvus,8.0442,-16.8858,19.3984,1.1,Crv.png,2.198407,-0.041593,-2.221593,HD108767
19 southern,Cet,Cetus,-28.7960,7.2425,-73.6693,1.5,Cet.png,0.238407,0.368407,0.688407,HD11353
20 southern,Cha,Chameleon,53.5121,-108.3624,-38.1807,1.1,Cha.png,-1.801593,2.738407,0.448407,HD92305
21 northern,Cam,Camelopardalis,-304.8155,179.0620,71.1454,1.7,Cam.png,2.128407,1.228407,1.478407,HD31910
22 equatorial,Aql,Aquila,11.7741,9.7467,-1.6418,1.0,Aql.png,-2.601593,-2.511593,-3.141593,HD182640
23 southern,Aps,Apus,31.6370,-32.5620,-16.5786,1.1,Aps.png,-1.691593,-2.281593,0.838407,HD149324
24 northern,Lyn,Lynx,-98.3174,4.4830,67.2289,1.2,Lyn.png,1.688407,1.768407,1.668407,HD70272
25 southern,Phe,Phoenix,5.0172,-4.2096,-22.8088,1.5,Phe.png,-3.141593,3.138407,-3.141593,HD6595
26 northern,Cyg,Cygnus,78.7445,375.2440,12.4995,1.4,Cyg.png,1.668407,-0.931593,-0.261593,HD194093
27 southern,Cen,Centaurus,20.1398,-33.1830,9.5915,2.7,Cen.png,-1.291593,3.088407,0.458407,HD110304
28 northern,Aur,Auriga,-12.3062,3.8595,1.0302,1.5,Aur.png,1.378407,1.108407,1.178407,HD34029
29 northern,Peg,Pegasus,0.9791,32.5947,-27.7339,2.42,Peg.png,0.918407,-0.221593,-0.191593,HD218045
30 southern,Hya,Hydra,-2.9043,-33.5496,25.8962,3,Hya.png,-0.531593,2.838407,0.368407,HD93813
31 southern,Oct,Octans,22.0434,-27.8601,-24.3108,1.0,Oct.png,-0.911593,0.398407,1.198407,HD214846
32 southern,Nor,Norma,34.9251,-17.5643,0.0068,1.0,Nor.png,-1.631593,-2.421593,1.298407,HD146686
33 southern,Mus,Musca,48.8888,-79.2952,-10.2828,1.25,Mus.png,-1.871593,3.138407,0.358407,HD109668
34 southern,Hyi,Hydrus,3.2767,-4.7183,-4.7829,1.1,Hyi.png,2.438407,-3.141593,-2.381593,HD2151
35 northern,Lac,Lacerta,-6.0878,30.5794,-3.6064,1.0,Lac.png,-1.521593,-2.391593,3.138407,HD213558
36 equatorial,Lep,Lepus,-212.6297,-184.4909,-132.1156,1.0,Lep.png,-1.801593,-2.351593,-0.861593,HD36673
37 southern,Lup,Lupus,129.1166,-102.2983,33.3251,1.2,Lup.png,-1.191593,-2.391593,0.798407,HD129056
38 southern,Men,Mensa,2.4149,-8.5586,-4.8892,1.0,Men.png,-2.101593,-2.781593,0.828407,HD43834
39 southern,Mic,Microscopium,51.0335,11.1671,-44.3692,1.0,Mic.png,0.728407,-0.831593,-0.561593,HD199951
40 equatorial,Mon,Monoceros,-93.0725,-66.8909,8.6548,1.2,Mon.png,-1.331593,1.988407,-0.891593,HD55185
41 southern,Pav,Pavo,4.4549,-2.5959,-3.2739,1.3,Pav.png,-2.391593,-2.171593,1.648407,HD190248
42 southern,Ind,Indus,133.6149,-53.5569,-115.9552,1.5,Ind.png,-2.031593,-1.491593,1.758407,HD198700
43 northern,LMi,Leo Minor,-23.3948,-2.5770,38.0756,1.1,LMi.png,-3.141593,0.478407,-2.201593,HD90537
44 northern,Lyr,Lyra,2.8086,6.7630,2.5555,1.0,Lyr.png,-1.831593,-2.091593,3.141500,HD172167
45 northern,Her,Hercules,14.0526,14.9773,12.5478,1.3,Her.png,-1.511593,-1.811593,2.288407,HD156164
46 southern,Gru,Grus,18.6528,-3.2893,-24.6602,1.3,Gru.png,-3.141593,-2.511593,-2.901593,HD209952
47 southern,Crt,Crater,1.5886,-43.9831,40.3390,1.3,Crt.png,-0.521593,3.140000,0.588407,HD98430
48 northern,Del,Delphinus,14.8599,24.6150,-8.0550,1.2,Del.png,1.308407,-0.951593,-0.241593,HD196524
49 southern,Dor,Dorado,-0.6460,-9.3172,-6.9654,1.2,Dor.png,2.118407,1.768407,-2.901593,HD33262
50 northern,Equ,Equuleus,27.7363,41.7071,-27.4371,1.2,Equ.png,-1.801593,-2.511593,2.558407,HD202447
51 southern,Eri,Eridanus,-37.5153,-23.5231,-65.6368,2.1,Eri.png,0.128407,0.698407,0.998407,HD20720
52 southern,For,Fornax,-14.0351,-17.8282,-46.5514,1.4,For.png,3.138407,2.678407,-2.351593,HD17652
53 southern,Hor,Horologium,2.1021,-27.1310,-40.5136,1.2,Hor.png,-3.141593,2.468407,-2.191593,HD16920
54 southern,Pyx,Pyxis,-66.7424,-248.9639,26.0445,1.2,Pyx.png,1.838407,-1.651593,2.708407,HD74575
55 southern,Ret,Reticulum,2.8130,-37.2904,-33.2644,1.5,Ret.png,1.998407,2.188407,-2.591593,HD27256
56 northern,Sge,Sagitta,44.3886,70.9446,-7.6264,1.2,Sge.png,-0.741593,-2.231593,2.108407,HD189319
57 southern,Scl,Sculptor,21.6545,-6.8861,-166.5240,1.3,Scl.png,-0.071593,-0.221593,0.638407,HD2429
58 southern,Sct,Scutum,48.8939,21.5158,-0.1629,1.2,Sct.png,1.188407,-1.271593,-0.971593,HD171443
59 southern,Tuc,Tucana,35.3950,-20.2535,-45.2324,1.1,Tuc.png,-0.351593,-0.161593,0.308407,HD211416
60 northern,Tri,Triangulum,-26.6263,21.9119,-16.2254,1.2,Tri.png,1.168407,0.218407,0.558407,HD13161
61 southern,TrA,Triangulum Australe,96.2283,-76.4459,-33.5257,1.2,TrA.png,-1.991593,-2.491593,1.128407,HD150798
62 southern,Tel,Telescopium,72.3444,-14.5016,-20.0248,1.2,Tel.png,-0.461593,-1.731593,0.298407,HD169467
63 southern,Ara,Ara,164.9273,-75.6246,-35.3100,1.1,Ara.png,-1.381593,-2.131593,1.048407,HD157244
64 southern,Cae,Caelum,-6.0961,-13.7926,-13.3392,1.0,Cae.png,-0.661593,0.948407,0.418407,HD29875
65 southern,CMa,Canis Major,-1.7693,-1.9125,-0.4074,1.3,CMa.png,1.128407,1.048407,1.878407,HD48915
66 northern,CMi,Canis Minor,-2.8348,-1.8906,0.7881,1.2,CMi.png,2.538407,1.138407,-3.141593,HD61421
67 southern,Vol,Volans,37.6000,-182.7856,-62.6559,1.2,Vol.png,-2.441593,1.988407,-0.351593,HD68520
68 northern,UMi,Ursa Minor,-11.3527,27.2100,25.1835,1.3,UMi.png,-2.491593,-0.581593,-2.381593,HD131873
69 northern,And,Andromdeda,-32.8276,43.3946,-27.8475,1.6,And.png,-2.021593,-3.141593,-2.521593,HD6860
70 northern,Boo,Bootes,11.2468,14.9864,30.4945,2.0,Boo.png,-3.141593,-0.601593,-2.361593,HD135722
71 northern,Vul,Vulpecula,46.7540,77.7780,5.3953,1.1,Vul.png,-2.301593,-2.061593,-3.141593,HD131873
72 northern,CVn,Canes Venatici,-3.1198,5.7935,33.1368,1.3,CVn.png,0.148407,3.138407,0.428407,HD112413
73 southern,Cir,Circinus,11.4255,-11.6937,-1.3129,1.0,Cir.png,1.448407,-0.391593,-2.211593,HD128898
74 northern,Com,Coma Berenices,1.9257,-1.2062,12.2465,1.4,Com.png,3.138407,-0.051593,-2.711593,HD114378
75 southern,CrA,Corona Australis,146.1322,-4.7492,-53.7124,1.0,CrA.png,-3.141593,-2.021593,-3.141593,HD178345
76 northern,CrB,Corona Borealis,33.5737,32.0314,52.9729,1.3,CrB.png,-3.141593,-0.601593,-2.271593,HD143107
77 northern,Cas,Cassiopeia,-36.3073,59.4424,-7.6926,1.4,Cas.png,-1.431593,3.128407,-2.331593,HD3712
78 northern,Cep,Cepheus,-2.8178,14.4985,2.3848,1.7,Cep.png,-1.331593,-2.291593,-2.931593,HD203280
79 southern,Car,Carina Vela Puppis,14.1325,-188.6018,-42.2785,2.0,Car.png,2.078407,1.048407,-3.111593,HD71129
80 northern,Col,Columba,-11.2568,-20.5973,-11.9895,1.0,Col.png,2.518407,1.358407,-2.981593,HD39425
81 northern,Per,Perseus,-139.8202,79.8063,-16.2631,1.3,Per.png,-1.751593,2.428407,-2.411593,HD22928
82 northern,Oph,Ophiuchus,127.9419,14.0822,56.2015,3.2,Oph.png,2.178407,-0.781593,-1.681593,HD149757
83 southern,PsA,Piscis Austrinus,99.9977,47.6679,-199.6345,1.0,PsA.png,3.138407,-2.541593,-2.881593,HD214748
84 southern,Cru,Crux,49.3509,-85.0446,-0.6223,1.1,Cru.png,1.718407,0.048407,-2.741593,HD108248
85 southern,Pic,Pictor,-4.5417,-45.5649,-27.1768,1.0,Pic.png,2.568407,2.138407,-2.081593,HD39523

View File

@@ -4,9 +4,9 @@ local Keybindings = {
{
Key = "c",
Name = "Show Constellation Art",
Command = "openspace.setPropertyValue('Scene.Constellation Art*.Renderable.Opacity', 0);" ..
"openspace.setPropertyValue('Scene.Constellation Art*.Renderable.Enabled', true);" ..
"openspace.setPropertyValue('Scene.Constellation Art*.Renderable.Opacity', 0.1, 2);",
Command = "openspace.setPropertyValue('Scene.ConstellationArt*.Renderable.Opacity', 0);" ..
"openspace.setPropertyValue('Scene.ConstellationArt*.Renderable.Enabled', true);" ..
"openspace.setPropertyValue('Scene.ConstellationArt*.Renderable.Opacity', 0.1, 2);",
Documentation = "Enables and fades up constellation art work",
GuiPath = "/Rendering",
Local = false
@@ -14,7 +14,7 @@ local Keybindings = {
{
Key = "SHIFT+c",
Name = "Hide Constellation Art",
Command = "openspace.setPropertyValue('Scene.Constellation Art*.Renderable.Opacity', 0, 2);",
Command = "openspace.setPropertyValue('Scene.ConstellationArt*.Renderable.Opacity', 0, 2);",
Documentation = "Fades out constellation artwork",
GuiPath = "/Rendering",
Local = false
@@ -22,7 +22,7 @@ local Keybindings = {
{
Key = "CTRL+c",
Name = "Disable Constellation Art",
Command = "openspace.setPropertyValue('Scene.Constellation Art*.Renderable.Enabled', false);",
Command = "openspace.setPropertyValue('Scene.ConstellationArt*.Renderable.Enabled', false);",
Documentation = "Disable constellation artwork",
GuiPath = "/Rendering",
Local = false
@@ -36,3 +36,13 @@ end)
asset.onDeinitialize(function ()
scene_helper.unbindKeys(Keybindings)
end)
asset.meta = {
Name = "Constellation Image Keybinds",
Version = "1.0",
Description = "Keybinds for fading in and out the constellations",
Author = "OpenSpace Team",
URL = "http://openspaceproject.com",
License = "MIT License"
}

View File

@@ -35,6 +35,4 @@ local object = {
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { object })

View File

@@ -52,3 +52,15 @@ local MilkyWayVolumeGalaxy = {
local objects = { MilkyWayVolumeGalaxy }
assetHelper.registerSceneGraphNodesAndExport(asset, objects)
asset.meta = {
Name = "Milky Way Volume",
Version = "1.0",
Description = [[Volumetric rendering of Milky Way galaxy based on simulation from
NAOJ.]],
Author = "OpenSpace Team",
URL = "http://openspaceproject.com",
License = "MIT License",
Identifiers = "MilkyWayVolume"
}

View File

@@ -29,6 +29,7 @@ local OrionClusterStars = {
assetHelper.registerSceneGraphNodesAndExport(asset, { OrionClusterStars })
asset.meta = {
Name = "Orion Nebula Star Cluster",
Version = "1.0",
@@ -47,5 +48,6 @@ But the distance of each star has been derived from this educated-guess approach
cluster distribution. ]],
Author = "AMNH Digital Universe",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "custom"
License = "AMNH Digital Universe",
Identifiers = "OrionClusterStars"
}

View File

@@ -135,6 +135,7 @@ assetHelper.registerSceneGraphNodesAndExport(asset, {
OrionNebulaProplydsModel
})
asset.meta = {
Name = "Orion Nebula Model",
Version = "1.0",
@@ -153,5 +154,7 @@ think of an HII region as a sort of tremendous explosion, taking place over mill
and the bow shocks are part of the outward rush of material. ]],
Author = "AMNH Digital Universe",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "custom"
License = "AMNH Digital Universe",
Identifiers = "OrionNebulaModel,OrionNebulaModel,OrionNebulaProplydsModel,"..
"OrionNebulaShocksModel"
}

View File

@@ -40,6 +40,15 @@ local object = {
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { object })
asset.meta = {
Name = "Stars Denver",
Version = "1.0",
Description = [[Alternative Milky Way Atlas: based on HIPPARCOS and Yale Bright
Star catalogs]],
Author = "Ka chun Yu",
URL = "http://openspaceproject.com",
License = "Creative Commons Attribution-Share Alike 3.0 Unported"
}

View File

@@ -50,6 +50,14 @@ local Charon = {
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { Charon })
asset.meta = {
Name = "Charon",
Version = "1.0",
Description = [[ Charon globe with labels.]],
Author = "OpenSpace Team",
URL = "http://openspaceproject.com",
License = "MIT license"
}

View File

@@ -17,12 +17,26 @@ local CharonTrailBarycentric = {
Period = 6.38723,
Resolution = 1000
},
Tag = {
"moonTrail_solarSystem",
"moonTrail_dwarf",
"moonTrail_pluto",
"moonTrail_minor" },
GUI = {
Name = "Charon Barycentric Trail",
Path = "/Solar System/Dwarf Planets/Pluto"
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { CharonTrailBarycentric })
asset.meta = {
Name = "Charon Barycentric Trail",
Version = "1.0",
Description = [[ Trail of Charon as observed by Pluto Barycenter. Data from
NASA Spice (see base spice asset)]],
Author = "OpenSpace Team",
URL = "http://openspaceproject.com",
License = "MIT license"
}

View File

@@ -5,5 +5,16 @@ local colorLayer = asset.require(colorLayersPath .. "/greyscale_usgs")
-- Set enabled layers (temporary solution)
-- @TODO: do this using a boolean that's passed to the 'asset.require' instead
asset.onInitialize(function ()
openspace.setPropertyValueSingle("Scene.Charon.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true)
openspace.setPropertyValueSingle("Scene.Charon.Renderable.Layers.ColorLayers." ..
colorLayer.layer.Identifier .. ".Enabled", true)
end)
asset.meta = {
Name = "Default Charon Layers",
Version = "1.0",
Description = [[ Default Charon layers are: Black & White USGS]],
Author = "OpenSpace Team",
URL = "http://openspaceproject.com",
License = "MIT license"
}

View File

@@ -11,3 +11,22 @@ asset.onInitialize(function ()
end)
asset.export("layer", layer)
asset.meta = {
Name = "Charon Black & White & White [USGS]",
Version = "1.0",
Description = [[ Charon New Horizons LORRI MVIC Global Mosaic 300m v1. This detailed,
high-quality global mosaic of Plutos largest moon, Charon, was assembled from nearly
all of the highest-resolution images obtained by the Long-Range Reconnaissance Imager
(LORRI) and the Multispectral Visible Imaging Camera (MVIC) on New Horizons. The
mosaic is the most detailed and comprehensive global view yet of Charons surface
using New Horizons data. Standing out on Charon is an enormous trough at least 350
kilometers long, and reaching 14 kilometers deep more than seven times as deep as the
Grand Canyon. This mosaic is available in equirectangular projection at an equatorial
pixel scale of 300 meters per pixel (m). (Description from URL)]],
Author = "USGS",
URL = "https://astrogeology.usgs.gov/search/map/Charon/NewHorizons/" ..
"Charon_NewHorizons_Global_Mosaic_300m_Jul2017",
License = "NASA/PDS"
}

View File

@@ -5,5 +5,16 @@ local colorLayer = asset.require(colorLayersPath .. "/greyscale_usgs")
-- Set enabled layers (temporary solution)
-- @TODO: do this using a boolean that's passed to the 'asset.require' instead
asset.onInitialize(function ()
openspace.setPropertyValueSingle("Scene.Pluto.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true)
openspace.setPropertyValueSingle("Scene.Pluto.Renderable.Layers.ColorLayers." ..
colorLayer.layer.Identifier .. ".Enabled", true)
end)
asset.meta = {
Name = "Default Pluto Layers",
Version = "1.0",
Description = [[ Default Pluto layers are: Black & White USGS]],
Author = "OpenSpace Team",
URL = "http://openspaceproject.com",
License = "MIT license"
}

View File

@@ -12,3 +12,13 @@ local PlutoKernels = {
}
asset.export("PlutoKernels", PlutoKernels)
asset.meta = {
Name = "Pluto Spice Kernels",
Version = "1.0",
Description = [[ Generic SPICE kernels for Pluto.]],
Author = "OpenSpace Team",
URL = "https://naif.jpl.nasa.gov/pub/naif/pds/wgc/kernels/spk/",
License = "NASA"
}

View File

@@ -11,3 +11,25 @@ asset.onInitialize(function ()
end)
asset.export("layer", layer)
asset.meta = {
Name = "Pluto Black & White & White [USGS]",
Version = "1.0",
Description = [[ This detailed, high-quality global mosaic of Pluto was assembled from
nearly all of the highest-resolution images obtained by the Long-Range
Reconnaissance Imager (LORRI) and the Multispectral Visible Imaging Camera (MVIC)
on New Horizons.The mosaic is the most detailed and comprehensive global view yet
of Plutos surface using New Horizons data. It includes topography data of the
hemisphere visible to New Horizons during the spacecrafts closest approach. The
topography is derived from digital stereo-image mapping tools that measure the
parallax or the difference in the apparent relative positions of features on
the surface obtained at different viewing angles during the encounter. Scientists
use these parallax displacements of high and low terrain to estimate landform
heights.The mosaic is available in Equirectangular projection at an equatorial
pixel scale of 300 meters per pixel (m). (Description from URL)]],
Author = "USGS",
URL = "https://astrogeology.usgs.gov/search/map/Pluto/NewHorizons/" ..
"Pluto_NewHorizons_Global_Mosaic_300m_Jul2017",
License = "NASA/PDS"
}

View File

@@ -21,6 +21,7 @@ local Hydra = {
SegmentsPerPatch = 64,
Layers = {}
},
Tag = { "moon_solarSystem", "moon_dwarf", "moon_pluto" },
GUI = {
Path = "/Solar System/Dwarf Planets/Pluto"
}
@@ -40,12 +41,26 @@ local HydraTrail = {
Period = 38.20177,
Resolution = 1000
},
Tag = {
"moonTrail_solarSystem",
"moonTrail_dwarf",
"moonTrail_pluto",
"moonTrail_minor" },
GUI = {
Name = "Hydra Trail",
Path = "/Solar System/Dwarf Planets/Pluto"
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { Hydra, HydraTrail })
asset.meta = {
Name = "Hydra",
Version = "1.0",
Description = [[ Globe and trail for Pluto's moon Hydra. Data from
NASA Spice (see base spice asset)]],
Author = "OpenSpace Team",
URL = "http://openspaceproject.com",
License = "MIT license"
}

View File

@@ -21,6 +21,7 @@ local Kerberos = {
SegmentsPerPatch = 64,
Layers = {}
},
Tag = { "moon_solarSystem", "moon_dwarf", "moon_pluto" },
GUI = {
Path = "/Solar System/Dwarf Planets/Pluto"
}
@@ -40,12 +41,26 @@ local KerberosTrail = {
Period = 32.16756,
Resolution = 1000
},
Tag = {
"moonTrail_solarSystem",
"moonTrail_dwarf",
"moonTrail_pluto",
"moonTrail_minor" },
GUI = {
Name = "Hydra Trail",
Path = "/Solar System/Dwarf Planets/Pluto"
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { Kerberos, KerberosTrail })
asset.meta = {
Name = "Kerberos",
Version = "1.0",
Description = [[ Globe and trail for Pluto's moon Kerberos. Data from
NASA Spice (see base spice asset)]],
Author = "OpenSpace Team",
URL = "http://openspaceproject.com",
License = "MIT license"
}

View File

@@ -21,6 +21,7 @@ local Nix = {
SegmentsPerPatch = 64,
Layers = {}
},
Tag = { "moon_solarSystem", "moon_dwarf", "moon_pluto" },
GUI = {
Path = "/Solar System/Dwarf Planets/Pluto"
}
@@ -40,12 +41,26 @@ local NixTrail = {
Period = 24.85463,
Resolution = 1000
},
Tag = {
"moonTrail_solarSystem",
"moonTrail_dwarf",
"moonTrail_pluto",
"moonTrail_minor" },
GUI = {
Name = "Nix Trail",
Path = "/Solar System/Dwarf Planets/Pluto"
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { Nix, NixTrail })
asset.meta = {
Name = "Nix",
Version = "1.0",
Description = [[ Globe and trail for Pluto's moon Nix. Data from
NASA Spice (see base spice asset)]],
Author = "OpenSpace Team",
URL = "http://openspaceproject.com",
License = "MIT license"
}

View File

@@ -21,6 +21,7 @@ local Styx = {
SegmentsPerPatch = 64,
Layers = {}
},
Tag = { "moon_solarSystem", "moon_dwarf", "moon_pluto" },
GUI = {
Path = "/Solar System/Dwarf Planets/Pluto"
}
@@ -40,12 +41,26 @@ local StyxTrail = {
Period = 20.16155,
Resolution = 1000
},
Tag = {
"moonTrail_solarSystem",
"moonTrail_dwarf",
"moonTrail_pluto",
"moonTrail_minor" },
GUI = {
Name = "Styx Trail",
Path = "/Solar System/Dwarf Planets/Pluto"
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { Styx, StyxTrail })
asset.meta = {
Name = "Styx",
Version = "1.0",
Description = [[ Globe and trail for Pluto's moon Styx. Data from
NASA Spice (see base spice asset)]],
Author = "OpenSpace Team",
URL = "http://openspaceproject.com",
License = "MIT license"
}

View File

@@ -72,3 +72,13 @@ local PlutoLabel = {
}
assetHelper.registerSceneGraphNodesAndExport(asset, { Pluto, PlutoLabel })
asset.meta = {
Name = "Pluto",
Version = "1.0",
Description = [[ Pluto globe, and main planet label.]],
Author = "OpenSpace Team",
URL = "http://openspaceproject.com",
License = "MIT license"
}

View File

@@ -17,12 +17,22 @@ local PlutoTrailBarycentric = {
Period = 6.38723,
Resolution = 1000
},
Tag = { "planetTrail_solarSystem", "planetTrail_dwarf" },
GUI = {
Name = "Pluto Barycentric Trail",
Path = "/Solar System/Dwarf Planets/Pluto"
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { PlutoTrailBarycentric })
asset.meta = {
Name = "Pluto Barycentric Trail",
Version = "1.0",
Description = [[ Trail of Pluto as observed by it's Barrycenter. Data from
NASA Spice (see base spice asset)]],
Author = "OpenSpace Team",
URL = "http://openspaceproject.com",
License = "MIT license"
}

View File

@@ -8,3 +8,13 @@ asset.require('./minor/kerberos')
asset.require('./minor/nix')
asset.require('./minor/styx')
asset.meta = {
Name = "Pluto System",
Version = "1.0",
Description = [[ Meta asset for the Pluto system, containing : Pluto, Pluto Trail,
Charon, Charon Trail, Hydra, Kerberos, Nix, and Styx]],
Author = "OpenSpace Team",
URL = "http://openspaceproject.com",
License = "MIT license"
}

View File

@@ -27,6 +27,15 @@ local PlutoBarycenterTrail = {
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { PlutoBarycenterTrail })
asset.meta = {
Name = "Pluto Barycenter Trail",
Version = "1.0",
Description = [[ Trail of Pluto as observed by the Sun. Data from
NASA Spice (see base spice asset)]],
Author = "OpenSpace Team",
URL = "http://openspaceproject.com",
License = "MIT license"
}

View File

@@ -22,6 +22,14 @@ local PlutoBarycenter = {
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { PlutoBarycenter })
asset.meta = {
Name = "Pluto Transforms",
Version = "1.0",
Description = [[ Pluto Barycenter transform]],
Author = "OpenSpace Team",
URL = "http://openspaceproject.com",
License = "MIT license"
}

View File

@@ -23,7 +23,7 @@ local C2019Q4BorisovTrail = {
SampleInterval = 60 * 60 * 24 * 7
},
GUI = {
Name = "C-2019 Q4 Borisov Trail",
Name = "C/2019 Q4 Borisov Trail",
Path = "/Solar System/Interstellar"
}
}
@@ -38,9 +38,23 @@ local C2019Q4BorisovPosition = {
},
},
GUI = {
Name = "C-2019 Q4 Borisov",
Name = "C/2019 Q4 Borisov",
Path = "/Solar System/Interstellar"
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { C2019Q4BorisovPosition, C2019Q4BorisovTrail })
asset.meta = {
Name = "C/2019 Q4 Borisov",
Version = "1.0",
Description = [[ This asset contains the trail
and position of C-2019 Q4 Borisov from 2015 JAN 01 00:00:00
to 2024 JAN 01 00:00:00. Data from JPL Horizons']],
Author = "OpenSpace Team",
URL = "https://ssd.jpl.nasa.gov/horizons.cgi",
License = [[ JPL-authored documents are sponsored by NASA under Contract
NAS7-030010. All documents available from this server may be protected
under the U.S. and Foreign Copyright Laws."]]
}

View File

@@ -45,3 +45,14 @@ local OumuamuaPosition = {
}
assetHelper.registerSceneGraphNodesAndExport(asset, { OumuamuaPosition, OumuamuaTrail })
asset.meta = {
Name = "'Oumuamua",
Version = "1.0",
Description = [[ This asset contains the trail and position of 'Oumuamua from 2014
JAN 01 00:00:00 to 2023 JAN 01 00:00:00. Data from JPL Horizons']],
Author = "OpenSpace Team",
URL = "https://ssd.jpl.nasa.gov/horizons.cgi",
License = "NASA"
}

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)
@@ -220,7 +220,6 @@ local Apollo11LemLandedModel = {
}
}
local exportList = {
Apollo11Position,
Apollo11LemPosition,

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)
},

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
-- },
@@ -110,6 +110,4 @@ for k,v in pairs(model_part) do
table.insert(list, v)
end
assetHelper.registerSceneGraphNodesAndExport(asset, list)

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,

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,

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,

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)

View File

@@ -55,6 +55,4 @@ local Ceres = {
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { Ceres })

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 = {

View File

@@ -5,4 +5,4 @@ local Kernels = asset.syncedResource({
Version = 2
})
asset.export("Kernels", Kernels)
asset.export("Kernels", Kernels)

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,
@@ -136,5 +136,4 @@ local VestaTrail = {
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { Vesta, VestaTrail })

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",

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,
},

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)
},
@@ -197,6 +197,4 @@ local JunoTrail = {
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { Juno, JunoTrail })

View File

@@ -1,6 +1,6 @@
-- mercurymagnetosphere.asset
local assetHelper = asset.require('util/asset_helper')
local mercuryTransforms = asset.require('scene/solarsystem/planets/mercury/transforms')
local localFolder = asset.syncedResource({
Name = "Mercury Magnetosphere",
@@ -15,7 +15,7 @@ local MercuryRadius = 2.4397E6
local Magnetosphere = {
Name = "Mercury Magnetosphere",
Identifier = "MercuryMagnetosphere",
Parent = "MercuryBarycenter",
Parent = mercuryTransforms.MercuryBarycenter.Identifier,
SceneRadius = 0.8E+5,
Renderable = {
Type = "RenderableTimeVaryingVolume",

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
},

View File

@@ -368,8 +368,6 @@ local Rex = {
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, {
Lorri,
RalphLeisa,

View File

@@ -41,8 +41,6 @@ local PlutoKernels = {
Kernels .. "/NavSE_plu047_od122.bsp"
}
asset.export("Kernels", Kernels)
asset.export("NewHorizonsKernels", NewHorizonsKernels)
asset.export("PlutoKernels", PlutoKernels)

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 = {
@@ -26,6 +26,4 @@ local Labels = {
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { Labels })

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,
@@ -50,8 +50,6 @@ local NewHorizons = {
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { NewHorizons })
asset.export("NewHorizonsTextures", textures)
asset.export("NewHorizonsModels", models)

View File

@@ -29,8 +29,6 @@ local TrailAtPluto = {
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, {
TrailAtPluto
})

View File

@@ -46,8 +46,6 @@ local NewHorizonsPosition = {
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, {
PlutoBarycenterAccurate,
NewHorizonsPosition

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",
@@ -111,5 +111,4 @@ local BennuTrail = {
}
assetHelper.registerSceneGraphNodesAndExport(asset, { Bennu, BennuTrail })

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 = {
@@ -334,8 +334,6 @@ local RexisFov = {
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, {
OsirisRex,
PolyCam,

View File

@@ -15,4 +15,4 @@ end)
asset.onDeinitialize(function ()
openspace.scriptScheduler.clear()
end)
end)

View File

@@ -71,8 +71,6 @@ local OsirisRexTrailBennu = {
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, {
OsirisRexTrailEarth,
OsirisRexTrailSolarSystem,

View File

@@ -21,6 +21,4 @@ local BennuBarycenter = {
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { BennuBarycenter })

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
},

View File

@@ -1,5 +1,3 @@
--perseverance.asset
asset.require('./model')
asset.require('./trail')

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"

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"

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)

Some files were not shown because too many files have changed in this diff Show More