mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-01 09:08:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

Code cleanup regarding scenegraphnodes

Browse Source
This commit is contained in:
Alexander Bock
2014-05-05 12:15:20 +02:00
parent ae88c0dd6d
commit 636f5327aa
7 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/openspace/query/query.h
View File

@@ -25,7 +25,6 @@
#ifndef __QUERY_H__
#define __QUERY_H__
#include <memory>
#include <string>
namespace openspace {
@@ -33,7 +32,7 @@ namespace openspace {
class SceneGraph;
class SceneGraphNode;
std::shared_ptr<SceneGraph> getSceneGraph();
SceneGraph* getSceneGraph();
SceneGraphNode* getSceneGraphNode(const std::string& name);

6
include/openspace/rendering/renderengine.h
View File

@@ -41,8 +41,8 @@ public:
bool initialize();
void setSceneGraph(std::shared_ptr<SceneGraph> sceneGraph);
std::shared_ptr<SceneGraph> sceneGraph();
void setSceneGraph(SceneGraph* sceneGraph);
SceneGraph* sceneGraph();
Camera* camera() const;
@@ -57,7 +57,7 @@ public:
private:
Camera* _mainCamera;
std::shared_ptr<SceneGraph> _sceneGraph;
SceneGraph* _sceneGraph;
};
} // namespace openspace

6
include/openspace/scenegraph/scenegraph.h
View File

@@ -88,6 +88,12 @@ public:
*/
SceneGraphNode* root() const;
/**
* Return the scenegraph node with the specified name or <code>nullptr</code> if that
* name does not exist
*/
SceneGraphNode* sceneGraphNode(const std::string& name) const;
private:
std::string _focus, _position;