josh/anaglym
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed texturing on quads

Browse Source
This commit is contained in:
Josh Holtrop 2010-12-19 00:11:38 -05:00
parent 0417ec2c29
commit 7924672b69
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Engine.cc
View File

@ -1375,10 +1375,12 @@ int Engine::Quad::render()
} }
if (m_texture != 0) if (m_texture != 0)
{ {
glEnable(GL_TEXTURE_2D);
glBindTexture(GL_TEXTURE_2D, m_texture); glBindTexture(GL_TEXTURE_2D, m_texture);
} }
else else
{ {
glDisable(GL_TEXTURE_2D);
glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, &m_color[0]); glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, &m_color[0]);
} }
if (m_enable_blending) if (m_enable_blending)
@ -1390,15 +1392,23 @@ int Engine::Quad::render()
glTranslatef(m_position[0], m_position[1], m_position[2]); glTranslatef(m_position[0], m_position[1], m_position[2]);
glBegin(GL_QUADS); glBegin(GL_QUADS);
glNormal3f(m_normal[0], m_normal[1], m_normal[2]); glNormal3f(m_normal[0], m_normal[1], m_normal[2]);
if (m_texture != 0)
glTexCoord2f(1.0, 1.0);
glVertex3f(m_center[0] + m_v1[0] + m_v2[0], glVertex3f(m_center[0] + m_v1[0] + m_v2[0],
m_center[1] + m_v1[1] + m_v2[1], m_center[1] + m_v1[1] + m_v2[1],
m_center[2] + m_v1[2] + m_v2[2]); m_center[2] + m_v1[2] + m_v2[2]);
if (m_texture != 0)
glTexCoord2f(0, 1.0);
glVertex3f(m_center[0] - m_v1[0] + m_v2[0], glVertex3f(m_center[0] - m_v1[0] + m_v2[0],
m_center[1] - m_v1[1] + m_v2[1], m_center[1] - m_v1[1] + m_v2[1],
m_center[2] - m_v1[2] + m_v2[2]); m_center[2] - m_v1[2] + m_v2[2]);
if (m_texture != 0)
glTexCoord2f(0, 0);
glVertex3f(m_center[0] - m_v1[0] - m_v2[0], glVertex3f(m_center[0] - m_v1[0] - m_v2[0],
m_center[1] - m_v1[1] - m_v2[1], m_center[1] - m_v1[1] - m_v2[1],
m_center[2] - m_v1[2] - m_v2[2]); m_center[2] - m_v1[2] - m_v2[2]);
if (m_texture != 0)
glTexCoord2f(1.0, 0);
glVertex3f(m_center[0] + m_v1[0] - m_v2[0], glVertex3f(m_center[0] + m_v1[0] - m_v2[0],
m_center[1] + m_v1[1] - m_v2[1], m_center[1] + m_v1[1] - m_v2[1],
m_center[2] + m_v1[2] - m_v2[2]); m_center[2] + m_v1[2] - m_v2[2]);