Add some inline files to reduce amount of code parsed.

src/nvtt/ClusterFit.cpp

@@ -26,6 +26,7 @@
 
 #include "ClusterFit.h"
 #include "nvmath/Fitting.h"
+#include "nvmath/Vector.inl"
 #include "nvimage/ColorBlock.h"
 
 #include <float.h> // FLT_MAX

src/nvtt/CubeSurface.cpp

@@ -26,7 +26,7 @@
 
 #include "nvimage/DirectDrawSurface.h"
 
-#include "nvmath/Vector.h"
+#include "nvmath/Vector.inl"
 
 #include "nvcore/Array.h"
 #include "nvcore/StrLib.h"
@@ -474,7 +474,7 @@ Vector3 CubeSurface::Private::applyCosinePowerFilter(const Vector3 & filterDir,
             // Focal point in polar coordinates:
             Vector2 Fp = toPolar(F);
             nvCheck(Fp.y >= 0.0f);  // top
-            nvCheck(Fp.y <= PI/2);  // horizon
+            //nvCheck(Fp.y <= PI/2);  // horizon    @@ We should cull this earlier.
 
             // If this is an ellipse:
             if (Fp.y + coneAngle < PI/2) {

src/nvtt/InputOptions.cpp

@@ -22,15 +22,16 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 // OTHER DEALINGS IN THE SOFTWARE.
 
+#include "InputOptions.h"
+
+#include "nvmath/Vector.inl"
+
+#include "nvcore/Utils.h" // nextPowerOfTwo
+#include "nvcore/Memory.h"
+
 #include <string.h> // memcpy
 
-#include <nvcore/Utils.h> // nextPowerOfTwo
-#include <nvcore/Memory.h>
 
-#include <nvmath/Color.h>
-
-#include "nvtt.h"
-#include "InputOptions.h"
 
 using namespace nv;
 using namespace nvtt;

src/nvtt/QuickCompressDXT.cpp

@@ -22,17 +22,19 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 // OTHER DEALINGS IN THE SOFTWARE.
 
-#include <nvcore/Utils.h> // swap
-
-#include <nvmath/Color.h>
-#include <nvmath/Fitting.h>
-
-#include <nvimage/ColorBlock.h>
-#include <nvimage/BlockDXT.h>
-
 #include "QuickCompressDXT.h"
 #include "OptimalCompressDXT.h"
 
+#include "nvimage/ColorBlock.h"
+#include "nvimage/BlockDXT.h"
+
+#include "nvmath/Color.h"
+#include "nvmath/Vector.inl"
+#include "nvmath/Fitting.h"
+
+#include "nvcore/Utils.h" // swap
+
+
 
 using namespace nv;
 using namespace QuickCompress;

src/nvtt/Surface.cpp

@@ -24,7 +24,7 @@
 
 #include "Surface.h"
 
-#include "nvmath/Vector.h"
+#include "nvmath/Vector.inl"
 #include "nvmath/Matrix.h"
 #include "nvmath/Color.h"
 #include "nvmath/Half.h"

src/nvtt/bc6h/utils.cpp

@@ -13,6 +13,7 @@ See the License for the specific language governing permissions and limitations
 // Utility and common routines
 
 #include "utils.h"
+#include "nvmath/Vector.inl"
 #include <math.h>
 
 using namespace nv;

src/nvtt/bc6h/zohone.cpp

@@ -18,7 +18,7 @@ See the License for the specific language governing permissions and limitations
 #include "zoh.h"
 #include "utils.h"
 
-#include "nvmath/Vector.h"
+#include "nvmath/Vector.inl"
 #include "nvmath/Fitting.h"
 
 #include <string.h> // strlen

src/nvtt/bc6h/zohtwo.cpp

@@ -43,6 +43,7 @@ See the License for the specific language governing permissions and limitations
 #include "utils.h"
 
 #include "nvmath/Fitting.h"
+#include "nvmath/Vector.inl"
 
 #include <string.h> // strlen
 #include <float.h> // FLT_MAX

src/nvtt/cuda/CudaCompressorDXT.cpp

@@ -27,6 +27,7 @@
 
 #include "nvcore/Debug.h"
 #include "nvmath/Color.h"
+#include "nvmath/Vector.inl"
 #include "nvimage/Image.h"
 #include "nvimage/ColorBlock.h"
 #include "nvimage/BlockDXT.h"

src/nvtt/tests/cubemaptest.cpp

@@ -40,9 +40,12 @@ int main(int argc, char *argv[])
     // Init context.
     nvtt::Context context;
 
+    const char * fileName = "envmap.dds";
+    if (argc > 1) fileName = argv[1];
+
     // Load cubemap.
     nvtt::CubeSurface envmap;
-    if (!envmap.load("envmap.dds", 0)) {
+    if (!envmap.load(fileName, 0)) {
         printf("Error loading envmap.dds\n");
         return EXIT_FAILURE;
     }

src/nvtt/tools/imgdiff.cpp

@@ -21,18 +21,19 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 // OTHER DEALINGS IN THE SOFTWARE.
 
-#include <nvcore/StrLib.h>
-#include <nvcore/StdStream.h>
+#include "cmdline.h"
 
-#include <nvimage/Image.h>
-#include <nvimage/DirectDrawSurface.h>
+#include "nvmath/Color.h"
+#include "nvmath/Vector.inl"
 
-#include <nvmath/Color.h>
-#include <nvmath/Vector.h>
+#include "nvimage/Image.h"
+#include "nvimage/DirectDrawSurface.h"
+
+#include "nvcore/StrLib.h"
+#include "nvcore/StdStream.h"
 
 #include <math.h>
 
-#include "cmdline.h"
 
 static bool loadImage(nv::Image & image, const char * fileName)
 {