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

Pull request changes.

Browse Source
This commit is contained in:
Jonathas Costa
2017-08-15 18:15:56 -04:00
parent 293cc3e063
commit 758ee8bd6d
28 changed files with 304 additions and 733 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/rendering/framebufferrenderer.cpp
View File

@@ -228,9 +228,9 @@ void FramebufferRenderer::raycastersChanged(VolumeRaycaster&, bool) {
_dirtyRaycastData = true;
}
void FramebufferRenderer::deferredcastersChanged(Deferredcaster& deferredcaster, bool attached) {
void FramebufferRenderer::deferredcastersChanged(Deferredcaster& deferredcaster, ghoul::Boolean isAttached) {
(void) deferredcaster;
(void) attached;
(void) isAttached;
_dirtyDeferredcastData = true;
}
@@ -250,11 +250,7 @@ void FramebufferRenderer::update() {
// If the resolve dictionary changed (or a file changed on disk)
// then rebuild the resolve program.
if (_hdrBackGroundProgram && _hdrBackGroundProgram->isDirty()) {
try {
_hdrBackGroundProgram->rebuildFromFile();
} catch (const ghoul::RuntimeError& error) {
LERRORC(error.component, error.message);
}
_hdrBackGroundProgram->rebuildFromFile();
}
if (_resolveProgram->isDirty()) {
@@ -299,11 +295,7 @@ void FramebufferRenderer::update() {
for (auto &program : _deferredcastPrograms) {
if (program.second && program.second->isDirty()) {
try {
program.second->rebuildFromFile();
} catch (ghoul::RuntimeError e) {
LERROR(e.message);
}
program.second->rebuildFromFile();
}
}
}
@@ -508,15 +500,15 @@ void FramebufferRenderer::updateDeferredcastData() {
data.id = nextId++;
data.namespaceName = "HELPER";
std::string vsPath = deferredcaster->getDeferredcastVSPath();
std::string fsPath = deferredcaster->getDeferredcastFSPath();
std::string deferredShaderPath = deferredcaster->getDeferredcastPath();
std::string vsPath = deferredcaster->deferredcastVSPath();
std::string fsPath = deferredcaster->deferredcastFSPath();
std::string deferredShaderPath = deferredcaster->deferredcastPath();
ghoul::Dictionary dict;
dict.setValue("rendererData", _rendererData);
//dict.setValue("fragmentPath", fsPath);
dict.setValue("id", data.id);
std::string helperPath = deferredcaster->getHelperPath();
std::string helperPath = deferredcaster->helperPath();
ghoul::Dictionary helpersDict;
if (helperPath != "") {
helpersDict.setValue("0", helperPath);