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

added a reset to default option on properties to the gui

Browse Source
This commit is contained in:
Jonathan Bosson
2017-05-19 10:50:06 -06:00
parent 202b31e7d1
commit a230fbeea4
2 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/touch/include/TouchInteraction.h
View File

@@ -101,6 +101,7 @@ class TouchInteraction : public properties::PropertyOwner
int interpretInteraction(const std::vector<TUIO::TuioCursor>& list, const std::vector<Point>& lastProcessed);
void computeVelocities(const std::vector<TUIO::TuioCursor>& list, const std::vector<Point>& lastProcessed);
void decelerate(double dt);
void resetToDefault();
Camera* _camera;
SceneGraphNode* _focusNode = nullptr;
@@ -110,6 +111,7 @@ class TouchInteraction : public properties::PropertyOwner
properties::BoolProperty _unitTest;
properties::BoolProperty _onlyPan; // temp
properties::BoolProperty _touchActive;
properties::BoolProperty _reset;
properties::IntProperty _maxTapTime;
properties::IntProperty _deceleratesPerSecond;
properties::FloatProperty _touchScreenSize;

27
modules/touch/src/TouchInteraction.cpp
View File

@@ -61,6 +61,7 @@ TouchInteraction::TouchInteraction()
_unitTest("Click to take a unit test", "Take a unit test saving the LM data into file", false),
_onlyPan("Toggle Panning Mode", "Toggle pan interaction on direct-manipulation three finger case (FOR FEEDBACK)", true), // temp
_touchActive("TouchEvents", "True if we have a touch event", false, properties::Property::Visibility::Hidden),
_reset("Default Values", "Reset all properties to default", false),
_maxTapTime("Max Tap Time", "Max tap delay (in ms) for double tap", 300, 10, 1000),
_deceleratesPerSecond("Decelerates per second", "Deceleration rate of velocity, times per second", 240, 60, 300),
_touchScreenSize("TouchScreenSize", "Touch Screen size in inches", 55.0f, 5.5f, 150.0f),
@@ -83,10 +84,11 @@ TouchInteraction::TouchInteraction()
_currentRadius{ 1.0 }, _slerpdT{ 1000 }, _numOfTests{ 0 }, _timeSlack { 0.0 },
_directTouchMode{ false }, _tap{ false }, _doubleTap{ false }, _lmSuccess{ true }, _guiON{ false }
{
addProperty(_touchActive); // hide
addProperty(_touchActive); // how do i hide this?
addProperty(_unitTest);
addProperty(_onlyPan); // temp
addProperty(_reset);
addProperty(_maxTapTime);
addProperty(_deceleratesPerSecond);
addProperty(_touchScreenSize);
@@ -630,6 +632,9 @@ void TouchInteraction::step(double dt) {
_tap = false;
_doubleTap = false;
if (_reset) {
resetToDefault();
}
}
}
@@ -722,6 +727,26 @@ void TouchInteraction::resetAfterInput() {
_selected.clear(); // should clear if no longer have a direct-touch input
}
void TouchInteraction::resetToDefault() {
_unitTest.set(false);
_onlyPan.set(true); // temp
_reset.set(false);
_maxTapTime.set(300);
_deceleratesPerSecond.set(240);
_touchScreenSize.set(55.0f);
_tapZoomFactor.set(0.1f);
_nodeRadiusThreshold.set(0.2f);
_rollAngleThreshold.set(0.019f);
_orbitSpeedThreshold.set(0.038f);
_panSpeedThreshold.set(0.004f);
_spinSensitivity.set(0.25f);
_inputStillThreshold.set(0.0005f);
_interpretPan.set(0.01f);
_slerpTime.set(1.0f);
_guiButton.set(glm::ivec2(32, 64));
_friction.set(glm::vec4(0.01, 0.02, 0.02, 0.02));
}
void TouchInteraction::tap() {
_tap = true;
}