mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-04-26 05:58:48 -05:00
Merged develop into NewAtmosphere branch.
This commit is contained in:
@@ -126,19 +126,16 @@ return {
|
||||
Name = "JunoTrail",
|
||||
Parent = "JupiterBarycenter",
|
||||
Renderable = {
|
||||
Type = "RenderableTrail",
|
||||
Body = "JUNO",
|
||||
Frame = "GALACTIC",
|
||||
Observer = "JUPITER BARYCENTER",
|
||||
RGB = { 0.70,0.50,0.20 },
|
||||
TropicalOrbitPeriod = 394250.0,
|
||||
EarthOrbitRatio = 4.5,
|
||||
DayLength = 9.9259,
|
||||
TimeStamps = false,
|
||||
Textures = {
|
||||
Type = "simple",
|
||||
Color = "textures/glare_blue.png",
|
||||
},
|
||||
Type = "RenderableTrailTrajectory",
|
||||
Translation = {
|
||||
Type = "SpiceTranslation",
|
||||
Body = "JUNO",
|
||||
Observer = "JUPITER BARYCENTER"
|
||||
},
|
||||
Color = { 0.70, 0.50, 0.20 },
|
||||
StartTime = "2016 JUN 28",
|
||||
EndTime = "2016 APR 01",
|
||||
SampleInterval = 3600
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
@@ -61,7 +61,7 @@ return {
|
||||
"sun",
|
||||
"mercury",
|
||||
"venus",
|
||||
"lodglobes/lodearth",
|
||||
"lodglobes/earth",
|
||||
"moon",
|
||||
"mars",
|
||||
"jupiter",
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
var levels = ['debug', 'info', 'warning', 'error', 'fatal'];
|
||||
var levels = ['trace', 'debug', 'info', 'warning', 'error', 'fatal'];
|
||||
var filterLevel = 0;
|
||||
|
||||
function insertAfter(newNode, referenceNode) {
|
||||
|
||||
@@ -27,6 +27,15 @@ label {
|
||||
margin-right: 0.5em;
|
||||
}
|
||||
|
||||
.log-level-trace {
|
||||
color: #eeeeee;
|
||||
background-color: #aaaaaa;
|
||||
border-bottom: 1px solid #eaeaea;
|
||||
}
|
||||
.log-level-trace td:first-child {
|
||||
border-left: 10px solid #eaeaea;
|
||||
}
|
||||
|
||||
.log-level-debug {
|
||||
background-color: #bbdda9;
|
||||
border-bottom: 1px solid #7bc142;
|
||||
|
||||
Reference in New Issue
Block a user