hgengine-cvs

[Hgengine-cvs] SF.net SVN: hgengine:[403] Mercury2/src/GLHelpers.h

[<axl...@us...>]

Revision: 403
          http://hgengine.svn.sourceforge.net/hgengine/?rev=403&view=rev
Author:   axlecrusher
Date:     2009-07-04 15:42:50 +0000 (Sat, 04 Jul 2009)

Log Message:
-----------
unified  load matrix

Modified Paths:
--------------
    Mercury2/src/GLHelpers.h

Modified: Mercury2/src/GLHelpers.h
===================================================================
--- Mercury2/src/GLHelpers.h	2009-07-04 15:40:09 UTC (rev 402)
+++ Mercury2/src/GLHelpers.h	2009-07-04 15:42:50 UTC (rev 403)
@@ -1,7 +1,9 @@
 #include <global.h>
 #include <MercuryUtil.h>
+#include <MercuryMatrix.h>
 
 MString GlError2String(uint32_t e);
+void glLoadMatrix(const MercuryMatrix& m);
 
 /****************************************************************************
  *   Copyright (C) 2009 by Joshua Allen                                     *


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Hgengine-cvs] SF.net SVN: hgengine:[424] Mercury2/src/GLHelpers.h

[<wil...@us...>]

Revision: 424
          http://hgengine.svn.sourceforge.net/hgengine/?rev=424&view=rev
Author:   willmurnane
Date:     2009-07-15 02:37:35 +0000 (Wed, 15 Jul 2009)

Log Message:
-----------
Mouse-tracking code (mostly last revision, my bad)

Modified Paths:
--------------
    Mercury2/src/GLHelpers.h

Modified: Mercury2/src/GLHelpers.h
===================================================================
--- Mercury2/src/GLHelpers.h	2009-07-15 02:36:45 UTC (rev 423)
+++ Mercury2/src/GLHelpers.h	2009-07-15 02:37:35 UTC (rev 424)
@@ -1,10 +1,12 @@
 #include <global.h>
 #include <MercuryUtil.h>
 #include <MercuryMatrix.h>
+#include <MercuryVertex.h>
 
 MString GlError2String(uint32_t e);
 void glLoadMatrix(const MercuryMatrix& m);
 MercuryMatrix glGetMatrix(int m);
+MercuryVertex pointFromScreenLoc(int screen_x, int screen_y);
 
 /****************************************************************************
  *   Copyright (C) 2009 by Joshua Allen                                     *


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Hgengine-cvs] SF.net SVN: hgengine:[547] Mercury2/src/GLHelpers.h

[<cn...@us...>]

Revision: 547
          http://hgengine.svn.sourceforge.net/hgengine/?rev=547&view=rev
Author:   cnlohr
Date:     2009-10-02 06:48:35 +0000 (Fri, 02 Oct 2009)

Log Message:
-----------
forgot to commit this

Modified Paths:
--------------
    Mercury2/src/GLHelpers.h

Modified: Mercury2/src/GLHelpers.h
===================================================================
--- Mercury2/src/GLHelpers.h	2009-10-02 06:47:57 UTC (rev 546)
+++ Mercury2/src/GLHelpers.h	2009-10-02 06:48:35 UTC (rev 547)
@@ -8,7 +8,11 @@
 
 #include <RawImageData.h>
 
+#ifdef GL_PROFILE
 #define GLCALL(x) x; ProfileGLCall(#x);
+#else
+#define GLCALL(x) x;
+#endif
 
 MString GlError2String(uint32_t e);
 void glLoadMatrix(const MercuryMatrix& m);
@@ -16,7 +20,9 @@
 MercuryVertex pointFromScreenLoc(int screen_x, int screen_y);
 unsigned int ToGLColorType(ColorByteType cbt);
 
+#ifdef GL_PROFILE
 void ProfileGLCall(const MString& funcName);
+#endif
 void PrintGLFunctionCalls();
 
 #endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.