mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-28 06:59:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Solved merge conflict

Browse Source
This commit is contained in:
Sebastian Piwell
2016-03-16 17:42:51 -04:00
parent 171aa46150
commit 5bb4e3640d
3 changed files with 15 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/base/rendering/screenspaceframebuffer.cpp
View File

@@ -39,7 +39,7 @@ ScreenSpaceFramebuffer::ScreenSpaceFramebuffer()
_id = id();
setName("ScreenSpaceFramebuffer" + std::to_string(_id));
OsEng.gui()._property.registerProperty(&_enabled);
OsEng.gui()._property.registerProperty(&_flatScreen);
OsEng.gui()._property.registerProperty(&_useFlatScreen);
OsEng.gui()._property.registerProperty(&_euclideanPosition);
OsEng.gui()._property.registerProperty(&_sphericalPosition);
OsEng.gui()._property.registerProperty(&_depth);

8
modules/base/rendering/screenspaceimage.cpp
View File

@@ -36,17 +36,15 @@ namespace openspace {
ScreenSpaceImage::ScreenSpaceImage(std::string texturePath)
:ScreenSpaceRenderable()
,_texturePath("texturePath", "Texture path", texturePath)
{
addProperty(_texturePath);
:ScreenSpaceRenderable(texturePath)
, _vertexPath("${MODULE_BASE}/shaders/screnspace_vs.glsl")
, _fragmentPath("${MODULE_BASE}/shaders/screnspace_fs.glsl")
OsEng.gui()._property.registerProperty(&_useFlatScreen);
{
addProperty(_texturePath);
_id = id();
setName("ScreenSpaceImage" + std::to_string(_id));
OsEng.gui()._property.registerProperty(&_enabled);
OsEng.gui()._property.registerProperty(&_flatScreen);
OsEng.gui()._property.registerProperty(&_useFlatScreen);
OsEng.gui()._property.registerProperty(&_euclideanPosition);
OsEng.gui()._property.registerProperty(&_sphericalPosition);
OsEng.gui()._property.registerProperty(&_depth);