Remove damned ancient DOS line endings from Irrlicht. Hopefully I did not go overboard.

1 files changed, 242 insertions, 242 deletions

diff --git a/libraries/irrlicht-1.8/include/SSharedMeshBuffer.h b/libraries/irrlicht-1.8/include/SSharedMeshBuffer.h
index b9ee07a..016b796 100644
--- a/libraries/irrlicht-1.8/include/SSharedMeshBuffer.h
+++ b/libraries/irrlicht-1.8/include/SSharedMeshBuffer.h
@@ -1,242 +1,242 @@
-// 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 __S_SHARED_MESH_BUFFER_H_INCLUDED__

-#define __S_SHARED_MESH_BUFFER_H_INCLUDED__

-

-#include "irrArray.h"

-#include "IMeshBuffer.h"

-

-namespace irr

-{

-namespace scene

-{

-        //! Implementation of the IMeshBuffer interface with shared vertex list

-        struct SSharedMeshBuffer : public IMeshBuffer

-        {

-                //! constructor

-                SSharedMeshBuffer() : IMeshBuffer(), Vertices(0), ChangedID_Vertex(1), ChangedID_Index(1), MappingHintVertex(EHM_NEVER), MappingHintIndex(EHM_NEVER)

-                {

-                        #ifdef _DEBUG

-                        setDebugName("SSharedMeshBuffer");

-                        #endif

-                }

-

-                //! constructor

-                SSharedMeshBuffer(core::array<video::S3DVertex> *vertices) : IMeshBuffer(), Vertices(vertices)

-                {

-                        #ifdef _DEBUG

-                        setDebugName("SSharedMeshBuffer");

-                        #endif

-                }

-

-                //! returns the material of this meshbuffer

-                virtual const video::SMaterial& getMaterial() const

-                {

-                        return Material;

-                }

-

-                //! returns the material of this meshbuffer

-                virtual video::SMaterial& getMaterial()

-                {

-                        return Material;

-                }

-

-                //! returns pointer to vertices

-                virtual const void* getVertices() const

-                {

-                        if (Vertices)

-                                return Vertices->const_pointer();

-                        else

-                                return 0;

-                }

-

-                //! returns pointer to vertices

-                virtual void* getVertices()

-                {

-                        if (Vertices)

-                                return Vertices->pointer();

-                        else

-                                return 0;

-                }

-

-                //! returns amount of vertices

-                virtual u32 getVertexCount() const

-                {

-                        if (Vertices)

-                                return Vertices->size();

-                        else

-                                return 0;

-                }

-

-                //! returns pointer to Indices

-                virtual const u16* getIndices() const

-                {

-                        return Indices.const_pointer();

-                }

-

-                //! returns pointer to Indices

-                virtual u16* getIndices()

-                {

-                        return Indices.pointer();

-                }

-

-                //! returns amount of indices

-                virtual u32 getIndexCount() const

-                {

-                        return Indices.size();

-                }

-

-                //! Get type of index data which is stored in this meshbuffer.

-                virtual video::E_INDEX_TYPE getIndexType() const

-                {

-                        return video::EIT_16BIT;

-                }

-

-                //! returns an axis aligned bounding box

-                virtual const core::aabbox3d<f32>& getBoundingBox() const

-                {

-                        return BoundingBox;

-                }

-

-                //! set user axis aligned bounding box

-                virtual void setBoundingBox( const core::aabbox3df& box)

-                {

-                        BoundingBox = box;

-                }

-

-                //! returns which type of vertex data is stored.

-                virtual video::E_VERTEX_TYPE getVertexType() const

-                {

-                        return video::EVT_STANDARD;

-                }

-

-                //! recalculates the bounding box. should be called if the mesh changed.

-                virtual void recalculateBoundingBox()

-                {

-                        if (!Vertices || Vertices->empty() || Indices.empty())

-                                BoundingBox.reset(0,0,0);

-                        else

-                        {

-                                BoundingBox.reset((*Vertices)[Indices[0]].Pos);

-                                for (u32 i=1; i<Indices.size(); ++i)

-                                        BoundingBox.addInternalPoint((*Vertices)[Indices[i]].Pos);

-                        }

-                }

-

-                //! returns position of vertex i

-                virtual const core::vector3df& getPosition(u32 i) const

-                {

-                        _IRR_DEBUG_BREAK_IF(!Vertices);

-                        return (*Vertices)[Indices[i]].Pos;

-                }

-

-                //! returns position of vertex i

-                virtual core::vector3df& getPosition(u32 i)

-                {

-                        _IRR_DEBUG_BREAK_IF(!Vertices);

-                        return (*Vertices)[Indices[i]].Pos;

-                }

-

-                //! returns normal of vertex i

-                virtual const core::vector3df& getNormal(u32 i) const

-                {

-                        _IRR_DEBUG_BREAK_IF(!Vertices);

-                        return (*Vertices)[Indices[i]].Normal;

-                }

-

-                //! returns normal of vertex i

-                virtual core::vector3df& getNormal(u32 i)

-                {

-                        _IRR_DEBUG_BREAK_IF(!Vertices);

-                        return (*Vertices)[Indices[i]].Normal;

-                }

-

-                //! returns texture coord of vertex i

-                virtual const core::vector2df& getTCoords(u32 i) const

-                {

-                        _IRR_DEBUG_BREAK_IF(!Vertices);

-                        return (*Vertices)[Indices[i]].TCoords;

-                }

-

-                //! returns texture coord of vertex i

-                virtual core::vector2df& getTCoords(u32 i)

-                {

-                        _IRR_DEBUG_BREAK_IF(!Vertices);

-                        return (*Vertices)[Indices[i]].TCoords;

-                }

-

-                //! append the vertices and indices to the current buffer

-                virtual void append(const void* const vertices, u32 numVertices, const u16* const indices, u32 numIndices) {}

-

-                //! append the meshbuffer to the current buffer

-                virtual void append(const IMeshBuffer* const other) {}

-

-                //! get the current hardware mapping hint

-                virtual E_HARDWARE_MAPPING getHardwareMappingHint_Vertex() const

-                {

-                        return MappingHintVertex;

-                }

-

-                //! get the current hardware mapping hint

-                virtual E_HARDWARE_MAPPING getHardwareMappingHint_Index() const

-                {

-                        return MappingHintIndex;

-                }

-

-                //! set the hardware mapping hint, for driver

-                virtual void setHardwareMappingHint( E_HARDWARE_MAPPING NewMappingHint, E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX )

-                {

-                        if (buffer==EBT_VERTEX_AND_INDEX || buffer==EBT_VERTEX)

-                                MappingHintVertex=NewMappingHint;

-                        if (buffer==EBT_VERTEX_AND_INDEX || buffer==EBT_INDEX)

-                                MappingHintIndex=NewMappingHint;

-                }

-

-                //! flags the mesh as changed, reloads hardware buffers

-                virtual void setDirty(E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX)

-                {

-                        if (buffer==EBT_VERTEX_AND_INDEX || buffer==EBT_VERTEX)

-                                ++ChangedID_Vertex;

-                        if (buffer==EBT_VERTEX_AND_INDEX || buffer==EBT_INDEX)

-                                ++ChangedID_Index;

-                }

-

-                //! Get the currently used ID for identification of changes.

-                /** This shouldn't be used for anything outside the VideoDriver. */

-                virtual u32 getChangedID_Vertex() const {return ChangedID_Vertex;}

-

-                //! Get the currently used ID for identification of changes.

-                /** This shouldn't be used for anything outside the VideoDriver. */

-                virtual u32 getChangedID_Index() const {return ChangedID_Index;}

-

-                //! Material of this meshBuffer

-                video::SMaterial Material;

-

-                //! Shared Array of vertices

-                core::array<video::S3DVertex> *Vertices;

-

-                //! Array of Indices

-                core::array<u16> Indices;

-

-                //! ID used for hardware buffer management

-                u32 ChangedID_Vertex;

-

-                //! ID used for hardware buffer management

-                u32 ChangedID_Index;

-

-                //! Bounding box

-                core::aabbox3df BoundingBox;

-

-                //! hardware mapping hint

-                E_HARDWARE_MAPPING MappingHintVertex;

-                E_HARDWARE_MAPPING MappingHintIndex;

-        };

-

-

-} // end namespace scene

-} // end namespace irr

