diff options
author | David Walter Seikel | 2013-01-13 18:54:10 +1000 |
---|---|---|
committer | David Walter Seikel | 2013-01-13 18:54:10 +1000 |
commit | 959831f4ef5a3e797f576c3de08cd65032c997ad (patch) | |
tree | e7351908be5995f0b325b2ebeaa02d5a34b82583 /libraries/irrlicht-1.8/source/Irrlicht/CSoftwareTexture.h | |
parent | Add info about changes to Irrlicht. (diff) | |
download | SledjHamr-959831f4ef5a3e797f576c3de08cd65032c997ad.zip SledjHamr-959831f4ef5a3e797f576c3de08cd65032c997ad.tar.gz SledjHamr-959831f4ef5a3e797f576c3de08cd65032c997ad.tar.bz2 SledjHamr-959831f4ef5a3e797f576c3de08cd65032c997ad.tar.xz |
Remove damned ancient DOS line endings from Irrlicht. Hopefully I did not go overboard.
Diffstat (limited to '')
-rw-r--r-- | libraries/irrlicht-1.8/source/Irrlicht/CSoftwareTexture.h | 152 |
1 files changed, 76 insertions, 76 deletions
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/CSoftwareTexture.h b/libraries/irrlicht-1.8/source/Irrlicht/CSoftwareTexture.h index ff06e16..e751ac7 100644 --- a/libraries/irrlicht-1.8/source/Irrlicht/CSoftwareTexture.h +++ b/libraries/irrlicht-1.8/source/Irrlicht/CSoftwareTexture.h | |||
@@ -1,76 +1,76 @@ | |||
1 | // Copyright (C) 2002-2012 Nikolaus Gebhardt | 1 | // Copyright (C) 2002-2012 Nikolaus Gebhardt |
2 | // This file is part of the "Irrlicht Engine". | 2 | // This file is part of the "Irrlicht Engine". |
3 | // For conditions of distribution and use, see copyright notice in irrlicht.h | 3 | // For conditions of distribution and use, see copyright notice in irrlicht.h |
4 | 4 | ||
5 | #ifndef __C_SOFTWARE_TEXTURE_H_INCLUDED__ | 5 | #ifndef __C_SOFTWARE_TEXTURE_H_INCLUDED__ |
6 | #define __C_SOFTWARE_TEXTURE_H_INCLUDED__ | 6 | #define __C_SOFTWARE_TEXTURE_H_INCLUDED__ |
7 | 7 | ||
8 | #include "ITexture.h" | 8 | #include "ITexture.h" |
9 | #include "CImage.h" | 9 | #include "CImage.h" |
10 | 10 | ||
11 | namespace irr | 11 | namespace irr |
12 | { | 12 | { |
13 | namespace video | 13 | namespace video |
14 | { | 14 | { |
15 | 15 | ||
16 | /*! | 16 | /*! |
17 | interface for a Video Driver dependent Texture. | 17 | interface for a Video Driver dependent Texture. |
18 | */ | 18 | */ |
19 | class CSoftwareTexture : public ITexture | 19 | class CSoftwareTexture : public ITexture |
20 | { | 20 | { |
21 | public: | 21 | public: |
22 | 22 | ||
23 | //! constructor | 23 | //! constructor |
24 | CSoftwareTexture(IImage* surface, const io::path& name, | 24 | CSoftwareTexture(IImage* surface, const io::path& name, |
25 | bool renderTarget=false, void* mipmapData=0); | 25 | bool renderTarget=false, void* mipmapData=0); |
26 | 26 | ||
27 | //! destructor | 27 | //! destructor |
28 | virtual ~CSoftwareTexture(); | 28 | virtual ~CSoftwareTexture(); |
29 | 29 | ||
30 | //! lock function | 30 | //! lock function |
31 | virtual void* lock(E_TEXTURE_LOCK_MODE mode=ETLM_READ_WRITE, u32 mipmapLevel=0); | 31 | virtual void* lock(E_TEXTURE_LOCK_MODE mode=ETLM_READ_WRITE, u32 mipmapLevel=0); |
32 | 32 | ||
33 | //! unlock function | 33 | //! unlock function |
34 | virtual void unlock(); | 34 | virtual void unlock(); |
35 | 35 | ||
36 | //! Returns original size of the texture. | 36 | //! Returns original size of the texture. |
37 | virtual const core::dimension2d<u32>& getOriginalSize() const; | 37 | virtual const core::dimension2d<u32>& getOriginalSize() const; |
38 | 38 | ||
39 | //! Returns (=size) of the texture. | 39 | //! Returns (=size) of the texture. |
40 | virtual const core::dimension2d<u32>& getSize() const; | 40 | virtual const core::dimension2d<u32>& getSize() const; |
41 | 41 | ||
42 | //! returns unoptimized surface | 42 | //! returns unoptimized surface |
43 | virtual CImage* getImage(); | 43 | virtual CImage* getImage(); |
44 | 44 | ||
45 | //! returns texture surface | 45 | //! returns texture surface |
46 | virtual CImage* getTexture(); | 46 | virtual CImage* getTexture(); |
47 | 47 | ||
48 | //! returns driver type of texture (=the driver, who created the texture) | 48 | //! returns driver type of texture (=the driver, who created the texture) |
49 | virtual E_DRIVER_TYPE getDriverType() const; | 49 | virtual E_DRIVER_TYPE getDriverType() const; |
50 | 50 | ||
51 | //! returns color format of texture | 51 | //! returns color format of texture |
52 | virtual ECOLOR_FORMAT getColorFormat() const; | 52 | virtual ECOLOR_FORMAT getColorFormat() const; |
53 | 53 | ||
54 | //! returns pitch of texture (in bytes) | 54 | //! returns pitch of texture (in bytes) |
55 | virtual u32 getPitch() const; | 55 | virtual u32 getPitch() const; |
56 | 56 | ||
57 | //! Regenerates the mip map levels of the texture. Useful after locking and | 57 | //! Regenerates the mip map levels of the texture. Useful after locking and |
58 | //! modifying the texture | 58 | //! modifying the texture |
59 | virtual void regenerateMipMapLevels(void* mipmapData=0); | 59 | virtual void regenerateMipMapLevels(void* mipmapData=0); |
60 | 60 | ||
61 | //! is it a render target? | 61 | //! is it a render target? |
62 | virtual bool isRenderTarget() const; | 62 | virtual bool isRenderTarget() const; |
63 | 63 | ||
64 | private: | 64 | private: |
65 | CImage* Image; | 65 | CImage* Image; |
66 | CImage* Texture; | 66 | CImage* Texture; |
67 | core::dimension2d<u32> OrigSize; | 67 | core::dimension2d<u32> OrigSize; |
68 | bool IsRenderTarget; | 68 | bool IsRenderTarget; |
69 | }; | 69 | }; |
70 | 70 | ||
71 | 71 | ||
72 | } // end namespace video | 72 | } // end namespace video |
73 | } // end namespace irr | 73 | } // end namespace irr |
74 | 74 | ||
75 | #endif | 75 | #endif |
76 | 76 | ||