Merge branch 'feature/iSWA' of github.com:OpenSpace/OpenSpace-Development into feature/iSWA

This commit is contained in:
Sebastian Piwell
2016-05-04 15:00:45 -04:00
113 changed files with 1093 additions and 3660 deletions

View File

@@ -1,3 +1,58 @@
function preInitialization()
--[[
The scripts in this function are executed after the scene is loaded but before the
scene elements have been initialized, thus they should be used to set the time at
which the scene should start and other settings that might determine initialization
critical objects.
]]--
openspace.time.setTime(openspace.time.currentWallTime())
dofile(openspace.absPath('${SCRIPTS}/bind_keys.lua'))
end
function postInitialization()
--[[
The scripts in this function are executed after all objects in the scene have been
created and initialized, but before the first render call. This is the place to set
graphical settings for the renderables.
]]--
openspace.printInfo("Setting default values")
openspace.setPropertyValue("Sun.renderable.enabled", false)
openspace.setPropertyValue("SunMarker.renderable.enabled", false)
openspace.setPropertyValue("EarthMarker.renderable.enabled", false)
--openspace.setPropertyValue("Constellation Bounds.renderable.enabled", false)
-- openspace.setPropertyValue("PlutoTrail.renderable.enabled", false)
-- openspace.setPropertyValue("PlutoTexture.renderable.enabled", false)
openspace.setPropertyValue("MilkyWay.renderable.transparency", 0.55)
openspace.setPropertyValue("MilkyWay.renderable.segments", 50)
openspace.printInfo("Done setting default values")
openspace.iswa.addCygnet("-1,Data,1");
openspace.iswa.addCygnet("-2,Data,1");
openspace.iswa.addCygnet("-3,Data,1");
openspace.registerScreenSpaceRenderable(
{
Type = "ScreenSpaceCygnet",
CygnetId = 7,
Position = {-0.8, 0.3},
FlatScreen = true,
Scale = 0.25,
});
openspace.registerScreenSpaceRenderable(
{
Type = "ScreenSpaceImage",
TexturePath = "${OPENSPACE_DATA}/test2.jpg",
Position = {0.8, -0.3},
FlatScreen = true,
Scale = 0.25,
});
end
return {
ScenePath = ".",
CommonFolder = "common",
@@ -30,4 +85,3 @@ return {
--"gridEquatorial",
}
}