mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-23 20:50:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Sebastian Piwell
2016-03-16 11:47:58 -04:00
parent e6aca4b836 f5d223c557
commit cab6951140
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/base/rendering/screenspaceimage.cpp
+3 -2
View File
@@ -29,6 +29,7 @@
#include <ghoul/opengl/textureunit.h>
#include <modules/onscreengui/include/gui.h>
#include <glm/gtx/polar_coordinates.hpp>
#include <openspace/util/camera.h>
namespace openspace {
ScreenSpaceImage::ScreenSpaceImage(std::string texturePath)
@@ -62,7 +63,7 @@ ScreenSpaceImage::ScreenSpaceImage(std::string texturePath)
ScreenSpaceImage::~ScreenSpaceImage(){}
void ScreenSpaceImage::render(Camera* camera){
void ScreenSpaceImage::render(){
GLfloat m_viewport[4];
glGetFloatv(GL_VIEWPORT, m_viewport);
@@ -96,7 +97,7 @@ void ScreenSpaceImage::render(Camera* camera){
_shader->activate();
_shader->setUniform("OcclusionDepth", occlusionDepth);
_shader->setUniform("ModelTransform",modelTransform);
_shader->setUniform("ViewProjectionMatrix", camera->viewProjectionMatrix());
_shader->setUniform("ViewProjectionMatrix", OsEng.renderEngine().camera()->viewProjectionMatrix());
ghoul::opengl::TextureUnit unit;
unit.activate();
_texture->bind();
modules/base/rendering/screenspaceimage.h
+1 -1
View File
@@ -34,7 +34,7 @@ public:
ScreenSpaceImage(std::string texturePath);
~ScreenSpaceImage();
void render(Camera* camera) override;
void render() override;
bool initialize() override;
bool deinitialize() override;
void update() override;