[artoolkit-commits] artoolkit/util/calib_camera2 main.c,1.10,1.11

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

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

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

Index: main.c
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/util/calib_camera2/main.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** main.c	21 Apr 2006 04:35:07 -0000	1.10
--- main.c	8 Jun 2006 21:36:52 -0000	1.11
***************
*** 532,540 ****
  }
  
! static void beginOrtho2D(void) {
  	glMatrixMode(GL_PROJECTION);
  	glPushMatrix();
  	glLoadIdentity();
! 	gluOrtho2D(0.0, gXsize, 0.0, gYsize);
  	glMatrixMode(GL_MODELVIEW);
  	glPushMatrix();
--- 532,540 ----
  }
  
! static void beginOrtho2D(int xsize, int ysize) {
  	glMatrixMode(GL_PROJECTION);
  	glPushMatrix();
  	glLoadIdentity();
! 	gluOrtho2D(0.0, xsize, 0.0, ysize);
  	glMatrixMode(GL_MODELVIEW);
  	glPushMatrix();
***************
*** 561,565 ****
  	glDisable(GL_LIGHTING);
  	glDisable(GL_TEXTURE_2D);
! 	beginOrtho2D();
  
      if (gStatus == 0) {
--- 561,565 ----
  	glDisable(GL_LIGHTING);
  	glDisable(GL_TEXTURE_2D);
! 	beginOrtho2D(gXsize, gYsize);
  
      if (gStatus == 0) {