Update of /cvsroot/artoolkit/artoolkit/examples/simpleLite
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15286
Modified Files:
simpleLite.c
Log Message:
Remove ugly function names.
Index: simpleLite.c
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/examples/simpleLite/simpleLite.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** simpleLite.c 6 Apr 2006 05:33:40 -0000 1.11
--- simpleLite.c 21 Apr 2006 08:32:38 -0000 1.12
***************
*** 148,152 ****
// Sets up gARTCparam.
! static int demoARSetupCamera(const char *cparam_name, char *vconf)
{
ARParam wparam;
--- 148,152 ----
// Sets up gARTCparam.
! static int setupCamera(const char *cparam_name, char *vconf)
{
ARParam wparam;
***************
*** 155,159 ****
// Open the video path.
if (arVideoOpen(vconf) < 0) {
! fprintf(stderr, "demoARSetupCamera(): Unable to open connection to camera.\n");
return (FALSE);
}
--- 155,159 ----
// Open the video path.
if (arVideoOpen(vconf) < 0) {
! fprintf(stderr, "setupCamera(): Unable to open connection to camera.\n");
return (FALSE);
}
***************
*** 165,169 ****
// 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);
}
--- 165,169 ----
// 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);
}
***************
*** 174,178 ****
if (arVideoCapStart() != 0) {
! fprintf(stderr, "demoARSetupCamera(): Unable to begin camera data capture.\n");
return (FALSE);
}
--- 174,178 ----
if (arVideoCapStart() != 0) {
! fprintf(stderr, "setupCamera(): Unable to begin camera data capture.\n");
return (FALSE);
}
***************
*** 181,189 ****
}
! static int demoARSetupMarker(const char *patt_name, int *patt_id)
{
if((*patt_id = arLoadPatt(patt_name)) < 0) {
! fprintf(stderr, "demoARSetupMarker(): pattern load error !!\n");
return (FALSE);
}
--- 181,189 ----
}
! static int setupMarker(const char *patt_name, int *patt_id)
{
if((*patt_id = arLoadPatt(patt_name)) < 0) {
! fprintf(stderr, "setupMarker(): pattern load error !!\n");
return (FALSE);
}
***************
*** 194,198 ****
// Report state of ARToolKit global variables arFittingMode,
// arImageProcMode, arglDrawMode, arTemplateMatchingMode, arMatchingPCAMode.
! static void demoARDebugReportMode(void)
{
if(arFittingMode == AR_FITTING_TO_INPUT ) {
--- 194,198 ----
// Report state of ARToolKit global variables arFittingMode,
// arImageProcMode, arglDrawMode, arTemplateMatchingMode, arMatchingPCAMode.
! static void debugReportMode(void)
{
if(arFittingMode == AR_FITTING_TO_INPUT ) {
***************
*** 263,267 ****
gCallCountMarkerDetect = 0;
arUtilTimerReset();
! demoARDebugReportMode();
break;
case '?':
--- 263,267 ----
gCallCountMarkerDetect = 0;
arUtilTimerReset();
! debugReportMode();
break;
case '?':
***************
*** 430,439 ****
//
! if (!demoARSetupCamera(cparam_name, vconf)) {
fprintf(stderr, "main(): Unable to set up AR camera.\n");
exit(-1);
}
! demoARDebugReportMode();
! if (!demoARSetupMarker(patt_name, &gPatt_id)) {
fprintf(stderr, "main(): Unable to set up AR marker.\n");
exit(-1);
--- 430,439 ----
//
! if (!setupCamera(cparam_name, vconf)) {
fprintf(stderr, "main(): Unable to set up AR camera.\n");
exit(-1);
}
! debugReportMode();
! if (!setupMarker(patt_name, &gPatt_id)) {
fprintf(stderr, "main(): Unable to set up AR marker.\n");
exit(-1);
|
