mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-03 17:30:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

solved merge conflict

Browse Source
This commit is contained in:
Michael Nilsson
2016-03-18 13:57:28 -04:00
parent af8880274c 48021a46e2
commit 85225946b9
6 changed files with 52 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/rendering/screenspacerenderable.cpp
+2 -1
View File
@@ -30,7 +30,7 @@ ScreenSpaceRenderable::ScreenSpaceRenderable()
, _useFlatScreen("flatScreen", "Flat Screen", false)
, _euclideanPosition("euclideanPosition", "Euclidean coordinates", glm::vec2(0),glm::vec2(-4),glm::vec2(4))
, _sphericalPosition("sphericalPosition", "Spherical coordinates", glm::vec2(0),glm::vec2(-M_PI),glm::vec2(M_PI))
, _depth("depth", "Depth", 0, 0, 1)
, _depth("depth", "Depth", 0, 0, 0)
, _scale("scale", "Scale" , 0.5, 0, 2)
, _alpha("alpha", "Alpha" , 1, 0, 1)
, _quad(0)
@@ -58,6 +58,7 @@ ScreenSpaceRenderable::ScreenSpaceRenderable()
_radius = _planeDepth;
_sphericalPosition.set(toSpherical(_euclideanPosition.value()));
}
ScreenSpaceRenderable::~ScreenSpaceRenderable(){}