drewcassidy
/
nvidia-texture-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Hide file format especific savers. Add generic image saver.

Browse Source 
Misc fixes under OSX.
pull/216/head
castano 15 years ago
parent 36850f6241
commit 50b8b67185
10 changed files with 491 additions and 461 deletions
Show Stats Download Patch File Download Diff File

18
src/CMakeLists.txt
Unescape Escape View File

@ -70,6 +70,15 @@ ELSE(MAYA_FOUND)
MESSAGE(STATUS "Looking for Maya - not found")
ENDIF(MAYA_FOUND)
# FreeImage
INCLUDE(${NV_CMAKE_DIR}/FindFreeImage.cmake)
IF(FREEIMAGE_FOUND)
SET(HAVE_FREEIMAGE ${FREEIMAGE_FOUND} CACHE BOOL "Set to TRUE if FreeImage is found, FALSE otherwise")
MESSAGE(STATUS "Looking for FreeImage - found")
ELSE(FREEIMAGE_FOUND)
MESSAGE(STATUS "Looking for FreeImage - not found")
ENDIF(FREEIMAGE_FOUND)
# JPEG
INCLUDE(FindJPEG)
IF(JPEG_FOUND)
@ -107,15 +116,6 @@ ELSE(OPENEXR_FOUND)
MESSAGE(STATUS "Looking for OpenEXR - not found")
ENDIF(OPENEXR_FOUND)
# FreeImage
INCLUDE(${NV_CMAKE_DIR}/FindFreeImage.cmake)
IF(FREEIMAGE_FOUND)
SET(HAVE_FREEIMAGE ${FREEIMAGE_FOUND} CACHE BOOL "Set to TRUE if FreeImage is found, FALSE otherwise")
MESSAGE(STATUS "Looking for FreeImage - found")
ELSE(FREEIMAGE_FOUND)
MESSAGE(STATUS "Looking for FreeImage - not found")
ENDIF(FREEIMAGE_FOUND)
# Qt
FIND_PACKAGE(Qt4)

799
src/nvimage/ImageIO.cpp
View File

File diff suppressed because it is too large Load Diff

36
src/nvimage/ImageIO.h
Unescape Escape View File

@ -16,43 +16,21 @@ namespace nv
namespace ImageIO
{
struct ImageMetaData
{
HashMap<String, String> tagMap;
};
NVIMAGE_API Image * load(const char * fileName);
NVIMAGE_API Image * load(const char * fileName, Stream & s);
NVIMAGE_API FloatImage * loadFloat(const char * fileName);
NVIMAGE_API FloatImage * loadFloat(const char * fileName, Stream & s);
NVIMAGE_API bool save(const char * fileName, Stream & s, const Image * img);
NVIMAGE_API bool save(const char * fileName, const Image * img);
NVIMAGE_API bool save(const char * fileName, Stream & s, const Image * img, const ImageMetaData * tags=NULL);
NVIMAGE_API bool save(const char * fileName, const Image * img, const ImageMetaData * tags=NULL);
NVIMAGE_API bool saveFloat(const char * fileName, const FloatImage * fimage, uint base_component, uint num_components);
NVIMAGE_API Image * loadTGA(Stream & s);
NVIMAGE_API bool saveTGA(Stream & s, const Image * img);
NVIMAGE_API Image * loadPSD(Stream & s);
#if defined(HAVE_PNG)
NVIMAGE_API Image * loadPNG(Stream & s);
typedef HashMap<String, String> PngCommentsMap;
NVIMAGE_API bool savePNG(Stream & s, const Image * img, const PngCommentsMap & comments = PngCommentsMap());
#endif
#if defined(HAVE_JPEG)
NVIMAGE_API Image * loadJPG(Stream & s);
#endif
#if defined(HAVE_TIFF)
NVIMAGE_API FloatImage * loadFloatTIFF(const char * fileName, Stream & s);
NVIMAGE_API bool saveFloatTIFF(const char * fileName, const FloatImage * fimage, uint base_component, uint num_components);
#endif
#if defined(HAVE_OPENEXR)
NVIMAGE_API FloatImage * loadFloatEXR(const char * fileName, Stream & s);
NVIMAGE_API bool saveFloatEXR(const char * fileName, const FloatImage * fimage, uint base_component, uint num_components);
#endif
} // ImageIO namespace
} // nv namespace

