mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-22 04:49:12 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove posincrement

Browse Source
This commit is contained in:
Malin Ejdbo
2021-05-31 16:26:51 +02:00
parent 23abfa5ee3
commit 59b3048c87
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
modules/base/rendering/renderableprism.cpp
View File

@@ -215,9 +215,9 @@ void RenderablePrism::updateVertexData() {
for (int i = 0; i < 2; ++i) {
float h = i * _length; // z value, 0 to _length
for (int j = 0, k = 0; j < _nShapeSegments && k < unitVertices.size(); ++j) {
float ux = unitVertices[k++];
float uy = unitVertices[k++];
for (int j = 0, k = 0; j < _nShapeSegments && k < unitVertices.size(); ++j, k += 2) {
float ux = unitVertices[k];
float uy = unitVertices[k + 1];
_vertexArray.push_back(ux * _radius); // x
_vertexArray.push_back(uy * _radius); // y
@@ -239,9 +239,9 @@ void RenderablePrism::updateVertexData() {
_vertexArray.push_back(_length);
}
else {
for (int j = 0, k = 0; j < _nLines && k < unitVerticesLines.size(); ++j) {
float ux = unitVerticesLines[k++];
float uy = unitVerticesLines[k++];
for (int j = 0, k = 0; j < _nLines && k < unitVerticesLines.size(); ++j, k += 2) {
float ux = unitVerticesLines[k];
float uy = unitVerticesLines[k + 1];
// Base
_vertexArray.push_back(ux * _radius); // x
@@ -270,12 +270,12 @@ void RenderablePrism::updateVertexData() {
}
// Indices for connecting lines
for (int i = 0, k = 0; i < _nLines; ++i) {
for (int i = 0, k = 0; i < _nLines; ++i, k += 2) {
// Reset
_indexArray.push_back(255);
_indexArray.push_back(2 * _nShapeSegments + k++);
_indexArray.push_back(2 * _nShapeSegments + k++);
_indexArray.push_back(2 * _nShapeSegments + k);
_indexArray.push_back(2 * _nShapeSegments + k + 1);
}
}