Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge current develop branch into master #24

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open

Merge current develop branch into master #24

Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
1b13f82
fixed errors when using MSVC
mmaurus Mar 27, 2019
599125a
consistent formatting; added done() functionality to properly close o…
mmaurus Mar 27, 2019
cefd6fa
changes so that an externally created window can be added
mmaurus Apr 11, 2019
514a239
return osg::ref_ptr instaed of *
ric-cave Apr 11, 2019
4a214cf
Merge branch 'getHUD' into develop
ric-cave Apr 11, 2019
9b88544
consistently use osg::ref_ptr in HUD and Main.cpp
planthaber Apr 17, 2019
7b6f5a0
remove find_package(OpenSceneGraph), pkg_config is used later
planthaber May 2, 2019
125d673
fixed fullscreen by reading the DISPLAY env variable
planthaber May 3, 2019
e7c13e4
add modules to Readme
planthaber Jul 12, 2019
b3a73fa
readme update
planthaber Jul 12, 2019
29e2dfe
searchNodes::searchByName: use const std::string& as param
planthaber Mar 24, 2020
45bf475
remove unused variable
planthaber Apr 1, 2020
5fa901a
Only run frame() on realized windows
pierrewillenbrockdfki May 26, 2020
ce3b4c9
Merge branch 'develop'
planthaber May 27, 2020
930439d
Revert "Only run frame() on realized windows"
planthaber May 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions src/tools/SearchNodes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ class SearchNodes{

}

static osg::Node* searchByName(std::string name, osg::Node* start, bool addParents = false){
static osg::Node* searchByName(const std::string& name, osg::Node* start, bool addParents = false){
std::deque< osg::Node* > nodes;
std::map< osg::Node*, bool > knownNodes;
nodes.push_back(start);
Expand Down Expand Up @@ -120,9 +120,6 @@ class SearchNodes{
if (node->getName() == name){
foundNodes.push_back(node);
}

osg::Group * group = dynamic_cast< osg::Group * >(node);

expand(node,knownNodes,nodes,addParents);

nodes.pop_front();
Expand Down