diff --git a/apps/OpenSpace/CMakeLists.txt b/apps/OpenSpace/CMakeLists.txt index 5aa70960a1..9ca9d6e316 100644 --- a/apps/OpenSpace/CMakeLists.txt +++ b/apps/OpenSpace/CMakeLists.txt @@ -68,25 +68,6 @@ if (OPENSPACE_OPENVR_SUPPORT) endif() endif() -##### -# Spout -##### -if (WIN32) - option(OPENSPACE_SPOUT_SUPPORT "Build OpenSpace application with Spout support" OFF) -endif () - -if (OPENSPACE_SPOUT_SUPPORT) - set(SPOUT_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/ext/spout) - set(SPOUT_LIBRARY ${CMAKE_CURRENT_SOURCE_DIR}/ext/spout/SpoutLibrary.lib) - set(SPOUT_DEFINITIONS "OPENSPACE_HAS_SPOUT") - - set(SGCT_SPOUT_SUPPORT ON CACHE BOOL "" FORCE) -endif () - -if (OPENSPACE_SPOUT_SUPPORT) - add_external_library_dependencies(${CMAKE_CURRENT_SOURCE_DIR}/ext/spout/SpoutLibrary.dll) -endif () - set(MACOSX_BUNDLE_ICON_FILE openspace.icns) create_new_application(OpenSpace diff --git a/data/assets/examples/renderableplaneimageonline.asset b/data/assets/examples/renderableplaneimageonline.asset new file mode 100644 index 0000000000..fd48f1d35f --- /dev/null +++ b/data/assets/examples/renderableplaneimageonline.asset @@ -0,0 +1,24 @@ +-- This asset requires OpenSpace to be built with the OPENSPACE_MODULE_SPOUT enabled + +local assetHelper = asset.require("util/asset_helper") +local transforms = asset.require("scene/solarsystem/sun/transforms") + + + +local RenderablePlaneImageOnline = { + Name = "RenderablePlaneImageOnline", + Parent = transforms.SolarSystemBarycenter.Name, + Renderable = { + Type = "RenderablePlaneImageOnline", + Size = 3.0E11, + Origin = "Center", + Billboard = true, + URL = "http://data.openspaceproject.com/examples/renderableplaneimageonline.jpg" + }, + GuiPath = "/Examples" +} + + + +local objects = { RenderablePlaneImageOnline } +assetHelper.registerSceneGraphNodesAndExport(asset, objects) diff --git a/data/assets/examples/screenspacespout.asset b/data/assets/examples/screenspacespout.asset new file mode 100644 index 0000000000..54cc619cd5 --- /dev/null +++ b/data/assets/examples/screenspacespout.asset @@ -0,0 +1,23 @@ +-- This asset requires OpenSpace to be built with the OPENSPACE_MODULE_SPOUT enabled + +local assetHelper = asset.require("util/asset_helper") +local transforms = asset.require("scene/solarsystem/sun/transforms") + + + +local Spout = { + Name = "Spouty", + Parent = transforms.SolarSystemBarycenter.Name, + Renderable = { + Type = "RenderablePlaneSpout", + Size = 3.0E11, + Origin = "Center", + Billboard = true + }, + GuiPath = "/Examples" +} + + + +local objects = { Spout } +assetHelper.registerSceneGraphNodesAndExport(asset, objects) diff --git a/data/assets/scene/solarsystem/missions/newhorizons/charon.asset b/data/assets/scene/solarsystem/missions/newhorizons/charon.asset index 4622be1bca..4de0e626c7 100644 --- a/data/assets/scene/solarsystem/missions/newhorizons/charon.asset +++ b/data/assets/scene/solarsystem/missions/newhorizons/charon.asset @@ -79,7 +79,7 @@ local CharonText = { } }, Renderable = { - Type = "RenderablePlane", + Type = "RenderablePlaneImageLocal", Size = 10^6.3, Origin = "Center", Billboard = true, diff --git a/data/assets/scene/solarsystem/missions/newhorizons/hydra.asset b/data/assets/scene/solarsystem/missions/newhorizons/hydra.asset index fee5678fb3..3e84d77c43 100644 --- a/data/assets/scene/solarsystem/missions/newhorizons/hydra.asset +++ b/data/assets/scene/solarsystem/missions/newhorizons/hydra.asset @@ -47,7 +47,7 @@ local HydraText = { }, }, Renderable = { - Type = "RenderablePlane", + Type = "RenderablePlaneImageLocal", Size = 10.0^6.3, Origin = "Center", Billboard = true, diff --git a/data/assets/scene/solarsystem/missions/newhorizons/kerberos.asset b/data/assets/scene/solarsystem/missions/newhorizons/kerberos.asset index c9d4ecce41..2ad3560809 100644 --- a/data/assets/scene/solarsystem/missions/newhorizons/kerberos.asset +++ b/data/assets/scene/solarsystem/missions/newhorizons/kerberos.asset @@ -51,7 +51,7 @@ local KerberosText = { }, }, Renderable = { - Type = "RenderablePlane", + Type = "RenderablePlaneImageLocal", Size = 10^6.3, Origin = "Center", Billboard = true, diff --git a/data/assets/scene/solarsystem/missions/newhorizons/nix.asset b/data/assets/scene/solarsystem/missions/newhorizons/nix.asset index 69861dad60..f1b251131e 100644 --- a/data/assets/scene/solarsystem/missions/newhorizons/nix.asset +++ b/data/assets/scene/solarsystem/missions/newhorizons/nix.asset @@ -38,7 +38,7 @@ local NixText = { Name = "NixText", Parent = Nix.Name, Renderable = { - Type = "RenderablePlane", + Type = "RenderablePlaneImageLocal", Size = 10^6.3, Origin = "Center", Billboard = true, diff --git a/data/assets/scene/solarsystem/missions/newhorizons/pluto.asset b/data/assets/scene/solarsystem/missions/newhorizons/pluto.asset index 95f284de27..8d45caf643 100644 --- a/data/assets/scene/solarsystem/missions/newhorizons/pluto.asset +++ b/data/assets/scene/solarsystem/missions/newhorizons/pluto.asset @@ -185,7 +185,7 @@ local PlutoBarycenterLabel = { Name = "PlutoBarycenterLabel", Parent = transforms.PlutoBarycenter.Name, Renderable = { - Type = "RenderablePlane", + Type = "RenderablePlaneImageLocal", Billboard = true, Size = 5E4, Texture = encounterTextures .. "/barycenter.png", @@ -204,7 +204,7 @@ local PlutoText = { }, }, Renderable = { - Type = "RenderablePlane", + Type = "RenderablePlaneImageLocal", Size = 10^6.3, Origin = "Center", Billboard = true, diff --git a/data/assets/scene/solarsystem/missions/newhorizons/styx.asset b/data/assets/scene/solarsystem/missions/newhorizons/styx.asset index e09b9f0072..ada45ff6c5 100644 --- a/data/assets/scene/solarsystem/missions/newhorizons/styx.asset +++ b/data/assets/scene/solarsystem/missions/newhorizons/styx.asset @@ -46,7 +46,7 @@ local StyxText = { }, }, Renderable = { - Type = "RenderablePlane", + Type = "RenderablePlaneImageLocal", Size = 10^6.3, Origin = "Center", Billboard = true, diff --git a/data/assets/scene/solarsystem/planets/earth/markers.asset b/data/assets/scene/solarsystem/planets/earth/markers.asset index 6ceb9458e5..ffb25ffb8a 100644 --- a/data/assets/scene/solarsystem/planets/earth/markers.asset +++ b/data/assets/scene/solarsystem/planets/earth/markers.asset @@ -8,7 +8,7 @@ local EarthMarker = { Name = "EarthMarker", Parent = transforms.EarthIAU.Name, Renderable = { - Type = "RenderablePlane", + Type = "RenderablePlaneImageLocal", Enabled = false, Size = 3.0E11, Origin = "Center", diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/satellites.asset b/data/assets/scene/solarsystem/planets/earth/satellites/satellites.asset index c7673bacd4..6b498b155a 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/satellites.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/satellites.asset @@ -63,7 +63,7 @@ function getSat(title, file, lineNum) Name = title, Parent = "EarthInertial", Renderable = { - Type = "RenderablePlane", + Type = "RenderablePlaneImageLocal", Size = 3e4, Origin = "Center", Body = "TLE", diff --git a/data/assets/scene/solarsystem/sun/glare.asset b/data/assets/scene/solarsystem/sun/glare.asset index 94a2682d92..fd35d5cc16 100644 --- a/data/assets/scene/solarsystem/sun/glare.asset +++ b/data/assets/scene/solarsystem/sun/glare.asset @@ -9,7 +9,7 @@ local SunGlare = { Name = "SunGlare", Parent = transforms.SolarSystemBarycenter.Name, Renderable = { - Type = "RenderablePlane", + Type = "RenderablePlaneImageLocal", Size = 1.3*10^10.5, Origin = "Center", Billboard = true, diff --git a/data/assets/scene/solarsystem/sun/marker.asset b/data/assets/scene/solarsystem/sun/marker.asset index bb4d2c26c8..604ad37456 100644 --- a/data/assets/scene/solarsystem/sun/marker.asset +++ b/data/assets/scene/solarsystem/sun/marker.asset @@ -10,7 +10,7 @@ local SunMarker = { Parent = transforms.SolarSystemBarycenter.Name, Renderable = { Enabled = false, - Type = "RenderablePlane", + Type = "RenderablePlaneImageLocal", Size = 3.0E11, Origin = "Center", Billboard = true, diff --git a/include/openspace/properties/optionproperty.h b/include/openspace/properties/optionproperty.h index 646dcd4930..1ab8db03ba 100644 --- a/include/openspace/properties/optionproperty.h +++ b/include/openspace/properties/optionproperty.h @@ -110,6 +110,11 @@ public: */ const std::vector