mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-24 04:58:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Issue/453 (#556)

Browse Source 
* Introduced guiName to PropertyOwner
  * Added requirement that PropertyOwner::identifier may not contain whitespaces
  * Changed Name to Identifier in asset and scene files
  * Added new PropertyOwner to RenderEngine that owns the ScreenSpaceRenderables
  * Moved Name and GuiPath into GUI group
  * Added user-facing names to layer groups
This commit is contained in:
Alexander Bock
2018-03-16 09:21:29 -04:00
committed by GitHub
parent 7a93a4fa37
commit db7ae7e384
234 changed files with 2921 additions and 1676 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/touch/src/touchinteraction.cpp
+11 -4
View File
@@ -593,8 +593,9 @@ void TouchInteraction::findSelectedNode(const std::vector<TuioCursor>& list) {
std::vector<SceneGraphNode*> selectableNodes;
for (SceneGraphNode* node : OsEng.renderEngine().scene()->allSceneGraphNodes())
for (std::string name : selectables)
if (node->name() == name)
if (node->identifier() == name) {
selectableNodes.push_back(node);
}
glm::dquat camToWorldSpace = _camera->rotationQuaternion();
glm::dvec3 camPos = _camera->positionVec3();
@@ -678,7 +679,10 @@ void TouchInteraction::findSelectedNode(const std::vector<TuioCursor>& list) {
// If the user touched the planet directly, this is definitely the one
// they are interested in => minimum distance
if (dist <= 0.0) {
LINFOC(node->name(), "Picking candidate based on direct touch");
LINFOC(
node->identifier(),
"Picking candidate based on direct touch"
);
pickingInfo.push_back({
node,
-std::numeric_limits<double>::max(),
@@ -687,7 +691,10 @@ void TouchInteraction::findSelectedNode(const std::vector<TuioCursor>& list) {
}
else {
// The node was considered due to minimum picking distance radius
LINFOC(node->name(), "Picking candidate based on proximity");
LINFOC(
node->identifier(),
"Picking candidate based on proximity"
);
pickingInfo.push_back({
node,
ndcDist,
@@ -713,7 +720,7 @@ void TouchInteraction::findSelectedNode(const std::vector<TuioCursor>& list) {
// If an item has been picked, it's in the first position of the vector now
if (!pickingInfo.empty()) {
_pickingSelected = pickingInfo.begin()->node;
LINFOC("Picking", "Picked node: " + _pickingSelected->name());
LINFOC("Picking", "Picked node: " + _pickingSelected->identifier());
}
_selected = std::move(newSelected);