mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-06 19:49:36 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing

Browse Source
This commit is contained in:
Karl Bladin
2016-04-04 12:12:19 -04:00
parent 972af8b5f3 90f3193236
commit ff74f0794c
76 changed files with 2623 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/rendering/renderable.cpp
View File

@@ -122,15 +122,25 @@ void Renderable::update(const UpdateData&)
{
}
void Renderable::render(const RenderData& data, RendererTasks& tasks)
{
(void) tasks;
render(data);
}
void Renderable::render(const RenderData& data)
{
}
void Renderable::setPscUniforms(
ghoul::opengl::ProgramObject* program,
const Camera* camera,
ghoul::opengl::ProgramObject& program,
const Camera& camera,
const PowerScaledCoordinate& position)
{
program->setUniform("campos", camera->position().vec4());
program->setUniform("objpos", position.vec4());
program->setUniform("camrot", camera->viewRotationMatrix());
program->setUniform("scaling", camera->scaling());
program.setUniform("campos", camera.position().vec4());
program.setUniform("objpos", position.vec4());
program.setUniform("camrot", camera.viewRotationMatrix());
program.setUniform("scaling", camera.scaling());
}
bool Renderable::isVisible() const {
@@ -177,8 +187,10 @@ bool Renderable::isEnabled() const {
return _enabled;
}
std::vector<Volume*> Renderable::volumesToRender(const RenderData& data) const {
return std::vector<Volume*>();
void Renderable::onEnabledChange(std::function<void(bool)> callback) {
_enabled.onChange([=] () {
callback(isEnabled());
});
}
} // namespace openspace