X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fprimitivetype.cpp;h=ca03a67e599ea0dc9e6b16cea2a1dc274f4bb080;hb=df9119a9bf2d348a513c515ed92953353da97b54;hp=848da8000d786ee26d05d8007453e90437bdac7b;hpb=a60b558e1c327fd2e2600ad2551dc0ac648761f2;p=libs%2Fgl.git diff --git a/source/core/primitivetype.cpp b/source/core/primitivetype.cpp index 848da800..ca03a67e 100644 --- a/source/core/primitivetype.cpp +++ b/source/core/primitivetype.cpp @@ -1,4 +1,5 @@ #include +#include "gl.h" #include "primitivetype.h" using namespace std; @@ -6,21 +7,6 @@ using namespace std; namespace Msp { namespace GL { -GLenum get_gl_primitive_type(PrimitiveType pt) -{ - switch(pt) - { - case POINTS: return GL_POINTS; - case LINES: return GL_LINES; - case LINE_STRIP: return GL_LINE_STRIP; - case LINE_LOOP: return GL_LINE_LOOP; - case TRIANGLES: return GL_TRIANGLES; - case TRIANGLE_STRIP: return GL_TRIANGLE_STRIP; - case TRIANGLE_FAN: return GL_TRIANGLE_FAN; - default: throw invalid_argument("get_gl_primitive_type"); - } -} - void operator>>(const LexicalConverter &conv, PrimitiveType &pt) { if(conv.get()=="POINTS")