Merging r5975 through r6036 from trunk to ogl-es branch.

GLES drivers adapted, but only did make compile-tests.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6038 dfc29bdd-3216-0410-991c-e03cc46cb475

source/Irrlicht/CFPSCounter.h

@@ -0,0 +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
+