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/CD3D8ShaderMaterialRenderer.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/CD3D8ShaderMaterialRenderer.h | 164 |
1 files changed, 82 insertions, 82 deletions
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/CD3D8ShaderMaterialRenderer.h b/libraries/irrlicht-1.8/source/Irrlicht/CD3D8ShaderMaterialRenderer.h index 02156a1..31497eb 100644 --- a/libraries/irrlicht-1.8/source/Irrlicht/CD3D8ShaderMaterialRenderer.h +++ b/libraries/irrlicht-1.8/source/Irrlicht/CD3D8ShaderMaterialRenderer.h | |||
@@ -1,82 +1,82 @@ | |||
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_D3D8_SHADER_MATERIAL_RENDERER_H_INCLUDED__ | 5 | #ifndef __C_D3D8_SHADER_MATERIAL_RENDERER_H_INCLUDED__ |
6 | #define __C_D3D8_SHADER_MATERIAL_RENDERER_H_INCLUDED__ | 6 | #define __C_D3D8_SHADER_MATERIAL_RENDERER_H_INCLUDED__ |
7 | 7 | ||
8 | #include "IrrCompileConfig.h" | 8 | #include "IrrCompileConfig.h" |
9 | #ifdef _IRR_WINDOWS_API_ | 9 | #ifdef _IRR_WINDOWS_API_ |
10 | 10 | ||
11 | #ifdef _IRR_COMPILE_WITH_DIRECT3D_8_ | 11 | #ifdef _IRR_COMPILE_WITH_DIRECT3D_8_ |
12 | #include <d3d8.h> | 12 | #include <d3d8.h> |
13 | #include <d3dx8core.h> | 13 | #include <d3dx8core.h> |
14 | 14 | ||
15 | #include "IMaterialRenderer.h" | 15 | #include "IMaterialRenderer.h" |
16 | #include "S3DVertex.h" | 16 | #include "S3DVertex.h" |
17 | 17 | ||
18 | namespace irr | 18 | namespace irr |
19 | { | 19 | { |
20 | namespace video | 20 | namespace video |
21 | { | 21 | { |
22 | 22 | ||
23 | class IVideoDriver; | 23 | class IVideoDriver; |
24 | class IShaderConstantSetCallBack; | 24 | class IShaderConstantSetCallBack; |
25 | class IMaterialRenderer; | 25 | class IMaterialRenderer; |
26 | 26 | ||
27 | //! Class for using vertex and pixel shaders with D3D8 | 27 | //! Class for using vertex and pixel shaders with D3D8 |
28 | class CD3D8ShaderMaterialRenderer : public IMaterialRenderer | 28 | class CD3D8ShaderMaterialRenderer : public IMaterialRenderer |
29 | { | 29 | { |
30 | public: | 30 | public: |
31 | 31 | ||
32 | //! Public constructor | 32 | //! Public constructor |
33 | CD3D8ShaderMaterialRenderer(IDirect3DDevice8* d3ddev, video::IVideoDriver* driver, | 33 | CD3D8ShaderMaterialRenderer(IDirect3DDevice8* d3ddev, video::IVideoDriver* driver, |
34 | s32& outMaterialTypeNr, const c8* vertexShaderProgram, const c8* pixelShaderProgram, | 34 | s32& outMaterialTypeNr, const c8* vertexShaderProgram, const c8* pixelShaderProgram, |
35 | IShaderConstantSetCallBack* callback, IMaterialRenderer* baseMaterial, s32 userData); | 35 | IShaderConstantSetCallBack* callback, IMaterialRenderer* baseMaterial, s32 userData); |
36 | 36 | ||
37 | //! Destructor | 37 | //! Destructor |
38 | ~CD3D8ShaderMaterialRenderer(); | 38 | ~CD3D8ShaderMaterialRenderer(); |
39 | 39 | ||
40 | virtual void OnSetMaterial(const video::SMaterial& material, const video::SMaterial& lastMaterial, | 40 | virtual void OnSetMaterial(const video::SMaterial& material, const video::SMaterial& lastMaterial, |
41 | bool resetAllRenderstates, video::IMaterialRendererServices* services); | 41 | bool resetAllRenderstates, video::IMaterialRendererServices* services); |
42 | 42 | ||
43 | virtual void OnUnsetMaterial(); | 43 | virtual void OnUnsetMaterial(); |
44 | 44 | ||
45 | virtual bool OnRender(IMaterialRendererServices* service, E_VERTEX_TYPE vtxtype); | 45 | virtual bool OnRender(IMaterialRendererServices* service, E_VERTEX_TYPE vtxtype); |
46 | 46 | ||
47 | //! Returns if the material is transparent. | 47 | //! Returns if the material is transparent. |
48 | virtual bool isTransparent() const; | 48 | virtual bool isTransparent() const; |
49 | 49 | ||
50 | protected: | 50 | protected: |
51 | 51 | ||
52 | //! constructor only for use by derived classes who want to | 52 | //! constructor only for use by derived classes who want to |
53 | //! create a fall back material for example. | 53 | //! create a fall back material for example. |
54 | CD3D8ShaderMaterialRenderer(IDirect3DDevice8* d3ddev, | 54 | CD3D8ShaderMaterialRenderer(IDirect3DDevice8* d3ddev, |
55 | video::IVideoDriver* driver, | 55 | video::IVideoDriver* driver, |
56 | IShaderConstantSetCallBack* callback, | 56 | IShaderConstantSetCallBack* callback, |
57 | IMaterialRenderer* baseMaterial, s32 userData=0); | 57 | IMaterialRenderer* baseMaterial, s32 userData=0); |
58 | 58 | ||
59 | void init(s32& outMaterialTypeNr, const c8* vertexShaderProgram, const c8* pixelShaderProgram, | 59 | void init(s32& outMaterialTypeNr, const c8* vertexShaderProgram, const c8* pixelShaderProgram, |
60 | E_VERTEX_TYPE type); | 60 | E_VERTEX_TYPE type); |
61 | bool createPixelShader(const c8* pxsh); | 61 | bool createPixelShader(const c8* pxsh); |
62 | bool createVertexShader(const char* vtxsh, E_VERTEX_TYPE type); | 62 | bool createVertexShader(const char* vtxsh, E_VERTEX_TYPE type); |
63 | 63 | ||
64 | IDirect3DDevice8* pID3DDevice; | 64 | IDirect3DDevice8* pID3DDevice; |
65 | video::IVideoDriver* Driver; | 65 | video::IVideoDriver* Driver; |
66 | IShaderConstantSetCallBack* CallBack; | 66 | IShaderConstantSetCallBack* CallBack; |
67 | IMaterialRenderer* BaseMaterial; | 67 | IMaterialRenderer* BaseMaterial; |
68 | 68 | ||
69 | DWORD VertexShader; | 69 | DWORD VertexShader; |
70 | DWORD OldVertexShader; | 70 | DWORD OldVertexShader; |
71 | DWORD PixelShader; | 71 | DWORD PixelShader; |
72 | s32 UserData; | 72 | s32 UserData; |
73 | }; | 73 | }; |
74 | 74 | ||
75 | 75 | ||
76 | } // end namespace video | 76 | } // end namespace video |
77 | } // end namespace irr | 77 | } // end namespace irr |
78 | 78 | ||
79 | #endif | 79 | #endif |
80 | #endif | 80 | #endif |
81 | #endif | 81 | #endif |
82 | 82 | ||