Merge changes from the Witness.

2013-06-07 17:53:55 +00:00
parent 634229a842
commit 94d0635285
49 changed files with 1974 additions and 625 deletions
--- a/src/nvtt/CubeSurface.h
+++ b/src/nvtt/CubeSurface.h
@ -94,8 +94,11 @@ namespace nvtt
        }

        // Filtering helpers:
+        nv::Vector3 applyAngularFilter(const nv::Vector3 & dir, float coneAngle, float * filterTable, int tableSize);
        nv::Vector3 applyCosinePowerFilter(const nv::Vector3 & dir, float coneAngle, float cosinePower);

+        nv::Vector3 sample(const nv::Vector3 & dir);
+
        uint edgeLength;
        Surface face[6];
        TexelTable * texelTable;