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/CFPSCounter.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/CFPSCounter.h | 108 |
1 files changed, 54 insertions, 54 deletions
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 @@ | |||
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_FPSCOUNTER_H_INCLUDED__ | 5 | #ifndef __C_FPSCOUNTER_H_INCLUDED__ |
6 | #define __C_FPSCOUNTER_H_INCLUDED__ | 6 | #define __C_FPSCOUNTER_H_INCLUDED__ |
7 | 7 | ||
8 | #include "irrTypes.h" | 8 | #include "irrTypes.h" |
9 | 9 | ||
10 | namespace irr | 10 | namespace irr |
11 | { | 11 | { |
12 | namespace video | 12 | namespace video |
13 | { | 13 | { |
14 | 14 | ||
15 | 15 | ||
16 | class CFPSCounter | 16 | class CFPSCounter |
17 | { | 17 | { |
18 | public: | 18 | public: |
19 | CFPSCounter(); | 19 | CFPSCounter(); |
20 | 20 | ||
21 | //! returns current fps | 21 | //! returns current fps |
22 | s32 getFPS() const; | 22 | s32 getFPS() const; |
23 | 23 | ||
24 | //! returns primitive count | 24 | //! returns primitive count |
25 | u32 getPrimitive() const; | 25 | u32 getPrimitive() const; |
26 | 26 | ||
27 | //! returns average primitive count of last period | 27 | //! returns average primitive count of last period |
28 | u32 getPrimitiveAverage() const; | 28 | u32 getPrimitiveAverage() const; |
29 | 29 | ||
30 | //! returns accumulated primitive count since start | 30 | //! returns accumulated primitive count since start |
31 | u32 getPrimitiveTotal() const; | 31 | u32 getPrimitiveTotal() const; |
32 | 32 | ||
33 | //! to be called every frame | 33 | //! to be called every frame |
34 | void registerFrame(u32 now, u32 primitive); | 34 | void registerFrame(u32 now, u32 primitive); |
35 | 35 | ||
36 | private: | 36 | private: |
37 | 37 | ||
38 | s32 FPS; | 38 | s32 FPS; |
39 | u32 Primitive; | 39 | u32 Primitive; |
40 | u32 StartTime; | 40 | u32 StartTime; |
41 | 41 | ||
42 | u32 FramesCounted; | 42 | u32 FramesCounted; |
43 | u32 PrimitivesCounted; | 43 | u32 PrimitivesCounted; |
44 | u32 PrimitiveAverage; | 44 | u32 PrimitiveAverage; |
45 | u32 PrimitiveTotal; | 45 | u32 PrimitiveTotal; |
46 | }; | 46 | }; |
47 | 47 | ||
48 | 48 | ||
49 | } // end namespace video | 49 | } // end namespace video |
50 | } // end namespace irr | 50 | } // end namespace irr |
51 | 51 | ||
52 | 52 | ||
53 | #endif | 53 | #endif |
54 | 54 | ||