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

Merge branch 'develop' into solarsystem2

Browse Source 
Conflicts:
	include/openspace/util/spicemanager.h
This commit is contained in:
Michal Marcinkowski
2014-12-09 18:04:38 -05:00
parent 1a9c726f58 fe73550b55
commit 6ef0181148
30 changed files with 635 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/bind_keys.lua
View File

@@ -9,8 +9,8 @@ interaction_speed = 2.75
-- Key Bindings
openspace.bindKey("f1", "openspace.gui.toggle()")
openspace.bindKey("f3", "openspace.setPropertyValue('Earth.renderable.enabled', true)")
openspace.bindKey("f4", "openspace.setPropertyValue('Earth.renderable.enabled', false)")
openspace.bindKey("f2", "openspace.setPerformanceMeasurement(true)")
openspace.bindKey("f3", "openspace.setPerformanceMeasurement(false)")
openspace.bindKey("f5", "loadKeyBindings()")