More waffling

2024-09-13 06:37:34 +00:00 · 2021-03-13 20:47:53 -08:00 · 2021-03-13 20:47:53 -08:00 · f72b794d20
commit f72b794d20
parent ab65c0a7c8
33 changed files with 50 additions and 51 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -12,29 +12,28 @@ add_subdirectory(extern/pybind11)
 # Collect source files
 file(GLOB SOURCE_FILES
        "quicktex/*.cpp"
-        "quicktex/compression/*.cpp"
-        "quicktex/compression/bc1/*.cpp"
-        "quicktex/compression/bc3/*.cpp"
-        "quicktex/compression/bc4/*.cpp"
-        "quicktex/compression/bc5/*.cpp"
+        "quicktex/s3tc/*.cpp"
+        "quicktex/s3tc/bc1/*.cpp"
+        "quicktex/s3tc/bc3/*.cpp"
+        "quicktex/s3tc/bc4/*.cpp"
+        "quicktex/s3tc/bc5/*.cpp"
        )

 file(GLOB HEADER_FILES
        "quicktex/*.h"
-        "quicktex/compression/*.h"
-        "quicktex/compression/bc1/*.h"
-        "quicktex/compression/bc3/*.h"
-        "quicktex/compression/bc4/*.h"
-        "quicktex/compression/bc5/*.h"
-        "quicktex/formats/blocks/*.h"
+        "quicktex/s3tc/*.h"
+        "quicktex/s3tc/bc1/*.h"
+        "quicktex/s3tc/bc3/*.h"
+        "quicktex/s3tc/bc4/*.h"
+        "quicktex/s3tc/bc5/*.h"
        )

 file(GLOB TEST_FILES "tests/*.cpp")

 set(PYTHON_FILES
        "quicktex/bindings/Module.cpp"
-        "quicktex/compression/bindings/Decoders.cpp"
-        "quicktex/compression/bindings/Encoders.cpp")
+        "quicktex/s3tc/bindings/Decoders.cpp"
+        "quicktex/s3tc/bindings/Encoders.cpp")

 # Organize source files together for some IDEs
 source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${SOURCE_FILES} ${HEADER_FILES} ${PYTHON_FILES})
--- a/quicktex/compression/BlockDecoder.h
+++ b/quicktex/compression/BlockDecoder.h
--- a/quicktex/compression/BlockEncoder.h
+++ b/quicktex/compression/BlockEncoder.h
--- a/quicktex/bindings/Module.cpp
+++ b/quicktex/bindings/Module.cpp
@ -19,7 +19,7 @@

 #include <pybind11/pybind11.h>

