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

Merge branch 'feature/render-bins' into feature/rosetta

Browse Source 
Conflicts:
	data/scene/earth/earth.mod
	include/openspace/util/updatestructures.h
	modules/base/shaders/ephemeris_fs.glsl
	modules/base/shaders/plane_fs.glsl
This commit is contained in:
Alexander Bock
2016-08-29 15:53:59 +02:00
parent 67f1a389d2 47583327ec
commit ae6ade497b
24 changed files with 154 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/rendering/renderable.cpp
View File

@@ -71,6 +71,7 @@ Renderable* Renderable::createFromDictionary(const ghoul::Dictionary& dictionary
Renderable::Renderable()
: _enabled("enabled", "Is Enabled", true)
, _renderBin(RenderBin::Opaque)
, _startTime("")
, _endTime("")
, _hasTimeInterval(false)
@@ -80,6 +81,7 @@ Renderable::Renderable()
Renderable::Renderable(const ghoul::Dictionary& dictionary)
: _enabled("enabled", "Is Enabled", true)
, _renderBin(RenderBin::Opaque)
, _startTime("")
, _endTime("")
, _hasTimeInterval(false)
@@ -143,6 +145,18 @@ void Renderable::setPscUniforms(
program.setUniform("scaling", camera.scaling());
}
Renderable::RenderBin Renderable::renderBin() const {
return _renderBin;
}
void Renderable::setRenderBin(RenderBin bin) {
_renderBin = bin;
}
bool Renderable::matchesRenderBinMask(int binMask) {
return binMask & static_cast<int>(renderBin());
}
bool Renderable::isVisible() const {
return _enabled;
}