mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-07 04:00:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Make sure relevant nodes list is being populated

Browse Source
This commit is contained in:
Emma Broman
2021-06-09 13:41:55 +02:00
parent 5f17e05dd1
commit e1ada5ab88
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/autonavigation/autonavigationmodule.cpp
View File

@@ -75,7 +75,12 @@ double AutoNavigationModule::minValidBoundingSphere() const {
return _minValidBoundingSphere;
}
const std::vector<SceneGraphNode*>& AutoNavigationModule::relevantNodes() const {
const std::vector<SceneGraphNode*>& AutoNavigationModule::relevantNodes() {
if (!_hasInitializedRelevantNodes) {
findRelevantNodes();
_hasInitializedRelevantNodes = true;
}
return _relevantNodes;
}

3
modules/autonavigation/autonavigationmodule.h
View File

@@ -41,7 +41,7 @@ public:
autonavigation::AutoNavigationHandler& AutoNavigationHandler();
double minValidBoundingSphere() const;
const std::vector<SceneGraphNode*>& relevantNodes() const;
const std::vector<SceneGraphNode*>& relevantNodes();
std::vector<documentation::Documentation> documentations() const override;
scripting::LuaLibrary luaLibrary() const override;
@@ -56,6 +56,7 @@ private:
properties::StringListProperty _relevantNodeTags;
std::vector<SceneGraphNode*> _relevantNodes;
bool _hasInitializedRelevantNodes = false;
};
} // namespace openspace

3
modules/autonavigation/curves/avoidcollisioncurve.cpp
View File

@@ -208,7 +208,8 @@ void AvoidCollisionCurve::removeCollisions(int step) {
_points.insert(_points.begin() + i + 2, extraKnot);
removeCollisions(++step);
step++;
removeCollisions(step);
break;
}
}