-#include "../Interpolator.h"
+#include "../s3tc/Interpolator.h"

 namespace py = pybind11;
 namespace quicktex::bindings {
--- a/quicktex/s3tc/Interpolator.cpp
+++ b/quicktex/s3tc/Interpolator.cpp
@ -24,7 +24,7 @@
 #include <cstdint>
 #include <stdexcept>

-#include "util.h"
+#include "../util.h"

 namespace quicktex {

--- a/quicktex/s3tc/Interpolator.h
+++ b/quicktex/s3tc/Interpolator.h
@ -22,7 +22,7 @@
 #include <cstdint>  // for uint8_t, uint16_t
 #include <memory>   // for unique_ptr

-#include "Color.h"  // for Color
+#include "../Color.h"  // for Color

 namespace quicktex {

--- a/quicktex/formats/blocks/BC1Block.h
+++ b/quicktex/formats/blocks/BC1Block.h
--- a/quicktex/compression/bc1/BC1Decoder.cpp
+++ b/quicktex/compression/bc1/BC1Decoder.cpp
@ -25,8 +25,8 @@

 #include "../../BlockView.h"
 #include "../../Color.h"
-#include "../../formats/blocks/BC1Block.h"
 #include "../../ndebug.h"
+#include "BC1Block.h"

 namespace quicktex {
 void BC1Decoder::DecodeBlock(Color4x4 dest, BC1Block *const block) const noexcept(ndebug) {
--- a/quicktex/compression/bc1/BC1Decoder.h
+++ b/quicktex/compression/bc1/BC1Decoder.h
@ -22,11 +22,11 @@
 #include <memory>
 #include <type_traits>

+#include "../../BlockDecoder.h"
 #include "../../BlockView.h"
-#include "../../Interpolator.h"
-#include "../../formats/blocks/BC1Block.h"
 #include "../../ndebug.h"
-#include "../BlockDecoder.h"
+#include "../Interpolator.h"
+#include "BC1Block.h"

 namespace quicktex {
 class BC1Decoder final : public BlockDecoderTemplate<BC1Block, 4, 4> {
--- a/quicktex/compression/bc1/BC1Encoder.cpp
+++ b/quicktex/compression/bc1/BC1Encoder.cpp
@ -29,12 +29,12 @@

 #include "../../BlockView.h"
 #include "../../Color.h"
-#include "../../Interpolator.h"
 #include "../../Matrix4x4.h"
 #include "../../Vector4.h"
 #include "../../Vector4Int.h"
 #include "../../bitwiseEnums.h"
 #include "../../util.h"
+#include "../Interpolator.h"
 #include "Histogram.h"
 #include "OrderTable.h"
 #include "SingleColorTable.h"
--- a/quicktex/compression/bc1/BC1Encoder.h
+++ b/quicktex/compression/bc1/BC1Encoder.h
@ -26,11 +26,11 @@
 #include <memory>
 #include <type_traits>

+#include "../../BlockEncoder.h"
 #include "../../BlockView.h"
 #include "../../Color.h"
-#include "../../Interpolator.h"
-#include "../../formats/blocks/BC1Block.h"
-#include "../BlockEncoder.h"
+#include "../Interpolator.h"
+#include "BC1Block.h"
 #include "SingleColorTable.h"

 namespace quicktex {
--- a/quicktex/compression/bc1/Histogram.h
+++ b/quicktex/compression/bc1/Histogram.h
--- a/quicktex/compression/bc1/OrderTable.cpp
+++ b/quicktex/compression/bc1/OrderTable.cpp
--- a/quicktex/compression/bc1/OrderTable.h
+++ b/quicktex/compression/bc1/OrderTable.h
--- a/quicktex/compression/bc1/OrderTable4.cpp
+++ b/quicktex/compression/bc1/OrderTable4.cpp
--- a/quicktex/compression/bc1/SingleColorTable.h
+++ b/quicktex/compression/bc1/SingleColorTable.h
@ -23,8 +23,8 @@
 #include <cstdint>
 #include <memory>

-#include "../../Interpolator.h"
 #include "../../util.h"
+#include "../Interpolator.h"

 namespace quicktex::BC1 {

--- a/quicktex/formats/blocks/BC3Block.h
+++ b/quicktex/formats/blocks/BC3Block.h
@ -19,7 +19,7 @@

 #pragma once

-#include "BC1Block.h"
+#include "../../s3tc/bc1/BC1Block.h"
 #include "BC4Block.h"

 namespace quicktex {
--- a/quicktex/compression/bc3/BC3Decoder.cpp
+++ b/quicktex/compression/bc3/BC3Decoder.cpp
@ -22,8 +22,8 @@
 #include <type_traits>

 #include "../../BlockView.h"
-#include "../../formats/blocks/BC3Block.h"
 #include "../../ndebug.h"
+#include "BC3Block.h"

 namespace quicktex {

--- a/quicktex/compression/bc3/BC3Decoder.h
+++ b/quicktex/compression/bc3/BC3Decoder.h
@ -21,13 +21,13 @@

 #include <memory>

+#include "../../BlockDecoder.h"
 #include "../../BlockView.h"
-#include "../../Interpolator.h"
-#include "../../formats/blocks/BC3Block.h"
 #include "../../ndebug.h"
-#include "../BlockDecoder.h"
+#include "../Interpolator.h"
 #include "../bc1/BC1Decoder.h"
 #include "../bc4/BC4Decoder.h"
+#include "BC3Block.h"

 namespace quicktex {
 class BC3Decoder : public BlockDecoderTemplate<BC3Block, 4, 4> {
--- a/quicktex/compression/bc3/BC3Encoder.cpp
+++ b/quicktex/compression/bc3/BC3Encoder.cpp
@ -20,7 +20,7 @@
 #include "BC3Encoder.h"

 #include "../../BlockView.h"
-#include "../../formats/blocks/BC3Block.h"
+#include "BC3Block.h"

 namespace quicktex {
 void BC3Encoder::EncodeBlock(Color4x4 pixels, BC3Block *dest) const {
--- a/quicktex/compression/bc3/BC3Encoder.h
+++ b/quicktex/compression/bc3/BC3Encoder.h
@ -21,12 +21,12 @@

 #include <memory>

+#include "../../BlockEncoder.h"
 #include "../../BlockView.h"
-#include "../../Interpolator.h"
-#include "../../formats/blocks/BC3Block.h"
-#include "../BlockEncoder.h"
+#include "../Interpolator.h"
 #include "../bc1/BC1Encoder.h"
 #include "../bc4/BC4Encoder.h"
+#include "BC3Block.h"

 namespace quicktex {

--- a/quicktex/formats/blocks/BC4Block.h
+++ b/quicktex/formats/blocks/BC4Block.h
@ -26,7 +26,7 @@

 #include "../../Color.h"
 #include "../../util.h"
-#include "BC1Block.h"
+#include "../bc1/BC1Block.h"

 namespace quicktex {

--- a/quicktex/compression/bc4/BC4Decoder.cpp
+++ b/quicktex/compression/bc4/BC4Decoder.cpp
@ -23,8 +23,8 @@
 #include <cassert>  // for assert

 #include "../../BlockView.h"  // for ColorBlock
-#include "../../formats/blocks/BC4Block.h"
 #include "../../ndebug.h"     // for ndebug
+#include "BC4Block.h"

 void quicktex::BC4Decoder::DecodeBlock(Byte4x4 dest, BC4Block *const block) const noexcept(ndebug) {
    auto l = block->GetLowAlpha();
--- a/quicktex/compression/bc4/BC4Decoder.h
+++ b/quicktex/compression/bc4/BC4Decoder.h
@ -23,10 +23,10 @@
 #include <cstdint>
 #include <stdexcept>

+#include "../../BlockDecoder.h"
 #include "../../BlockView.h"
-#include "../../formats/blocks/BC4Block.h"
 #include "../../ndebug.h"
-#include "../BlockDecoder.h"
+#include "BC4Block.h"

 namespace quicktex {
 class BC4Decoder : public BlockDecoderTemplate<BC4Block, 4, 4> {
--- a/quicktex/compression/bc4/BC4Encoder.cpp
+++ b/quicktex/compression/bc4/BC4Encoder.cpp
@ -25,8 +25,8 @@
 #include <utility>

 #include "../../BlockView.h"
-#include "../../formats/blocks/BC4Block.h"
 #include "../../ndebug.h"
+#include "BC4Block.h"

 namespace quicktex {
 void BC4Encoder::EncodeBlock(Byte4x4 pixels, BC4Block *const dest) const noexcept(ndebug) {
--- a/quicktex/compression/bc4/BC4Encoder.h
+++ b/quicktex/compression/bc4/BC4Encoder.h
@ -23,10 +23,10 @@
 #include <cstdint>
 #include <stdexcept>

+#include "../../BlockEncoder.h"
 #include "../../BlockView.h"
-#include "../../formats/blocks/BC4Block.h"
 #include "../../ndebug.h"
-#include "../BlockEncoder.h"
+#include "BC4Block.h"

 namespace quicktex {

--- a/quicktex/formats/blocks/BC5Block.h
+++ b/quicktex/formats/blocks/BC5Block.h
@ -19,7 +19,7 @@

 #pragma once

-#include "BC4Block.h"
+#include "../bc4/BC4Block.h"

 namespace quicktex {

--- a/quicktex/compression/bc5/BC5Decoder.cpp
+++ b/quicktex/compression/bc5/BC5Decoder.cpp
@ -21,7 +21,7 @@

 #include "../../BlockView.h"
 #include "../../ndebug.h"
-#include "../../formats/blocks/BC5Block.h"
+#include "BC5Block.h"

 namespace quicktex {

--- a/quicktex/compression/bc5/BC5Decoder.h
+++ b/quicktex/compression/bc5/BC5Decoder.h
@ -24,11 +24,11 @@
 #include <tuple>
 #include <type_traits>

+#include "../../BlockDecoder.h"
 #include "../../BlockView.h"
 #include "../../ndebug.h"
 #include "../bc4/BC4Decoder.h"
-#include "../BlockDecoder.h"
-#include "../../formats/blocks/BC5Block.h"
+#include "BC5Block.h"

 namespace quicktex {
 class BC5Decoder : public BlockDecoderTemplate<BC5Block, 4, 4> {
--- a/quicktex/compression/bc5/BC5Encoder.cpp
+++ b/quicktex/compression/bc5/BC5Encoder.cpp
--- a/quicktex/compression/bc5/BC5Encoder.h
+++ b/quicktex/compression/bc5/BC5Encoder.h
@ -24,11 +24,11 @@
 #include <tuple>
 #include <type_traits>

+#include "../../BlockEncoder.h"
 #include "../../BlockView.h"
 #include "../../ndebug.h"
 #include "../bc4/BC4Encoder.h"
-#include "../BlockEncoder.h"
-#include "../../formats/blocks/BC5Block.h"
+#include "BC5Block.h"

 namespace quicktex {
 class BC5Encoder : public BlockEncoderTemplate<BC5Block, 4, 4> {
--- a/quicktex/compression/bindings/Decoders.cpp
+++ b/quicktex/compression/bindings/Decoders.cpp
@ -25,7 +25,7 @@
 #include <stdexcept>
 #include <string>

-#include "../BlockDecoder.h"
+#include "../../BlockDecoder.h"
 #include "../bc1/BC1Decoder.h"
 #include "../bc3/BC3Decoder.h"
 #include "../bc4/BC4Decoder.h"
--- a/quicktex/compression/bindings/Encoders.cpp
+++ b/quicktex/compression/bindings/Encoders.cpp
@ -24,9 +24,9 @@
 #include <stdexcept>
 #include <string>

+#include "../../BlockEncoder.h"
 #include "../../Color.h"
-#include "../../Interpolator.h"
-#include "../BlockEncoder.h"
+#include "../Interpolator.h"
 #include "../bc1/BC1Encoder.h"
 #include "../bc3/BC3Encoder.h"
 #include "../bc4/BC4Encoder.h"