hgengine-cvs

[Hgengine-cvs] SF.net SVN: hgengine:[54] Mercury2/src/Quad.cpp

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

Revision: 54
          http://hgengine.svn.sourceforge.net/hgengine/?rev=54&view=rev
Author:   axlecrusher
Date:     2008-12-06 20:19:59 +0000 (Sat, 06 Dec 2008)

Log Message:
-----------
use multitextures

Modified Paths:
--------------
    Mercury2/src/Quad.cpp

Modified: Mercury2/src/Quad.cpp
===================================================================
--- Mercury2/src/Quad.cpp	2008-12-06 20:18:00 UTC (rev 53)
+++ Mercury2/src/Quad.cpp	2008-12-06 20:19:59 UTC (rev 54)
@@ -1,21 +1,36 @@
 #include <Quad.h>
+
+#define GL_GLEXT_PROTOTYPES
+
 #include <GL/gl.h>
+#include <GL/glext.h>
 
+#include <Texture.h>
+
 REGISTER_ASSET_TYPE(Quad);
 
 void Quad::Render(MercuryNode* node)
 {
+	unsigned short numTextures = Texture::NumberActiveTextures();
+	unsigned int i;
+	
 	glBegin(GL_QUADS);
-	glTexCoord2f(0,0);
+	
+	for (i=0; i < numTextures; ++i)
+		glMultiTexCoord2f(GL_TEXTURE0+i, 0, 0);
 	glVertex3f(-0.5f, -0.5f,  0.0f);
 	
-	glTexCoord2f(1,0);
+	for (i=0; i < numTextures; ++i)
+		glMultiTexCoord2f(GL_TEXTURE0+i, 1, 0);
 	glVertex3f( 0.5f, -0.5f,  0.0f);
 	
-	glTexCoord2f(1,1);
+	for (i=0; i < numTextures; ++i)
+		glMultiTexCoord2f(GL_TEXTURE0+i, 1, 1);
 	glVertex3f( 0.5f,  0.5f,  0.0f);
 	
-	glTexCoord2f(0,1);
+//	glTexCoord2f(0,1);
+	for (i=0; i < numTextures; ++i)
+		glMultiTexCoord2f(GL_TEXTURE0+i, 0, 1);
 	glVertex3f(-0.5f,  0.5f,  0.0f);
 
 	glEnd();


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

[Hgengine-cvs] SF.net SVN: hgengine:[58] Mercury2/src/Quad.cpp

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

Revision: 58
          http://hgengine.svn.sourceforge.net/hgengine/?rev=58&view=rev
Author:   axlecrusher
Date:     2008-12-07 03:43:41 +0000 (Sun, 07 Dec 2008)

Log Message:
-----------
flip vertical

Modified Paths:
--------------
    Mercury2/src/Quad.cpp

Modified: Mercury2/src/Quad.cpp
===================================================================
--- Mercury2/src/Quad.cpp	2008-12-07 02:56:50 UTC (rev 57)
+++ Mercury2/src/Quad.cpp	2008-12-07 03:43:41 UTC (rev 58)
@@ -17,20 +17,20 @@
 	glBegin(GL_QUADS);
 	
 	for (i=0; i < numTextures; ++i)
-		glMultiTexCoord2f(GL_TEXTURE0+i, 0, 0);
+		glMultiTexCoord2f(GL_TEXTURE0+i, 0, 1);
 	glVertex3f(-0.5f, -0.5f,  0.0f);
 	
 	for (i=0; i < numTextures; ++i)
-		glMultiTexCoord2f(GL_TEXTURE0+i, 1, 0);
+		glMultiTexCoord2f(GL_TEXTURE0+i, 1, 1);
 	glVertex3f( 0.5f, -0.5f,  0.0f);
 	
 	for (i=0; i < numTextures; ++i)
-		glMultiTexCoord2f(GL_TEXTURE0+i, 1, 1);
+		glMultiTexCoord2f(GL_TEXTURE0+i, 1, 0);
 	glVertex3f( 0.5f,  0.5f,  0.0f);
 	
 //	glTexCoord2f(0,1);
 	for (i=0; i < numTextures; ++i)
-		glMultiTexCoord2f(GL_TEXTURE0+i, 0, 1);
+		glMultiTexCoord2f(GL_TEXTURE0+i, 0, 0);
 	glVertex3f(-0.5f,  0.5f,  0.0f);
 
 	glEnd();


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

[Hgengine-cvs] SF.net SVN: hgengine:[128] Mercury2/src/Quad.cpp

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

Revision: 128
          http://hgengine.svn.sourceforge.net/hgengine/?rev=128&view=rev
Author:   axlecrusher
Date:     2008-12-31 20:15:14 +0000 (Wed, 31 Dec 2008)

Log Message:
-----------
call base constructor

Modified Paths:
--------------
    Mercury2/src/Quad.cpp

Modified: Mercury2/src/Quad.cpp
===================================================================
--- Mercury2/src/Quad.cpp	2008-12-31 15:02:36 UTC (rev 127)
+++ Mercury2/src/Quad.cpp	2008-12-31 20:15:14 UTC (rev 128)
@@ -8,6 +8,7 @@
 REGISTER_ASSET_TYPE(Quad);
 
 Quad::Quad()
+	:MercuryVBO()
 {
 	AllocateIndexSpace(6);
 	AllocateVertexSpace(4);


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