[Hgengine-cvs] SF.net SVN: hgengine:[88] Mercury2/src

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

Revision: 88
          http://hgengine.svn.sourceforge.net/hgengine/?rev=88&view=rev
Author:   axlecrusher
Date:     2008-12-29 03:15:55 +0000 (Mon, 29 Dec 2008)

Log Message:
-----------
add normals

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

Modified: Mercury2/src/MercuryVBO.cpp
===================================================================
--- Mercury2/src/MercuryVBO.cpp	2008-12-25 01:20:29 UTC (rev 87)
+++ Mercury2/src/MercuryVBO.cpp	2008-12-29 03:15:55 UTC (rev 88)
@@ -24,7 +24,7 @@
 void MercuryVBO::Render(MercuryNode* node)
 {
 //	unsigned short numTextures = Texture::NumberActiveTextures();
-	unsigned short stride = sizeof(float)*5;
+	unsigned short stride = sizeof(float)*8;
 	
 	if ( m_initiated )
 	{
@@ -38,10 +38,10 @@
 		InitVBO();
 		
 	if ( this != m_lastVBOrendered)
-		glVertexPointer(3, GL_FLOAT, stride, 0);
+		glVertexPointer(3, GL_FLOAT, stride, BUFFER_OFFSET(sizeof(float)*5));
 	
 	//XXX This seems to apply texture coordinates to all active texture units
-	glTexCoordPointer(2, GL_FLOAT, stride, BUFFER_OFFSET(sizeof(float)*3));
+	glTexCoordPointer(2, GL_FLOAT, stride, BUFFER_OFFSET(sizeof(float)*0));
 
 	glDrawRangeElements(GL_TRIANGLES, 0, m_indexData.Length()-1, m_indexData.Length(), GL_UNSIGNED_SHORT, NULL);
 	
@@ -67,7 +67,7 @@
 
 void MercuryVBO::AllocateVertexSpace(unsigned int count)
 {
-	m_vertexData.Allocate(count*5);
+	m_vertexData.Allocate(count*8);
 }
 
 void MercuryVBO::AllocateIndexSpace(unsigned int count)

Modified: Mercury2/src/Quad.cpp
===================================================================
--- Mercury2/src/Quad.cpp	2008-12-25 01:20:29 UTC (rev 87)
+++ Mercury2/src/Quad.cpp	2008-12-29 03:15:55 UTC (rev 88)
@@ -15,17 +15,21 @@
 //	float* buffer = m_vertexData.m_vertexData();
 	int i = 0;
 	
+	m_vertexData[i++] = 0; m_vertexData[i++] = 1;
+	m_vertexData[i++] = 0; m_vertexData[i++] = 0; m_vertexData[i++] = -1.0;
 	m_vertexData[i++] = -0.5; m_vertexData[i++] = -0.5; m_vertexData[i++] = 0.0;
-	m_vertexData[i++] = 0; m_vertexData[i++] = 1;
 	
+	m_vertexData[i++] = 1; m_vertexData[i++] = 1;
+	m_vertexData[i++] = 0; m_vertexData[i++] = 0; m_vertexData[i++] = -1.0;
 	m_vertexData[i++] = 0.5; m_vertexData[i++] = -0.5; m_vertexData[i++] = 0.0;
-	m_vertexData[i++] = 1; m_vertexData[i++] = 1;
 	
+	m_vertexData[i++] = 1; m_vertexData[i++] = 0;
+	m_vertexData[i++] = 0; m_vertexData[i++] = 0; m_vertexData[i++] = -1.0;
 	m_vertexData[i++] = 0.5; m_vertexData[i++] = 0.5; m_vertexData[i++] = 0.0;
-	m_vertexData[i++] = 1; m_vertexData[i++] = 0;
 	
+	m_vertexData[i++] = 0; m_vertexData[i++] = 0;
+	m_vertexData[i++] = 0; m_vertexData[i++] = 0; m_vertexData[i++] = -1.0;
 	m_vertexData[i++] = -0.5; m_vertexData[i++] = 0.5; m_vertexData[i++] = 0.0;
-	m_vertexData[i++] = 0; m_vertexData[i++] = 0;
 	
 	m_indexData[5] = m_indexData[0] = 0;
 	m_indexData[1] = 1;


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