improved galaxy rendering

This commit is contained in:
Emil Axelsson
2016-06-03 11:16:57 +02:00
parent 432a29314c
commit 1901166640
47 changed files with 1156 additions and 353 deletions

View File

@@ -44,6 +44,7 @@ namespace {
const std::string ExitFragmentShaderPath = "${SHADERS}/framebuffer/exitframebuffer.frag";
const std::string RaycastFragmentShaderPath = "${SHADERS}/framebuffer/raycastframebuffer.frag";
const std::string RenderFragmentShaderPath = "${SHADERS}/framebuffer/renderframebuffer.frag";
const std::string PostRenderFragmentShaderPath = "${SHADERS}/framebuffer/postrenderframebuffer.frag";
}
namespace openspace {
@@ -400,7 +401,8 @@ void FramebufferRenderer::setResolution(glm::ivec2 res) {
void FramebufferRenderer::updateRendererData() {
ghoul::Dictionary dict;
dict.setValue("fragmentRendererPath", RenderFragmentShaderPath);
dict.setValue("fragmentRendererPath", std::string(RenderFragmentShaderPath));
dict.setValue("postFragmentRendererPath", std::string(PostRenderFragmentShaderPath));
dict.setValue("windowWidth", _resolution.x);
dict.setValue("windowHeight", _resolution.y);