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

Fixed issue 675.

Browse Source
This commit is contained in:
Jonathas Costa
2018-07-31 14:50:10 -04:00
parent 335beb8dd3
commit 4e30d9c3b8
2 changed files with 75 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/digitaluniverse/rendering/renderableplanescloud.h
+6 -6
View File
@@ -82,14 +82,15 @@ private:
GigalightYears = 6
};
struct RenderingPlane {
int planeIndex;
struct PlaneAggregate {
int textureIndex;
int numberOfPlanes;
GLuint vao;
GLuint vbo;
GLfloat vertexData[PLANES_VERTEX_DATA_SIZE];
std::vector<GLfloat> planesCoordinates;
};
void deleteDataGPU();
void deleteDataGPUAndCPU();
void createPlanes();
void renderPlanes(const RenderData& data, const glm::dmat4& modelViewMatrix,
const glm::dmat4& projectionMatrix, float fadeInVariable);
@@ -134,6 +135,7 @@ private:
std::shared_ptr<ghoul::fontrendering::Font> _font = nullptr;
std::unordered_map<int, std::unique_ptr<ghoul::opengl::Texture>> _textureMap;
std::unordered_map<int, std::string> _textureFileMap;
std::unordered_map<int, PlaneAggregate> _planesMap;
std::string _speckFile;
std::string _labelFile;
@@ -151,8 +153,6 @@ private:
float _sluminosity = 1.f;
glm::dmat4 _transformationMatrix = glm::dmat4(1.0);
std::vector<RenderingPlane> _renderingPlanesArray;
};