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

General pass for code cleanup

Browse Source
This commit is contained in:
Alexander Bock
2024-03-08 00:36:54 +01:00
parent 2ed6907cf1
commit fff6f8a627
145 changed files with 432 additions and 463 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/digitaluniverse/rendering/renderabledumeshes.cpp
+7 -7
View File
@@ -255,7 +255,7 @@ RenderableDUMeshes::RenderableDUMeshes(const ghoul::Dictionary& dictionary)
if (p.meshColor.has_value()) {
std::vector<glm::vec3> ops = *p.meshColor;
for (size_t i = 0; i < ops.size(); ++i) {
for (size_t i = 0; i < ops.size(); i++) {
_meshColorMap.insert({ static_cast<int>(i) + 1, ops[i] });
}
}
@@ -304,7 +304,7 @@ void RenderableDUMeshes::initializeGL() {
void RenderableDUMeshes::deinitializeGL() {
for (const std::pair<const int, RenderingMesh>& pair : _renderingMeshesMap) {
for (int i = 0; i < pair.second.numU; ++i) {
for (int i = 0; i < pair.second.numU; i++) {
glDeleteVertexArrays(1, &pair.second.vaoArray[i]);
glDeleteBuffers(1, &pair.second.vboArray[i]);
}
@@ -336,7 +336,7 @@ void RenderableDUMeshes::renderMeshes(const RenderData&,
for (const std::pair<const int, RenderingMesh>& pair : _renderingMeshesMap) {
_program->setUniform(_uniformCache.color, _meshColorMap[pair.second.colorIndex]);
for (size_t i = 0; i < pair.second.vaoArray.size(); ++i) {
for (size_t i = 0; i < pair.second.vaoArray.size(); i++) {
glBindVertexArray(pair.second.vaoArray[i]);
switch (pair.second.style) {
case Solid:
@@ -563,7 +563,7 @@ bool RenderableDUMeshes::readSpeckFile() {
// Try to read three values for the position
glm::vec3 pos;
bool success = true;
for (int i = 0; i < 3; ++i) {
for (int i = 0; i < 3; i++) {
GLfloat value;
lineData >> value;
bool errorReading = lineData.rdstate() & std::ifstream::failbit;
@@ -592,7 +592,7 @@ bool RenderableDUMeshes::readSpeckFile() {
// OLD CODE:
// (2022-03-23, emmbr) None of our files included texture coordinates,
// and if they would they would still not be used by the shader
//for (int i = 0; i < 7; ++i) {
//for (int i = 0; i < 7; i++) {
// GLfloat value;
// lineData >> value;
// bool errorReading = lineData.rdstate() & std::ifstream::failbit;
@@ -626,7 +626,7 @@ void RenderableDUMeshes::createMeshes() {
LDEBUG("Creating planes");
for (std::pair<const int, RenderingMesh>& p : _renderingMeshesMap) {
for (int i = 0; i < p.second.numU; ++i) {
for (int i = 0; i < p.second.numU; i++) {
GLuint vao;
glGenVertexArrays(1, &vao);
p.second.vaoArray.push_back(vao);
@@ -685,7 +685,7 @@ void RenderableDUMeshes::createMeshes() {
// Grid: we need columns
if (p.second.numU > 1) {
for (int i = 0; i < p.second.numV; ++i) {
for (int i = 0; i < p.second.numV; i++) {
GLuint cvao;
glGenVertexArrays(1, &cvao);
p.second.vaoArray.push_back(cvao);
modules/digitaluniverse/rendering/renderableplanescloud.cpp
+3 -3
View File
@@ -587,7 +587,7 @@ void RenderablePlanesCloud::createPlanes() {
glm::vec4 vertex2 = transformedPos - u + v;
glm::vec4 vertex4 = transformedPos + u - v;
for (int i = 0; i < 3; ++i) {
for (int i = 0; i < 3; i++) {
maxSize = std::max(maxSize, vertex0[i]);
maxSize = std::max(maxSize, vertex1[i]);
maxSize = std::max(maxSize, vertex2[i]);
@@ -613,7 +613,7 @@ void RenderablePlanesCloud::createPlanes() {
std::unordered_map<int, PlaneAggregate>::iterator found =
_planesMap.find(textureIndex);
if (found != _planesMap.end()) {
for (int i = 0; i < PlanesVertexDataSize; ++i) {
for (int i = 0; i < PlanesVertexDataSize; i++) {
found->second.planesCoordinates.push_back(VertexData[i]);
}
found->second.numberOfPlanes++;
@@ -624,7 +624,7 @@ void RenderablePlanesCloud::createPlanes() {
glGenVertexArrays(1, &pA.vao);
glGenBuffers(1, &pA.vbo);
pA.numberOfPlanes = 1;
for (int i = 0; i < PlanesVertexDataSize; ++i) {
for (int i = 0; i < PlanesVertexDataSize; i++) {
pA.planesCoordinates.push_back(VertexData[i]);
}
_planesMap.insert(std::pair(textureIndex, pA));