66
src/nvtt/Texture.cpp
Unescape Escape View File

@ -27,6 +27,7 @@
#include <nvmath/Matrix.h>
#include <nvimage/Filter.h>
#include <nvimage/ImageIO.h>
using namespace nv;
using namespace nvtt;
@ -126,8 +127,19 @@ void Texture::setNormalMap(bool isNormalMap)
bool Texture::load(const char * fileName)
{
// @@ Not implemented.
return false;
// @@ Add support for DDS textures!
AutoPtr<FloatImage> img(ImageIO::loadFloat(fileName));
if (img == NULL)
{
return false;
}
m->imageArray.resize(1);
m->imageArray[0] = img.release();
return true;
}
void Texture::setTexture2D(InputFormat format, int w, int h, int idx, void * data)
@ -140,7 +152,7 @@ void Texture::resize(int w, int h, ResizeFilter filter)
{
if (m->imageArray.count() > 0)
{
if (w == m->imageArray[0].width() && h == m->imageArray[0].height()) return;
if (w == m->imageArray[0]->width() && h == m->imageArray[0]->height()) return;
}
// @TODO: if cubemap, make sure w == h.
@ -156,25 +168,25 @@ void Texture::resize(int w, int h, ResizeFilter filter)
if (filter == ResizeFilter_Box)
{
BoxFilter filter;
m->imageArray[i].resize(filter, w, h, wrapMode, 3);
m->imageArray[i]->resize(filter, w, h, wrapMode, 3);
}
else if (filter == ResizeFilter_Triangle)
{
TriangleFilter filter;
m->imageArray[i].resize(filter, w, h, wrapMode, 3);
m->imageArray[i]->resize(filter, w, h, wrapMode, 3);
}
else if (filter == ResizeFilter_Kaiser)
{
//KaiserFilter filter(inputOptions.kaiserWidth);
//filter.setParameters(inputOptions.kaiserAlpha, inputOptions.kaiserStretch);
KaiserFilter filter(3);
m->imageArray[i].resize(filter, w, h, wrapMode, 3);
m->imageArray[i]->resize(filter, w, h, wrapMode, 3);
}
else //if (filter == ResizeFilter_Mitchell)
{
nvDebugCheck(filter == ResizeFilter_Mitchell);
MitchellFilter filter;
m->imageArray[i].resize(filter, w, h, wrapMode, 3);
m->imageArray[i]->resize(filter, w, h, wrapMode, 3);
}
}
else
@ -182,25 +194,25 @@ void Texture::resize(int w, int h, ResizeFilter filter)
if (filter == ResizeFilter_Box)
{
BoxFilter filter;
m->imageArray[i].resize(filter, w, h, wrapMode);
m->imageArray[i]->resize(filter, w, h, wrapMode);
}
else if (filter == ResizeFilter_Triangle)
{
TriangleFilter filter;
m->imageArray[i].resize(filter, w, h, wrapMode);
m->imageArray[i]->resize(filter, w, h, wrapMode);
}
else if (filter == ResizeFilter_Kaiser)
{
//KaiserFilter filter(inputOptions.kaiserWidth);
//filter.setParameters(inputOptions.kaiserAlpha, inputOptions.kaiserStretch);
KaiserFilter filter(3);
m->imageArray[i].resize(filter, w, h, wrapMode);
m->imageArray[i]->resize(filter, w, h, wrapMode);
}
else //if (filter == ResizeFilter_Mitchell)
{
nvDebugCheck(filter == ResizeFilter_Mitchell);
MitchellFilter filter;
m->imageArray[i].resize(filter, w, h, wrapMode);
m->imageArray[i]->resize(filter, w, h, wrapMode);
}
}
}
@ -210,8 +222,8 @@ void Texture::resize(int maxExtent, RoundMode roundMode, ResizeFilter filter)
{
if (m->imageArray.count() > 0)
{
int w = m->imageArray[0].width();
int h = m->imageArray[0].height();
int w = m->imageArray[0]->width();
int h = m->imageArray[0]->height();
nvDebugCheck(w > 0);
nvDebugCheck(h > 0);
@ -255,8 +267,8 @@ bool Texture::buildNextMipmap(MipmapFilter filter)
{
if (m->imageArray.count() > 0)
{
int w = m->imageArray[0].width();
int h = m->imageArray[0].height();
int w = m->imageArray[0]->width();
int h = m->imageArray[0]->height();
nvDebugCheck(w > 0);
nvDebugCheck(h > 0);
@ -278,12 +290,12 @@ bool Texture::buildNextMipmap(MipmapFilter filter)
if (filter == MipmapFilter_Box)
{
BoxFilter filter;
m->imageArray[i].downSample(filter, wrapMode, 3);
m->imageArray[i]->downSample(filter, wrapMode, 3);
}
else if (filter == MipmapFilter_Triangle)
{
TriangleFilter filter;
m->imageArray[i].downSample(filter, wrapMode, 3);
m->imageArray[i]->downSample(filter, wrapMode, 3);
}
else if (filter == MipmapFilter_Kaiser)
{
@ -291,19 +303,19 @@ bool Texture::buildNextMipmap(MipmapFilter filter)
//KaiserFilter filter(inputOptions.kaiserWidth);
//filter.setParameters(inputOptions.kaiserAlpha, inputOptions.kaiserStretch);
KaiserFilter filter(3);
m->imageArray[i].downSample(filter, wrapMode, 3);
m->imageArray[i]->downSample(filter, wrapMode, 3);
}
}
else
{
if (filter == MipmapFilter_Box)
{
m->imageArray[i].fastDownSample();
m->imageArray[i]->fastDownSample();
}
else if (filter == MipmapFilter_Triangle)
{
TriangleFilter filter;
m->imageArray[i].downSample(filter, wrapMode);
m->imageArray[i]->downSample(filter, wrapMode);
}
else //if (filter == MipmapFilter_Kaiser)
{
@ -311,7 +323,7 @@ bool Texture::buildNextMipmap(MipmapFilter filter)
//KaiserFilter filter(inputOptions.kaiserWidth);
//filter.setParameters(inputOptions.kaiserAlpha, inputOptions.kaiserStretch);
KaiserFilter filter(3);
m->imageArray[i].downSample(filter, wrapMode);
m->imageArray[i]->downSample(filter, wrapMode);
}
}
}
@ -328,7 +340,7 @@ void Texture::toLinear(float gamma)
foreach(i, m->imageArray)
{
m->imageArray[i].toLinear(0, 3, gamma);
m->imageArray[i]->toLinear(0, 3, gamma);
}
}
@ -340,7 +352,7 @@ void Texture::toGamma(float gamma)
foreach(i, m->imageArray)
{
m->imageArray[i].toGamma(0, 3, gamma);
m->imageArray[i]->toGamma(0, 3, gamma);
}
}
@ -358,7 +370,7 @@ void Texture::transform(const float w0[4], const float w1[4], const float w2[4],
foreach(i, m->imageArray)
{
m->imageArray[i].transform(0, xform, voffset);
m->imageArray[i]->transform(0, xform, voffset);
}
}
@ -370,7 +382,7 @@ void Texture::swizzle(int r, int g, int b, int a)
foreach(i, m->imageArray)
{
m->imageArray[i].swizzle(0, r, g, b, a);
m->imageArray[i]->swizzle(0, r, g, b, a);
}
}
@ -382,7 +394,7 @@ void Texture::scaleBias(int channel, float scale, float bias)
foreach(i, m->imageArray)
{
m->imageArray[i].scaleBias(channel, 1, scale, bias);
m->imageArray[i]->scaleBias(channel, 1, scale, bias);
}
}
@ -392,7 +404,7 @@ void Texture::normalizeNormals()
foreach(i, m->imageArray)
{
m->imageArray[i].normalize(0);
m->imageArray[i]->normalize(0);
}
}

