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

Spherical and Euclidean coordinate update each other

Browse Source
This commit is contained in:
Sebastian Piwell
2016-03-16 11:47:53 -04:00
parent 6bea326151
commit e6aca4b836
5 changed files with 82 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/openspace/rendering/screenspacerenderable.h
+21 -5
View File
@@ -44,10 +44,22 @@ public:
virtual void update() = 0;
virtual bool isReady() const = 0;
bool isEnabled() const;
void move(glm::vec3 v){
glm::vec3 pos = _position.value();
pos += v;
_position.set(pos);
void move(glm::vec2 v){
if(_flatScreen.value()){
glm::vec2 pos = _euclideanPosition.value();
pos += v;
_euclideanPosition.set(pos);
}else{
glm::vec2 pos = _sphericalPosition.value();
pos += v;
_sphericalPosition.set(pos);
}
// glm::vec3 pos = _position.value();
// pos += v;
// _position.set(pos);
};
void toggleFlatScreen(){
_flatScreen.set(!_flatScreen.value());
};
protected:
@@ -55,13 +67,17 @@ protected:
properties::BoolProperty _enabled;
properties::BoolProperty _flatScreen;
properties::Vec3Property _position;
properties::Vec2Property _euclideanPosition;
properties::Vec2Property _sphericalPosition;
properties::FloatProperty _depth;
properties::FloatProperty _scale;
properties::StringProperty _texturePath;
GLuint _quad;
GLuint _vertexPositionBuffer;
std::unique_ptr<ghoul::opengl::ProgramObject> _shader;
float _radius;
bool _useEuclideanCoordinates;
};
} // namespace openspace
#endif // __SCREENSPACERENDERABLE_H__