mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-25 13:38:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Put ISWACygnets in sceneGraph

Browse Source
This commit is contained in:
Sebastian Piwell
2016-04-08 15:42:24 -04:00
parent 6a81065b42
commit a55d5e9e9a
11 changed files with 137 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/scene/scene.cpp
View File

@@ -145,7 +145,7 @@ void Scene::update(const UpdateData& data) {
// _graph.addSceneGraphNode(node);
// ONCE = true;
//}
// ISWAManagar::ref().update();
for (SceneGraphNode* node : _graph.nodes()) {
try {
node->update(data);
@@ -166,6 +166,7 @@ void Scene::render(const RenderData& data, RendererTasks& tasks) {
for (SceneGraphNode* node : _graph.nodes()) {
node->render(data, tasks);
}
std::cout << std::endl;
}
void Scene::scheduleLoadSceneFile(const std::string& sceneDescriptionFilePath) {

1
src/scene/scenegraph.cpp
View File

@@ -380,6 +380,7 @@ bool SceneGraph::addSceneGraphNode(SceneGraphNode* node) {
_nodes.push_back(internalNode);
sortTopologically();
std::cout << "Added the node" << std::endl;
return true;
}

6
src/scene/scenegraphnode.cpp
View File

@@ -247,6 +247,12 @@ void SceneGraphNode::render(const RenderData& data, RendererTasks& tasks) {
RenderData newData = {data.camera, thisPosition, data.doPerformanceMeasurement};
std::cout << name() << " ";
if(_renderable){
std::cout << _renderableVisible << " " << _renderable->isVisible() << " " << _renderable->isReady() << " " << _renderable->isEnabled() << std::endl;
}else{
std::cout << "No Renderable" << std::endl;
}
_performanceRecord.renderTime = 0;
if (_renderableVisible && _renderable->isVisible() && _renderable->isReady() && _renderable->isEnabled()) {
if (data.doPerformanceMeasurement) {