Fix some small issues

This commit is contained in:
Malin Ejdbo
2021-06-11 08:45:38 +02:00
parent a2651296cf
commit 4dce07032a
13 changed files with 13 additions and 20 deletions
@@ -14,7 +14,7 @@ asset.export("layer", layer)
asset.meta = { asset.meta = {
Name = "Charon Black & White & White [USGS]", Name = "Charon Black & White [USGS]",
Version = "1.0", Version = "1.0",
Description = [[ Charon New Horizons LORRI MVIC Global Mosaic 300m v1. This detailed, 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 high-quality global mosaic of Plutos largest moon, Charon, was assembled from nearly
@@ -14,7 +14,7 @@ asset.export("layer", layer)
asset.meta = { asset.meta = {
Name = "Pluto Black & White & White [USGS]", Name = "Pluto Black & White [USGS]",
Version = "1.0", Version = "1.0",
Description = [[ This detailed, high-quality global mosaic of Pluto was assembled from Description = [[ This detailed, high-quality global mosaic of Pluto was assembled from
nearly all of the highest-resolution images obtained by the Long-Range nearly all of the highest-resolution images obtained by the Long-Range
@@ -35,7 +35,7 @@ assetHelper.registerSceneGraphNodesAndExport(asset, { PlutoBarycenterTrail })
asset.meta = { asset.meta = {
Name = "Pluto Barycenter Trail", Name = "Pluto Barycenter Trail",
Version = "1.0", Version = "1.0",
Description = [[ Trail of Pluto as observed by the Sun. Data from Description = [[ Trail of Pluto Barycenter as observed by the Sun. Data from
NASA Spice (see base spice asset)]], NASA Spice (see base spice asset)]],
Author = "OpenSpace Team", Author = "OpenSpace Team",
URL = "http://openspaceproject.com", URL = "http://openspaceproject.com",
@@ -37,7 +37,7 @@ local LightSources = {
Node = sunTransforms.SolarSystemBarycenter.Identifier, Node = sunTransforms.SolarSystemBarycenter.Identifier,
Intensity = 1.0 Intensity = 1.0
}, },
{ {
Identifier = "Camera", Identifier = "Camera",
Type = "CameraLightSource", Type = "CameraLightSource",
Intensity = 0.5 Intensity = 0.5
@@ -1,5 +1,5 @@
local LabelsPath = asset.syncedResource({ local LabelsPath = asset.syncedResource({
Name = "Callisto Labels", Name = "Jupiter Labels",
Type = "HttpSynchronization", Type = "HttpSynchronization",
Identifier = "jupiter_labels", Identifier = "jupiter_labels",
Version = 1 Version = 1
@@ -36,7 +36,7 @@ asset.meta = {
Author = "OpenSpace Team", Author = "OpenSpace Team",
URL = "http://openspaceproject.com", URL = "http://openspaceproject.com",
License = "MIT license", License = "MIT license",
Identifiers = {"VenusTrailEarth"} Identifiers = {"JupiterTrailEarth"}
} }
assetHelper.registerSceneGraphNodesAndExport(asset, { JupiterTrailEarth }) assetHelper.registerSceneGraphNodesAndExport(asset, { JupiterTrailEarth })
@@ -2,7 +2,7 @@ asset.require('./triton')
asset.meta = { asset.meta = {
Name = "Neptune Minor Moons", Name = "Neptune Major Moons",
Version = "1.0", Version = "1.0",
Description = [[ Meta asset containing Neptune's major moon: Triton]], Description = [[ Meta asset containing Neptune's major moon: Triton]],
Author = "OpenSpace Team", Author = "OpenSpace Team",
@@ -40,5 +40,5 @@ asset.meta = {
Author = "OpenSpace Team", Author = "OpenSpace Team",
URL = "http://openspaceproject.com", URL = "http://openspaceproject.com",
License = "MIT license", License = "MIT license",
Identifiers = {"VenusTrailEarth"} Identifiers = {"NeptuneTrailEarth"}
} }
@@ -1,5 +1,5 @@
local LabelsPath = asset.syncedResource({ local LabelsPath = asset.syncedResource({
Name = "Dione Labels", Name = "Saturn Labels",
Type = "HttpSynchronization", Type = "HttpSynchronization",
Identifier = "saturn_labels", Identifier = "saturn_labels",
Version = 1 Version = 1
@@ -37,8 +37,8 @@ asset.meta = {
Author = "OpenSpace Team", Author = "OpenSpace Team",
URL = "http://openspaceproject.com", URL = "http://openspaceproject.com",
License = "MIT license", License = "MIT license",
Identifiers = {"VenusTrailEarth"} Identifiers = {"SaturnTrailEarth"}
} }
assetHelper.registerSceneGraphNodesAndExport(asset, { UranusTrailEarth }) assetHelper.registerSceneGraphNodesAndExport(asset, { SaturnTrailEarth })
@@ -40,5 +40,5 @@ asset.meta = {
Author = "OpenSpace Team", Author = "OpenSpace Team",
URL = "http://openspaceproject.com", URL = "http://openspaceproject.com",
License = "MIT license", License = "MIT license",
Identifiers = {"VenusTrailEarth"} Identifiers = {"UranusTrailEarth"}
} }
@@ -18,13 +18,6 @@ local SunGlare = {
Opacity = 0.65, Opacity = 0.65,
RenderableType = "PreDeferredTransparency" RenderableType = "PreDeferredTransparency"
}, },
Transform = {
Translation = {
Type = "SpiceTranslation",
Target = "SSB",
Observer = "SSB"
}
},
GUI = { GUI = {
Name = "Sun Glare", Name = "Sun Glare",
Path = "/Solar System/Sun", Path = "/Solar System/Sun",
@@ -682,7 +682,7 @@ void AtmosphereDeferredcaster::loadComputationPrograms() {
); );
} }
_irradianceSupTermsProgramObject->setIgnoreUniformLocationError(IgnoreError::Yes); _irradianceSupTermsProgramObject->setIgnoreUniformLocationError(IgnoreError::Yes);
// //
// InScattering S // InScattering S
if (!_inScatteringProgramObject) { if (!_inScatteringProgramObject) {