[cadcdev-svn-commits] SF.net SVN: cadcdev: [525] tiki/src/gl/drawables/console.cpp

[<c99...@us...>]

Revision: 525
          http://cadcdev.svn.sourceforge.net/cadcdev/?rev=525&view=rev
Author:   c99koder
Date:     2007-11-04 09:20:24 -0800 (Sun, 04 Nov 2007)

Log Message:
-----------
Tweak the Z offset between Console foreground and background, and keep depth testing enabled

Modified Paths:
--------------
    tiki/src/gl/drawables/console.cpp

Modified: tiki/src/gl/drawables/console.cpp
===================================================================
--- tiki/src/gl/drawables/console.cpp	2007-11-04 15:44:30 UTC (rev 524)
+++ tiki/src/gl/drawables/console.cpp	2007-11-04 17:20:24 UTC (rev 525)
@@ -226,7 +226,7 @@
 	w *= sv.x;
 	h *= sv.y;
 
-	const Vector & tv = getPosition() + Vector( x, y, 0.01f );
+	const Vector & tv = getPosition() + Vector( x, y, 0.0001f );
 
 	Color color = m_palette[BLACK];
 	if ( attr & HIGH_INTENSITY )
@@ -252,7 +252,7 @@
 	w *= sv.x;
 	h *= sv.y;
 
-	const Vector & tv = getPosition() + Vector( x, y, -0.01f );
+	const Vector & tv = getPosition() + Vector( x, y, -0.0001f );
 	m_palette[ color ].select();
 	
 	glVertex3f(tv.x - (m_w / 2), tv.y + h - (m_h / 2), tv.z);
@@ -267,9 +267,6 @@
 	float x_step = ( m_w / m_cols );
 	float y_step = ( m_h / m_rows );
 
-#if TIKI_PLAT != TIKI_NDS
-	glDisable( GL_DEPTH_TEST );
-#endif
 	if ( list == Trans )
 	{ //Characters!
 		m_texture->select();


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