mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 03:29:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixing more includes and forward declarations (#3876)

Browse Source
This commit is contained in:
Alexander Bock
2025-12-16 13:40:19 +01:00
committed by GitHub
parent c4fe078706
commit c02e59b9f8
1009 changed files with 5216 additions and 3589 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
modules/multiresvolume/rendering/brickmanager.cpp
View File

@@ -29,6 +29,10 @@
#include <ghoul/logging/logmanager.h>
#include <ghoul/opengl/texture.h>
#include <glm/gtx/std_based_type.hpp>
#include <algorithm>
#include <cmath>
#include <format>
#include <string_view>
namespace {
constexpr std::string_view _loggerCat = "BrickManager";
@@ -157,8 +161,7 @@ bool BrickManager::initialize() {
return true;
}
bool BrickManager::buildBrickList(BUFFER_INDEX bufferIndex,
std::vector<int> &brickRequest)
bool BrickManager::buildBrickList(BufferIndex bufferIndex, std::vector<int>& brickRequest)
{
// Keep track of number bricks used and number of bricks cached
// (for benchmarking)
@@ -281,7 +284,7 @@ void BrickManager::coordinatesFromLinear(int idx, int& x, int& y, int& z) {
z = idx;
}
bool BrickManager::diskToPBO(BUFFER_INDEX pboIndex) {
bool BrickManager::diskToPBO(BufferIndex pboIndex) {
// Map PBO
glBindBuffer(GL_PIXEL_UNPACK_BUFFER, _pboHandle[pboIndex]);
glBufferData(GL_PIXEL_UNPACK_BUFFER, _volumeSize, nullptr, GL_STREAM_DRAW);
@@ -406,8 +409,8 @@ bool BrickManager::diskToPBO(BUFFER_INDEX pboIndex) {
return true;
}
bool BrickManager::pboToAtlas(BUFFER_INDEX _pboIndex) {
glBindBuffer(GL_PIXEL_UNPACK_BUFFER, _pboHandle[_pboIndex]);
bool BrickManager::pboToAtlas(BufferIndex pboIndex) {
glBindBuffer(GL_PIXEL_UNPACK_BUFFER, _pboHandle[pboIndex]);
glm::size3_t dim = _textureAtlas->dimensions();
glBindTexture(GL_TEXTURE_3D, *_textureAtlas);
glTexSubImage3D(
@@ -433,11 +436,11 @@ ghoul::opengl::Texture* BrickManager::textureAtlas() {
return _textureAtlas;
}
unsigned int BrickManager::pbo(BUFFER_INDEX pboIndex) const {
unsigned int BrickManager::pbo(BufferIndex pboIndex) const {
return _pboHandle[pboIndex];
}
const std::vector<int>& BrickManager::brickList(BUFFER_INDEX index) const {
const std::vector<int>& BrickManager::brickList(BufferIndex index) const {
return _brickLists.at(index);
}