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

include/EPrimitiveTypes.h

@@ -0,0 +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 __E_PRIMITIVE_TYPES_H_INCLUDED__
+#define __E_PRIMITIVE_TYPES_H_INCLUDED__
+
+namespace irr
+{
+namespace scene
+{
+
+	//! Enumeration for all primitive types there are.
+	enum E_PRIMITIVE_TYPE
+	{
+		//! All vertices are non-connected points.
+		EPT_POINTS=0,
+
+		//! All vertices form a single connected line.
+		EPT_LINE_STRIP,
+
+		//! Just as LINE_STRIP, but the last and the first vertex is also connected.
+		EPT_LINE_LOOP,
+
+		//! Every two vertices are connected creating n/2 lines.
+		EPT_LINES,
+
+		//! After the first two vertices each vertex defines a new triangle.
+		//! Always the two last and the new one form a new triangle.
+		EPT_TRIANGLE_STRIP,
+
+		//! After the first two vertices each vertex defines a new triangle.
+		//! All around the common first vertex.
+		EPT_TRIANGLE_FAN,
+
+		//! Explicitly set all vertices for each triangle.
+		EPT_TRIANGLES,
+
+		//! After the first two vertices each further two vertices create a quad with the preceding two.
+		//! Not supported by Direct3D
+		EPT_QUAD_STRIP,
+
+		//! Every four vertices create a quad.
+		//! Not supported by Direct3D
+		//! Deprecated with newer OpenGL drivers
+		EPT_QUADS,
+
+		//! Just as LINE_LOOP, but filled.
+		//! Not supported by Direct3D
+		//! Deprecated with newer OpenGL drivers
+		EPT_POLYGON,
+
+		//! The single vertices are expanded to quad billboards on the GPU.
+		EPT_POINT_SPRITES
+	};
+
+} // end namespace scene
+} // end namespace irr
+
+#endif
+