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/CGUIMeshViewer.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/CGUIMeshViewer.h | 122 |
1 files changed, 61 insertions, 61 deletions
diff --git a/libraries/irrlicht-1.8/source/Irrlicht/CGUIMeshViewer.h b/libraries/irrlicht-1.8/source/Irrlicht/CGUIMeshViewer.h index 7827b4b..4164fb1 100644 --- a/libraries/irrlicht-1.8/source/Irrlicht/CGUIMeshViewer.h +++ b/libraries/irrlicht-1.8/source/Irrlicht/CGUIMeshViewer.h | |||
@@ -1,61 +1,61 @@ | |||
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_GUI_MESH_VIEWER_H_INCLUDED__ | 5 | #ifndef __C_GUI_MESH_VIEWER_H_INCLUDED__ |
6 | #define __C_GUI_MESH_VIEWER_H_INCLUDED__ | 6 | #define __C_GUI_MESH_VIEWER_H_INCLUDED__ |
7 | 7 | ||
8 | #include "IrrCompileConfig.h" | 8 | #include "IrrCompileConfig.h" |
9 | #ifdef _IRR_COMPILE_WITH_GUI_ | 9 | #ifdef _IRR_COMPILE_WITH_GUI_ |
10 | 10 | ||
11 | #include "IGUIMeshViewer.h" | 11 | #include "IGUIMeshViewer.h" |
12 | #include "SMaterial.h" | 12 | #include "SMaterial.h" |
13 | 13 | ||
14 | namespace irr | 14 | namespace irr |
15 | { | 15 | { |
16 | 16 | ||
17 | namespace gui | 17 | namespace gui |
18 | { | 18 | { |
19 | 19 | ||
20 | class CGUIMeshViewer : public IGUIMeshViewer | 20 | class CGUIMeshViewer : public IGUIMeshViewer |
21 | { | 21 | { |
22 | public: | 22 | public: |
23 | 23 | ||
24 | //! constructor | 24 | //! constructor |
25 | CGUIMeshViewer(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle); | 25 | CGUIMeshViewer(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect<s32> rectangle); |
26 | 26 | ||
27 | //! destructor | 27 | //! destructor |
28 | virtual ~CGUIMeshViewer(); | 28 | virtual ~CGUIMeshViewer(); |
29 | 29 | ||
30 | //! sets the mesh to be shown | 30 | //! sets the mesh to be shown |
31 | virtual void setMesh(scene::IAnimatedMesh* mesh); | 31 | virtual void setMesh(scene::IAnimatedMesh* mesh); |
32 | 32 | ||
33 | //! Gets the displayed mesh | 33 | //! Gets the displayed mesh |
34 | virtual scene::IAnimatedMesh* getMesh() const; | 34 | virtual scene::IAnimatedMesh* getMesh() const; |
35 | 35 | ||
36 | //! sets the material | 36 | //! sets the material |
37 | virtual void setMaterial(const video::SMaterial& material); | 37 | virtual void setMaterial(const video::SMaterial& material); |
38 | 38 | ||
39 | //! gets the material | 39 | //! gets the material |
40 | virtual const video::SMaterial& getMaterial() const; | 40 | virtual const video::SMaterial& getMaterial() const; |
41 | 41 | ||
42 | //! called if an event happened. | 42 | //! called if an event happened. |
43 | virtual bool OnEvent(const SEvent& event); | 43 | virtual bool OnEvent(const SEvent& event); |
44 | 44 | ||
45 | //! draws the element and its children | 45 | //! draws the element and its children |
46 | virtual void draw(); | 46 | virtual void draw(); |
47 | 47 | ||
48 | private: | 48 | private: |
49 | 49 | ||
50 | video::SMaterial Material; | 50 | video::SMaterial Material; |
51 | scene::IAnimatedMesh* Mesh; | 51 | scene::IAnimatedMesh* Mesh; |
52 | }; | 52 | }; |
53 | 53 | ||
54 | 54 | ||
55 | } // end namespace gui | 55 | } // end namespace gui |
56 | } // end namespace irr | 56 | } // end namespace irr |
57 | 57 | ||
58 | #endif // _IRR_COMPILE_WITH_GUI_ | 58 | #endif // _IRR_COMPILE_WITH_GUI_ |
59 | 59 | ||
60 | #endif // __C_GUI_MESH_VIEWER_H_INCLUDED__ | 60 | #endif // __C_GUI_MESH_VIEWER_H_INCLUDED__ |
61 | 61 | ||