[artoolkit-commits] artoolkit/examples/simpleVRML simpleVRML.c,1.8,1.9

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

Update of /cvsroot/artoolkit/artoolkit/examples/simpleVRML
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15374

Modified Files:
	simpleVRML.c 
Log Message:
Remove ugly function names.

Index: simpleVRML.c
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/examples/simpleVRML/simpleVRML.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** simpleVRML.c	6 Apr 2006 05:33:21 -0000	1.8
--- simpleVRML.c	21 Apr 2006 08:32:52 -0000	1.9
***************
*** 102,106 ****
  
  // Sets up gARTCparam.
! static int demoARSetupCamera(const char *cparam_name, char *vconf)
  {	
      ARParam  wparam;
--- 102,106 ----
  
  // Sets up gARTCparam.
! static int setupCamera(const char *cparam_name, char *vconf)
  {	
      ARParam  wparam;
***************
*** 109,113 ****
      // Open the video path.
      if (arVideoOpen(vconf) < 0) {
!     	fprintf(stderr, "demoARSetupCamera(): Unable to open connection to camera.\n");
      	return (FALSE);
  	}
--- 109,113 ----
      // Open the video path.
      if (arVideoOpen(vconf) < 0) {
!     	fprintf(stderr, "setupCamera(): Unable to open connection to camera.\n");
      	return (FALSE);
  	}
***************
*** 119,123 ****
  	// Load the camera parameters, resize for the window and init.
      if (arParamLoad(cparam_name, 1, &wparam) < 0) {
! 		fprintf(stderr, "demoARSetupCamera(): Error loading parameter file %s for camera.\n", cparam_name);
          return (FALSE);
      }
--- 119,123 ----
  	// Load the camera parameters, resize for the window and init.
      if (arParamLoad(cparam_name, 1, &wparam) < 0) {
! 		fprintf(stderr, "setupCamera(): Error loading parameter file %s for camera.\n", cparam_name);
          return (FALSE);
      }
***************
*** 128,132 ****
  	
      if (arVideoCapStart() != 0) {
!     	fprintf(stderr, "demoARSetupCamera(): Unable to begin camera data capture.\n");
  		return (FALSE);		
  	}
--- 128,132 ----
  	
      if (arVideoCapStart() != 0) {
!     	fprintf(stderr, "setupCamera(): Unable to begin camera data capture.\n");
  		return (FALSE);		
  	}
***************
*** 135,143 ****
  }
  
! static int demoARSetupMarkersObjects(char *objectDataFilename)
  {	
  	// Load in the object data - trained markers and associated bitmap files.
      if ((gObjectData = read_VRMLdata(objectDataFilename, &gObjectDataCount)) == NULL) {
!         fprintf(stderr, "demoARSetupMarkersObjects(): read_VRMLdata returned error !!\n");
          return (FALSE);
      }
--- 135,143 ----
  }
  
! static int setupMarkersObjects(char *objectDataFilename)
  {	
  	// Load in the object data - trained markers and associated bitmap files.
      if ((gObjectData = read_VRMLdata(objectDataFilename, &gObjectDataCount)) == NULL) {
!         fprintf(stderr, "setupMarkersObjects(): read_VRMLdata returned error !!\n");
          return (FALSE);
      }
***************
*** 150,154 ****
  // Report state of ARToolKit global variables arFittingMode,
  // arImageProcMode, arglDrawMode, arTemplateMatchingMode, arMatchingPCAMode.
! static void demoARDebugReportMode(void)
  {
  	if(arFittingMode == AR_FITTING_TO_INPUT ) {
--- 150,154 ----
  // Report state of ARToolKit global variables arFittingMode,
  // arImageProcMode, arglDrawMode, arTemplateMatchingMode, arMatchingPCAMode.
! static void debugReportMode(void)
  {
  	if(arFittingMode == AR_FITTING_TO_INPUT ) {
***************
*** 220,224 ****
  			gCallCountMarkerDetect = 0;
  			arUtilTimerReset();
! 			demoARDebugReportMode();
  			break;
  		case '?':
--- 220,224 ----
  			gCallCountMarkerDetect = 0;
  			arUtilTimerReset();
! 			debugReportMode();
  			break;
  		case '?':
***************
*** 411,419 ****
  	//
  
! 	if (!demoARSetupCamera(cparam_name, vconf)) {
  		fprintf(stderr, "main(): Unable to set up AR camera.\n");
  		exit(-1);
  	}
! 	demoARDebugReportMode();
  	
  #ifdef _WIN32
--- 411,419 ----
  	//
  
! 	if (!setupCamera(cparam_name, vconf)) {
  		fprintf(stderr, "main(): Unable to set up AR camera.\n");
  		exit(-1);
  	}
! 	debugReportMode();
  	
  #ifdef _WIN32
***************
*** 444,448 ****
  	arUtilTimerReset();
  
! 	if (!demoARSetupMarkersObjects(objectDataFilename)) {
  		fprintf(stderr, "main(): Unable to set up AR objects and markers.\n");
  		Quit();
--- 444,448 ----
  	arUtilTimerReset();
  
! 	if (!setupMarkersObjects(objectDataFilename)) {
  		fprintf(stderr, "main(): Unable to set up AR objects and markers.\n");
  		Quit();