# HG changeset patch # User Sebastien Jodogne # Date 1683144038 -7200 # Node ID b6b5e1ca1cc2174c92ff0cec4c6b66ed4e61d88e # Parent f5db73779f2d36beac2bffaf6622af9d635b31ad rename diff -r f5db73779f2d -r b6b5e1ca1cc2 OrthancStone/Sources/OpenGL/OpenGLFramebuffer.h --- a/OrthancStone/Sources/OpenGL/OpenGLFramebuffer.h Wed May 03 16:48:59 2023 +0200 +++ b/OrthancStone/Sources/OpenGL/OpenGLFramebuffer.h Wed May 03 22:00:38 2023 +0200 @@ -34,6 +34,7 @@ { class OpenGLTexture; class OpenGLTextureArray; + class OpenGLTextureVolume; class OpenGLFramebuffer : public boost::noncopyable { @@ -55,12 +56,19 @@ void SetTarget(OpenGLTextureArray& target, unsigned int layer); + void SetTarget(OpenGLTextureVolume& target, + unsigned int z); + void ReadTexture(Orthanc::ImageAccessor& target, const OpenGLTexture& source); void ReadTexture(Orthanc::ImageAccessor& target, const OpenGLTextureArray& source, unsigned int layer); + + void ReadTexture(Orthanc::ImageAccessor& target, + const OpenGLTextureVolume& source, + unsigned int z); }; } } diff -r f5db73779f2d -r b6b5e1ca1cc2 OrthancStone/Sources/OpenGL/OpenGLTextureArray.cpp --- a/OrthancStone/Sources/OpenGL/OpenGLTextureArray.cpp Wed May 03 16:48:59 2023 +0200 +++ b/OrthancStone/Sources/OpenGL/OpenGLTextureArray.cpp Wed May 03 22:00:38 2023 +0200 @@ -223,7 +223,7 @@ } - OpenGLTextureArray::DownloadedVolume::DownloadedVolume(const OpenGLTextureArray& texture) : + OpenGLTextureArray::DownloadedArray::DownloadedArray(const OpenGLTextureArray& texture) : format_(texture.format_), width_(texture.width_), height_(texture.height_), @@ -282,7 +282,7 @@ } - Orthanc::ImageAccessor* OpenGLTextureArray::DownloadedVolume::GetLayer(unsigned int layer) const + Orthanc::ImageAccessor* OpenGLTextureArray::DownloadedArray::GetLayer(unsigned int layer) const { if (layer >= depth_) { diff -r f5db73779f2d -r b6b5e1ca1cc2 OrthancStone/Sources/OpenGL/OpenGLTextureArray.h --- a/OrthancStone/Sources/OpenGL/OpenGLTextureArray.h Wed May 03 16:48:59 2023 +0200 +++ b/OrthancStone/Sources/OpenGL/OpenGLTextureArray.h Wed May 03 22:00:38 2023 +0200 @@ -105,7 +105,7 @@ void Upload(const Orthanc::ImageAccessor& image, unsigned int layer); - class DownloadedVolume : public boost::noncopyable + class DownloadedArray : public boost::noncopyable { private: std::string buffer_; @@ -115,7 +115,7 @@ unsigned int depth_; public: - DownloadedVolume(const OpenGLTextureArray& texture); + DownloadedArray(const OpenGLTextureArray& texture); Orthanc::PixelFormat GetFormat() const {