Remove damned ancient DOS line endings from Irrlicht. Hopefully I did not go overboard.

1 files changed, 205 insertions, 205 deletions

diff --git a/libraries/irrlicht-1.8/source/Irrlicht/COpenGLTexture.h b/libraries/irrlicht-1.8/source/Irrlicht/COpenGLTexture.h
index 8bff1a8..4e01d55 100644
--- a/libraries/irrlicht-1.8/source/Irrlicht/COpenGLTexture.h
+++ b/libraries/irrlicht-1.8/source/Irrlicht/COpenGLTexture.h
@@ -1,205 +1,205 @@
-// Copyright (C) 2002-2012 Nikolaus Gebhardt

-// This file is part of the "Irrlicht Engine".

-// For conditions of distribution and use, see copyright notice in irrlicht.h

-

-#ifndef __C_OPEN_GL_TEXTURE_H_INCLUDED__

-#define __C_OPEN_GL_TEXTURE_H_INCLUDED__

-

-#include "ITexture.h"

-#include "IImage.h"

-

-#include "IrrCompileConfig.h"

-#ifdef _IRR_COMPILE_WITH_OPENGL_

-

-#if defined(_IRR_OPENGL_USE_EXTPOINTER_)

-        #define GL_GLEXT_LEGACY 1

-#else

-        #define GL_GLEXT_PROTOTYPES 1

-#endif

-#ifdef _IRR_WINDOWS_API_

-        // include windows headers for HWND

-        #define WIN32_LEAN_AND_MEAN

-        #include <windows.h>

-        #include <GL/gl.h>

-#ifdef _MSC_VER

-        #pragma comment(lib, "OpenGL32.lib")

-#endif

-#elif defined(_IRR_OSX_PLATFORM_)

-        #include <OpenGL/gl.h>

-#elif defined(_IRR_COMPILE_WITH_SDL_DEVICE_)

-        #define NO_SDL_GLEXT

-        #include <SDL/SDL_video.h>

-        #include <SDL/SDL_opengl.h>

-#else

-        #if defined(_IRR_OSX_PLATFORM_)

-                #include <OpenGL/gl.h>

-        #else

-                #include <GL/gl.h>

-        #endif

-#endif

-

-

-namespace irr

-{

-namespace video

-{

-

-class COpenGLDriver;

-//! OpenGL texture.

-class COpenGLTexture : public ITexture

-{

-public:

-

-        //! constructor

-        COpenGLTexture(IImage* surface, const io::path& name, void* mipmapData=0, COpenGLDriver* driver=0);

-

-        //! destructor

-        virtual ~COpenGLTexture();

-

-        //! lock function

-        virtual void* lock(E_TEXTURE_LOCK_MODE mode=ETLM_READ_WRITE, u32 mipmapLevel=0);

-

-        //! unlock function

-        virtual void unlock();

-

-        //! Returns original size of the texture (image).

-        virtual const core::dimension2d<u32>& getOriginalSize() const;

-

-        //! Returns size of the texture.

-        virtual const core::dimension2d<u32>& getSize() const;

-

-        //! returns driver type of texture (=the driver, that created it)

-        virtual E_DRIVER_TYPE getDriverType() const;

-

-        //! returns color format of texture

-        virtual ECOLOR_FORMAT getColorFormat() const;

-

-        //! returns pitch of texture (in bytes)

-        virtual u32 getPitch() const;

-

-        //! return open gl texture name

-        GLuint getOpenGLTextureName() const;

-

-        //! return whether this texture has mipmaps

-        virtual bool hasMipMaps() const;

-

-        //! Regenerates the mip map levels of the texture.

-        /** Useful after locking and modifying the texture

-        \param mipmapData Pointer to raw mipmap data, including all necessary mip levels, in the same format as the main texture image. If not set the mipmaps are derived from the main image. */

-        virtual void regenerateMipMapLevels(void* mipmapData=0);

-

-        //! Is it a render target?

-        virtual bool isRenderTarget() const;

-

-        //! Is it a FrameBufferObject?

-        virtual bool isFrameBufferObject() const;

-

-        //! Bind RenderTargetTexture

-        virtual void bindRTT();

-

-        //! Unbind RenderTargetTexture

-        virtual void unbindRTT();

-

-        //! sets whether this texture is intended to be used as a render target.

-        void setIsRenderTarget(bool isTarget);

-

-protected:

-

-        //! protected constructor with basic setup, no GL texture name created, for derived classes

-        COpenGLTexture(const io::path& name, COpenGLDriver* driver);

-

-        //! get the desired color format based on texture creation flags and the input format.

-        ECOLOR_FORMAT getBestColorFormat(ECOLOR_FORMAT format);

-

-        //! Get the OpenGL color format parameters based on the given Irrlicht color format

-        GLint getOpenGLFormatAndParametersFromColorFormat(

-                ECOLOR_FORMAT format, GLint& filtering, GLenum& colorformat, GLenum& type);

-

-        //! get important numbers of the image and hw texture

-        void getImageValues(IImage* image);

-

-        //! copies the texture into an OpenGL texture.

-        /** \param newTexture True if method is called for a newly created texture for the first time. Otherwise call with false to improve memory handling.

-        \param mipmapData Pointer to raw mipmap data, including all necessary mip levels, in the same format as the main texture image.

-        \param mipLevel If set to non-zero, only that specific miplevel is updated, using the MipImage member. */

-        void uploadTexture(bool newTexture=false, void* mipmapData=0, u32 mipLevel=0);

-

-        core::dimension2d<u32> ImageSize;

-        core::dimension2d<u32> TextureSize;

-        ECOLOR_FORMAT ColorFormat;

-        COpenGLDriver* Driver;

-        IImage* Image;

-        IImage* MipImage;

-

-        GLuint TextureName;

-        GLint InternalFormat;

-        GLenum PixelFormat;

-        GLenum PixelType;

-

-        u8 MipLevelStored;

-        bool HasMipMaps;

-        bool MipmapLegacyMode;

-        bool IsRenderTarget;

-        bool AutomaticMipmapUpdate;

-        bool ReadOnlyLock;

-        bool KeepImage;

-};

-

-//! OpenGL FBO texture.

-class COpenGLFBOTexture : public COpenGLTexture

-{

-public:

-

-        //! FrameBufferObject constructor

-        COpenGLFBOTexture(const core::dimension2d<u32>& size, const io::path& name,

-                COpenGLDriver* driver = 0, const ECOLOR_FORMAT format = ECF_UNKNOWN);

-

-        //! destructor

-        virtual ~COpenGLFBOTexture();

-

-        //! Is it a FrameBufferObject?

-        virtual bool isFrameBufferObject() const;

-

-        //! Bind RenderTargetTexture

-        virtual void bindRTT();

-

-        //! Unbind RenderTargetTexture

-        virtual void unbindRTT();

-

-        ITexture* DepthTexture;

-protected:

-        GLuint ColorFrameBuffer;

-};

-

-

-//! OpenGL FBO depth texture.

-class COpenGLFBODepthTexture : public COpenGLTexture

-{

-public:

-        //! FrameBufferObject depth constructor

-        COpenGLFBODepthTexture(const core::dimension2d<u32>& size, const io::path& name, COpenGLDriver* driver=0, bool useStencil=false);

-

-        //! destructor

-        virtual ~COpenGLFBODepthTexture();

-

-        //! Bind RenderTargetTexture

-        virtual void bindRTT();

-

-        //! Unbind RenderTargetTexture

-        virtual void unbindRTT();

-

-        bool attach(ITexture*);

-

-protected:

-        GLuint DepthRenderBuffer;

-        GLuint StencilRenderBuffer;

-        bool UseStencil;

-};

-

-

-} // end namespace video

-} // end namespace irr

