|
From: <cn...@us...> - 2009-08-11 03:06:58
|
Revision: 472
http://hgengine.svn.sourceforge.net/hgengine/?rev=472&view=rev
Author: cnlohr
Date: 2009-08-11 03:06:51 +0000 (Tue, 11 Aug 2009)
Log Message:
-----------
tweak - do not require gl stuff for glhelpers, now since it could be for other systems. I don't know if this is going to
stay or not.
Modified Paths:
--------------
Mercury2/src/GLHelpers.cpp
Mercury2/src/GLHelpers.h
Modified: Mercury2/src/GLHelpers.cpp
===================================================================
--- Mercury2/src/GLHelpers.cpp 2009-08-11 02:26:25 UTC (rev 471)
+++ Mercury2/src/GLHelpers.cpp 2009-08-11 03:06:51 UTC (rev 472)
@@ -47,7 +47,7 @@
glLoadMatrixf( l.Ptr() );
}
-MercuryMatrix glGetMatrix(GLenum m)
+MercuryMatrix glGetMatrix(unsigned int m)
{
MercuryMatrix mm;
glGetFloatv(m, mm.Ptr());
@@ -78,7 +78,7 @@
return MercuryVertex( (float)mouseX, (float)mouseY, (float)mouseZ );
}
-GLenum ToGLColorType(ColorByteType cbt)
+unsigned int ToGLColorType(ColorByteType cbt)
{
switch (cbt)
{
Modified: Mercury2/src/GLHelpers.h
===================================================================
--- Mercury2/src/GLHelpers.h 2009-08-11 02:26:25 UTC (rev 471)
+++ Mercury2/src/GLHelpers.h 2009-08-11 03:06:51 UTC (rev 472)
@@ -7,9 +7,9 @@
MString GlError2String(uint32_t e);
void glLoadMatrix(const MercuryMatrix& m);
-MercuryMatrix glGetMatrix(GLenum m);
+MercuryMatrix glGetMatrix(unsigned int m);
MercuryVertex pointFromScreenLoc(int screen_x, int screen_y);
-GLenum ToGLColorType(ColorByteType cbt);
+unsigned int ToGLColorType(ColorByteType cbt);
/****************************************************************************
* Copyright (C) 2009 by Joshua Allen *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|