[artoolkit-commits] artoolkit/util/calib_cparam calib_cparam.c, 1.11, 1.12

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

Update of /cvsroot/artoolkit/artoolkit/util/calib_cparam
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13653

Modified Files:
	calib_cparam.c 
Log Message:
Update with beginOrtho2D() from mk_patt.

Index: calib_cparam.c
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/util/calib_cparam/calib_cparam.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** calib_cparam.c	5 Apr 2006 05:47:51 -0000	1.11
--- calib_cparam.c	8 Jun 2006 21:31:21 -0000	1.12
***************
*** 469,477 ****
  }
  
! static void beginOrtho2D(void) {
  	glMatrixMode(GL_PROJECTION);
  	glPushMatrix();
  	glLoadIdentity();
! 	gluOrtho2D(0.0, gXsize, 0.0, gYsize);
  	glMatrixMode(GL_MODELVIEW);
  	glPushMatrix();
--- 469,477 ----
  }
  
! static void beginOrtho2D(int xsize, int ysize) {
  	glMatrixMode(GL_PROJECTION);
  	glPushMatrix();
  	glLoadIdentity();
! 	gluOrtho2D(0.0, xsize, 0.0, ysize);
  	glMatrixMode(GL_MODELVIEW);
  	glPushMatrix();
***************
*** 494,498 ****
  	glDisable(GL_LIGHTING);
  	glDisable(GL_TEXTURE_2D);
! 	beginOrtho2D();
  	
      if (mode == 0) {
--- 494,498 ----
  	glDisable(GL_LIGHTING);
  	glDisable(GL_TEXTURE_2D);
! 	beginOrtho2D(gXsize, gYsize);
  	
      if (mode == 0) {