[artoolkit-commits] artoolkit/examples/twoView twoView.c,1.4,1.5

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

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

Modified Files:
	twoView.c 
Log Message:
Revert to use of int rather than BOOL.

Index: twoView.c
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/examples/twoView/twoView.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** twoView.c	1 Dec 2004 20:20:05 -0000	1.4
--- twoView.c	18 Feb 2005 04:18:22 -0000	1.5
***************
*** 73,77 ****
  	long						callCountMarkerDetect;	// Frames received.
  	double						patt_trans[3][4];	// Marker transformation.
! 	BOOL						patt_found;			// Whether marker transformation is valid.
  	ARGL_CONTEXT_SETTINGS_REF	arglSettings;		// Settings from ARGL.
  } CONTEXT_INFO;
--- 73,77 ----
  	long						callCountMarkerDetect;	// Frames received.
  	double						patt_trans[3][4];	// Marker transformation.
! 	int						patt_found;			// Whether marker transformation is valid.
  	ARGL_CONTEXT_SETTINGS_REF	arglSettings;		// Settings from ARGL.
  } CONTEXT_INFO;
***************
*** 94,98 ****
  
  // Other globals.
! static BOOL gDrawRotate = FALSE;
  static float gDrawRotateAngle = 0;			// For use in drawing.
  
--- 94,98 ----
  
  // Other globals.
! static int gDrawRotate = FALSE;
  static float gDrawRotateAngle = 0;			// For use in drawing.
  
***************
*** 101,105 ****
  // ============================================================================
  
! static BOOL DrawCubeInit(int contextsActiveCountMax)
  {
  	// Allocate room for display lists for all contexts.
--- 101,105 ----
  // ============================================================================
  
! static int DrawCubeInit(int contextsActiveCountMax)
  {
  	// Allocate room for display lists for all contexts.
***************
*** 112,116 ****
  }
  
! static BOOL DrawCubeSetup(int contextIndex)
  {
  	// Colour cube data.
--- 112,116 ----
  }
  
! static int DrawCubeSetup(int contextIndex)
  {
  	// Colour cube data.
***************
*** 169,173 ****
  }
  
! static BOOL DrawCubeCleanup(int contextIndex)
  {
  	if (contextIndex >= gContextsActiveCount) return (FALSE); // Sanity check.
--- 169,173 ----
  }
  
! static int DrawCubeCleanup(int contextIndex)
  {
  	if (contextIndex >= gContextsActiveCount) return (FALSE); // Sanity check.
***************
*** 182,186 ****
  }
  
! static BOOL DrawCubeFinal(void)
  {
  	if (!gDrawListBox) {
--- 182,186 ----
  }
  
! static int DrawCubeFinal(void)
  {
  	if (!gDrawListBox) {
***************
*** 218,222 ****
  
  // Sets up fields ARTVideo, ARTCparam of gContextsActive[0] through gContextsActive[cameraCount - 1].
! static BOOL demoARSetupCameras(const int cameraCount, const unsigned char *cparam_names[], char *vconfs[])
  {
  	int i;
--- 218,222 ----
  
  // Sets up fields ARTVideo, ARTCparam of gContextsActive[0] through gContextsActive[cameraCount - 1].
! static int demoARSetupCameras(const int cameraCount, const unsigned char *cparam_names[], char *vconfs[])
  {
  	int i;
***************
*** 256,260 ****
  }
  
! static BOOL demoARSetupMarker(const unsigned char *patt_name, int *patt_id)
  {
  	
--- 256,260 ----
  }
  
! static int demoARSetupMarker(const unsigned char *patt_name, int *patt_id)
  {