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

Code cleanup

Browse Source 
Remove warnings from multiresvolume module
This commit is contained in:
Alexander Bock
2018-07-13 16:02:42 -04:00
parent c2cc2bab17
commit d0f3e5507a
40 changed files with 1622 additions and 1638 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/multiresvolume/rendering/atlasmanager.cpp
+51 -44
View File
@@ -25,16 +25,8 @@
#include <modules/multiresvolume/rendering/atlasmanager.h>
#include <modules/multiresvolume/rendering/tsp.h>
#include <ghoul/filesystem/filesystem.h>
#include <ghoul/logging/logmanager.h>
#include <ghoul/opengl/texture.h>
#include <cstring>
#include <iostream>
#include <fstream>
namespace {
constexpr const char* _loggerCat = "AtlasManager";
} // namespace
namespace openspace {
@@ -43,17 +35,17 @@ AtlasManager::AtlasManager(TSP* tsp) : _tsp(tsp) {}
bool AtlasManager::initialize() {
TSP::Header header = _tsp->header();
_nBricksPerDim = header.xNumBricks_;
_nBricksPerDim = header.xNumBricks;
_nOtLeaves = _nBricksPerDim * _nBricksPerDim * _nBricksPerDim;
_nOtNodes = _tsp->numOTNodes();
_nOtLevels = static_cast<unsigned int>(log(_nOtLeaves)/log(8) + 1);
_nOtLevels = static_cast<unsigned int>(log(_nOtLeaves) / log(8) + 1);
_paddedBrickDim = _tsp->paddedBrickDim();
_nBricksInMap = _nBricksPerDim * _nBricksPerDim * _nBricksPerDim;
_atlasDim = _nBricksPerDim * _paddedBrickDim;
_nBrickVals = _paddedBrickDim*_paddedBrickDim*_paddedBrickDim;
_brickSize = _nBrickVals * sizeof(float);
_volumeSize = _brickSize * _nOtLeaves;
_atlasMap = std::vector<unsigned int>(_nOtLeaves, NOT_USED);
_atlasMap = std::vector<unsigned int>(_nOtLeaves, NotUsedIndex);
_nBricksInAtlas = _nBricksInMap;
_freeAtlasCoords = std::vector<unsigned int>(_nBricksInAtlas, 0);
@@ -63,9 +55,9 @@ bool AtlasManager::initialize() {
}
_textureAtlas = new ghoul::opengl::Texture(
glm::size3_t(_atlasDim, _atlasDim, _atlasDim),
ghoul::opengl::Texture::Format::RGBA,
GL_RGBA,
glm::size3_t(_atlasDim, _atlasDim, _atlasDim),
ghoul::opengl::Texture::Format::RGBA,
GL_RGBA,
GL_FLOAT
);
_textureAtlas->uploadTexture();
@@ -114,10 +106,12 @@ void AtlasManager::updateAtlas(BufferIndex bufferIndex, std::vector<int>& brickI
glBindBuffer(GL_PIXEL_UNPACK_BUFFER, _pboHandle[bufferIndex]);
glBufferData(GL_PIXEL_UNPACK_BUFFER, _volumeSize, nullptr, GL_STREAM_DRAW);
float* mappedBuffer = reinterpret_cast<float*>(glMapBuffer(GL_PIXEL_UNPACK_BUFFER, GL_WRITE_ONLY));
float* mappedBuffer = reinterpret_cast<float*>(
glMapBuffer(GL_PIXEL_UNPACK_BUFFER, GL_WRITE_ONLY)
);
if (!mappedBuffer) {
LERROR("Failed to map PBO");
LERRORC("AtlasManager", "Failed to map PBO");
std::cout << glGetError() << std::endl;
return;
}
@@ -152,7 +146,7 @@ void AtlasManager::updateAtlas(BufferIndex bufferIndex, std::vector<int>& brickI
pboToAtlas(bufferIndex);
glBindBuffer(GL_SHADER_STORAGE_BUFFER, _atlasMapBuffer);
GLint *to = reinterpret_cast<GLint*>(
GLint* to = reinterpret_cast<GLint*>(
glMapBuffer(GL_SHADER_STORAGE_BUFFER, GL_WRITE_ONLY)
);
memcpy(to, _atlasMap.data(), sizeof(GLint)*_atlasMap.size());
@@ -160,16 +154,25 @@ void AtlasManager::updateAtlas(BufferIndex bufferIndex, std::vector<int>& brickI
glBindBuffer(GL_SHADER_STORAGE_BUFFER, 0);
}
void AtlasManager::addToAtlas(int firstBrickIndex, int lastBrickIndex, float* mappedBuffer) {
while (_brickMap.count(firstBrickIndex) && firstBrickIndex <= lastBrickIndex) firstBrickIndex++;
while (_brickMap.count(lastBrickIndex) && lastBrickIndex >= firstBrickIndex) lastBrickIndex--;
if (lastBrickIndex < firstBrickIndex) return;
void AtlasManager::addToAtlas(int firstBrickIndex, int lastBrickIndex,
float* mappedBuffer)
{
while (_brickMap.count(firstBrickIndex) && firstBrickIndex <= lastBrickIndex) {
firstBrickIndex++;
}
while (_brickMap.count(lastBrickIndex) && lastBrickIndex >= firstBrickIndex) {
lastBrickIndex--;
}
if (lastBrickIndex < firstBrickIndex) {
return;
}
int sequenceLength = lastBrickIndex - firstBrickIndex + 1;
float* sequenceBuffer = new float[sequenceLength*_nBrickVals];
size_t bufferSize = sequenceLength * _brickSize;
long long offset = TSP::dataPosition() + static_cast<long long>(firstBrickIndex) * static_cast<long long>(_brickSize);
long long offset = TSP::dataPosition() + static_cast<long long>(firstBrickIndex) *
static_cast<long long>(_brickSize);
_tsp->file().seekg(offset);
_tsp->file().read(reinterpret_cast<char*>(sequenceBuffer), bufferSize);
_nDiskReads++;
@@ -178,12 +181,18 @@ void AtlasManager::addToAtlas(int firstBrickIndex, int lastBrickIndex, float* ma
if (!_brickMap.count(brickIndex)) {
unsigned int atlasCoords = _freeAtlasCoords.back();
_freeAtlasCoords.pop_back();
int level = _nOtLevels - static_cast<int>(floor(log((7.0 * (float(brickIndex % _nOtNodes)) + 1.0))/log(8)) - 1);
int level = _nOtLevels - static_cast<int>(
floor(log((7.0 * (float(brickIndex % _nOtNodes)) + 1.0))/log(8)) - 1
);
ghoul_assert(atlasCoords <= 0x0FFFFFFF, "@MISSING");
unsigned int atlasData = (level << 28) + atlasCoords;
_brickMap.insert(std::pair<unsigned int, unsigned int>(brickIndex, atlasData));
_brickMap.emplace(brickIndex, atlasData);
_nStreamedBricks++;
fillVolume(&sequenceBuffer[_nBrickVals*(brickIndex - firstBrickIndex)], mappedBuffer, atlasCoords);
fillVolume(
&sequenceBuffer[_nBrickVals*(brickIndex - firstBrickIndex)],
mappedBuffer,
atlasCoords
);
}
}
@@ -213,10 +222,8 @@ void AtlasManager::fillVolume(float* in, float* out, unsigned int linearAtlasCoo
for (unsigned int zValCoord = zMin; zValCoord<zMax; ++zValCoord) {
for (unsigned int yValCoord = yMin; yValCoord<yMax; ++yValCoord) {
for (unsigned int xValCoord = xMin; xValCoord<xMax; ++xValCoord) {
unsigned int idx =
xValCoord +
yValCoord*_atlasDim +
zValCoord*_atlasDim*_atlasDim;
unsigned int idx = xValCoord + yValCoord * _atlasDim +
zValCoord * _atlasDim * _atlasDim;
out[idx] = in[from];
from++;
@@ -230,17 +237,17 @@ void AtlasManager::pboToAtlas(BufferIndex bufferIndex) {
glm::size3_t dim = _textureAtlas->dimensions();
glBindTexture(GL_TEXTURE_3D, *_textureAtlas);
glTexSubImage3D(
GL_TEXTURE_3D, // target
0, // level
0, // xoffset
0, // yoffset
0, // zoffset
static_cast<GLsizei>(dim[0]), // width
static_cast<GLsizei>(dim[1]), // height
static_cast<GLsizei>(dim[2]), // depth
GL_RED, // format
GL_FLOAT, // type
nullptr // *pixels
GL_TEXTURE_3D,
0,
0,
0,
0,
static_cast<GLsizei>(dim[0]),
static_cast<GLsizei>(dim[1]),
static_cast<GLsizei>(dim[2]),
GL_RED,
GL_FLOAT,
nullptr
);
glBindTexture(GL_TEXTURE_3D, 0);
glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0);
@@ -251,19 +258,19 @@ ghoul::opengl::Texture& AtlasManager::textureAtlas() {
return *_textureAtlas;
}
unsigned int AtlasManager::getNumDiskReads() {
unsigned int AtlasManager::numDiskReads() const {
return _nDiskReads;
}
unsigned int AtlasManager::getNumUsedBricks() {
unsigned int AtlasManager::numUsedBricks() const {
return _nUsedBricks;
}
unsigned int AtlasManager::getNumStreamedBricks() {
unsigned int AtlasManager::numStreamedBricks() const {
return _nStreamedBricks;
}
glm::size3_t AtlasManager::textureSize() {
glm::size3_t AtlasManager::textureSize() const {
return _textureAtlas->dimensions();
}