diff --git a/include/openspace/abuffer/abufferframebuffer.h b/include/openspace/abuffer/abufferframebuffer.h index 46d71b1a4d..9c40222aa5 100644 --- a/include/openspace/abuffer/abufferframebuffer.h +++ b/include/openspace/abuffer/abufferframebuffer.h @@ -40,7 +40,7 @@ public: virtual void preRender(); virtual void postRender(); - virtual std::string settings(); + std::vector pixelData(); protected: virtual bool reinitializeInternal(); diff --git a/include/openspace/query/query.h b/include/openspace/query/query.h index 1bd1edf34b..22874d39cf 100644 --- a/include/openspace/query/query.h +++ b/include/openspace/query/query.h @@ -32,11 +32,13 @@ namespace openspace { namespace properties { class Property; } +class Renderable; class SceneGraph; class SceneGraphNode; SceneGraph* sceneGraph(); SceneGraphNode* sceneGraphNode(const std::string& name); +Renderable* renderable(const std::string& name); properties::Property* property(const std::string& uri); } // namespace diff --git a/src/abuffer/abufferframebuffer.cpp b/src/abuffer/abufferframebuffer.cpp index 0cc5ffe58c..6f2673690b 100644 --- a/src/abuffer/abufferframebuffer.cpp +++ b/src/abuffer/abufferframebuffer.cpp @@ -60,8 +60,8 @@ void ABufferFramebuffer::postRender() { } -std::string ABufferFramebuffer::settings() { - return R"()"; +std::vector ABufferFramebuffer::pixelData() { + return std::vector(); } diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp index 85b91e39d3..fbcb8b1d58 100644 --- a/src/engine/openspaceengine.cpp +++ b/src/engine/openspaceengine.cpp @@ -222,6 +222,10 @@ void OpenSpaceEngine::loadFonts() { std::string font; fonts.getValue(key, font); font = absPath(font); + if(!FileSys.fileExists(font)) { + LERROR("Could not find font '" << font << "'"); + continue; + } LINFO("Registering font '" << font << "' with key '" << key << "'"); sgct_text::FontManager::instance()->addFont(key, font, local); @@ -313,8 +317,8 @@ bool OpenSpaceEngine::create(int argc, char** argv, for (auto token : tokens) { if (!FileSys.directoryExists(token)) { std::string p = absPath(token); - LDEBUG("Directory '" << p <<"' does not exsist, creating."); - if(FileSys.createDirectory(p, true)) + LDEBUG("Directory '" << p <<"' does not exist, creating."); + if(!FileSys.createDirectory(p, true)) LERROR("Directory '" << p <<"' could not be created"); } } diff --git a/src/query/query.cpp b/src/query/query.cpp index 9b2ad06a97..b75ec2b61b 100644 --- a/src/query/query.cpp +++ b/src/query/query.cpp @@ -45,7 +45,12 @@ SceneGraphNode* sceneGraphNode(const std::string& name) const SceneGraph* graph = sceneGraph(); return graph->sceneGraphNode(name); } - + +Renderable* renderable(const std::string& name) { + SceneGraphNode* node = sceneGraphNode(name); + return node->renderable(); +} + properties::Property* property(const std::string& uri) { // The URI consists of the following form at this stage: diff --git a/src/scenegraph/scenegraphnode.cpp b/src/scenegraph/scenegraphnode.cpp index 2d61eaec50..aeca5c4c23 100644 --- a/src/scenegraph/scenegraphnode.cpp +++ b/src/scenegraph/scenegraphnode.cpp @@ -328,6 +328,10 @@ const Renderable* SceneGraphNode::renderable() const return _renderable; } +Renderable* SceneGraphNode::renderable() { + return _renderable; +} + // private helper methods bool SceneGraphNode::sphereInsideFrustum(const psc s_pos, const PowerScaledScalar& s_rad, const Camera* camera)