More header optimizations.

src/nvcore/nvcore.h

@@ -189,7 +189,7 @@ NV_COMPILER_CHECK(sizeof(uint32) == 4);
 
 #define NV_ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0]))
 
-#if 1
+#if 0 // Disabled in The Witness.
 #if NV_CC_MSVC
 #define NV_MESSAGE(x) message(__FILE__ "(" NV_STRING(__LINE__) ") : " x)
 #else

src/nvimage/FloatImage.cpp

@@ -6,7 +6,7 @@
 
 #include "nvmath/Color.h"
 #include "nvmath/Vector.inl"
-#include "nvmath/Matrix.h"
+#include "nvmath/Matrix.inl"
 
 #include "nvcore/Utils.h" // max
 #include "nvcore/Ptr.h"

src/nvmath/Matrix.cpp

@@ -0,0 +1,4 @@
+// This code is in the public domain -- castanyo@yahoo.es
+
+#include "Matrix.h"
+#include "Matrix.inl"

src/nvmath/Plane.cpp

@@ -2,7 +2,7 @@
 
 #include "Plane.h"
 #include "Plane.inl"
-#include "Matrix.h"
+#include "Matrix.inl"
 
 namespace nv
 {

src/nvthread/ParallelFor.cpp

@@ -5,6 +5,8 @@
 #include "Atomic.h"
 #include "ThreadPool.h"
 
+#include "nvcore/Utils.h" // toI32
+
 using namespace nv;
 
 #define ENABLE_PARALLEL_FOR 0
@@ -52,7 +54,7 @@ void ParallelFor::run(uint count) {
 
     nvDebugCheck(idx >= count);
 #else
-    for (int i = 0; i < count; i++) {
+    for (int i = 0; i < toI32(count); i++) {
         task(context, i);
     }
 #endif

src/nvtt/CubeSurface.cpp

@@ -518,7 +518,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
 
             // If this is an ellipse:
             if (Fp.y + coneAngle < PI/2) {

src/nvtt/InputOptions.cpp

@@ -29,7 +29,7 @@
 #include "nvcore/Utils.h" // nextPowerOfTwo
 #include "nvcore/Memory.h"
 
-#include <string.h> // memcpy
+#include <string.h> // memcpy, memset
 
 
 

src/nvtt/InputOptions.h

@@ -25,13 +25,11 @@
 #ifndef NVTT_INPUTOPTIONS_H
 #define NVTT_INPUTOPTIONS_H
 
-#include <nvcore/Ptr.h>
-#include <nvmath/Vector.h>
-#include <nvmath/Matrix.h>
-#include <nvimage/Image.h>
-#include <nvimage/FloatImage.h>
 #include "nvtt.h"
 
+#include "nvmath/Vector.h"
+
+
 namespace nvtt
 {
 

src/nvtt/Surface.cpp

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