osx fixes. Fix issue 211.

cmake/OptimalOptions.cmake

@@ -35,6 +35,10 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
 #		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk")
 #		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk")
 #	ENDIF(DARWIN)
+	IF(APPLE)
+		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -arch i586 -arch x86_64 -msse3 -mmacosx-version-min=10.5")
+		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -arch i586 -arch x86_64 -msse3 -mmacosx-version-min=10.5")
+	ENDIF(APPLE)
 
 	IF(CMAKE_BUILD_TYPE STREQUAL "debug")
 		ADD_DEFINITIONS(-D_DEBUG)

configure

@@ -52,7 +52,7 @@ echo "-- Configuring nvidia-texture-tools "`cat VERSION`
 
 mkdir -p ./build-$build
 cd ./build-$build
-$CMAKE .. -DNVTT_SHARED=1 -DCMAKE_BUILD_TYPE=$build -DCMAKE_INSTALL_PREFIX=$prefix -G "Unix Makefiles" || exit 1
+$CMAKE .. -DNVTT_SHARED=0 -DCMAKE_BUILD_TYPE=$build -DCMAKE_INSTALL_PREFIX=$prefix -G "Unix Makefiles" || exit 1
 cd ..
 
 echo ""

src/CMakeLists.txt

@@ -8,6 +8,8 @@ SUBDIRS(nvmath)
 SUBDIRS(nvimage)
 SUBDIRS(nvthread)
 SUBDIRS(nvtt)
+SUBDIRS(bc6h)
+SUBDIRS(bc7)
 
 # OpenGL
 INCLUDE(FindOpenGL)

src/bc6h/CMakeLists.txt

@@ -6,8 +6,8 @@ SET(BC6H_SRCS
 	bits.h
 	shapes_two.h
 	tile.h
-	utils.cpp
-	utils.h
+	zoh_utils.cpp
+	zoh_utils.h
 	zoh.cpp
 	zoh.h
 	zohone.cpp

src/bc7/CMakeLists.txt

@@ -18,8 +18,8 @@ SET(BC7_SRCS
 	shapes_three.h
 	shapes_two.h
 	tile.h
-	utils.cpp
-	utils.h)
+	avpcl_utils.cpp
+	avpcl_utils.h)
 
 ADD_LIBRARY(bc7 STATIC ${BC7_SRCS})
 

src/bc7/avpcl_mode0.cpp

@@ -67,7 +67,7 @@ struct Pattern
 	int transformed;		// if 0, deltas are unsigned and no transform; otherwise, signed and transformed
 	int mode;				// associated mode value
 	int modebits;			// number of mode bits
-	char *encoding;			// verilog description of encoding for this mode
+    const char *encoding;			// verilog description of encoding for this mode
 };
 
 #define	NPATTERNS 1

src/bc7/avpcl_mode1.cpp

@@ -61,7 +61,7 @@ struct Pattern
 	int transformed;		// if 0, deltas are unsigned and no transform; otherwise, signed and transformed
 	int mode;				// associated mode value
 	int modebits;			// number of mode bits
-	char *encoding;			// verilog description of encoding for this mode
+	const char *encoding;			// verilog description of encoding for this mode
 };
 
 #define	NPATTERNS 1

src/bc7/avpcl_mode2.cpp

@@ -57,7 +57,7 @@ struct Pattern
 	int transformed;		// if 0, deltas are unsigned and no transform; otherwise, signed and transformed
 	int mode;				// associated mode value
 	int modebits;			// number of mode bits
-	char *encoding;			// verilog description of encoding for this mode
+	const char *encoding;			// verilog description of encoding for this mode
 };
 
 #define	NPATTERNS 1

src/bc7/avpcl_mode3.cpp

@@ -61,7 +61,7 @@ struct Pattern
 	int transformed;		// if 0, deltas are unsigned and no transform; otherwise, signed and transformed
 	int mode;				// associated mode value
 	int modebits;			// number of mode bits
-	char *encoding;			// verilog description of encoding for this mode
+	const char *encoding;			// verilog description of encoding for this mode
 };
 
 #define	NPATTERNS 1

src/bc7/avpcl_mode4.cpp

@@ -87,7 +87,7 @@ struct Pattern
 	int transform_mode;		// x0 means alpha channel not transformed, x1 otherwise. 0x rgb not transformed, 1x otherwise.
 	int mode;				// associated mode value
 	int modebits;			// number of mode bits
-	char *encoding;			// verilog description of encoding for this mode
+	const char *encoding;			// verilog description of encoding for this mode
 };
 
 #define	TRANSFORM_MODE_ALPHA	1

src/bc7/avpcl_mode5.cpp

@@ -87,7 +87,7 @@ struct Pattern
 	int transform_mode;		// x0 means alpha channel not transformed, x1 otherwise. 0x rgb not transformed, 1x otherwise.
 	int mode;				// associated mode value
 	int modebits;			// number of mode bits