3
src/nvtt/Texture.h
Unescape Escape View File

@ -28,6 +28,7 @@
#include <nvcore/Containers.h>
#include <nvcore/RefCounted.h>
#include <nvcore/Ptr.h>
#include <nvimage/Image.h>
#include <nvimage/FloatImage.h>
@ -59,7 +60,7 @@ namespace nvtt
AlphaMode alphaMode;
bool isNormalMap;
nv::Array<nv::FloatImage> imageArray;
nv::Array<nv::FloatImage *> imageArray;
};

4
src/nvtt/cuda/CudaUtils.cpp
Unescape Escape View File

@ -72,8 +72,10 @@ static bool isWow32()
#endif
*/
static bool isCudaDriverAvailable(int version)
{
#if defined HAVE_CUDA
#if NV_OS_WIN32
Library nvcuda("nvcuda.dll");
#else
@ -109,11 +111,13 @@ static bool isCudaDriverAvailable(int version)
return driverVersion >= version;
}
#endif // HAVE_CUDA
return false;
}
/// Determine if CUDA is available.
bool nv::cuda::isHardwarePresent()
{

3
src/nvtt/tests/imperativeapi.cpp
Unescape Escape View File

@ -29,7 +29,10 @@
int main(int argc, char *argv[])
{
nvtt::CompressionOptions compressionOptions;
compressionOptions.setFormat(nvtt::Format_BC1);
nvtt::OutputOptions outputOptions;
outputOptions.setFileName("output.dds");
nvtt::Context context;
nvtt::Texture texture = context.createTexture();

11
src/nvtt/tools/decompress.cpp
Unescape Escape View File

@ -179,16 +179,7 @@ int main(int argc, char *argv[])
return 1;
}
#ifdef HAVE_PNG
if (savePNG)
{
nv::ImageIO::savePNG(stream, &mipmap);
}
else
#endif
{
nv::ImageIO::saveTGA(stream, &mipmap);
}
nv::ImageIO::save(name, stream, &mipmap);
}
}

