From 959831f4ef5a3e797f576c3de08cd65032c997ad Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Sun, 13 Jan 2013 18:54:10 +1000 Subject: Remove damned ancient DOS line endings from Irrlicht. Hopefully I did not go overboard. --- .../irrlicht-1.8/source/Irrlicht/CImageLoaderWAL.h | 200 ++++++++++----------- 1 file changed, 100 insertions(+), 100 deletions(-) (limited to 'libraries/irrlicht-1.8/source/Irrlicht/CImageLoaderWAL.h') diff --git a/libraries/irrlicht-1.8/source/Irrlicht/CImageLoaderWAL.h b/libraries/irrlicht-1.8/source/Irrlicht/CImageLoaderWAL.h index 871814a..d885398 100644 --- a/libraries/irrlicht-1.8/source/Irrlicht/CImageLoaderWAL.h +++ b/libraries/irrlicht-1.8/source/Irrlicht/CImageLoaderWAL.h @@ -1,100 +1,100 @@ -// Copyright (C) 2004 Murphy McCauley -// Copyright (C) 2007-2012 Christian Stehno -// This file is part of the "Irrlicht Engine". -// For conditions of distribution and use, see copyright notice in irrlicht.h -/* - Thanks to: - Max McGuire for his Flipcode article about WAL textures - Nikolaus Gebhardt for the Irrlicht 3D engine -*/ - -#ifndef __C_IMAGE_LOADER_WAL_H_INCLUDED__ -#define __C_IMAGE_LOADER_WAL_H_INCLUDED__ - -#include "IrrCompileConfig.h" -#include "IImageLoader.h" - -namespace irr -{ -namespace video -{ - -#ifdef _IRR_COMPILE_WITH_LMP_LOADER_ - -// byte-align structures -#include "irrpack.h" - - struct SLMPHeader { - u32 width; // width - u32 height; // height - // variably sized - } PACK_STRUCT; - -// Default alignment -#include "irrunpack.h" - -//! An Irrlicht image loader for Quake1,2 engine lmp textures/palette -class CImageLoaderLMP : public irr::video::IImageLoader -{ -public: - virtual bool isALoadableFileExtension(const io::path& filename) const; - virtual bool isALoadableFileFormat(irr::io::IReadFile* file) const; - virtual irr::video::IImage* loadImage(irr::io::IReadFile* file) const; -}; - -#endif - -#ifdef _IRR_COMPILE_WITH_WAL_LOADER_ - -//! An Irrlicht image loader for quake2 wal engine textures -class CImageLoaderWAL : public irr::video::IImageLoader -{ -public: - virtual bool isALoadableFileExtension(const io::path& filename) const; - virtual bool isALoadableFileFormat(irr::io::IReadFile* file) const; - virtual irr::video::IImage* loadImage(irr::io::IReadFile* file) const; -}; - -//! An Irrlicht image loader for Halflife 1 engine textures -class CImageLoaderWAL2 : public irr::video::IImageLoader -{ -public: - virtual bool isALoadableFileExtension(const io::path& filename) const; - virtual bool isALoadableFileFormat(irr::io::IReadFile* file) const; - virtual irr::video::IImage* loadImage(irr::io::IReadFile* file) const; -}; - -// byte-align structures -#include "irrpack.h" - - // Halfelife wad3 type 67 file - struct miptex_halflife - { - c8 name[16]; - u32 width, height; - u32 mipmap[4]; // four mip maps stored - } PACK_STRUCT; - - //quake2 texture - struct miptex_quake2 - { - c8 name[32]; - u32 width; - u32 height; - u32 mipmap[4]; // four mip maps stored - c8 animname[32]; // next frame in animation chain - s32 flags; - s32 contents; - s32 value; - } PACK_STRUCT; - -// Default alignment -#include "irrunpack.h" - -#endif - -} -} - -#endif - +// Copyright (C) 2004 Murphy McCauley +// Copyright (C) 2007-2012 Christian Stehno +// This file is part of the "Irrlicht Engine". +// For conditions of distribution and use, see copyright notice in irrlicht.h +/* + Thanks to: + Max McGuire for his Flipcode article about WAL textures + Nikolaus Gebhardt for the Irrlicht 3D engine +*/ + +#ifndef __C_IMAGE_LOADER_WAL_H_INCLUDED__ +#define __C_IMAGE_LOADER_WAL_H_INCLUDED__ + +#include "IrrCompileConfig.h" +#include "IImageLoader.h" + +namespace irr +{ +namespace video +{ + +#ifdef _IRR_COMPILE_WITH_LMP_LOADER_ + +// byte-align structures +#include "irrpack.h" + + struct SLMPHeader { + u32 width; // width + u32 height; // height + // variably sized + } PACK_STRUCT; + +// Default alignment +#include "irrunpack.h" + +//! An Irrlicht image loader for Quake1,2 engine lmp textures/palette +class CImageLoaderLMP : public irr::video::IImageLoader +{ +public: + virtual bool isALoadableFileExtension(const io::path& filename) const; + virtual bool isALoadableFileFormat(irr::io::IReadFile* file) const; + virtual irr::video::IImage* loadImage(irr::io::IReadFile* file) const; +}; + +#endif + +#ifdef _IRR_COMPILE_WITH_WAL_LOADER_ + +//! An Irrlicht image loader for quake2 wal engine textures +class CImageLoaderWAL : public irr::video::IImageLoader +{ +public: + virtual bool isALoadableFileExtension(const io::path& filename) const; + virtual bool isALoadableFileFormat(irr::io::IReadFile* file) const; + virtual irr::video::IImage* loadImage(irr::io::IReadFile* file) const; +}; + +//! An Irrlicht image loader for Halflife 1 engine textures +class CImageLoaderWAL2 : public irr::video::IImageLoader +{ +public: + virtual bool isALoadableFileExtension(const io::path& filename) const; + virtual bool isALoadableFileFormat(irr::io::IReadFile* file) const; + virtual irr::video::IImage* loadImage(irr::io::IReadFile* file) const; +}; + +// byte-align structures +#include "irrpack.h" + + // Halfelife wad3 type 67 file + struct miptex_halflife + { + c8 name[16]; + u32 width, height; + u32 mipmap[4]; // four mip maps stored + } PACK_STRUCT; + + //quake2 texture + struct miptex_quake2 + { + c8 name[32]; + u32 width; + u32 height; + u32 mipmap[4]; // four mip maps stored + c8 animname[32]; // next frame in animation chain + s32 flags; + s32 contents; + s32 value; + } PACK_STRUCT; + +// Default alignment +#include "irrunpack.h" + +#endif + +} +} + +#endif + -- cgit v1.1