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/COpenGLParallaxMapRenderer.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/COpenGLParallaxMapRenderer.h | 110 |
1 files changed, 55 insertions, 55 deletions
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/COpenGLParallaxMapRenderer.h b/libraries/irrlicht-1.8/source/Irrlicht/COpenGLParallaxMapRenderer.h index bfee487..12c5c94 100644 --- a/libraries/irrlicht-1.8/source/Irrlicht/COpenGLParallaxMapRenderer.h +++ b/libraries/irrlicht-1.8/source/Irrlicht/COpenGLParallaxMapRenderer.h | |||
@@ -1,55 +1,55 @@ | |||
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_OPENGL_PARALLAX_MAP_RENDERER_H_INCLUDED__ | 5 | #ifndef __C_OPENGL_PARALLAX_MAP_RENDERER_H_INCLUDED__ |
6 | #define __C_OPENGL_PARALLAX_MAP_RENDERER_H_INCLUDED__ | 6 | #define __C_OPENGL_PARALLAX_MAP_RENDERER_H_INCLUDED__ |
7 | 7 | ||
8 | #include "IrrCompileConfig.h" | 8 | #include "IrrCompileConfig.h" |
9 | #ifdef _IRR_COMPILE_WITH_OPENGL_ | 9 | #ifdef _IRR_COMPILE_WITH_OPENGL_ |
10 | 10 | ||
11 | #include "COpenGLShaderMaterialRenderer.h" | 11 | #include "COpenGLShaderMaterialRenderer.h" |
12 | #include "IShaderConstantSetCallBack.h" | 12 | #include "IShaderConstantSetCallBack.h" |
13 | 13 | ||
14 | namespace irr | 14 | namespace irr |
15 | { | 15 | { |
16 | namespace video | 16 | namespace video |
17 | { | 17 | { |
18 | 18 | ||
19 | //! Class for rendering normal maps with OpenGL | 19 | //! Class for rendering normal maps with OpenGL |
20 | class COpenGLParallaxMapRenderer : public COpenGLShaderMaterialRenderer, public IShaderConstantSetCallBack | 20 | class COpenGLParallaxMapRenderer : public COpenGLShaderMaterialRenderer, public IShaderConstantSetCallBack |
21 | { | 21 | { |
22 | public: | 22 | public: |
23 | 23 | ||
24 | //! Constructor | 24 | //! Constructor |
25 | COpenGLParallaxMapRenderer(video::COpenGLDriver* driver, | 25 | COpenGLParallaxMapRenderer(video::COpenGLDriver* driver, |
26 | s32& outMaterialTypeNr, IMaterialRenderer* baseMaterial); | 26 | s32& outMaterialTypeNr, IMaterialRenderer* baseMaterial); |
27 | 27 | ||
28 | //! Destructor | 28 | //! Destructor |
29 | ~COpenGLParallaxMapRenderer(); | 29 | ~COpenGLParallaxMapRenderer(); |
30 | 30 | ||
31 | //! Called by the engine when the vertex and/or pixel shader constants for an | 31 | //! Called by the engine when the vertex and/or pixel shader constants for an |
32 | //! material renderer should be set. | 32 | //! material renderer should be set. |
33 | virtual void OnSetConstants(IMaterialRendererServices* services, s32 userData); | 33 | virtual void OnSetConstants(IMaterialRendererServices* services, s32 userData); |
34 | 34 | ||
35 | //! Returns the render capability of the material. | 35 | //! Returns the render capability of the material. |
36 | virtual s32 getRenderCapability() const; | 36 | virtual s32 getRenderCapability() const; |
37 | 37 | ||
38 | virtual void OnSetMaterial(const SMaterial& material) { } | 38 | virtual void OnSetMaterial(const SMaterial& material) { } |
39 | virtual void OnSetMaterial(const video::SMaterial& material, | 39 | virtual void OnSetMaterial(const video::SMaterial& material, |
40 | const video::SMaterial& lastMaterial, | 40 | const video::SMaterial& lastMaterial, |
41 | bool resetAllRenderstates, video::IMaterialRendererServices* services); | 41 | bool resetAllRenderstates, video::IMaterialRendererServices* services); |
42 | 42 | ||
43 | protected: | 43 | protected: |
44 | 44 | ||
45 | bool CompiledShaders; | 45 | bool CompiledShaders; |
46 | f32 CurrentScale; | 46 | f32 CurrentScale; |
47 | }; | 47 | }; |
48 | 48 | ||
49 | 49 | ||
50 | } // end namespace video | 50 | } // end namespace video |
51 | } // end namespace irr | 51 | } // end namespace irr |
52 | 52 | ||
53 | #endif | 53 | #endif |
54 | #endif | 54 | #endif |
55 | 55 | ||