3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-11 16:57:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Refactoring into GLTexture::Compressor

Browse source
This commit is contained in:
Enrico Turri 2019-08-01 11:01:18 +02:00
parent f913bbf8ef
commit 299739eeda
2 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/slic3r/GUI/GLTexture.cpp
View file

@ -27,10 +27,13 @@ namespace GUI {
void GLTexture::Compressor::reset() void GLTexture::Compressor::reset()
{ {
// force compression completion, if any if (m_is_compressing)
m_abort_compressing = true; {
// wait for compression completion, if any // force compression completion, if any
while (m_is_compressing) {} m_abort_compressing = true;
// wait for compression completion, if any
while (m_is_compressing) {}
}
m_levels.clear(); m_levels.clear();
} }
@ -42,8 +45,6 @@ void GLTexture::Compressor::add_level(unsigned int w, unsigned int h, const std:
void GLTexture::Compressor::start_compressing() void GLTexture::Compressor::start_compressing()
{ {
m_is_compressing = true;
m_abort_compressing = false;
std::thread t(&GLTexture::Compressor::compress, this); std::thread t(&GLTexture::Compressor::compress, this);
t.detach(); t.detach();
} }
@ -97,6 +98,9 @@ void GLTexture::Compressor::compress()
{ {
// reference: https://github.com/Cyan4973/RygsDXTc // reference: https://github.com/Cyan4973/RygsDXTc
m_is_compressing = true;
m_abort_compressing = false;
for (Level& level : m_levels) for (Level& level : m_levels)
{ {
if (m_abort_compressing) if (m_abort_compressing)

1
src/slic3r/GUI/GLTexture.hpp
View file

@ -32,6 +32,7 @@ namespace GUI {
public: public:
explicit Compressor(GLTexture& texture) : m_texture(texture), m_is_compressing(false), m_abort_compressing(false) {} explicit Compressor(GLTexture& texture) : m_texture(texture), m_is_compressing(false), m_abort_compressing(false) {}
~Compressor() { reset(); }
void reset(); void reset();