diff --git a/IO/CMakeLists.txt b/IO/CMakeLists.txt index 520539b..58b4046 100644 --- a/IO/CMakeLists.txt +++ b/IO/CMakeLists.txt @@ -83,6 +83,10 @@ SET( SOURCES ${SOURCES} "third_party/tga/targa.c" ) SET( HEADERS ${HEADERS} "third_party/tga/targa.h" ) INCLUDE_DIRECTORIES( ${FasTC_SOURCE_DIR}/IO/third_party/tga ) +# Add TGA loaders +SET( SOURCES ${SOURCES} "src/ImageLoaderTGA.cpp" ) +SET( HEADERS ${HEADERS} "src/ImageLoaderTGA.h" ) + CONFIGURE_FILE( "config/ImageLoader.h.in" "include/ImageLoader.h" diff --git a/IO/include/ImageFileFormat.h b/IO/include/ImageFileFormat.h index 48b262b..6035a81 100644 --- a/IO/include/ImageFileFormat.h +++ b/IO/include/ImageFileFormat.h @@ -47,6 +47,7 @@ enum EImageFileFormat { eFileFormat_PNG, eFileFormat_PVR, + eFileFormat_TGA, kNumImageFileFormats }; diff --git a/IO/src/ImageFile.cpp b/IO/src/ImageFile.cpp index 6c3adfd..6b62043 100644 --- a/IO/src/ImageFile.cpp +++ b/IO/src/ImageFile.cpp @@ -65,6 +65,8 @@ # include "ImageLoaderPVR.h" #endif +#include "ImageLoaderTGA.h" + ////////////////////////////////////////////////////////////////////////////////////////// // // Static helper functions @@ -196,6 +198,10 @@ FasTC::Image<> *ImageFile::LoadImage() const { break; #endif // PVRTEXLIB_FOUND + case eFileFormat_TGA: + loader = new ImageLoaderTGA(m_FileData, m_FileDataSz); + break; + default: fprintf(stderr, "Unable to load image: unknown file format.\n"); return NULL; diff --git a/IO/src/ImageLoaderTGA.cpp b/IO/src/ImageLoaderTGA.cpp new file mode 100644 index 0000000..b50c2fb --- /dev/null +++ b/IO/src/ImageLoaderTGA.cpp @@ -0,0 +1,85 @@ +/* FasTC + * Copyright (c) 2013 University of North Carolina at Chapel Hill. + * All rights reserved. + * + * Permission to use, copy, modify, and distribute this software and its + * documentation for educational, research, and non-profit purposes, without + * fee, and without a written agreement is hereby granted, provided that the + * above copyright notice, this paragraph, and the following four paragraphs + * appear in all copies. + * + * Permission to incorporate this software into commercial products may be + * obtained by contacting the authors or the Office of Technology Development + * at the University of North Carolina at Chapel Hill . + * + * This software program and documentation are copyrighted by the University of + * North Carolina at Chapel Hill. The software program and documentation are + * supplied "as is," without any accompanying services from the University of + * North Carolina at Chapel Hill or the authors. The University of North + * Carolina at Chapel Hill and the authors do not warrant that the operation of + * the program will be uninterrupted or error-free. The end-user understands + * that the program was developed for research purposes and is advised not to + * rely exclusively on the program for any reason. + * + * IN NO EVENT SHALL THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL OR THE + * AUTHORS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, + * OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF + * THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF NORTH CAROLINA + * AT CHAPEL HILL OR THE AUTHORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL AND THE AUTHORS SPECIFICALLY + * DISCLAIM ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE AND ANY + * STATUTORY WARRANTY OF NON-INFRINGEMENT. THE SOFTWARE PROVIDED HEREUNDER IS ON + * AN "AS IS" BASIS, AND THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL AND + * THE AUTHORS HAVE NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, + * ENHANCEMENTS, OR MODIFICATIONS. + * + * Please send all BUG REPORTS to . + * + * The authors may be contacted via: + * + * Pavel Krajcevski + * Dept of Computer Science + * 201 S Columbia St + * Frederick P. Brooks, Jr. Computer Science Bldg + * Chapel Hill, NC 27599-3175 + * USA + * + * + */ + +#include "ImageLoaderTGA.h" + +#include +#include +#include +#include + +#include "TexCompTypes.h" + +#include "targa.h" + +static void ReportError(const char *msg) { + fprintf(stderr, "ERROR: ImageLoaderTGA -- %s\n", msg); +} + +ImageLoaderTGA::ImageLoaderTGA(const uint8 *rawData, const int32 rawDataSz) + : ImageLoader(rawData, rawDataSz) +{ } + +ImageLoaderTGA::~ImageLoaderTGA() { } + +bool ImageLoaderTGA::ReadData() { + Targa tga; + targa_loadFromData(&tga, m_RawData, m_NumRawDataBytes); + + m_Width = tga.width; + m_Height = tga.height; + + assert(tga.imagelength == m_Width * m_Height * 4); + + return LoadFromPixelBuffer(reinterpret_cast(tga.image)); +} + diff --git a/IO/src/ImageLoaderTGA.h b/IO/src/ImageLoaderTGA.h new file mode 100644 index 0000000..df68db0 --- /dev/null +++ b/IO/src/ImageLoaderTGA.h @@ -0,0 +1,66 @@ +/* FasTC + * Copyright (c) 2013 University of North Carolina at Chapel Hill. + * All rights reserved. + * + * Permission to use, copy, modify, and distribute this software and its + * documentation for educational, research, and non-profit purposes, without + * fee, and without a written agreement is hereby granted, provided that the + * above copyright notice, this paragraph, and the following four paragraphs + * appear in all copies. + * + * Permission to incorporate this software into commercial products may be + * obtained by contacting the authors or the Office of Technology Development + * at the University of North Carolina at Chapel Hill . + * + * This software program and documentation are copyrighted by the University of + * North Carolina at Chapel Hill. The software program and documentation are + * supplied "as is," without any accompanying services from the University of + * North Carolina at Chapel Hill or the authors. The University of North + * Carolina at Chapel Hill and the authors do not warrant that the operation of + * the program will be uninterrupted or error-free. The end-user understands + * that the program was developed for research purposes and is advised not to + * rely exclusively on the program for any reason. + * + * IN NO EVENT SHALL THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL OR THE + * AUTHORS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, + * OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF + * THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF NORTH CAROLINA + * AT CHAPEL HILL OR THE AUTHORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + * THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL AND THE AUTHORS SPECIFICALLY + * DISCLAIM ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE AND ANY + * STATUTORY WARRANTY OF NON-INFRINGEMENT. THE SOFTWARE PROVIDED HEREUNDER IS ON + * AN "AS IS" BASIS, AND THE UNIVERSITY OF NORTH CAROLINA AT CHAPEL HILL AND + * THE AUTHORS HAVE NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, + * ENHANCEMENTS, OR MODIFICATIONS. + * + * Please send all BUG REPORTS to . + * + * The authors may be contacted via: + * + * Pavel Krajcevski + * Dept of Computer Science + * 201 S Columbia St + * Frederick P. Brooks, Jr. Computer Science Bldg + * Chapel Hill, NC 27599-3175 + * USA + * + * + */ + +#ifndef IO_SRC_IMAGELOADERTGA_H_ +#define IO_SRC_IMAGELOADERTGA_H_ + +#include "ImageLoader.h" + +class ImageLoaderTGA : public ImageLoader { + public: + ImageLoaderTGA(const uint8 *rawData, const int32 rawDataSz); + virtual ~ImageLoaderTGA(); + + virtual bool ReadData(); +}; + +#endif // IO_SRC_IMAGELOADERTGA_H_