-	char *encoding;			// verilog description of encoding for this mode
+	const char *encoding;			// verilog description of encoding for this mode
 };
 
 #define	TRANSFORM_MODE_ALPHA	1

src/bc7/avpcl_mode6.cpp

@@ -62,7 +62,7 @@ struct Pattern
 	ChanBits chan[NCHANNELS_RGBA];//  bit patterns used per channel
 	int mode;				// associated mode value
 	int modebits;			// number of mode bits
-	char *encoding;			// verilog description of encoding for this mode
+	const char *encoding;			// verilog description of encoding for this mode
 };
 
 #define	NPATTERNS 1

src/bc7/avpcl_mode7.cpp

@@ -61,7 +61,7 @@ struct Pattern
 	int transformed;		// if 0, deltas are unsigned and no transform; otherwise, signed and transformed
 	int mode;				// associated mode value
 	int modebits;			// number of mode bits
-	char *encoding;			// verilog description of encoding for this mode
+	const char *encoding;			// verilog description of encoding for this mode
 };
 
 #define	NPATTERNS 1

src/nvimage/BlockDXT.cpp

@@ -29,8 +29,8 @@
 #include "nvmath/Half.h"
 #include "nvmath/Vector.inl"
 
-#include "nvtt/bc6h/zoh.h"
-#include "nvtt/bc7/avpcl.h"
+#include "bc6h/zoh.h"
+#include "bc7/avpcl.h"
 
 
 using namespace nv;

src/nvimage/CMakeLists.txt

@@ -53,7 +53,7 @@ ELSE(NVIMAGE_SHARED)
     ADD_LIBRARY(nvimage ${IMAGE_SRCS})
 ENDIF(NVIMAGE_SHARED)
 
