From c8ac20ee0fcbcbac75571c434b2e60ce48cfb6dc Mon Sep 17 00:00:00 2001 From: castano Date: Fri, 18 Jan 2008 23:50:22 +0000 Subject: [PATCH] Remove errorThreshold. --- src/nvtt/CompressDXT.cpp | 3 --- src/nvtt/CompressionOptions.cpp | 3 +-- src/nvtt/CompressionOptions.h | 1 - src/nvtt/nvtt.cs | 0 src/nvtt/nvtt.h | 2 +- 5 files changed, 2 insertions(+), 7 deletions(-) mode change 100755 => 100644 src/nvtt/nvtt.cs diff --git a/src/nvtt/CompressDXT.cpp b/src/nvtt/CompressDXT.cpp index 010126c..2e983b2 100644 --- a/src/nvtt/CompressDXT.cpp +++ b/src/nvtt/CompressDXT.cpp @@ -364,9 +364,6 @@ void nv::compressBC4(const Image * image, const nvtt::OutputOptions::Private & o const uint w = image->width(); const uint h = image->height(); - // threshold should be from [0 - 1] but may also be higher... - const uint threshold = uint(compressionOptions.errorThreshold * 256); - ColorBlock rgba; AlphaBlockDXT5 block; diff --git a/src/nvtt/CompressionOptions.cpp b/src/nvtt/CompressionOptions.cpp index 0e65aab..3d698b4 100644 --- a/src/nvtt/CompressionOptions.cpp +++ b/src/nvtt/CompressionOptions.cpp @@ -71,10 +71,9 @@ void CompressionOptions::setFormat(Format format) /// Set compression quality settings. -void CompressionOptions::setQuality(Quality quality, float errorThreshold /*= 0.5f*/) +void CompressionOptions::setQuality(Quality quality) { m.quality = quality; - m.errorThreshold = errorThreshold; } diff --git a/src/nvtt/CompressionOptions.h b/src/nvtt/CompressionOptions.h index 374033e..d9caba8 100644 --- a/src/nvtt/CompressionOptions.h +++ b/src/nvtt/CompressionOptions.h @@ -36,7 +36,6 @@ namespace nvtt Format format; Quality quality; - float errorThreshold; // deprecated. nv::Vector4 colorWeight; diff --git a/src/nvtt/nvtt.cs b/src/nvtt/nvtt.cs old mode 100755 new mode 100644 diff --git a/src/nvtt/nvtt.h b/src/nvtt/nvtt.h index 73c7986..8d87f6a 100644 --- a/src/nvtt/nvtt.h +++ b/src/nvtt/nvtt.h @@ -96,7 +96,7 @@ namespace nvtt NVTT_API void reset(); NVTT_API void setFormat(Format format); - NVTT_API void setQuality(Quality quality, float errorThreshold = 0.5f); + NVTT_API void setQuality(Quality quality); NVTT_API void setColorWeights(float red, float green, float blue, float alpha = 1.0f); NVTT_DEPRECATED void enableHardwareCompression(bool enable);