mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-07 20:21:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add documentation to the rosetta scene keyboard bindings

Browse Source
This commit is contained in:
Alexander Bock
2016-11-07 10:34:19 +01:00
parent 286eb89048
commit 4caa3d25ba
3 changed files with 81 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
data/scene/rosetta.scene
View File

@@ -18,10 +18,6 @@ function preInitialization()
-- Shadow flyby
-- openspace.time.setTime("2015-02-14T12:00:00.000")
-- openspace.time.setTime("2015-07-29T06:02:10.000")
-- openspace.time.setTime("2014 AUG 21 18:00:00")
-- openspace.time.setTime("2015 SEP 10 19:39:00")
dofile(openspace.absPath('${SCRIPTS}/bind_keys_rosetta.lua'))
end
@@ -59,7 +55,7 @@ return {
"earth",
"mars",
"jupiter/jupiter",
"saturn",
"saturn/saturn",
"uranus",
"neptune",
"stars",

53
modules/iswa/rendering/iswadatagroup.h
View File

@@ -1,32 +1,37 @@
/*****************************************************************************************
* *
* OpenSpace *
* *
* Copyright (c) 2014-2015 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
* without restriction, including without limitation the rights to use, copy, modify, *
* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
* permit persons to whom the Software is furnished to do so, subject to the following *
* conditions: *
* *
* The above copyright notice and this permission notice shall be included in all copies *
* or substantial portions of the Software. *
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
* *
* OpenSpace *
* *
* Copyright (c) 2014-2015 *
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
* software and associated documentation files (the "Software"), to deal in the Software *
* without restriction, including without limitation the rights to use, copy, modify, *
* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
* permit persons to whom the Software is furnished to do so, subject to the following *
* conditions: *
* *
* The above copyright notice and this permission notice shall be included in all copies *
* or substantial portions of the Software. *
* *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifndef __ISWADATAGROUP_H__
#define __ISWADATAGROUP_H__
#include <modules/iswa/rendering/iswagroup.h>
namespace openspace{
class IswaDataGroup : public IswaBaseGroup{
#include <openspace/properties/stringproperty.h>
namespace openspace {
class IswaDataGroup : public IswaBaseGroup {
public:
IswaDataGroup(std::string name, std::string type);
~IswaDataGroup();

63
scripts/bind_keys_rosetta.lua
View File

@@ -12,18 +12,57 @@ helper.setDeltaTimeKeys({
28800, 57600, 115200, 230400, 460800, 921600, 1843200, 3686400, 7372800, 14745600
})
openspace.bindKey("a", "openspace.setPropertyValue('Interaction.origin', '67P')")
openspace.bindKey("s", "openspace.setPropertyValue('Interaction.origin', 'Rosetta')")
openspace.bindKey(
"a",
"openspace.setPropertyValue('Interaction.origin', '67P')",
"Sets the focus of the camera on '67P'."
)
openspace.bindKey(
"s",
"openspace.setPropertyValue('Interaction.origin', 'Rosetta')",
"Sets the focus of the camera on 'Rosetta'."
)
-- openspace.bindKey("F5", "openspace.setPropertyValue('Interaction.coordinateSystem', 'Sun'); openspace.printInfo('Changing Viewpoint to Sun');");
openspace.bindKey("F6", "openspace.setPropertyValue('Interaction.coordinateSystem', '67P'); openspace.printInfo('Changing Viewpoint to 67P');");
openspace.bindKey("F7", "openspace.time.setTime('2014-08-15T03:05:18.101')");
openspace.bindKey("F8", "openspace.setPropertyValue('67P.renderable.ProjectionComponent.clearAllProjections', true);");
openspace.bindKey(
"F5",
"openspace.time.setTime('2014-08-01T03:05:18.101')",
"Jumps to the time of initial approach of Rosetta to 67P."
)
openspace.bindKey(
"F6",
"openspace.time.setTime('2014-11-12T08:20:00.00')",
"Jumps to the time when the Philae lander is released."
)
openspace.bindKey(
"F8",
"openspace.setPropertyValue('67P.renderable.ProjectionComponent.clearAllProjections', true)",
"Removes all image projections from 67P."
)
openspace.bindKey("i", helper.renderable.toggle('ImagePlaneRosetta'))
openspace.bindKey("q", helper.renderable.toggle('SunMarker'))
openspace.bindKey("e", helper.renderable.toggle('JupiterTrail') .. helper.renderable.toggle('SaturnTrail') .. helper.renderable.toggle('UranusTrail') .. helper.renderable.toggle('NeptuneTrail'))
openspace.bindKey("f", helper.renderable.toggle('PhilaeTrail'))
openspace.bindKey(
"i",
helper.renderable.toggle('ImagePlaneRosetta'),
"Toggles the visibility of the free floating image plane."
)
openspace.bindKey(
"q",
helper.renderable.toggle('SunMarker'),
"Toggles the visibility of the text marking the location of the Sun."
)
openspace.bindKey(
"e",
helper.renderable.toggle('JupiterTrail') .. helper.renderable.toggle('SaturnTrail') ..
helper.renderable.toggle('UranusTrail') .. helper.renderable.toggle('NeptuneTrail'),
"Toggles the visibility of all trails further from the Sun than 67P."
)
openspace.bindKey(
"f",
helper.renderable.toggle('PhilaeTrail'),
"Toggles the visibility of Philae's trail."
)
openspace.bindKeyLocal("h", "openspace.parallel.setAddress('127.0.0.1');openspace.parallel.setPort('25001');openspace.parallel.setPassword('test');openspace.parallel.connect();openspace.parallel.requestHostship('test');")
openspace.bindKeyLocal("c", "openspace.parallel.setAddress('127.0.0.1');openspace.parallel.setPort('25001');openspace.parallel.setPassword('test');openspace.parallel.connect();")
openspace.bindKey(
"p",
helper.property.invert('67P.renderable.ProjectionComponent.performProjection'),
"Enables or disables the image projection on 67P."
)