mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-18 02:49:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/documentation-cleanup

Browse Source
This commit is contained in:
Ylva Selling
2023-04-25 17:45:57 -04:00
parent 3ad2d35cb4 d13dcb714e
commit a20b69fbb2
22 changed files with 64 additions and 4278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/OpenSpace/ext/sgct

Submodule apps/OpenSpace/ext/sgct updated: 92ca9e7811...476c11ae10

35
data/assets/scene/solarsystem/missions/messenger/messengerSC.asset
View File

@@ -92,12 +92,7 @@ local MessengerProbeBlack = {
GeometryFile = models .. "MessengerProbe_black.obj",
ModelTransform = RotationMatrix,
LightSources = {
sun.LightSource,
{
Identifier = "Camera",
Type = "CameraLightSource",
Intensity = 0.5
}
sun.LightSource
}
},
GUI = {
@@ -114,12 +109,7 @@ local MessengerProbeFoil = {
GeometryFile = models .. "MessengerProbe_foil.obj",
ModelTransform = RotationMatrix,
LightSources = {
sun.LightSource,
{
Identifier = "Camera",
Type = "CameraLightSource",
Intensity = 0.5
}
sun.LightSource
}
},
GUI = {
@@ -136,12 +126,7 @@ local MessengerProbeHeatShield = {
GeometryFile = models .. "MessengerProbe_heatShield.obj",
ModelTransform = RotationMatrix,
LightSources = {
sun.LightSource,
{
Identifier = "Camera",
Type = "CameraLightSource",
Intensity = 0.5
}
sun.LightSource
}
},
GUI = {
@@ -158,12 +143,7 @@ local MessengerProbeMetal = {
GeometryFile = models .. "MessengerProbe_metal.obj",
ModelTransform = RotationMatrix,
LightSources = {
sun.LightSource,
{
Identifier = "Camera",
Type = "CameraLightSource",
Intensity = 0.5
}
sun.LightSource
}
},
GUI = {
@@ -180,12 +160,7 @@ local MessengerProbePanels = {
GeometryFile = models .. "MessengerProbe_panels.obj",
ModelTransform = RotationMatrix,
LightSources = {
sun.LightSource,
{
Identifier = "Camera",
Type = "CameraLightSource",
Intensity = 0.5
}
sun.LightSource
}
},
GUI = {

2
data/assets/scene/solarsystem/missions/newhorizons/trail.asset
View File

@@ -17,7 +17,7 @@ local TrailAtPluto = {
StartTime = "2015 JUL 07 12:00:00",
EndTime = "2015 JUL 17 12:00:00",
PointSize = 5,
SampleInterval = 3600,
SampleInterval = 100,
TimeStampSubsampleFactor = 4,
EnableFade = false,
Rendering = "Lines+Points"

29
data/assets/spice/base.asset
View File

@@ -1,4 +1,18 @@
local syncedDirectory = asset.syncedResource({
local lsk = asset.syncedResource({
Name = "General LSK Kernels",
Type = "HttpSynchronization",
Identifier = "general_lsk",
Version = 1
})
local pck = asset.syncedResource({
Name = "General PCK Kernels",
Type = "HttpSynchronization",
Identifier = "general_pck",
Version = 1
})
local spk = asset.syncedResource({
Name = "General SPK Kernels",
Type = "HttpSynchronization",
Identifier = "general_spk",
@@ -6,10 +20,9 @@ local syncedDirectory = asset.syncedResource({
})
local kernels = {
asset.localResource("naif0012.tls"),
-- Leapseconds:
asset.localResource("pck00010.tpc"),
syncedDirectory .. "de430.bsp"
lsk .. "naif0012.tls",
pck .. "pck00011.tpc",
spk .. "de430.bsp"
}
asset.onInitialize(function()
@@ -27,9 +40,9 @@ end)
asset.meta = {
Name = "SPICE Base",
Version = "1.0",
Description = [[This asset contains the spice base kernels. With positions for Solar
System bodies from 1850 to 2150]],
Version = "1.1",
Description = [[This asset contains the spice base kernels necessary for any space
application. Includes positions for Solar System bodies from 1850 to 2150]],
Author = "OpenSpace Team",
URL = "https://naif.jpl.nasa.gov/naif/data_generic.html",
License = "NASA"

152
data/assets/spice/naif0012.tls
View File

@@ -1,152 +0,0 @@
KPL/LSK
LEAPSECONDS KERNEL FILE
===========================================================================
Modifications:
--------------
2016, Jul. 14 NJB Modified file to account for the leapsecond that
will occur on December 31, 2016.
2015, Jan. 5 NJB Modified file to account for the leapsecond that
will occur on June 30, 2015.
2012, Jan. 5 NJB Modified file to account for the leapsecond that
will occur on June 30, 2012.
2008, Jul. 7 NJB Modified file to account for the leapsecond that
will occur on December 31, 2008.
2005, Aug. 3 NJB Modified file to account for the leapsecond that
will occur on December 31, 2005.
1998, Jul 17 WLT Modified file to account for the leapsecond that
will occur on December 31, 1998.
1997, Feb 22 WLT Modified file to account for the leapsecond that
will occur on June 30, 1997.
1995, Dec 14 KSZ Corrected date of last leapsecond from 1-1-95
to 1-1-96.
1995, Oct 25 WLT Modified file to account for the leapsecond that
will occur on Dec 31, 1995.
1994, Jun 16 WLT Modified file to account for the leapsecond on
June 30, 1994.
1993, Feb. 22 CHA Modified file to account for the leapsecond on
June 30, 1993.
1992, Mar. 6 HAN Modified file to account for the leapsecond on
June 30, 1992.
1990, Oct. 8 HAN Modified file to account for the leapsecond on
Dec. 31, 1990.
Explanation:
------------
The contents of this file are used by the routine DELTET to compute the
time difference
[1] DELTA_ET = ET - UTC
the increment to be applied to UTC to give ET.
The difference between UTC and TAI,
[2] DELTA_AT = TAI - UTC
is always an integral number of seconds. The value of DELTA_AT was 10
seconds in January 1972, and increases by one each time a leap second
is declared. Combining [1] and [2] gives
[3] DELTA_ET = ET - (TAI - DELTA_AT)
= (ET - TAI) + DELTA_AT
The difference (ET - TAI) is periodic, and is given by
[4] ET - TAI = DELTA_T_A + K sin E
where DELTA_T_A and K are constant, and E is the eccentric anomaly of the
heliocentric orbit of the Earth-Moon barycenter. Equation [4], which ignores
small-period fluctuations, is accurate to about 0.000030 seconds.
The eccentric anomaly E is given by
[5] E = M + EB sin M
where M is the mean anomaly, which in turn is given by
[6] M = M + M t
0 1
where t is the number of ephemeris seconds past J2000.
Thus, in order to compute DELTA_ET, the following items are necessary.
DELTA_TA
K
EB
M0
M1
DELTA_AT after each leap second.
The numbers, and the formulation, are taken from the following sources.
1) Moyer, T.D., Transformation from Proper Time on Earth to
Coordinate Time in Solar System Barycentric Space-Time Frame
of Reference, Parts 1 and 2, Celestial Mechanics 23 (1981),
33-56 and 57-68.
2) Moyer, T.D., Effects of Conversion to the J2000 Astronomical
Reference System on Algorithms for Computing Time Differences
and Clock Rates, JPL IOM 314.5--942, 1 October 1985.
The variable names used above are consistent with those used in the
Astronomical Almanac.
\begindata
DELTET/DELTA_T_A = 32.184
DELTET/K = 1.657D-3
DELTET/EB = 1.671D-2
DELTET/M = ( 6.239996D0 1.99096871D-7 )
DELTET/DELTA_AT = ( 10, @1972-JAN-1
11, @1972-JUL-1
12, @1973-JAN-1
13, @1974-JAN-1
14, @1975-JAN-1
15, @1976-JAN-1
16, @1977-JAN-1
17, @1978-JAN-1
18, @1979-JAN-1
19, @1980-JAN-1
20, @1981-JUL-1
21, @1982-JUL-1
22, @1983-JUL-1
23, @1985-JUL-1
24, @1988-JAN-1
25, @1990-JAN-1
26, @1991-JAN-1
27, @1992-JUL-1
28, @1993-JUL-1
29, @1994-JUL-1
30, @1996-JAN-1
31, @1997-JUL-1
32, @1999-JAN-1
33, @2006-JAN-1
34, @2009-JAN-1
35, @2012-JUL-1
36, @2015-JUL-1
37, @2017-JAN-1 )
\begintext

4061
data/assets/spice/pck00010.tpc
View File

File diff suppressed because it is too large Load Diff

2
data/assets/util/webgui.asset
View File

@@ -3,7 +3,7 @@ asset.require("./static_server")
local guiCustomization = asset.require("customization/gui")
-- Select which commit hashes to use for the frontend and backend
local frontendHash = "aaca14dffeb9aed1163c01651e2a6c3c5a01d2ec"
local frontendHash = "7fc3d9550dbdf64740519c7c5d7fc8e5385b7191"
local dataProvider = "data.openspaceproject.com/files/webgui"
local frontend = asset.syncedResource({

26
data/profiles/jwst.profile
View File

@@ -21,19 +21,19 @@
"aim": "",
"anchor": "JWSTModel",
"frame": "Root",
"yaw": -0.005731,
"pitch": -0.001656,
"type": "setNavigationState",
"position": {
"x": 30.188156,
"y": -9.477188,
"z": -9.203491
},
"type": "setNavigationState",
"up": {
"x": 0.361587,
"y": 0.893643,
"z": 0.265813
}
},
"yaw": -0.005731
},
"delta_times": [
1.0,
@@ -238,11 +238,6 @@
"type": "setPropertyValueSingle",
"value": "900"
},
{
"name": "Scene.Earth.Renderable.Layers.ColorLayers.Terra_Modis_Temporal.Enabled",
"type": "setPropertyValueSingle",
"value": "true"
},
{
"name": "Scene.Earth.Renderable.Layers.ColorLayers.ESRI_VIIRS_Combo.Enabled",
"type": "setPropertyValueSingle",
@@ -252,14 +247,25 @@
"name": "Scene.ISS_trail.Renderable.Enabled",
"type": "setPropertyValueSingle",
"value": "false"
},
{
"name": "",
"type": "setPropertyValueSingle",
"value": ""
},
{
"name": "Scene.Earth.Renderable.Layers.ColorLayers.VIIRS_NOAA20_Temporal.Enabled",
"type": "setPropertyValueSingle",
"value": "true"
}
],
"time": {
"is_paused": false,
"type": "absolute",
"value": "2021-12-25T12:50:01"
},
"version": {
"major": 1,
"minor": 1
"minor": 2
}
}
}

BIN
data/test.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 798 KiB

After

Width:  |  Height:  |  Size: 59 KiB

BIN
data/test2.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 133 KiB

After

Width:  |  Height:  |  Size: 64 KiB

BIN
data/test3.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 186 KiB

After

Width:  |  Height:  |  Size: 51 KiB

2
modules/cefwebgui/cefwebguimodule.cpp
View File

@@ -40,7 +40,7 @@
namespace {
constexpr openspace::properties::Property::PropertyInfo EnabledInfo = {
"Enabled",
"Is Enabled",
"Enabled",
"This setting determines whether the browser should be enabled or not",
openspace::properties::Property::Visibility::AdvancedUser
};

4
modules/globebrowsing/CMakeLists.txt
View File

@@ -182,4 +182,8 @@ endif () # WIN32
begin_dependency("GEOS")
add_subdirectory(ext/geos SYSTEM)
target_link_libraries(openspace-module-globebrowsing PRIVATE geos)
set_property(TARGET geos PROPERTY FOLDER "External")
set_property(TARGET geos_c PROPERTY FOLDER "External")
set_property(TARGET ryu PROPERTY FOLDER "External")
end_dependency("GEOS")

4
modules/globebrowsing/src/geojson/geojsoncomponent.cpp
View File

@@ -60,9 +60,9 @@ namespace {
constexpr openspace::properties::Property::PropertyInfo EnabledInfo = {
"Enabled",
"Is Enabled",
"Enabled",
"This setting determines whether this object will be visible or not",
openspace::properties::Property::Visibility::NoviceUser
openspace::properties::Property::Visibility::AdvancedUser
};
constexpr openspace::properties::Property::PropertyInfo FileInfo = {

2
modules/imgui/imguimodule.cpp
View File

@@ -54,7 +54,7 @@ namespace {
constexpr openspace::properties::Property::PropertyInfo EnabledInfo = {
"Enabled",
"Is Enabled",
"Enabled",
"This setting determines whether this object will be visible or not",
openspace::properties::Property::Visibility::Developer
};

2
modules/imgui/src/guicomponent.cpp
View File

@@ -27,7 +27,7 @@
namespace {
constexpr openspace::properties::Property::PropertyInfo EnabledInfo = {
"Enabled",
"Is Enabled",
"Enabled",
"This setting determines whether this object will be visible or not",
// @VISIBILITY(3.4)
openspace::properties::Property::Visibility::AdvancedUser

2
modules/server/src/serverinterface.cpp
View File

@@ -39,7 +39,7 @@ namespace {
constexpr openspace::properties::Property::PropertyInfo EnabledInfo = {
"Enabled",
"Is Enabled",
"Enabled",
"This setting determines whether this server interface is enabled or not",
openspace::properties::Property::Visibility::AdvancedUser
};

4
modules/space/labelscomponent.cpp
View File

@@ -41,11 +41,11 @@ namespace {
constexpr openspace::properties::Property::PropertyInfo EnabledInfo = {
"Enabled",
"Is Enabled",
"Enabled",
"This setting determines whether the labels will be visible or not. They are "
"disabled per default",
// @VISIBILITY(?)
openspace::properties::Property::Visibility::NoviceUser
openspace::properties::Property::Visibility::AdvancedUser
};
constexpr openspace::properties::Property::PropertyInfo FileInfo = {

1
openspace.cfg
View File

@@ -177,6 +177,7 @@ ModuleConfigurations = {
HttpSynchronizationRepositories = {
"http://data.openspaceproject.com/request"
-- "http://openspace.sci.utah.edu/request"
-- "http://localhost:8100/request"
}
},
Server = {

4
src/rendering/dashboarditem.cpp
View File

@@ -36,10 +36,10 @@ namespace {
constexpr openspace::properties::Property::PropertyInfo EnabledInfo = {
"Enabled",
"Is Enabled",
"Enabled",
"If this value is set to 'true' this dashboard item is shown in the dashboard",
// @VISIBILITY(1.75)
openspace::properties::Property::Visibility::NoviceUser
openspace::properties::Property::Visibility::AdvancedUser
};
struct [[codegen::Dictionary(DashboardItem)]] Parameters {

4
src/rendering/renderable.cpp
View File

@@ -44,10 +44,10 @@ namespace {
constexpr openspace::properties::Property::PropertyInfo EnabledInfo = {
"Enabled",
"Is Enabled",
"Enabled",
"This setting determines whether this object will be visible or not",
// @VISIBILITY(0.33)
openspace::properties::Property::Visibility::NoviceUser
openspace::properties::Property::Visibility::AdvancedUser
};
constexpr openspace::properties::Property::PropertyInfo RenderableTypeInfo = {

4
src/rendering/screenspacerenderable.cpp
View File

@@ -49,9 +49,9 @@ namespace {
constexpr openspace::properties::Property::PropertyInfo EnabledInfo = {
"Enabled",
"Is Enabled",
"Enabled",
"This setting determines whether this sceen space plane will be visible or not",
openspace::properties::Property::Visibility::NoviceUser
openspace::properties::Property::Visibility::AdvancedUser
};
constexpr openspace::properties::Property::PropertyInfo