mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-04 10:40:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merged master into NewAtmosphere.

Browse Source
This commit is contained in:
Jonathas Costa
2017-07-21 15:02:24 -04:00
parent bf9c3a6bd4 3c213fae1e
commit 20003d5b32
710 changed files with 4734 additions and 5366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/base/rendering/renderableplane.cpp
View File

@@ -104,7 +104,7 @@ RenderablePlane::RenderablePlane(const ghoul::Dictionary& dictionary)
"RenderablePlane"
);
_size = dictionary.value<double>(KeySize);
_size = static_cast<float>(dictionary.value<double>(KeySize));
if (dictionary.hasKey(KeyBillboard)) {
_billboard = dictionary.value<bool>(KeyBillboard);
@@ -173,7 +173,7 @@ bool RenderablePlane::deinitialize() {
return true;
}
void RenderablePlane::render(const RenderData& data) {
void RenderablePlane::render(const RenderData& data, RendererTasks&) {
_shader->activate();
//if (_projectionListener){
// //get parent node-texture and set with correct dimensions