mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-08 20:50:19 -06:00
4e75b161db
* Removal of dead code and compiler warnings
* Added basic internal touch
This commit only adds the description-shell of the touch implementation
* Added callbacks and first WIP of internal touch
Makes use of the TouchInput/TouchInputs class in the TouchModule.
Internally we cache the TouchInputs as an input deque and utilizes it
for motion-vectors.
This commit has bugs and issues, which will be worked upon.
* Happy new year!
Bumped year on branch-local files
* Improvements to internal touch
Almost reached feature-parity with tuio-handled touch events
- Added most of the touch-logic to touchinteraction
- Added helper functions to new TouchInput/TouchInputs classes
* Naming changes to touch interface
* Translate TUIO to TouchInput
This commit translates TUIO messages to an internal TouchInput structure
while still trying to keep feature parity.
Removed TUIO-dependencies from many files.
Changed behavior on tuioear to lock-swap its content.
* Minor cleanup and fixes
- Should fix touch roll
- Simplified some functions
* Build fix
* Use internal touch in webgui
- Added consume-logic to touch callbacks
- Constrained touch-input to either webgui or 3D application as mouse is
- This fixes some flaws with previous implementation,
such as ghost inputs
- Initialize touchmodule through init-functions rather than constructor
* Cleanup of comments
* Simplified touch classes
Added timestamp through constructor meaning no more sprinkled timestamps
Renamed TouchInputs to TouchInputHolder for clarity
Added helper functions to the Holder to see if it holds an input
Remade addInput as tryAddInput which return true on successful insertion
+ other cleanup
* Code style cleanup and tweaks
Removed avoidable zero-comparison for code clarity
Cleanup of code style
* Added comments to DirectInputSolver
Clarifying the use of the DirectInputSolver.
* Changes for coding style
Change SGCT version to make it checkout-able
* Clarify magic bitmask
* const -> constexpr const for magic bitmasks
Co-authored-by: Alexander Bock <mail@alexanderbock.eu>
78 lines
3.4 KiB
C++
78 lines
3.4 KiB
C++
/*****************************************************************************************
|
|
* *
|
|
* OpenSpace *
|
|
* *
|
|
* Copyright (c) 2014-2019 *
|
|
* *
|
|
* 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 __OPENSPACE_MODULE_TOUCH___DIRECTINPUT_SOLVER___H__
|
|
#define __OPENSPACE_MODULE_TOUCH___DIRECTINPUT_SOLVER___H__
|
|
|
|
#include <openspace/util/touch.h>
|
|
#include <modules/touch/ext/levmarq.h>
|
|
#include <vector>
|
|
|
|
|
|
namespace openspace {
|
|
|
|
class Camera;
|
|
class SceneGraphNode;
|
|
|
|
/**
|
|
* The DirectInputSolver is used to minimize the L2 error of touch input
|
|
* to 3D camera position. It uses the levmarq algorithm in order to do this.
|
|
* */
|
|
class DirectInputSolver {
|
|
public:
|
|
// Stores the selected node, the cursor ID as well as the surface coordinates the
|
|
// cursor touched
|
|
struct SelectedBody {
|
|
size_t id;
|
|
SceneGraphNode* node;
|
|
glm::dvec3 coordinates;
|
|
};
|
|
|
|
DirectInputSolver();
|
|
|
|
/**
|
|
* Returns true if the error could be minimized within certain bounds.
|
|
* If the error is found to be outside the bounds after a certain amount of
|
|
* iterations, this function fails.
|
|
* */
|
|
bool solve(const std::vector<TouchInputHolder>& list,
|
|
const std::vector<SelectedBody>& selectedBodies,
|
|
std::vector<double>* calculatedValues, const Camera& camera);
|
|
|
|
int nDof() const;
|
|
|
|
const LMstat& levMarqStat();
|
|
|
|
void setLevMarqVerbosity(bool verbose);
|
|
|
|
private:
|
|
int _nDof = 0;
|
|
LMstat _lmstat;
|
|
};
|
|
|
|
} // openspace namespace
|
|
|
|
#endif // __OPENSPACE_MODULE_TOUCH___DIRECTINPUT_SOLVER___H__
|
|
|