From 1ed4a293d4fbbacabf3aa1075fdd3ac4e38f2f0e Mon Sep 17 00:00:00 2001 From: Erik Broberg Date: Thu, 30 Jun 2016 20:53:27 -0400 Subject: [PATCH] Use globebrowsing scene --- modules/globebrowsing/tile/tiledataset.h | 2 +- openspace.cfg | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/globebrowsing/tile/tiledataset.h b/modules/globebrowsing/tile/tiledataset.h index d06fa641cc..7b7136c017 100644 --- a/modules/globebrowsing/tile/tiledataset.h +++ b/modules/globebrowsing/tile/tiledataset.h @@ -152,7 +152,7 @@ namespace openspace { const static glm::ivec2 tilePixelStartOffset; const static glm::ivec2 tilePixelSizeDifference; const static PixelRegion padding; // same as the two above - + private: diff --git a/openspace.cfg b/openspace.cfg index 5f0ac5e37d..69421a0171 100644 --- a/openspace.cfg +++ b/openspace.cfg @@ -8,8 +8,8 @@ return { -- Sets the scene that is to be loaded by OpenSpace. A scene file is a description -- of all entities that will be visible during an instance of OpenSpace -- Scene = "${SCENE}/default-moon.scene", - Scene = "${SCENE}/default.scene", - -- Scene = "${SCENE}/globebrowsing.scene", + -- Scene = "${SCENE}/default.scene", + Scene = "${SCENE}/globebrowsing.scene", -- Scene = "${SCENE}/rosetta.scene", -- Scene = "${SCENE}/dawn.scene", -- Scene = "${SCENE}/newhorizons.scene",