mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-24 21:18:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	include/openspace/rendering/screenspacerenderable.h
	modules/base/rendering/screenspaceimage.cpp
	src/rendering/screenspacerenderable.cpp
This commit is contained in:
Sebastian Piwell
2016-03-16 17:42:13 -04:00
parent 0f963ee3b8 5a0ee0bc7a
commit 171aa46150
6 changed files with 84 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/rendering/screenspacerenderable.cpp
+17 -2
View File
@@ -37,7 +37,16 @@ ScreenSpaceRenderable::ScreenSpaceRenderable()
, _vertexPositionBuffer(0)
,_shader(nullptr)
,_radius(-.2f)
ScreenSpaceRenderable::ScreenSpaceRenderable(std::string texturePath)
: _enabled("enabled", "Is Enabled", true)
, _useFlatScreen("flatScreen", "Flat Screen", true)
, _shader(nullptr)
, _radius(-.2f)
, _rendererPath("${SHADERS}/renderframebuffer.frag")
{
addProperty(_enabled);
addProperty(_flatScreen);
{
addProperty(_enabled);
addProperty(_flatScreen);
@@ -46,11 +55,17 @@ ScreenSpaceRenderable::ScreenSpaceRenderable()
addProperty(_depth);
addProperty(_scale);
// addProperty(_texturePath);
{
addProperty(_enabled);
addProperty(_useFlatScreen);
_useEuclideanCoordinates = _flatScreen.value();
}
_rendererData = ghoul::Dictionary();
_rendererData.setValue("fragmentRendererPath", _rendererPath);
_rendererData.setValue("windowWidth", OsEng.windowWrapper().currentWindowResolution().x);
_rendererData.setValue("windowHeight", OsEng.windowWrapper().currentWindowResolution().y);
ScreenSpaceRenderable::~ScreenSpaceRenderable(){}
_useEuclideanCoordinates = _useFlatScreen.value();
bool ScreenSpaceRenderable::isEnabled() const {
return _enabled;