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/CFPSCounter.h | 108 ++++++++++----------- 1 file changed, 54 insertions(+), 54 deletions(-) (limited to 'libraries/irrlicht-1.8/source/Irrlicht/CFPSCounter.h') diff --git a/libraries/irrlicht-1.8/source/Irrlicht/CFPSCounter.h b/libraries/irrlicht-1.8/source/Irrlicht/CFPSCounter.h index ca36527..7edcdb5 100644 --- a/libraries/irrlicht-1.8/source/Irrlicht/CFPSCounter.h +++ b/libraries/irrlicht-1.8/source/Irrlicht/CFPSCounter.h @@ -1,54 +1,54 @@ -// 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_FPSCOUNTER_H_INCLUDED__ -#define __C_FPSCOUNTER_H_INCLUDED__ - -#include "irrTypes.h" - -namespace irr -{ -namespace video -{ - - -class CFPSCounter -{ -public: - CFPSCounter(); - - //! returns current fps - s32 getFPS() const; - - //! returns primitive count - u32 getPrimitive() const; - - //! returns average primitive count of last period - u32 getPrimitiveAverage() const; - - //! returns accumulated primitive count since start - u32 getPrimitiveTotal() const; - - //! to be called every frame - void registerFrame(u32 now, u32 primitive); - -private: - - s32 FPS; - u32 Primitive; - u32 StartTime; - - u32 FramesCounted; - u32 PrimitivesCounted; - u32 PrimitiveAverage; - u32 PrimitiveTotal; -}; - - -} // end namespace video -} // 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 __C_FPSCOUNTER_H_INCLUDED__ +#define __C_FPSCOUNTER_H_INCLUDED__ + +#include "irrTypes.h" + +namespace irr +{ +namespace video +{ + + +class CFPSCounter +{ +public: + CFPSCounter(); + + //! returns current fps + s32 getFPS() const; + + //! returns primitive count + u32 getPrimitive() const; + + //! returns average primitive count of last period + u32 getPrimitiveAverage() const; + + //! returns accumulated primitive count since start + u32 getPrimitiveTotal() const; + + //! to be called every frame + void registerFrame(u32 now, u32 primitive); + +private: + + s32 FPS; + u32 Primitive; + u32 StartTime; + + u32 FramesCounted; + u32 PrimitivesCounted; + u32 PrimitiveAverage; + u32 PrimitiveTotal; +}; + + +} // end namespace video +} // end namespace irr + + +#endif + -- cgit v1.1