-

-#endif

-#endif // _IRR_COMPILE_WITH_OPENGL_

-

+// Copyright (C) 2002-2012 Nikolaus Gebhardt
+// This file is part of the "Irrlicht Engine".
+// For conditions of distribution and use, see copyright notice in irrlicht.h
+
+#ifndef __C_OPEN_GL_TEXTURE_H_INCLUDED__
+#define __C_OPEN_GL_TEXTURE_H_INCLUDED__
+
+#include "ITexture.h"
+#include "IImage.h"
+
+#include "IrrCompileConfig.h"
+#ifdef _IRR_COMPILE_WITH_OPENGL_
+
+#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+        #define GL_GLEXT_LEGACY 1
+#else
+        #define GL_GLEXT_PROTOTYPES 1
+#endif
+#ifdef _IRR_WINDOWS_API_
+        // include windows headers for HWND
+        #define WIN32_LEAN_AND_MEAN
+        #include <windows.h>
+        #include <GL/gl.h>
+#ifdef _MSC_VER
+        #pragma comment(lib, "OpenGL32.lib")
+#endif
+#elif defined(_IRR_OSX_PLATFORM_)
+        #include <OpenGL/gl.h>
+#elif defined(_IRR_COMPILE_WITH_SDL_DEVICE_)
+        #define NO_SDL_GLEXT
+        #include <SDL/SDL_video.h>
+        #include <SDL/SDL_opengl.h>
+#else
+        #if defined(_IRR_OSX_PLATFORM_)
+                #include <OpenGL/gl.h>
+        #else
+                #include <GL/gl.h>
+        #endif
+#endif
+
+
+namespace irr
+{
+namespace video
+{
+
+class COpenGLDriver;
+//! OpenGL texture.
+class COpenGLTexture : public ITexture
+{
+public:
+
+        //! constructor
+        COpenGLTexture(IImage* surface, const io::path& name, void* mipmapData=0, COpenGLDriver* driver=0);
+
+        //! destructor
+        virtual ~COpenGLTexture();
+
+        //! lock function
+        virtual void* lock(E_TEXTURE_LOCK_MODE mode=ETLM_READ_WRITE, u32 mipmapLevel=0);
+
+        //! unlock function
+        virtual void unlock();
+
+        //! Returns original size of the texture (image).
+        virtual const core::dimension2d<u32>& getOriginalSize() const;
+
+        //! Returns size of the texture.
+        virtual const core::dimension2d<u32>& getSize() const;
+
+        //! returns driver type of texture (=the driver, that created it)
+        virtual E_DRIVER_TYPE getDriverType() const;
+
+        //! returns color format of texture
+        virtual ECOLOR_FORMAT getColorFormat() const;
+
+        //! returns pitch of texture (in bytes)
+        virtual u32 getPitch() const;
+
+        //! return open gl texture name
+        GLuint getOpenGLTextureName() const;
+
+        //! return whether this texture has mipmaps
+        virtual bool hasMipMaps() const;
+
+        //! Regenerates the mip map levels of the texture.
+        /** Useful after locking and modifying the texture
+        \param mipmapData Pointer to raw mipmap data, including all necessary mip levels, in the same format as the main texture image. If not set the mipmaps are derived from the main image. */
+        virtual void regenerateMipMapLevels(void* mipmapData=0);
+
+        //! Is it a render target?
+        virtual bool isRenderTarget() const;
+
+        //! Is it a FrameBufferObject?
+        virtual bool isFrameBufferObject() const;
+
+        //! Bind RenderTargetTexture
+        virtual void bindRTT();
+
+        //! Unbind RenderTargetTexture
+        virtual void unbindRTT();
+
+        //! sets whether this texture is intended to be used as a render target.
+        void setIsRenderTarget(bool isTarget);
+
+protected:
+
+        //! protected constructor with basic setup, no GL texture name created, for derived classes
+        COpenGLTexture(const io::path& name, COpenGLDriver* driver);
+
+        //! get the desired color format based on texture creation flags and the input format.
+        ECOLOR_FORMAT getBestColorFormat(ECOLOR_FORMAT format);
+
+        //! Get the OpenGL color format parameters based on the given Irrlicht color format
+        GLint getOpenGLFormatAndParametersFromColorFormat(
+                ECOLOR_FORMAT format, GLint& filtering, GLenum& colorformat, GLenum& type);
+
+        //! get important numbers of the image and hw texture
+        void getImageValues(IImage* image);
+
+        //! copies the texture into an OpenGL texture.
+        /** \param newTexture True if method is called for a newly created texture for the first time. Otherwise call with false to improve memory handling.
+        \param mipmapData Pointer to raw mipmap data, including all necessary mip levels, in the same format as the main texture image.
+        \param mipLevel If set to non-zero, only that specific miplevel is updated, using the MipImage member. */
+        void uploadTexture(bool newTexture=false, void* mipmapData=0, u32 mipLevel=0);
+
+        core::dimension2d<u32> ImageSize;
+        core::dimension2d<u32> TextureSize;
+        ECOLOR_FORMAT ColorFormat;
+        COpenGLDriver* Driver;
+        IImage* Image;
+        IImage* MipImage;
+
+        GLuint TextureName;
+        GLint InternalFormat;
+        GLenum PixelFormat;
+        GLenum PixelType;
+
+        u8 MipLevelStored;
+        bool HasMipMaps;
+        bool MipmapLegacyMode;
+        bool IsRenderTarget;
+        bool AutomaticMipmapUpdate;
+        bool ReadOnlyLock;
+        bool KeepImage;
+};
+
+//! OpenGL FBO texture.
+class COpenGLFBOTexture : public COpenGLTexture
+{
+public:
+
+        //! FrameBufferObject constructor
+        COpenGLFBOTexture(const core::dimension2d<u32>& size, const io::path& name,
+                COpenGLDriver* driver = 0, const ECOLOR_FORMAT format = ECF_UNKNOWN);
+
+        //! destructor
+        virtual ~COpenGLFBOTexture();
+
+        //! Is it a FrameBufferObject?
+        virtual bool isFrameBufferObject() const;
+
+        //! Bind RenderTargetTexture
+        virtual void bindRTT();
+
+        //! Unbind RenderTargetTexture
+        virtual void unbindRTT();
+
+        ITexture* DepthTexture;
+protected:
+        GLuint ColorFrameBuffer;
+};
+
+
+//! OpenGL FBO depth texture.
+class COpenGLFBODepthTexture : public COpenGLTexture
+{
+public:
+        //! FrameBufferObject depth constructor
+        COpenGLFBODepthTexture(const core::dimension2d<u32>& size, const io::path& name, COpenGLDriver* driver=0, bool useStencil=false);
+
+        //! destructor
+        virtual ~COpenGLFBODepthTexture();
+
+        //! Bind RenderTargetTexture
+        virtual void bindRTT();
+
+        //! Unbind RenderTargetTexture
+        virtual void unbindRTT();
+
+        bool attach(ITexture*);
+
+protected:
+        GLuint DepthRenderBuffer;
+        GLuint StencilRenderBuffer;
+        bool UseStencil;
+};
+
+
+} // end namespace video
+} // end namespace irr
+
+#endif
+#endif // _IRR_COMPILE_WITH_OPENGL_
+