artoolkit-commits

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

Update of /cvsroot/artoolkit/artoolkit/examples/twoView
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv12341

Modified Files:
	twoView.c 
Log Message:
Rename some fns for clarity, change Quit to cleanup.

Index: twoView.c
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/examples/twoView/twoView.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** twoView.c	23 Jan 2007 00:39:27 -0000	1.19
--- twoView.c	6 Aug 2007 02:37:37 -0000	1.20
***************
*** 361,365 ****
  }
  
! static void Idle(void)
  {
  	int i;
--- 361,365 ----
  }
  
! static void mainLoop(void)
  {
  	int i;
***************
*** 373,377 ****
      int             j, k;
  	
! 	// Find out how long since Idle() last ran.
  	ms = glutGet(GLUT_ELAPSED_TIME);
  	s_elapsed = (float)(ms - ms_prev) * 0.001;
--- 373,377 ----
      int             j, k;
  	
! 	// Find out how long since mainLoop() last ran.
  	ms = glutGet(GLUT_ELAPSED_TIME);
  	s_elapsed = (float)(ms - ms_prev) * 0.001;
***************
*** 382,386 ****
  	DrawCubeUpdate(s_elapsed);
  	
! 	gCallCountGetImage++; // Increment Idle() counter.
  	
  	for (i = 0; i < gContextsActiveCount; i++) {
--- 382,386 ----
  	DrawCubeUpdate(s_elapsed);
  	
! 	gCallCountGetImage++; // Increment mainLoop() counter.
  	
  	for (i = 0; i < gContextsActiveCount; i++) {
***************
*** 391,395 ****
  			
  			gContextsActive[i].callCountMarkerDetect++; // Increment ARToolKit FPS counter.
! 			//fprintf(stderr, "Idle(): Got image #%ld from cam %d on attempt #%ld.\n", gContextsActive[i].callCountMarkerDetect, i + 1, gCallCountGetImage);
  			
  			// Detect the markers in the video frame.
--- 391,395 ----
  			
  			gContextsActive[i].callCountMarkerDetect++; // Increment ARToolKit FPS counter.
! 			//fprintf(stderr, "mainLoop(): Got image #%ld from cam %d on attempt #%ld.\n", gContextsActive[i].callCountMarkerDetect, i + 1, gCallCountGetImage);
  			
  			// Detect the markers in the video frame.
***************
*** 429,433 ****
  {
  	if (visible == GLUT_VISIBLE) {
! 		glutIdleFunc(Idle);
  	} else {
  		glutIdleFunc(NULL);
--- 429,433 ----
  {
  	if (visible == GLUT_VISIBLE) {
! 		glutIdleFunc(mainLoop);
  	} else {
  		glutIdleFunc(NULL);
***************
*** 614,618 ****
  		
  	// Register GLUT event-handling callbacks.
! 	// NB: Idle() is registered by Visibility.
  	glutMainLoop();
  
--- 614,618 ----
  		
  	// Register GLUT event-handling callbacks.
! 	// NB: mainLoop() is registered by Visibility.
  	glutMainLoop();