2
src/nvtt/tools/resize.cpp
Unescape Escape View File

@ -176,7 +176,7 @@ int main(int argc, char *argv[])
result->setFormat(nv::Image::Format_ARGB);
nv::StdOutputStream stream(output);
nv::ImageIO::saveTGA(stream, result.ptr()); // @@ Add generic save function. Add support for png too.
nv::ImageIO::save(output, stream, result.ptr());
return 0;
}

10
src/nvtt/tools/thumbnailer.cpp
Unescape Escape View File

@ -119,9 +119,9 @@ int main(int argc, char *argv[])
nv::Image image;
if (!loadImage(image, input)) return 1;
nv::ImageIO::PngCommentsMap pngComments;
pngComments.add("Thumb::Image::Width", nv::StringBuilder().number (image.width()));
pngComments.add("Thumb::Image::Height", nv::StringBuilder().number (image.height()));
nv::ImageIO::ImageMetaData metaData;
metaData.tagMap.add("Thumb::Image::Width", nv::StringBuilder().number (image.width()));
metaData.tagMap.add("Thumb::Image::Height", nv::StringBuilder().number (image.height()));
if ((image.width() > size) || (image.height() > size))
{
@ -145,12 +145,12 @@ int main(int argc, char *argv[])
result->setFormat(nv::Image::Format_ARGB);
nv::StdOutputStream stream(output);
nv::ImageIO::savePNG(stream, result.ptr(), pngComments);
nv::ImageIO::save(output, stream, result.ptr(), &metaData);
}
else
{
nv::StdOutputStream stream(output);
nv::ImageIO::savePNG(stream, &image, pngComments);
nv::ImageIO::save(output, stream, &image, &metaData);
}
return 0;

Write Preview
Loading…
Cancel
Save