-

-#endif

-

+// 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 __S_SHARED_MESH_BUFFER_H_INCLUDED__
+#define __S_SHARED_MESH_BUFFER_H_INCLUDED__
+
+#include "irrArray.h"
+#include "IMeshBuffer.h"
+
+namespace irr
+{
+namespace scene
+{
+        //! Implementation of the IMeshBuffer interface with shared vertex list
+        struct SSharedMeshBuffer : public IMeshBuffer
+        {
+                //! constructor
+                SSharedMeshBuffer() : IMeshBuffer(), Vertices(0), ChangedID_Vertex(1), ChangedID_Index(1), MappingHintVertex(EHM_NEVER), MappingHintIndex(EHM_NEVER)
+                {
+                        #ifdef _DEBUG
+                        setDebugName("SSharedMeshBuffer");
+                        #endif
+                }
+
+                //! constructor
+                SSharedMeshBuffer(core::array<video::S3DVertex> *vertices) : IMeshBuffer(), Vertices(vertices)
+                {
+                        #ifdef _DEBUG
+                        setDebugName("SSharedMeshBuffer");
+                        #endif
+                }
+
+                //! returns the material of this meshbuffer
+                virtual const video::SMaterial& getMaterial() const
+                {
+                        return Material;
+                }
+
+                //! returns the material of this meshbuffer
+                virtual video::SMaterial& getMaterial()
+                {
+                        return Material;
+                }
+
+                //! returns pointer to vertices
+                virtual const void* getVertices() const
+                {
+                        if (Vertices)
+                                return Vertices->const_pointer();
+                        else
+                                return 0;
+                }
+
+                //! returns pointer to vertices
+                virtual void* getVertices()
+                {
+                        if (Vertices)
+                                return Vertices->pointer();
+                        else
+                                return 0;
+                }
+
+                //! returns amount of vertices
+                virtual u32 getVertexCount() const
+                {
+                        if (Vertices)
+                                return Vertices->size();
+                        else
+                                return 0;
+                }
+
+                //! returns pointer to Indices
+                virtual const u16* getIndices() const
+                {
+                        return Indices.const_pointer();
+                }
+
+                //! returns pointer to Indices
+                virtual u16* getIndices()
+                {
+                        return Indices.pointer();
+                }
+
+                //! returns amount of indices
+                virtual u32 getIndexCount() const
+                {
+                        return Indices.size();
+                }
+
+                //! Get type of index data which is stored in this meshbuffer.
+                virtual video::E_INDEX_TYPE getIndexType() const
+                {
+                        return video::EIT_16BIT;
+                }
+
+                //! returns an axis aligned bounding box
+                virtual const core::aabbox3d<f32>& getBoundingBox() const
+                {
+                        return BoundingBox;
+                }
+
+                //! set user axis aligned bounding box
+                virtual void setBoundingBox( const core::aabbox3df& box)
+                {
+                        BoundingBox = box;
+                }
+
+                //! returns which type of vertex data is stored.
+                virtual video::E_VERTEX_TYPE getVertexType() const
+                {
+                        return video::EVT_STANDARD;
+                }
+
+                //! recalculates the bounding box. should be called if the mesh changed.
+                virtual void recalculateBoundingBox()
+                {
+                        if (!Vertices || Vertices->empty() || Indices.empty())
+                                BoundingBox.reset(0,0,0);
+                        else
+                        {
+                                BoundingBox.reset((*Vertices)[Indices[0]].Pos);
+                                for (u32 i=1; i<Indices.size(); ++i)
+                                        BoundingBox.addInternalPoint((*Vertices)[Indices[i]].Pos);
+                        }
+                }
+
+                //! returns position of vertex i
+                virtual const core::vector3df& getPosition(u32 i) const
+                {
+                        _IRR_DEBUG_BREAK_IF(!Vertices);
+                        return (*Vertices)[Indices[i]].Pos;
+                }
+
+                //! returns position of vertex i
+                virtual core::vector3df& getPosition(u32 i)
+                {
+                        _IRR_DEBUG_BREAK_IF(!Vertices);
+                        return (*Vertices)[Indices[i]].Pos;
+                }
+
+                //! returns normal of vertex i
+                virtual const core::vector3df& getNormal(u32 i) const
+                {
+                        _IRR_DEBUG_BREAK_IF(!Vertices);
+                        return (*Vertices)[Indices[i]].Normal;
+                }
+
+                //! returns normal of vertex i
+                virtual core::vector3df& getNormal(u32 i)
+                {
+                        _IRR_DEBUG_BREAK_IF(!Vertices);
+                        return (*Vertices)[Indices[i]].Normal;
+                }
+
+                //! returns texture coord of vertex i
+                virtual const core::vector2df& getTCoords(u32 i) const
+                {
+                        _IRR_DEBUG_BREAK_IF(!Vertices);
+                        return (*Vertices)[Indices[i]].TCoords;
+                }
+
+                //! returns texture coord of vertex i
+                virtual core::vector2df& getTCoords(u32 i)
+                {
+                        _IRR_DEBUG_BREAK_IF(!Vertices);
+                        return (*Vertices)[Indices[i]].TCoords;
+                }
+
+                //! append the vertices and indices to the current buffer
+                virtual void append(const void* const vertices, u32 numVertices, const u16* const indices, u32 numIndices) {}
+
+                //! append the meshbuffer to the current buffer
+                virtual void append(const IMeshBuffer* const other) {}
+
+                //! get the current hardware mapping hint
+                virtual E_HARDWARE_MAPPING getHardwareMappingHint_Vertex() const
+                {
+                        return MappingHintVertex;
+                }
+
+                //! get the current hardware mapping hint
+                virtual E_HARDWARE_MAPPING getHardwareMappingHint_Index() const
+                {
+                        return MappingHintIndex;
+                }
+
+                //! set the hardware mapping hint, for driver
+                virtual void setHardwareMappingHint( E_HARDWARE_MAPPING NewMappingHint, E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX )
+                {
+                        if (buffer==EBT_VERTEX_AND_INDEX || buffer==EBT_VERTEX)
+                                MappingHintVertex=NewMappingHint;
+                        if (buffer==EBT_VERTEX_AND_INDEX || buffer==EBT_INDEX)
+                                MappingHintIndex=NewMappingHint;
+                }
+
+                //! flags the mesh as changed, reloads hardware buffers
+                virtual void setDirty(E_BUFFER_TYPE buffer=EBT_VERTEX_AND_INDEX)
+                {
+                        if (buffer==EBT_VERTEX_AND_INDEX || buffer==EBT_VERTEX)
+                                ++ChangedID_Vertex;
+                        if (buffer==EBT_VERTEX_AND_INDEX || buffer==EBT_INDEX)
+                                ++ChangedID_Index;
+                }
+
+                //! Get the currently used ID for identification of changes.
+                /** This shouldn't be used for anything outside the VideoDriver. */
+                virtual u32 getChangedID_Vertex() const {return ChangedID_Vertex;}
+
+                //! Get the currently used ID for identification of changes.
+                /** This shouldn't be used for anything outside the VideoDriver. */
+                virtual u32 getChangedID_Index() const {return ChangedID_Index;}
+
+                //! Material of this meshBuffer
+                video::SMaterial Material;
+
+                //! Shared Array of vertices
+                core::array<video::S3DVertex> *Vertices;
+
+                //! Array of Indices
+                core::array<u16> Indices;
+
+                //! ID used for hardware buffer management
+                u32 ChangedID_Vertex;
+
+                //! ID used for hardware buffer management
+                u32 ChangedID_Index;
+
+                //! Bounding box
+                core::aabbox3df BoundingBox;
+
+                //! hardware mapping hint
+                E_HARDWARE_MAPPING MappingHintVertex;
+                E_HARDWARE_MAPPING MappingHintIndex;
+        };
+
+
+} // end namespace scene
+} // end namespace irr
+
+#endif
+