-TARGET_LINK_LIBRARIES(nvimage ${LIBS} nvcore nvmath posh)
+TARGET_LINK_LIBRARIES(nvimage ${LIBS} nvcore nvmath posh bc6h bc7)
 
 INSTALL(TARGETS nvimage
     RUNTIME DESTINATION bin

src/nvtt/CMakeLists.txt

@@ -1,8 +1,6 @@
 PROJECT(nvtt)
 
 ADD_SUBDIRECTORY(squish)
-ADD_SUBDIRECTORY(bc6h)
-ADD_SUBDIRECTORY(bc7)
 
 SET(NVTT_SRCS
     nvtt.h nvtt.cpp
@@ -13,6 +11,7 @@ SET(NVTT_SRCS
     CompressorDX9.h CompressorDX9.cpp
     CompressorDX10.h CompressorDX10.cpp
     CompressorDX11.h CompressorDX11.cpp
+    CompressorDXT1.h CompressorDXT1.cpp
     CompressorRGB.h CompressorRGB.cpp
     Context.h Context.cpp
     QuickCompressDXT.h QuickCompressDXT.cpp

src/nvtt/CompressorDXT1.cpp

@@ -15,6 +15,7 @@
 #include "nvcore/Utils.h" // swap
 
 #include <string.h> // memset
+#include <float.h> // FLT_MAX
 
 
 using namespace nv;
@@ -80,14 +81,14 @@ static Color32 bitexpand_color16_to_color32(Color16 c16) {
     return c32;
 }
 
-static Color32 bitexpand_color16_to_color32(int r, int g, int b) {
+/*static Color32 bitexpand_color16_to_color32(int r, int g, int b) {
     Color32 c32;
     c32.b = (b << 3) | (b >> 2);
     c32.g = (g << 2) | (g >> 4);
     c32.r = (r << 3) | (r >> 2);
     c32.a = 0xFF;
     return c32;
-}
+}*/
 
 static Color16 truncate_color32_to_color16(Color32 c32) {
     Color16 c16;
@@ -97,14 +98,14 @@ static Color16 truncate_color32_to_color16(Color32 c32) {
     return c16;
 }
 
-inline Vector3 r5g6b5_to_vector3(int r, int g, int b)
+/*inline Vector3 r5g6b5_to_vector3(int r, int g, int b)
 {
     Vector3 c;
     c.x = float((r << 3) | (r >> 2));
     c.y = float((g << 2) | (g >> 4));
     c.z = float((b << 3) | (b >> 2));
     return c;
-}
+}*/
 
 inline Vector3 color_to_vector3(Color32 c)
 {
@@ -711,3 +712,92 @@ float nv::compress_dxt1(const Vector3 input_colors[16], const float input_weight
 
     return error;
 }
+
+
+// Once we have an index assignment we have colors grouped in 1-4 clusters.
+// If 1 clusters -> Use optimal compressor.
+// If 2 clusters -> Try: (0, 1), (1, 2), (0, 2), (0, 3) - [0, 1]
+// If 3 clusters -> Try: (0, 1, 2), (0, 1, 3), (0, 2, 3) - [0, 1, 2]
+// If 4 clusters -> Try: (0, 1, 2, 3)
+
+// @@ How do we do the initial index/cluster assignment? Use standard cluster fit.
+
+
+// Least squares fitting of color end points for the given indices. @@ Take weights into account.
+static bool optimize_end_points4(uint indices, const Vector3 * colors, const Vector3 * weights, int count, Vector3 * a, Vector3 * b)
+{
+    float alpha2_sum = 0.0f;
+    float beta2_sum = 0.0f;
+    float alphabeta_sum = 0.0f;
+    Vector3 alphax_sum(0.0f);
+    Vector3 betax_sum(0.0f);
+
+    for (int i = 0; i < count; i++)
+    {
+        const uint bits = indices >> (2 * i);
+
+        float beta = float(bits & 1);
+        if (bits & 2) beta = (1 + beta) / 3.0f;
+        float alpha = 1.0f - beta;
+
+        alpha2_sum += alpha * alpha;
+        beta2_sum += beta * beta;
+        alphabeta_sum += alpha * beta;
+        alphax_sum += alpha * colors[i];
+        betax_sum += beta * colors[i];
+    }
+
+    float denom = alpha2_sum * beta2_sum - alphabeta_sum * alphabeta_sum;
+    if (equal(denom, 0.0f)) return false;
+
+    float factor = 1.0f / denom;
+
+    *a = saturate((alphax_sum * beta2_sum - betax_sum * alphabeta_sum) * factor);
+    *b = saturate((betax_sum * alpha2_sum - alphax_sum * alphabeta_sum) * factor);
+
+    return true;
+}
+
+
+// Least squares fitting of color end points for the given indices. @@ This does not support black/transparent index. @@ Take weights into account.
+static bool optimize_end_points3(uint indices, const Vector3 * colors, const Vector3 * weights, int count, Vector3 * a, Vector3 * b)
+{
+    float alpha2_sum = 0.0f;
+    float beta2_sum = 0.0f;
+    float alphabeta_sum = 0.0f;
+    Vector3 alphax_sum(0.0f);
+    Vector3 betax_sum(0.0f);
+
+    for (int i = 0; i < count; i++)
+    {
+        const uint bits = indices >> (2 * i);
+
+        float beta = float(bits & 1);
+        if (bits & 2) beta = 0.5f;
+        float alpha = 1.0f - beta;
+
+        alpha2_sum += alpha * alpha;
+        beta2_sum += beta * beta;
+        alphabeta_sum += alpha * beta;
+        alphax_sum += alpha * colors[i];
+        betax_sum += beta * colors[i];
+    }
+
+    float denom = alpha2_sum * beta2_sum - alphabeta_sum * alphabeta_sum;
+    if (equal(denom, 0.0f)) return false;
+
+    float factor = 1.0f / denom;
+
+    *a = saturate((alphax_sum * beta2_sum - betax_sum * alphabeta_sum) * factor);
+    *b = saturate((betax_sum * alpha2_sum - alphax_sum * alphabeta_sum) * factor);
+
+    return true;
+}
+
+// @@ After optimization we need to round end points. Round in all possible directions, and pick best.
+
+
+
+
+
+

src/nvtt/CompressorDXT1.h

@@ -8,23 +8,6 @@ namespace nv {
 
     // All these functions return MSE.
 
-    // Optimal compressors:
-    /*float compress_dxt1_single_color_optimal(const Color32 & rgb, BlockDXT1 * output);
-    float compress_dxt1_single_color_optimal(const ColorBlock & input, BlockDXT1 * output);
-    float compress_dxt1_optimal(const ColorBlock & input, BlockDXT1 * output);
-
-
-
-    // Brute force with restricted search space:
-    float compress_dxt1_bounding_box_exhaustive(const ColorBlock & input, BlockDXT1 * output);
-    float compress_dxt1_best_fit_line_exhaustive(const ColorBlock & input, BlockDXT1 * output);
-
-
-    // Fast least squres fitting compressors:
-    float compress_dxt1_least_squares_fit(const ColorBlock & input, BlockDXT1 * output);
-    float compress_dxt1_least_squares_fit_iterative(const ColorBlock & input, BlockDXT1 * output);
-    */
-
     float compress_dxt1_single_color_optimal(Color32 c, BlockDXT1 * output);
     float compress_dxt1_single_color_optimal(const Vector3 & color, BlockDXT1 * output);
 
@@ -36,4 +19,4 @@ namespace nv {
 
     float compress_dxt1(const Vector3 colors[16], const float weights[16], const Vector3 & color_weights, BlockDXT1 * output);
 
-}
+}

src/nvtt/QuickCompressDXT.cpp

@@ -35,6 +35,7 @@
 #include "nvcore/Utils.h" // swap
 
 #include <string.h> // memset
+#include <float.h> // FLT_MAX 
 
 using namespace nv;
 using namespace QuickCompress;
@@ -285,7 +286,7 @@ inline static uint computeIndices4(const ColorSet & set, Vector3::Arg maxColor,
         }
 
 		swap(row0, row1);
-		memset(row1, 0, sizeof(row1));
+		memset(row1, 0, sizeof(Vector3) * (4+2));
 	}
 
 	return indices;
@@ -866,108 +867,3 @@ void QuickCompress::outputBlock3(const ColorSet & set, const Vector3 & start, co
     //optimizeEndPoints3(set, block);
 }
 
-
-
-
-
-inline Vector3 toVectorColor(int r, int g, int b) {
-    Vector3 c;
-    c.x = float((r << 3) | (r >> 2));
-    c.y = float((g << 2) | (g >> 4));
-    c.z = float((b << 3) | (b >> 2));
-    return c;
-}
-
-// Do an exhaustive search inside the bounding box.
-void compress_dxt1_bounding_box_exhaustive(const ColorBlock & input, BlockDXT1 * output)
-{
-    int min_r = 255, min_g = 255, min_b = 255;
-    int max_r = 0,  max_g = 0,  max_b = 0;
-
-    for (int i = 0; i < 16; i++) {
-        Color32 c = input.color(i);
-        min_r = min(min_r, int(c.r));
-        max_r = max(max_r, int(c.r));
-        min_g = min(min_g, int(c.g));
-        max_g = max(max_g, int(c.g));
-        min_b = min(min_b, int(c.b));
-        max_b = max(max_b, int(c.b));
-    }
-
-    // Convert to 5:6:5
-    min_r >>= 3; min_g >>= 2; min_b >>= 3; 
-    max_r >>= 3; max_g >>= 2; max_b >>= 3; 
-
-    // Expand the box.
-    int range_r = max_r - min_r;
-    int range_g = max_g - min_g;
-    int range_b = max_b - min_b;
-
-    min_r = max(0, min_r - (range_r + 1) / 1 - 1);
-    min_g = max(0, min_g - (range_g + 1) / 1 - 1);
-    min_b = max(0, min_b - (range_b + 1) / 1 - 1);
-
-    max_r = min(31, max_r + (range_r + 1) / 2 + 1);
-    max_g = min(63, max_g + (range_g + 1) / 2 + 1);
-    max_b = min(31, max_b + (range_b + 1) / 2 + 1);
-
-    int count = (max_r-min_r) + (max_g-min_g) + (max_b-min_b);
-
-	Vector3 colors[16];
-	extractColorBlockRGB(input, colors);
-
-
-    // @@ Use a single loop and remap index to box location?
-    float bestError = FLT_MAX;
-    Vector3 best0, best1;
-    bool threeColorMode;
-
-    for(int r0 = min_r; r0 <= max_r; r0++)
-    for(int r1 = max_r; r1 >= r0; r1--)
-    for(int g0 = min_g; g0 <= max_g; g0++)
-    for(int g1 = max_g; g1 >= g0; g1--)
-    for(int b0 = min_b; b0 <= max_b; b0++)
-    for(int b1 = max_b; b1 >= b0; b1--)
-    {
-        Vector3 c0 = toVectorColor(r0, g0, b0);
-        Vector3 c1 = toVectorColor(r1, g1, b1);
-
-        // Compute palette and evaluate error for these endpoints.
-        float error = evaluatePaletteError4(colors, c1, c0);
-
-        if (error < bestError) {
-            bestError = error;
-            best0 = c1; // c0 > c1
-            best1 = c0;
-            threeColorMode = false;
-        }
-
-#if 0
-        error = evaluatePaletteError3(colors, /*maxColor=*/c1, /*minColor=*/c0);
-
-        if (error < bestError) {
-            bestError = error;
-            best0 = c0;
-            best1 = c1;
-            threeColorMode = true;
-        }
-#endif
-    }
-
-    uint16 color0 = roundAndExpand(&best0);
-    uint16 color1 = roundAndExpand(&best1);
-
-    if (threeColorMode) {
-        nvCheck(color0 <= color1);
-        output->col0 = Color16(color1);
-        output->col1 = Color16(color0);
-        output->indices = computeIndices3(colors, best0, best1);
-    }
-    else {
-        nvCheck(color0 >= color1);
-        output->col0 = Color16(color0);
-        output->col1 = Color16(color1);
-        output->indices = computeIndices4(colors, best0, best1);
-    }
-
-}

src/nvtt/tools/CMakeLists.txt

@@ -66,8 +66,8 @@ IF(QT4_FOUND)
         QT4_WRAP_CPP(MOCS compressdialog.h)
 	#QT4_ADD_RESOURCES(RCCS ui/configdialog.rc)
 
-    ADD_EXECUTABLE(nvtt-diag MACOSX_BUNDLE ${SRCS} ${UICS} ${MOCS})
-    TARGET_LINK_LIBRARIES(nvtt-diag ${LIBS})
+	#ADD_EXECUTABLE(nvtt-diag MACOSX_BUNDLE ${SRCS} ${UICS} ${MOCS})
+	#TARGET_LINK_LIBRARIES(nvtt-diag ${LIBS})
 
 ENDIF(QT4_FOUND)
 

src/nvtt/tools/compressdialog.cpp

@@ -17,23 +17,6 @@ int main(int argc, char *argv[])
 CompressDialog::CompressDialog(const QString & fileName, QWidget *parent) : QDialog(parent)
 {
     ui.setupUi(this);
-
-    //connect(ui.openButton, SIGNAL(clicked()), this, SLOT(openClicked()));
-    connect(ui.generateMipmapsCheckBox, SIGNAL(stateChanged(int)), this, SLOT(generateMipmapsChanged(int)));
-    connect(ui.mipmapFilterComboBox, SIGNAL(activated(QString)), this, SLOT(mipmapFilterChanged(QString)));
-    //connect(ui.mipmapFilterSettings, SIGNAL(clicked()), this, SLOT(mipmapFilterSettingsShow()));
-
-    connect(ui.formatComboBox, SIGNAL(activated(QString)), this, SLOT(formatChanged(QString)));
-
-
-    connect(ui.redSpinBox, SIGNAL(valueChanged(double)), this, SLOT(colorWeightChanged()));
-    connect(ui.greenSpinBox, SIGNAL(valueChanged(double)), this, SLOT(colorWeightChanged()));
-    connect(ui.blueSpinBox, SIGNAL(valueChanged(double)), this, SLOT(colorWeightChanged()));
-    connect(ui.uniformButton, SIGNAL(toggled(bool)), this, SLOT(uniformWeightToggled(bool)));
-    connect(ui.luminanceButton, SIGNAL(toggled(bool)), this, SLOT(luminanceWeightToggled(bool)));
-
-    //connect(ui.rgbMapRadioButton, SIGNAL(toggled(bool)), this, SLOT(colorModeChanged()));
-    //connect(ui.normalMapRadioButton, SIGNAL(toggled(bool)), this, SLOT(normalMapModeChanged(bool)));
 }
 
 CompressDialog::~CompressDialog()
@@ -46,79 +29,3 @@ void CompressDialog::openClicked()
     // @@ What is openButton?
 }
 
-
-void CompressDialog::generateMipmapsChanged(int state)
-{
-    Q_UNUSED(state);
-
-    bool generateMipmapEnabled = ui.generateMipmapsCheckBox->isChecked();
-
-    ui.mipmapFilterLabel->setEnabled(generateMipmapEnabled);
-    ui.mipmapFilterComboBox->setEnabled(generateMipmapEnabled);
-    ui.limitMipmapsCheckBox->setEnabled(generateMipmapEnabled);
-
-    bool enableFilterSettings = (ui.mipmapFilterComboBox->currentText() == "Kaiser");
-    ui.mipmapFilterSettings->setEnabled(generateMipmapEnabled && enableFilterSettings);
-
-    bool enableMaxLevel = ui.limitMipmapsCheckBox->isChecked();
-    ui.maxLevelLabel->setEnabled(generateMipmapEnabled && enableMaxLevel);
-    ui.maxLevelSpinBox->setEnabled(generateMipmapEnabled && enableMaxLevel);
-}
-
-void CompressDialog::mipmapFilterChanged(QString name)
-{
-    bool enableFilterSettings = (name == "Kaiser");
-    ui.mipmapFilterSettings->setEnabled(enableFilterSettings);
-}
-
-void CompressDialog::formatChanged(QString format)
-{
-    if (format == "Uncompressed") {
-        ui.formatOptions->setCurrentIndex(1);
-    }
-    else {
-        ui.formatOptions->setCurrentIndex(0);
-    }
-}
-
-void CompressDialog::colorWeightChanged()
-{
-    double r = ui.redSpinBox->value();
-    double g = ui.greenSpinBox->value();
-    double b = ui.blueSpinBox->value();
-
-    bool uniform = (r == 1.0 && g == 1.0 && b == 1.0);
-    bool luminance = (r == 0.3 && g == 0.59 && b == 0.11);
-
-    ui.uniformButton->setChecked(uniform);
-    ui.luminanceButton->setChecked(luminance);
-}
-
-void CompressDialog::uniformWeightToggled(bool checked)
-{
-    if (checked)
-    {
-        ui.redSpinBox->setValue(1.0);
-        ui.greenSpinBox->setValue(1.0);
-        ui.blueSpinBox->setValue(1.0);
-    }
-}
-
-void CompressDialog::luminanceWeightToggled(bool checked)
-{
-    if (checked)
-    {
-        ui.redSpinBox->setValue(0.3);
-        ui.greenSpinBox->setValue(0.59);
-        ui.blueSpinBox->setValue(0.11);
-    }
-}
-
-void CompressDialog::normalMapModeChanged(bool checked)
-{
-    //ui.alphaModeGroupBox->setEnabled(!checked);
-    //ui.inputGammaSpinBox->setEnabled(!checked);
-    //ui.inputGammaLabel->setEnabled(!checked);
-    //ui.outputGammaSpinBox->setEnabled(!checked);
-    //ui.outputGammaLabel->setEnabled(!checked);
-}

src/nvtt/tools/compressdialog.h

@@ -16,15 +16,6 @@ public:
 protected slots:
 
     void openClicked();
-    void generateMipmapsChanged(int state);
-    void mipmapFilterChanged(QString name);
-    void formatChanged(QString format);
-
-    void colorWeightChanged();
-    void uniformWeightToggled(bool checked);
-    void luminanceWeightToggled(bool checked);
-
-    void normalMapModeChanged(bool checked);
 
 
 private:

src/nvtt/tools/compressdialog.ui

@@ -2,6 +2,14 @@
 <ui version="4.0">
  <class>CompressDialog</class>
  <widget class="QDialog" name="CompressDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>766</width>
+    <height>540</height>
+   </rect>
+  </property>
   <property name="minimumSize">
    <size>
     <width>280</width>
@@ -11,12 +19,21 @@
   <property name="windowTitle">
    <string>Dialog</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
+  <layout class="QVBoxLayout" name="verticalLayout_6">
    <property name="spacing">
+    <number>-1</number>
+   </property>
+   <property name="leftMargin">
+    <number>8</number>
+   </property>
+   <property name="topMargin">
+    <number>8</number>
+   </property>
+   <property name="rightMargin">
     <number>8</number>
    </property>
-   <property name="margin">
-    <number>10</number>
+   <property name="bottomMargin">
+    <number>8</number>
    </property>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
@@ -39,694 +56,41 @@
     </layout>
    </item>
    <item>
-    <widget class="QToolBox" name="toolBox">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="frameShape">
-      <enum>QFrame::Box</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Sunken</enum>
-     </property>
-     <property name="currentIndex">
-      <number>3</number>
-     </property>
-     <widget class="QWidget" name="page_info">
-      <property name="geometry">
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>249</width>
-        <height>367</height>
-       </rect>
-      </property>
-      <attribute name="label">
-       <string>Image Info</string>
-      </attribute>
-     </widget>
-     <widget class="QWidget" name="page_compression">
-      <property name="geometry">
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>249</width>
-        <height>367</height>
-       </rect>
-      </property>
-      <attribute name="label">
-       <string>Compression Options</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout">
-       <property name="spacing">
-        <number>2</number>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
+      <widget class="QGraphicsView" name="graphicsView"/>
+     </item>
+     <item>
+      <widget class="QGraphicsView" name="graphicsView_2"/>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_11">
+     <item>
+      <widget class="QProgressBar" name="progressBar">
+       <property name="value">
+        <number>24</number>
        </property>
-       <property name="margin">
-        <number>6</number>
+      </widget>
+     </item>
+     <item>
+      <widget class="QDialogButtonBox" name="buttonBox">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
        </property>
-       <item>
-        <layout class="QHBoxLayout">
-         <item>
-          <widget class="QLabel" name="label_3">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="text">
-            <string>Format:</string>
-           </property>
-           <property name="textFormat">
-            <enum>Qt::PlainText</enum>
-           </property>
-           <property name="textInteractionFlags">
-            <set>Qt::NoTextInteraction</set>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QComboBox" name="formatComboBox">
-           <item>
-            <property name="text">
-             <string>Uncompressed</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>BC1 (DXT1)</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>BC1a (DXT1a)</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>BC2 (DXT3)</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>BC3 (DXT5)</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>BC4</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>BC5</string>
-            </property>
-           </item>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <widget class="QStackedWidget" name="formatOptions">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="currentIndex">
-          <number>1</number>
-         </property>
-         <widget class="QWidget" name="page_colorweights">
-          <layout class="QVBoxLayout" name="verticalLayout_3">
-           <property name="leftMargin">
-            <number>0</number>
-           </property>
-           <property name="topMargin">
-            <number>8</number>
-           </property>
-           <property name="rightMargin">
-            <number>0</number>
-           </property>
-           <property name="bottomMargin">
-            <number>0</number>
-           </property>
-           <item>
-            <widget class="QGroupBox" name="groupBox_6">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="title">
-              <string>Color Weights</string>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignHCenter</set>
-             </property>
-             <layout class="QVBoxLayout" name="_2">
-              <property name="topMargin">
-               <number>12</number>
-              </property>
-              <item>
-               <layout class="QHBoxLayout" name="_3">
-                <item>
-                 <widget class="QLabel" name="label_10">
-                  <property name="text">
-                   <string>Red</string>
-                  </property>
-                  <property name="buddy">
-                   <cstring>redSpinBox</cstring>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="QDoubleSpinBox" name="redSpinBox">
-                  <property name="maximum">
-                   <double>1.000000000000000</double>
-                  </property>
-                  <property name="singleStep">
-                   <double>0.050000000000000</double>
-                  </property>
-                  <property name="value">
-                   <double>1.000000000000000</double>
-                  </property>
-                 </widget>
-                </item>
-               </layout>
-              </item>
-              <item>
-               <layout class="QHBoxLayout" name="_4">
-                <item>
-                 <widget class="QLabel" name="label_11">
-                  <property name="text">
-                   <string>Green</string>
-                  </property>
-                  <property name="buddy">
-                   <cstring>greenSpinBox</cstring>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="QDoubleSpinBox" name="greenSpinBox">
-                  <property name="maximum">
-                   <double>1.000000000000000</double>
-                  </property>
-                  <property name="singleStep">
-                   <double>0.050000000000000</double>
-                  </property>
-                  <property name="value">
-                   <double>1.000000000000000</double>
-                  </property>
-                 </widget>
-                </item>
-               </layout>
-              </item>
-              <item>
-               <layout class="QHBoxLayout" name="_5">
-                <item>
-                 <widget class="QLabel" name="label_12">
-                  <property name="text">
-                   <string>Blue</string>
-                  </property>
-                  <property name="buddy">
-                   <cstring>blueSpinBox</cstring>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="QDoubleSpinBox" name="blueSpinBox">
-                  <property name="maximum">
-                   <double>1.000000000000000</double>
-                  </property>
-                  <property name="singleStep">
-                   <double>0.050000000000000</double>
-                  </property>
-                  <property name="value">
-                   <double>1.000000000000000</double>
-                  </property>
-                 </widget>
-                </item>
-               </layout>
-              </item>
-              <item>
-               <layout class="QHBoxLayout" name="_6">
-                <item>
-                 <widget class="QToolButton" name="uniformButton">
-                  <property name="text">
-                   <string>Uniform</string>
-                  </property>
-                  <property name="checkable">
-                   <bool>true</bool>
-                  </property>
-                  <property name="checked">
-                   <bool>true</bool>
-                  </property>
-                 </widget>
-                </item>
-                <item>
-                 <widget class="QToolButton" name="luminanceButton">
-                  <property name="text">
-                   <string>Luminance</string>
-                  </property>
-                  <property name="checkable">
-                   <bool>true</bool>
-                  </property>
-                 </widget>
-                </item>
-               </layout>
-              </item>
-             </layout>
-            </widget>
-           </item>
-          </layout>
-         </widget>
-         <widget class="QWidget" name="page_pixelformat">
-          <layout class="QVBoxLayout" name="verticalLayout_4">
-           <property name="spacing">
-            <number>1</number>
-           </property>
-           <property name="margin">
-            <number>0</number>
-           </property>
-           <item>
-            <layout class="QHBoxLayout" name="horizontalLayout_4">
-             <item>
-              <widget class="QLabel" name="label_4">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="maximumSize">
-                <size>
-                 <width>16777215</width>
-                 <height>24</height>
-                </size>
-               </property>
-               <property name="text">
-                <string>Pixel Format:</string>
-               </property>
-               <property name="textFormat">
-                <enum>Qt::PlainText</enum>
-               </property>
-               <property name="textInteractionFlags">
-                <set>Qt::NoTextInteraction</set>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QComboBox" name="pixelformatComboBox">
-               <property name="currentIndex">
-                <number>1</number>
-               </property>
-               <item>
-                <property name="text">
-                 <string>Custom</string>
-                </property>
-               </item>
-               <item>
-                <property name="text">
-                 <string>R8G8B8A8</string>
-                </property>
-               </item>
-               <item>
-                <property name="text">
-                 <string>R5G6B5</string>
-                </property>
-               </item>
-               <item>
-                <property name="text">
-                 <string>A1</string>
-                </property>
-               </item>
-              </widget>
-             </item>
-            </layout>
-           </item>
-           <item>
-            <layout class="QHBoxLayout" name="horizontalLayout_9">
-             <item>
-              <widget class="QLabel" name="label_7">
-               <property name="text">
-                <string>Color Type:</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QComboBox" name="comboBox">
-               <item>
-                <property name="text">
-                 <string>Fixed</string>
-                </property>
-               </item>
-               <item>
-                <property name="text">
-                 <string>Float</string>
-                </property>
-               </item>
-              </widget>
-             </item>
-            </layout>
-           </item>
-           <item>
-            <layout class="QHBoxLayout" name="horizontalLayout_5">
-             <item>
-              <widget class="QLabel" name="label">
-               <property name="text">
-                <string>Red Bits:</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QSpinBox" name="redbitSpinBox">
-               <property name="maximum">
-                <number>32</number>
-               </property>
-               <property name="value">
-                <number>8</number>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </item>
-           <item>
-            <layout class="QHBoxLayout" name="horizontalLayout_8">
-             <item>
-              <widget class="QLabel" name="label_2">
-               <property name="text">
-                <string>Green Bits:</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QSpinBox" name="greenbitSpinBox">
-               <property name="maximum">
-                <number>32</number>
-               </property>
-               <property name="value">
-                <number>8</number>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </item>
-           <item>
-            <layout class="QHBoxLayout" name="horizontalLayout_6">
-             <item>
-              <widget class="QLabel" name="label_5">
-               <property name="text">
-                <string>Blue Bits:</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QSpinBox" name="bluebitSpinBox">
-               <property name="maximum">
-                <number>32</number>
-               </property>
-               <property name="value">
-                <number>8</number>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </item>
-           <item>
-            <layout class="QHBoxLayout" name="horizontalLayout_7">
-             <item>
-              <widget class="QLabel" name="label_6">
-               <property name="text">
-                <string>Alpha Bits:</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QSpinBox" name="alphabitSpinBox">
-               <property name="maximum">
-                <number>32</number>
-               </property>
-               <property name="value">
-                <number>8</number>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </item>
-          </layout>
-         </widget>
-        </widget>
-       </item>
-       <item>
-        <widget class="QCheckBox" name="ditherColorCheckBox">
-         <property name="text">
-          <string>Dither Color</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QCheckBox" name="checkBox">
-         <property name="text">
-          <string>Dither Alpha</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer name="verticalSpacer">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="page_resize">
-      <property name="geometry">
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>249</width>
-        <height>367</height>
-       </rect>
-      </property>
-      <attribute name="label">
-       <string>Resize Options</string>
-      </attribute>
-     </widget>
-     <widget class="QWidget" name="page_mipmap">
-      <property name="geometry">
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>241</width>
-        <height>357</height>
-       </rect>
-      </property>
-      <attribute name="label">
-       <string>Mipmap Options</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_5">
-       <property name="spacing">
-        <number>2</number>
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
        </property>
-       <property name="margin">
-        <number>6</number>
+       <property name="standardButtons">
+        <set>QDialogButtonBox::Cancel|QDialogButtonBox::Save</set>
        </property>
-       <item>
-        <widget class="QCheckBox" name="generateMipmapsCheckBox">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="text">
-          <string>Generate mipmaps</string>
-         </property>
-         <property name="checked">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <layout class="QHBoxLayout" name="_8">
-         <property name="spacing">
-          <number>1</number>
-         </property>
-         <item>
-          <widget class="QLabel" name="mipmapFilterLabel">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="maximumSize">
-            <size>
-             <width>16777215</width>
-             <height>26</height>
-            </size>
-           </property>
-           <property name="text">
-            <string>Filter:</string>
-           </property>
-           <property name="buddy">
-            <cstring>mipmapFilterComboBox</cstring>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QComboBox" name="mipmapFilterComboBox">
-           <property name="maximumSize">
-            <size>
-             <width>16777215</width>
-             <height>26</height>
-            </size>
-           </property>
-           <item>
-            <property name="text">
-             <string>Box</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Triangle</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>Kaiser</string>
-            </property>
-           </item>
-          </widget>
-         </item>
-         <item>
-          <widget class="QToolButton" name="mipmapFilterSettings">
-           <property name="enabled">
-            <bool>false</bool>
-           </property>
-           <property name="autoFillBackground">
-            <bool>false</bool>
-           </property>
-           <property name="text">
-            <string>...</string>
-           </property>
-           <property name="toolButtonStyle">
-            <enum>Qt::ToolButtonTextOnly</enum>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <layout class="QHBoxLayout" name="_9">
-         <item>
-          <widget class="QCheckBox" name="limitMipmapsCheckBox">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="text">
-            <string>Limit Mipmaps</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <layout class="QHBoxLayout" name="horizontalLayout_10">
-         <item>
-          <spacer name="horizontalSpacer">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>40</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-         <item>
-          <widget class="QLabel" name="maxLevelLabel">
-           <property name="enabled">
-            <bool>false</bool>
-           </property>
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="text">
-            <string>&amp;Max Level:</string>
-           </property>
-           <property name="buddy">
-            <cstring>maxLevelSpinBox</cstring>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QSpinBox" name="maxLevelSpinBox">
-           <property name="enabled">
-            <bool>false</bool>
-           </property>
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="maximumSize">
-            <size>
-             <width>80</width>
-             <height>16777215</height>
-            </size>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <spacer name="verticalSpacer_3">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-   <item>
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
+      </widget>
+     </item>
+    </layout>
    </item>
   </layout>
  </widget>

src/nvtt/tools/thumbnailer.cpp

@@ -41,7 +41,7 @@
 
 static bool loadImage(nv::Image & image, const char * fileName)
 {
-    if (nv::strCaseCmp(nv::Path::extension(fileName), ".dds") == 0)
+    if (nv::strCaseDiff(nv::Path::extension(fileName), ".dds") == 0)
     {
         nv::DirectDrawSurface dds(fileName);
         if (!dds.isValid())