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

solve snapping bug by not overwriting selected surface coordinates in case levmarq doesn't converge.

Browse Source
This commit is contained in:
Jonathan Bosson
2017-05-02 15:25:22 -06:00
parent 8f36159cba
commit 7f7b40d736
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -132,6 +132,7 @@ class TouchInteraction : public properties::PropertyOwner
double _time;
bool _directTouchMode;
bool _tap;
bool _levSuccess;
std::vector<SelectedBody> _selected;

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

@@ -65,7 +65,7 @@ TouchInteraction::TouchInteraction()
_action{ -1 },
_projectionScaleFactor{ 1.000004 }, // calculated with two vectors with known diff in length, then projDiffLength/diffLength.
_currentRadius{ 1.0 }, _time{ 1.0 },
_directTouchMode{ false }, _tap{ false }
_directTouchMode{ false }, _tap{ false }, _levSuccess{ true }
{
addProperty(_touchScreenSize);
levmarq_init(&_lmstat);
@@ -86,7 +86,8 @@ void TouchInteraction::update(const std::vector<TuioCursor>& list, std::vector<P
if (_directTouchMode && _selected.size() > 0 && list.size() == _selected.size()) {
manipulate(list);
}
trace(list);
if (_levSuccess)
trace(list);
if (!_directTouchMode) {
_action = interpret(list, lastProcessed);
accelerate(list, lastProcessed);
@@ -190,7 +191,7 @@ void TouchInteraction::manipulate(const std::vector<TuioCursor>& list) {
f1 = ptr->distToMinimize(dPar, x, fdata);
dPar[i] -= h;
der = (f1 - f0) / h;
g[i] = (i > 1 && i < 4) ? der : der / abs(der);
}
delete[] dPar;
@@ -241,11 +242,11 @@ void TouchInteraction::manipulate(const std::vector<TuioCursor>& list) {
}
// debugging
/*std::ostringstream os;
std::ostringstream os;
for (int i = 0; i < nDOF; ++i) {
os << par[i] << ", ";
}
std::cout << "Levmarq success after " << _lmstat.final_it << " iterations. Values: " << os.str() << "\n";*/
std::cout << "Levmarq success after " << _lmstat.final_it << " iterations. Values: " << os.str() << "\n";
// cleanup
delete[] par;
@@ -547,6 +548,7 @@ void TouchInteraction::decelerate() {
// Called if all fingers are off the screen
void TouchInteraction::clear() {
//_directTouchMode = false;
_levSuccess = true;
_selected.clear(); // should clear if no longer have a direct-touch input
}