Update of /cvsroot/artoolkit/artoolkit/examples/simpleLite
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4034
Modified Files:
simpleLite.c
Log Message:
Moved some gsub_lite globals into state structure.
Index: simpleLite.c
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/examples/simpleLite/simpleLite.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** simpleLite.c 22 Sep 2005 19:15:24 -0000 1.10
--- simpleLite.c 6 Apr 2006 05:33:40 -0000 1.11
***************
*** 208,219 ****
}
! if( arglDrawMode == AR_DRAW_BY_GL_DRAW_PIXELS ) {
fprintf(stderr, "DrawMode (C) : GL_DRAW_PIXELS\n");
! } else if( arglTexmapMode == AR_DRAW_TEXTURE_FULL_IMAGE ) {
fprintf(stderr, "DrawMode (C) : TEXTURE MAPPING (FULL RESOLUTION)\n");
} else {
fprintf(stderr, "DrawMode (C) : TEXTURE MAPPING (HALF RESOLUTION)\n");
}
!
if( arTemplateMatchingMode == AR_TEMPLATE_MATCHING_COLOR ) {
fprintf(stderr, "TemplateMatchingMode (M) : Color Template\n");
--- 208,219 ----
}
! if (arglDrawModeGet(gArglSettings) == AR_DRAW_BY_GL_DRAW_PIXELS) {
fprintf(stderr, "DrawMode (C) : GL_DRAW_PIXELS\n");
! } else if (arglTexmapModeGet(gArglSettings) == AR_DRAW_TEXTURE_FULL_IMAGE) {
fprintf(stderr, "DrawMode (C) : TEXTURE MAPPING (FULL RESOLUTION)\n");
} else {
fprintf(stderr, "DrawMode (C) : TEXTURE MAPPING (HALF RESOLUTION)\n");
}
!
if( arTemplateMatchingMode == AR_TEMPLATE_MATCHING_COLOR ) {
fprintf(stderr, "TemplateMatchingMode (M) : Color Template\n");
***************
*** 239,242 ****
--- 239,243 ----
static void Keyboard(unsigned char key, int x, int y)
{
+ int mode;
switch (key) {
case 0x1B: // Quit.
***************
*** 250,260 ****
case 'C':
case 'c':
! if( arglDrawMode == AR_DRAW_BY_GL_DRAW_PIXELS ) {
! arglDrawMode = AR_DRAW_BY_TEXTURE_MAPPING;
! arglTexmapMode = AR_DRAW_TEXTURE_FULL_IMAGE;
! } else if( arglTexmapMode == AR_DRAW_TEXTURE_FULL_IMAGE ) {
! arglTexmapMode = AR_DRAW_TEXTURE_HALF_IMAGE;
} else {
! arglDrawMode = AR_DRAW_BY_GL_DRAW_PIXELS;
}
fprintf(stderr, "*** Camera - %f (frame/sec)\n", (double)gCallCountMarkerDetect/arUtilTimer());
--- 251,262 ----
case 'C':
case 'c':
! mode = arglDrawModeGet(gArglSettings);
! if (mode == AR_DRAW_BY_GL_DRAW_PIXELS) {
! arglDrawModeSet(gArglSettings, AR_DRAW_BY_TEXTURE_MAPPING);
! arglTexmapModeSet(gArglSettings, AR_DRAW_TEXTURE_FULL_IMAGE);
} else {
! mode = arglTexmapModeGet(gArglSettings);
! if (mode == AR_DRAW_TEXTURE_FULL_IMAGE) arglTexmapModeSet(gArglSettings, AR_DRAW_TEXTURE_HALF_IMAGE);
! else arglDrawModeSet(gArglSettings, AR_DRAW_BY_GL_DRAW_PIXELS);
}
fprintf(stderr, "*** Camera - %f (frame/sec)\n", (double)gCallCountMarkerDetect/arUtilTimer());
***************
*** 263,273 ****
demoARDebugReportMode();
break;
- #ifdef AR_OPENGL_TEXTURE_RECTANGLE
- case 'R':
- case 'r':
- arglTexRectangle = !arglTexRectangle;
- fprintf(stderr, "Toggled arglTexRectangle to %d.\n", arglTexRectangle);
- break;
- #endif // AR_OPENGL_TEXTURE_RECTANGLE
case '?':
case '/':
--- 265,268 ----
***************
*** 275,281 ****
printf(" q or [esc] Quit demo.\n");
printf(" c Change arglDrawMode and arglTexmapMode.\n");
- #ifdef AR_OPENGL_TEXTURE_RECTANGLE
- printf(" r Toggle arglTexRectangle.\n");
- #endif // AR_OPENGL_TEXTURE_RECTANGLE
printf(" ? or / Show this help.\n");
printf("\nAdditionally, the ARVideo library supplied the following help text:\n");
--- 270,273 ----
|
