mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-28 14:59:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merged master into NewAtmosphere

Browse Source
This commit is contained in:
Jonathas Costa
2017-12-01 17:13:04 -05:00
parent 695df47b00 bc61200724
commit a797c2b6db
34 changed files with 365 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/openspace/rendering/loadingscreen.h
+1 -1
View File
@@ -41,7 +41,7 @@ namespace ghoul::fontrendering {
namespace ghoul::opengl {
class ProgramObject;
class Texture;
class Texture;
} // namespace ghoul::opengl
namespace openspace {
include/openspace/rendering/renderengine.h
+3 -3
View File
@@ -110,9 +110,9 @@ public:
float globalBlackOutFactor();
void setGlobalBlackOutFactor(float factor);
void registerScreenSpaceRenderable(std::shared_ptr<ScreenSpaceRenderable> s);
void unregisterScreenSpaceRenderable(std::shared_ptr<ScreenSpaceRenderable> s);
void unregisterScreenSpaceRenderable(const std::string& name);
void addScreenSpaceRenderable(std::shared_ptr<ScreenSpaceRenderable> s);
void removeScreenSpaceRenderable(std::shared_ptr<ScreenSpaceRenderable> s);
void removeScreenSpaceRenderable(const std::string& name);
std::shared_ptr<ScreenSpaceRenderable> screenSpaceRenderable(const std::string& name);
std::vector<ScreenSpaceRenderable*> screenSpaceRenderables() const;