Showing the changes to interface/src/MetavoxelSystem.cpp (1 of 2 files). Show all
Unified · Split
| @@ -215,7 +215,7 @@ void MetavoxelSystem::render() { · 214 unmodified lines | |||
| 215 | 215 | ||
| 216 | _baseHeightfieldProgram.bind(); | 216 | _baseHeightfieldProgram.bind(); |
| 217 | 217 | ||
| 218 | foreach (const HeightfieldBaseBatch& batch, _heightfieldBaseBatches) { | 218 | foreach (const HeightfieldBaseLayerBatch& batch, _heightfieldBaseBatches) { |
| 219 | glPushMatrix(); | 219 | glPushMatrix(); |
| 220 | glTranslatef(batch.translation.x, batch.translation.y, batch.translation.z); | 220 | glTranslatef(batch.translation.x, batch.translation.y, batch.translation.z); |
| 221 | glm::vec3 axis = glm::axis(batch.rotation); | 221 | glm::vec3 axis = glm::axis(batch.rotation); |
| @@ -362,7 +362,7 @@ void MetavoxelSystem::render() { · 140 unmodified lines | |||
| 362 | 362 | ||
| 363 | _baseVoxelProgram.bind(); | 363 | _baseVoxelProgram.bind(); |
| 364 | 364 | ||
| 365 | foreach (const VoxelBaseBatch& batch, _voxelBaseBatches) { | 365 | foreach (const VoxelBatch& batch, _voxelBaseBatches) { |
| 366 | batch.vertexBuffer->bind(); | 366 | batch.vertexBuffer->bind(); |
| 367 | batch.indexBuffer->bind(); | 367 | batch.indexBuffer->bind(); |
| 368 | 368 | ||
| @@ -1155,7 +1155,7 @@ void VoxelBuffer::render(bool cursor) { · 786 unmodified lines | |||
| 1155 | return; | 1155 | return; |
| 1156 | } | 1156 | } |
| 1157 | 1157 | ||
| 1158 | VoxelBaseBatch baseBatch; | 1158 | VoxelBatch baseBatch; |
| 1159 | baseBatch.vertexBuffer = &_vertexBuffer; | 1159 | baseBatch.vertexBuffer = &_vertexBuffer; |
| 1160 | baseBatch.indexBuffer = &_indexBuffer; | 1160 | baseBatch.indexBuffer = &_indexBuffer; |
| 1161 | baseBatch.vertexCount = _vertexCount; | 1161 | baseBatch.vertexCount = _vertexCount; |
| @@ -2209,7 +2209,7 @@ void HeightfieldRenderer::render(bool cursor) { · 1047 unmodified lines | |||
| 2209 | return; | 2209 | return; |
| 2210 | } | 2210 | } |
| 2211 | 2211 | ||
| 2212 | HeightfieldBaseBatch baseBatch; | 2212 | HeightfieldBaseLayerBatch baseBatch; |
| 2213 | baseBatch.vertexBuffer = &bufferPair.first; | 2213 | baseBatch.vertexBuffer = &bufferPair.first; |
| 2214 | baseBatch.indexBuffer = &bufferPair.second; | 2214 | baseBatch.indexBuffer = &bufferPair.second; |
| 2215 | baseBatch.translation = heightfield->getTranslation(); | 2215 | baseBatch.translation = heightfield->getTranslation(); |