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

Merge remote-tracking branch 'origin/master' into feature/loadingscreen-refactor

Browse Source 
# Conflicts:
#	modules/volume/rendering/renderabletimevaryingvolume.cpp
This commit is contained in:
Alexander Bock
2017-11-12 10:50:11 -05:00
parent 7e4bb0b2c6 76b26c0128
commit f227767492
187 changed files with 10004 additions and 4565 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,7 +58,8 @@ public:
Overlay = 8
};
static std::unique_ptr<Renderable> createFromDictionary(const ghoul::Dictionary& dictionary);
static std::unique_ptr<Renderable> createFromDictionary(
const ghoul::Dictionary& dictionary);
// constructors & destructor
Renderable(const ghoul::Dictionary& dictionary);
@@ -91,7 +92,8 @@ public:
void onEnabledChange(std::function<void(bool)> callback);
static void setPscUniforms(ghoul::opengl::ProgramObject& program, const Camera& camera, const PowerScaledCoordinate& position);
static void setPscUniforms(ghoul::opengl::ProgramObject& program,
const Camera& camera, const PowerScaledCoordinate& position);
static documentation::Documentation Documentation();