From 959831f4ef5a3e797f576c3de08cd65032c997ad Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Sun, 13 Jan 2013 18:54:10 +1000 Subject: Remove damned ancient DOS line endings from Irrlicht. Hopefully I did not go overboard. --- .../irrlicht-1.8/source/Irrlicht/CGUIMeshViewer.h | 122 ++++++++++----------- 1 file changed, 61 insertions(+), 61 deletions(-) (limited to 'libraries/irrlicht-1.8/source/Irrlicht/CGUIMeshViewer.h') 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 @@ -// 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_GUI_MESH_VIEWER_H_INCLUDED__ -#define __C_GUI_MESH_VIEWER_H_INCLUDED__ - -#include "IrrCompileConfig.h" -#ifdef _IRR_COMPILE_WITH_GUI_ - -#include "IGUIMeshViewer.h" -#include "SMaterial.h" - -namespace irr -{ - -namespace gui -{ - - class CGUIMeshViewer : public IGUIMeshViewer - { - public: - - //! constructor - CGUIMeshViewer(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect rectangle); - - //! destructor - virtual ~CGUIMeshViewer(); - - //! sets the mesh to be shown - virtual void setMesh(scene::IAnimatedMesh* mesh); - - //! Gets the displayed mesh - virtual scene::IAnimatedMesh* getMesh() const; - - //! sets the material - virtual void setMaterial(const video::SMaterial& material); - - //! gets the material - virtual const video::SMaterial& getMaterial() const; - - //! called if an event happened. - virtual bool OnEvent(const SEvent& event); - - //! draws the element and its children - virtual void draw(); - - private: - - video::SMaterial Material; - scene::IAnimatedMesh* Mesh; - }; - - -} // end namespace gui -} // end namespace irr - -#endif // _IRR_COMPILE_WITH_GUI_ - -#endif // __C_GUI_MESH_VIEWER_H_INCLUDED__ - +// 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_GUI_MESH_VIEWER_H_INCLUDED__ +#define __C_GUI_MESH_VIEWER_H_INCLUDED__ + +#include "IrrCompileConfig.h" +#ifdef _IRR_COMPILE_WITH_GUI_ + +#include "IGUIMeshViewer.h" +#include "SMaterial.h" + +namespace irr +{ + +namespace gui +{ + + class CGUIMeshViewer : public IGUIMeshViewer + { + public: + + //! constructor + CGUIMeshViewer(IGUIEnvironment* environment, IGUIElement* parent, s32 id, core::rect rectangle); + + //! destructor + virtual ~CGUIMeshViewer(); + + //! sets the mesh to be shown + virtual void setMesh(scene::IAnimatedMesh* mesh); + + //! Gets the displayed mesh + virtual scene::IAnimatedMesh* getMesh() const; + + //! sets the material + virtual void setMaterial(const video::SMaterial& material); + + //! gets the material + virtual const video::SMaterial& getMaterial() const; + + //! called if an event happened. + virtual bool OnEvent(const SEvent& event); + + //! draws the element and its children + virtual void draw(); + + private: + + video::SMaterial Material; + scene::IAnimatedMesh* Mesh; + }; + + +} // end namespace gui +} // end namespace irr + +#endif // _IRR_COMPILE_WITH_GUI_ + +#endif // __C_GUI_MESH_VIEWER_H_INCLUDED__ + -- cgit v1.1