mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 03:29:44 -06: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:
Michael Nilsson
2016-03-30 09:52:01 -04:00
parent d390a70fb6 48978f38fc
commit e09ed7594e
4 changed files with 4 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/openspace/rendering/screenspacerenderable.h
View File

@@ -66,18 +66,6 @@ public:
glm::vec2 sphericalPosition() const {return _sphericalPosition.value();};
float depth() const {return _depth.value();};
void move(glm::vec2 v){
if(_useFlatScreen.value()){
glm::vec2 pos = _euclideanPosition.value();
pos += v;
_euclideanPosition.set(pos);
}else{
glm::vec2 pos = _sphericalPosition.value();
pos += v;
_sphericalPosition.set(pos);
}
};
protected:
void createPlane();
void useEuclideanCoordinates(bool b);