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

Compile fix for Dataconverter

Browse Source
This commit is contained in:
Alexander Bock
2017-02-25 18:40:34 -05:00
parent bc75334eb4
commit 5bf729dca9
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/volume/textureslicevolumereader.inl
View File

@@ -29,7 +29,7 @@ namespace openspace {
template <typename VoxelType>
VoxelType TextureSliceVolumeReader<VoxelType>::get(const glm::ivec3& coordinates) const {
ghoul::opengl::Texture& slice = getSlice(coordinates.z);
return slice.texel<VoxelType>(coordinates.xy());
return slice.texel<VoxelType>(glm::ivec2(coordinates));
}
template <typename VoxelType>
@@ -52,7 +52,7 @@ void TextureSliceVolumeReader<VoxelType>::initialize() {
std::shared_ptr<ghoul::opengl::Texture> firstSlice =
ghoul::io::TextureReader::ref().loadTexture(_paths[0]);
_sliceDimensions = firstSlice->dimensions().xy();
_sliceDimensions = firstSlice->dimensions();
_initialized = true;
_cache.set(0, firstSlice);
}
@@ -72,7 +72,7 @@ ghoul::opengl::Texture& TextureSliceVolumeReader<VoxelType>::getSlice(int sliceI
std::shared_ptr<ghoul::opengl::Texture> texture =
ghoul::io::TextureReader::ref().loadTexture(_paths[sliceIndex]);
glm::ivec2 dims = texture->dimensions().xy();
glm::ivec2 dims = texture->dimensions();
ghoul_assert(dims == _sliceDimensions, "Slice dimensions do not agree.");
_cache.set(sliceIndex, std::move(texture));
}