Update of /cvsroot/artoolkit/artoolkit/examples/twoView
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25215
Modified Files:
twoView.c
Log Message:
Followup to simpleLite.c changes.
Index: twoView.c
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/examples/twoView/twoView.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** twoView.c 22 May 2006 22:18:12 -0000 1.14
--- twoView.c 29 May 2006 04:00:20 -0000 1.15
***************
*** 447,451 ****
//
! // The function is called when a
// GLUT window is resized.
//
--- 447,451 ----
//
! // This function is called when the
// GLUT window is resized.
//
***************
*** 464,468 ****
//
! // The function is called when a window needs redrawing.
//
static void DisplayPerContext(const int drawContextIndex)
--- 464,468 ----
//
! // This function is called when a window needs redrawing.
//
static void DisplayPerContext(const int drawContextIndex)
***************
*** 470,474 ****
GLdouble p[16];
GLdouble m[16];
!
// Select correct buffer for this context.
glDrawBuffer(GL_BACK);
--- 470,474 ----
GLdouble p[16];
GLdouble m[16];
!
// Select correct buffer for this context.
glDrawBuffer(GL_BACK);
***************
*** 555,559 ****
const char *patt_name = "Data/patt.hiro";
-
// ----------------------------------------------------------------------------
// Library inits.
--- 555,558 ----
***************
*** 585,594 ****
}
gContextsActiveCount = CONTEXTSACTIVECOUNT;
! for (i = 0; i < gContextsActiveCount; i++) debugReportMode(gContextsActive[i].arglSettings);
! if (!setupMarker(patt_name, &gPatt_id)) {
fprintf(stderr, "main(): Unable to set up AR marker.\n");
exit(-1);
}
!
// ----------------------------------------------------------------------------
// Library setup.
--- 584,592 ----
}
gContextsActiveCount = CONTEXTSACTIVECOUNT;
! for (i = 0; i < gContextsActiveCount; i++) if (!setupMarker(patt_name, &gPatt_id)) {
fprintf(stderr, "main(): Unable to set up AR marker.\n");
exit(-1);
}
!
// ----------------------------------------------------------------------------
// Library setup.
***************
*** 618,629 ****
exit(-1);
}
glEnable(GL_DEPTH_TEST);
}
arUtilTimerReset();
!
// Register GLUT event-handling callbacks.
// NB: Idle() is registered by Visibility.
glutMainLoop();
!
return (0);
}
--- 616,628 ----
exit(-1);
}
+ debugReportMode(gContextsActive[i].arglSettings);
glEnable(GL_DEPTH_TEST);
}
arUtilTimerReset();
!
// Register GLUT event-handling callbacks.
// NB: Idle() is registered by Visibility.
glutMainLoop();
!
return (0);
}
|
