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

Feature/thesis work merge (#566)

Browse Source 
Web GUI from Klas Eskilson (three new modules: webgui, webbrowser and cefwebgui)
Parallel connection refactorization
Wormhole server added to the main repository
Transfer function editor work from Cristoffer Särevall
Update ghoul
This commit is contained in:
Emil Axelsson
2018-03-20 09:30:59 +01:00
committed by GitHub
parent 35fe90cbfa
commit d64a0df5f6
340 changed files with 26401 additions and 1625 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/rendering/framebufferrenderer.cpp
View File

@@ -466,7 +466,7 @@ void FramebufferRenderer::updateRaycastData() {
_exitPrograms[raycaster] = ghoul::opengl::ProgramObject::Build(
"Volume " + std::to_string(data.id) + " exit",
vsPath,
ExitFragmentShaderPath,
absPath(ExitFragmentShaderPath),
dict
);
} catch (ghoul::RuntimeError e) {
@@ -474,7 +474,7 @@ void FramebufferRenderer::updateRaycastData() {
}
try {
ghoul::Dictionary outsideDict = dict;
outsideDict.setValue("getEntryPath", GetEntryOutsidePath);
outsideDict.setValue("getEntryPath", absPath(GetEntryOutsidePath));
_raycastPrograms[raycaster] = ghoul::opengl::ProgramObject::Build(
"Volume " + std::to_string(data.id) + " raycast",
absPath(vsPath),
@@ -486,7 +486,7 @@ void FramebufferRenderer::updateRaycastData() {
}
try {
ghoul::Dictionary insideDict = dict;
insideDict.setValue("getEntryPath", GetEntryInsidePath);
insideDict.setValue("getEntryPath", absPath(GetEntryInsidePath));
_insideRaycastPrograms[raycaster] = ghoul::opengl::ProgramObject::Build(
"Volume " + std::to_string(data.id) + " inside raycast",
absPath("${SHADERS}/framebuffer/resolveframebuffer.vert"),
@@ -533,7 +533,7 @@ void FramebufferRenderer::updateDeferredcastData() {
try {
ghoul::Dictionary deferredDict = dict;
//deferredDict.setValue("getEntryPath", GetEntryOutsidePath);
//deferredDict.setValue("getEntryPath", absPath(GetEntryOutsidePath));
_deferredcastPrograms[caster] = ghoul::opengl::ProgramObject::Build(
"Deferred " + std::to_string(data.id) + " raycast",
absPath(vsPath),
@@ -1288,7 +1288,7 @@ std::vector<double> FramebufferRenderer::mSSAPattern() const {
void FramebufferRenderer::updateRendererData() {
ghoul::Dictionary dict;
dict.setValue("fragmentRendererPath", std::string(RenderFragmentShaderPath));
dict.setValue("fragmentRendererPath", absPath(RenderFragmentShaderPath));
_rendererData = dict;