mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-05 11:58:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
nusic
2016-07-13 13:44:11 -04:00
parent c2488b6d8a 718a5d69e6
commit f4f0e53b2c
5 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/scene/globebrowsing.scene
View File

@@ -6,8 +6,8 @@ function preInitialization()
critical objects.
]]--
--openspace.time.setTime("2015 NOV 24 00:00:00")
openspace.time.setTime(openspace.time.currentWallTime())
openspace.time.setTime("2015 NOV 24 00:00:00")
--openspace.time.setTime(openspace.time.currentWallTime())
dofile(openspace.absPath('${SCRIPTS}/bind_keys.lua'))
--openspace.bindKey("v", "openspace.setPropertyValue('DebugGlobe.saveOrThrowCamera', true)")
end

6
include/openspace/interaction/interactionhandler.h
View File

@@ -219,9 +219,9 @@ private:
properties::StringProperty _origin;
properties::StringProperty _coordinateSystem;
properties::FloatProperty _rotationalFriction;
properties::FloatProperty _horizontalFriction;
properties::FloatProperty _verticalFriction;
properties::BoolProperty _rotationalFriction;
properties::BoolProperty _horizontalFriction;
properties::BoolProperty _verticalFriction;
properties::FloatProperty _sensitivity;
properties::FloatProperty _rapidness;

2
modules/globebrowsing/chunk/culling.cpp
View File

@@ -101,7 +101,7 @@ namespace openspace {
const Ellipsoid& ellipsoid = chunk.owner()->ellipsoid();
const GeodeticPatch& patch = chunk.surfacePatch();
float maxHeight = chunk.getBoundingHeights().max;
Vec3 globePosition = data.position.dvec3();
Vec3 globePosition = glm::dvec3(0,0,0); // In model space it is 0
Scalar minimumGlobeRadius = ellipsoid.minimumRadius();
Vec3 cameraPosition =

5
scripts/common.lua
View File

@@ -17,8 +17,9 @@ helper.setCommonKeys = function()
openspace.bindKey("COMMA", "openspace.setRenderer('Framebuffer');")
openspace.bindKey("PERIOD", "openspace.setRenderer('ABuffer');")
openspace.bindKey("f", helper.property.invert('Interaction.rotationalFriction'))
openspace.bindKey("Shift+f", helper.property.invert('Interaction.zoomFriction'))
openspace.bindKey("f", helper.property.invert('Interaction.horizontalFriction'))
openspace.bindKey("Shift+f", helper.property.invert('Interaction.rotationalFriction'))
openspace.bindKey("Shift+Ctrl+f", helper.property.invert('Interaction.verticalFriction'))
end
helper.setDeltaTimeKeys = function(t)

12
src/interaction/interactionhandler.cpp
View File

@@ -621,9 +621,9 @@ void InteractionHandler::clearKeyframes(){
InteractionHandler::InteractionHandler()
: _origin("origin", "Origin", "")
, _coordinateSystem("coordinateSystem", "Coordinate System", "")
, _rotationalFriction("rotationalFriction", "Rotational Friction", 1, 0, 1)
, _horizontalFriction("horizontalFriction", "Horizontal Friction", 1, 0, 1)
, _verticalFriction("verticalFriction", "Vertical Friction", 1, 0, 1)
, _rotationalFriction("rotationalFriction", "Rotational Friction", true)
, _horizontalFriction("horizontalFriction", "Horizontal Friction", true)
, _verticalFriction("verticalFriction", "Vertical Friction", true)
, _sensitivity("sensitivity", "Sensitivity", 0.002, 0.0001, 0.02)
, _rapidness("rapidness", "Rapidness", 1, 0.1, 60)
{
@@ -637,13 +637,10 @@ InteractionHandler::InteractionHandler()
}
setFocusNode(node);
});
addProperty(_origin);
_coordinateSystem.onChange([this]() {
OsEng.renderEngine().changeViewPoint(_coordinateSystem.value());
});
addProperty(_coordinateSystem);
// Create the interactionModes
_inputState = std::make_unique<InputState>();
@@ -681,6 +678,9 @@ InteractionHandler::InteractionHandler()
});
// Add the properties
addProperty(_origin);
addProperty(_coordinateSystem);
addProperty(_rotationalFriction);
addProperty(_horizontalFriction);
addProperty(_verticalFriction);