[artoolkit-commits] artoolkit/lib/SRC/Gl gsub_lite.c,1.21,1.22

[Philip L. <phi...@us...>]

Update of /cvsroot/artoolkit/artoolkit/lib/SRC/Gl
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv7118

Modified Files:
	gsub_lite.c 
Log Message:
arDebug fixes.

Index: gsub_lite.c
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/Gl/gsub_lite.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** gsub_lite.c	4 Oct 2006 05:37:22 -0000	1.21
--- gsub_lite.c	17 Nov 2006 03:34:42 -0000	1.22
***************
*** 847,851 ****
  	// Prepare an orthographic projection, set camera position for 2D drawing, and save GL state.
  	glGetTexEnviv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, &texEnvModeSave); // Save GL texture environment mode.
! 	glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
  	lightingSave = glIsEnabled(GL_LIGHTING);			// Save enabled state of lighting.
  	if (lightingSave == GL_TRUE) glDisable(GL_LIGHTING);
--- 847,851 ----
  	// Prepare an orthographic projection, set camera position for 2D drawing, and save GL state.
  	glGetTexEnviv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, &texEnvModeSave); // Save GL texture environment mode.
! 	if (texEnvModeSave != GL_REPLACE) glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
  	lightingSave = glIsEnabled(GL_LIGHTING);			// Save enabled state of lighting.
  	if (lightingSave == GL_TRUE) glDisable(GL_LIGHTING);
***************
*** 860,864 ****
  	glLoadIdentity();		
  	
! 	arglDispImageStateful(image, cparam, zoom, contextSettings);
  
  	// Restore previous projection, camera position, and GL state.
--- 860,877 ----
  	glLoadIdentity();		
  	
! 	if (arDebug) { // Globals from ar.h: arDebug, arImage, arImageProcMode.
! 		if (arImage) {
! 			if (arImageProcMode == AR_IMAGE_PROC_IN_HALF) {
! 				ARParam cparamScaled = *cparam;
! 				cparamScaled.xsize /= 2;
! 				cparamScaled.ysize /= 2;
! 				arglDispImageStateful(arImage, &cparamScaled, zoom * 2.0, contextSettings);
! 			} else {
! 				arglDispImageStateful(arImage, cparam, zoom, contextSettings);
! 			}
! 		}
! 	} else {
! 		arglDispImageStateful(image, cparam, zoom, contextSettings);
! 	}
  
  	// Restore previous projection, camera position, and GL state.
***************
*** 869,873 ****
  	if (depthTestSave == GL_TRUE) glEnable(GL_DEPTH_TEST);			// Restore enabled state of depth test.
  	if (lightingSave == GL_TRUE) glEnable(GL_LIGHTING);			// Restore enabled state of lighting.
! 	glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, texEnvModeSave); // Restore GL texture environment mode.
  	
  #ifdef ARGL_DEBUG
--- 882,886 ----
  	if (depthTestSave == GL_TRUE) glEnable(GL_DEPTH_TEST);			// Restore enabled state of depth test.
  	if (lightingSave == GL_TRUE) glEnable(GL_LIGHTING);			// Restore enabled state of lighting.
! 	if (texEnvModeSave != GL_REPLACE) glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, texEnvModeSave); // Restore GL texture environment mode.
  	
  #ifdef ARGL_DEBUG