[artoolkit-commits] artoolkit/examples/simpleLite simpleLite.c, 1.14, 1.15

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

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

Modified Files:
	simpleLite.c 
Log Message:
Tiny tidy up.

Index: simpleLite.c
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/examples/simpleLite/simpleLite.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** simpleLite.c	26 May 2006 05:53:40 -0000	1.14
--- simpleLite.c	28 May 2006 23:38:40 -0000	1.15
***************
*** 72,89 ****
  static int prefRefresh = 0;					// Fullscreen mode refresh rate. Set to 0 to use default rate.
  
! // ARToolKit globals.
! static ARParam		gARTCparam;
  static ARUint8		*gARTImage = NULL;
  static int			gARTThreshhold = 100;
  static long			gCallCountMarkerDetect = 0;
- static double		gPatt_trans[3][4];
- static int			gPatt_found = FALSE;
- static ARGL_CONTEXT_SETTINGS_REF gArglSettings = NULL;
  
! static int			gPatt_id;
! static double		gPatt_width     = 80.0;
! static double		gPatt_centre[2] = {0.0, 0.0};
  
! // Other globals.
  static int gDrawRotate = FALSE;
  static float gDrawRotateAngle = 0;			// For use in drawing.
--- 72,92 ----
  static int prefRefresh = 0;					// Fullscreen mode refresh rate. Set to 0 to use default rate.
  
! // Image acquisition.
  static ARUint8		*gARTImage = NULL;
+ 
+ // Marker detection.
  static int			gARTThreshhold = 100;
  static long			gCallCountMarkerDetect = 0;
  
! // Transformation matrix retrieval.
! static double		gPatt_width     = 80.0;	// Per-marker, but we are using only 1 marker.
! static double		gPatt_centre[2] = {0.0, 0.0}; // Per-marker, but we are using only 1 marker.
! static double		gPatt_trans[3][4];		// Per-marker, but we are using only 1 marker.
! static int			gPatt_found = FALSE;	// Per-marker, but we are using only 1 marker.
! static int			gPatt_id;				// Per-marker, but we are using only 1 marker.
  
! // Drawing.
! static ARParam		gARTCparam;
! static ARGL_CONTEXT_SETTINGS_REF gArglSettings = NULL;
  static int gDrawRotate = FALSE;
  static float gDrawRotateAngle = 0;			// For use in drawing.
***************
*** 149,154 ****
  static int setupCamera(const char *cparam_name, char *vconf, ARParam *cparam)
  {	
!     ARParam  wparam;
! 	int xsize, ysize;
  
      // Open the video path.
--- 152,157 ----
  static int setupCamera(const char *cparam_name, char *vconf, ARParam *cparam)
  {	
!     ARParam			wparam;
! 	int				xsize, ysize;
  
      // Open the video path.
***************
*** 168,176 ****
      }
      arParamChangeSize(&wparam, xsize, ysize, cparam);
-     arInitCparam(cparam);
      fprintf(stdout, "*** Camera Parameter ***\n");
      arParamDisp(cparam);
  	
!     if (arVideoCapStart() != 0) {
      	fprintf(stderr, "setupCamera(): Unable to begin camera data capture.\n");
  		return (FALSE);		
--- 171,180 ----
      }
      arParamChangeSize(&wparam, xsize, ysize, cparam);
      fprintf(stdout, "*** Camera Parameter ***\n");
      arParamDisp(cparam);
  	
!     arInitCparam(cparam);
! 
! 	if (arVideoCapStart() != 0) {
      	fprintf(stderr, "setupCamera(): Unable to begin camera data capture.\n");
  		return (FALSE);		
***************
*** 433,437 ****
  		exit(-1);
  	}
- 	debugReportMode();
  	if (!setupMarker(patt_name, &gPatt_id)) {
  		fprintf(stderr, "main(): Unable to set up AR marker.\n");
--- 437,440 ----
***************
*** 460,463 ****
--- 463,467 ----
  		exit(-1);
  	}
+ 	debugReportMode();
  	glEnable(GL_DEPTH_TEST);
  	arUtilTimerReset();