pull/216/head
castano 13 years ago
parent 86b43e55c1
commit 9c0658edca

6
configure vendored

@ -18,7 +18,7 @@ fi
help=false help=false
build="Debug" # release build="debug" # release
prefix=/usr/local prefix=/usr/local
# Parse the args # Parse the args
@ -26,8 +26,8 @@ for i in "$@"
do do
case $i in case $i in
--help ) help=true ;; --help ) help=true ;;
--debug ) build="Debug" ;; --debug ) build="debug" ;;
--release ) build="Release" ;; --release ) build="release" ;;
--prefix=* ) prefix="${i#--prefix=}" ;; --prefix=* ) prefix="${i#--prefix=}" ;;
* ) echo "Unrecognised argument $i" ;; * ) echo "Unrecognised argument $i" ;;
esac esac

@ -22,6 +22,7 @@
// OTHER DEALINGS IN THE SOFTWARE. // OTHER DEALINGS IN THE SOFTWARE.
#include "CubeImage.h" #include "CubeImage.h"
#include "TexImage.h"
using namespace nv; using namespace nv;
using namespace nvtt; using namespace nvtt;
@ -113,14 +114,14 @@ TexImage CubeImage::unfold(CubeLayout layout)
void CubeImage::toLinear(float gamma) void CubeImage::toLinear(float gamma)
{ {
for (int i = 0; i < 6; i++) { for (int i = 0; i < 6; i++) {
m->face.toLinear(gamma); m->face[i].toLinear(gamma);
} }
} }
void CubeImage::toGamma(float gamma) void CubeImage::toGamma(float gamma)
{ {
for (int i = 0; i < 6; i++) { for (int i = 0; i < 6; i++) {
m->face.toGamma(gamma); m->face[i].toGamma(gamma);
} }
} }

@ -536,7 +536,7 @@ namespace nvtt
TexImage & face(int face); TexImage & face(int face);
// Layout conversion. // Layout conversion.
void fold(TexImage & img, CubeLayout layout); void fold(const TexImage & img, CubeLayout layout);
TexImage unfold(CubeLayout layout); TexImage unfold(CubeLayout layout);
// @@ Angular extent filtering. // @@ Angular extent filtering.

Loading…
Cancel
Save