mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-07 20:21:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'thesis/2021/skybrowser' of https://github.com/OpenSpace/OpenSpace into thesis/2021/skybrowser

Browse Source
This commit is contained in:
Ylva Selling
2021-03-29 08:27:53 +02:00
parent bb5042cd50 379dc39da0
commit d72080b2f6
4 changed files with 70 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/skybrowser/include/screenspaceskytarget.h
View File

@@ -22,24 +22,19 @@ namespace openspace {
ScreenSpaceSkyTarget(const ghoul::Dictionary& dictionary);
virtual ~ScreenSpaceSkyTarget() = default;
// from SSR
bool initializeGL() override;
bool isReady() const override;
void render() override;
void update() override;
void createShaders();
void setBrowser(ScreenSpaceSkyBrowser* browser);
ScreenSpaceSkyBrowser* getSkyBrowser();
void setDimensions(glm::vec2 currentBrowserDimensions);
void updateFOV(float fov);
void updateFOV(float browserFOV);
glm::vec2 getScreenSpacePosition();
glm::vec2 getAnglePosition();
void setScale(float scale);
void setConnectedBrowser();
void setBorderColor(glm::ivec3 color);
glm::ivec3 getColor();
@@ -58,8 +53,10 @@ namespace openspace {
private:
properties::Vec2Property _targetDimensions;
properties::FloatProperty _showCrosshairThreshold;
std::unique_ptr<ghoul::opengl::Texture> _texture;
UniformCache(modelTransform, viewProj, texture, fieldOfView, borderWidth, targetRatio, borderColor) _uniformCache;
UniformCache(modelTransform, viewProj, texture, showCrosshair, borderWidth, targetDimensions, borderColor) _uniformCache;
GLuint _vertexArray = 0;
GLuint _vertexBuffer = 0;
float _fieldOfView = 100.f;