Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
OpenSpace
Commits
d918648c
Unverified
Commit
d918648c
authored
3 years ago
by
Malin E
Committed by
GitHub
3 years ago
Browse files
Options
Download
Plain Diff
Merge pull request #2068 from OpenSpace/issue/2055
Issue/2055
parents
9715d22a
43d52b4e
thesis/2022/streaming
feature/WSA
feature/arrow-renderable
feature/asset-require
feature/atmosphere-stars-rendering
feature/change-renderbin-runtime
feature/compile-times
feature/direction-hint-renderable
feature/du-meshes-selection
feature/gamma-correction
feature/geojson
feature/getting-started-tour
feature/grid-labels
feature/grids-update
feature/gui-mouseinteraction-fix
feature/horizons-unit-tests
feature/imageTestKeys2Actions
feature/jenkins-timeout
feature/jwst-trail-update
feature/labels-rendering
feature/model-opacity
feature/molecule_rendering
feature/properties-visibility
feature/renderable-enabled-event
feature/satellites
feature/saturn-shepherd-moons
feature/skybrowser-cleanup
feature/skybrowser-drag-and-drop
feature/skybrowser-reload
feature/ubuntu2204
feature/various-changes
feature/video-on-globe
feature/xbox-update
issue/1479
issue/1607
issue/1827
issue/2029
issue/2093
issue/2111
issue/2118
issue/2121
issue/2127
issue/2133
issue/2137
issue/2194
issue/2207
issue/2209
issue/2212
issue/2236
issue/2259
issue/2261
issue/2266
issue/2269
jenkins/2286
project/2021-wisdome-installation
project/exoplanet-explorer
project/exoplanets-expert-tool
rc/0.18.1
thesis/2020/sonification
thesis/2022/climate
thesis/2022/cosmic-view
thesis/2022/fieldline-rendering
thesis/2022/software-integration
thesis/2022/software-integration_receive-ra-dec
releases/v0.18.0
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
data/assets/scene/solarsystem/missions/insight/edl.asset
+1
-1
data/assets/scene/solarsystem/missions/insight/edl.asset
data/assets/scene/solarsystem/missions/perseverance/model.asset
+1
-1
...ssets/scene/solarsystem/missions/perseverance/model.asset
data/assets/scene/solarsystem/missions/perseverance/trail.asset
+3
-3
...ssets/scene/solarsystem/missions/perseverance/trail.asset
with
5 additions
and
5 deletions
+5
-5
data/assets/scene/solarsystem/missions/insight/edl.asset
+
1
-
1
View file @
d918648c
...
...
@@ -151,7 +151,7 @@ local RotationKeyframes = {
local InsightParent = {
Identifier = "InsightParent",
Parent = mars.Identifier,
Parent = mars.
Mars.
Identifier,
Transform = {
Translation ={
Type = "TimelineTranslation",
...
...
This diff is collapsed.
Click to expand it.
data/assets/scene/solarsystem/missions/perseverance/model.asset
+
1
-
1
View file @
d918648c
...
...
@@ -3,7 +3,7 @@ local marsTransforms = asset.require("scene/solarsystem/planets/mars/transforms"
local sun = asset.require("scene/solarsystem/sun/sun")
local models = asset.syncedResource({
Name = "
Mars 2020 Kern
el
s
",
Name = "
Perseverance Mod
el",
Type = "HttpSynchronization",
Identifier = "perseverance_models",
Version = 2
...
...
This diff is collapsed.
Click to expand it.
data/assets/scene/solarsystem/missions/perseverance/trail.asset
+
3
-
3
View file @
d918648c
...
...
@@ -48,7 +48,7 @@ local PerseveranceNode = {
TimeFrame = {
Type = "TimeFrameInterval",
Start = "2020 JUL 30 12:52:43.643",
End = "2021 FEB 18 20:4
4:58.82
8"
End = "2021 FEB 18 20:4
3:4
8"
}
}
...
...
@@ -83,12 +83,12 @@ local PerseveranceTrailMars = {
Translation = {
Type = "SpiceTranslation",
Target = perseverance_id,
Observer = "MARS",
Observer = "MARS
BARYCENTER
",
Kernels = m2020_kernels
},
Color = { 0.7, 0.9, 0.6 },
StartTime = approachMars,
EndTime =
endTime
,
EndTime =
"2021 FEB 18 20:43:48"
,
SampleInterval = 100,
Enabled = false
},
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help