artoolkit-commits Mailing List for ARToolKit (Page 11)
Optical marker tracking and overlay for augmented reality.
Brought to you by:
philip_lamb
Menu
▾
▴
artoolkit-commits — Log of code commits to the ARToolKit repository
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(65) |
Dec
(32) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
|
Feb
(5) |
Mar
(15) |
Apr
(22) |
May
|
Jun
(9) |
Jul
(108) |
Aug
(42) |
Sep
(62) |
Oct
(5) |
Nov
|
Dec
(4) |
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
(38) |
May
(27) |
Jun
(58) |
Jul
(8) |
Aug
(11) |
Sep
(51) |
Oct
(15) |
Nov
(12) |
Dec
(3) |
| 2007 |
Jan
(25) |
Feb
(6) |
Mar
(8) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(13) |
Sep
(1) |
Oct
(1) |
Nov
(2) |
Dec
|
| 2008 |
Jan
(2) |
Feb
(3) |
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
(20) |
Sep
(5) |
Oct
|
Nov
|
Dec
(2) |
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(2) |
Oct
|
Nov
|
Dec
|
|
From: Philip L. <phi...@us...> - 2006-06-08 21:34:08
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/AR In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15359 Modified Files: arGetCode.c Log Message: Fix to bug which occurs when AR_PATT_SIZE_X and AR_PATT_SIZE_Y differ. Index: arGetCode.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/AR/arGetCode.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** arGetCode.c 21 Apr 2006 04:35:41 -0000 1.3 --- arGetCode.c 8 Jun 2006 21:34:02 -0000 1.4 *************** *** 304,308 **** for( j = 0; j < AR_PATT_SIZE_Y; j++ ) { ! for( i = 0; i < AR_PATT_SIZE_Y; i++ ) { ext_pat[j][i][0] = ext_pat2[j][i][0] / (xdiv*ydiv); ext_pat[j][i][1] = ext_pat2[j][i][1] / (xdiv*ydiv); --- 304,308 ---- for( j = 0; j < AR_PATT_SIZE_Y; j++ ) { ! for( i = 0; i < AR_PATT_SIZE_X; i++ ) { // PRL 2006-06-08. ext_pat[j][i][0] = ext_pat2[j][i][0] / (xdiv*ydiv); ext_pat[j][i][1] = ext_pat2[j][i][1] / (xdiv*ydiv); |
|
From: Philip L. <phi...@us...> - 2006-06-08 21:31:29
|
Update of /cvsroot/artoolkit/artoolkit/util/calib_cparam In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13653 Modified Files: calib_cparam.c Log Message: Update with beginOrtho2D() from mk_patt. Index: calib_cparam.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/calib_cparam/calib_cparam.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** calib_cparam.c 5 Apr 2006 05:47:51 -0000 1.11 --- calib_cparam.c 8 Jun 2006 21:31:21 -0000 1.12 *************** *** 469,477 **** } ! static void beginOrtho2D(void) { glMatrixMode(GL_PROJECTION); glPushMatrix(); glLoadIdentity(); ! gluOrtho2D(0.0, gXsize, 0.0, gYsize); glMatrixMode(GL_MODELVIEW); glPushMatrix(); --- 469,477 ---- } ! static void beginOrtho2D(int xsize, int ysize) { glMatrixMode(GL_PROJECTION); glPushMatrix(); glLoadIdentity(); ! gluOrtho2D(0.0, xsize, 0.0, ysize); glMatrixMode(GL_MODELVIEW); glPushMatrix(); *************** *** 494,498 **** glDisable(GL_LIGHTING); glDisable(GL_TEXTURE_2D); ! beginOrtho2D(); if (mode == 0) { --- 494,498 ---- glDisable(GL_LIGHTING); glDisable(GL_TEXTURE_2D); ! beginOrtho2D(gXsize, gYsize); if (mode == 0) { |
|
From: Philip L. <phi...@us...> - 2006-06-01 03:41:24
|
Update of /cvsroot/artoolkit/artoolkit/ARToolKit.xcodeproj In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30626 Modified Files: project.pbxproj Log Message: ARvrml ppc-only. Index: project.pbxproj =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/ARToolKit.xcodeproj/project.pbxproj,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** project.pbxproj 31 May 2006 22:10:28 -0000 1.11 --- project.pbxproj 1 Jun 2006 03:41:19 -0000 1.12 *************** *** 1679,1683 **** 788C838C089AB5B9003E3825 /* simpleLite.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = simpleLite.app; sourceTree = BUILT_PRODUCTS_DIR; }; 788C83A7089AB67A003E3825 /* simpleLite-Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = "simpleLite-Info.plist"; sourceTree = "<group>"; }; ! 788C83C5089AB6AE003E3825 /* simpleVRML.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = simpleVRML.app; sourceTree = BUILT_PRODUCTS_DIR; }; 788C83F0089AB8B1003E3825 /* simpleVRML-Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = "simpleVRML-Info.plist"; sourceTree = "<group>"; }; 78A519D1089ABA58005197A0 /* twoView.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = twoView.app; sourceTree = BUILT_PRODUCTS_DIR; }; --- 1679,1683 ---- 788C838C089AB5B9003E3825 /* simpleLite.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = simpleLite.app; sourceTree = BUILT_PRODUCTS_DIR; }; 788C83A7089AB67A003E3825 /* simpleLite-Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = "simpleLite-Info.plist"; sourceTree = "<group>"; }; ! 788C83C5089AB6AE003E3825 /* simpleVRML.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = simpleVRML.app; sourceTree = BUILT_PRODUCTS_DIR; }; 788C83F0089AB8B1003E3825 /* simpleVRML-Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = "simpleVRML-Info.plist"; sourceTree = "<group>"; }; 78A519D1089ABA58005197A0 /* twoView.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = twoView.app; sourceTree = BUILT_PRODUCTS_DIR; }; *************** *** 5967,5974 **** isa = XCBuildConfiguration; buildSettings = { ! ARCHS = ( ! ppc, ! i386, ! ); COPY_PHASE_STRIP = NO; DEPLOYMENT_LOCATION = YES; --- 5967,5971 ---- isa = XCBuildConfiguration; buildSettings = { ! ARCHS = ppc; COPY_PHASE_STRIP = NO; DEPLOYMENT_LOCATION = YES; *************** *** 5995,6002 **** isa = XCBuildConfiguration; buildSettings = { ! ARCHS = ( ! ppc, ! i386, ! ); COPY_PHASE_STRIP = YES; DEPLOYMENT_LOCATION = YES; --- 5992,5996 ---- isa = XCBuildConfiguration; buildSettings = { ! ARCHS = ppc; COPY_PHASE_STRIP = YES; DEPLOYMENT_LOCATION = YES; |
|
From: Philip L. <phi...@us...> - 2006-06-01 03:40:19
|
Update of /cvsroot/artoolkit/artoolkit/examples/simpleVRML In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30258 Modified Files: simpleVRML.c Log Message: Forgot loop variable. Index: simpleVRML.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/examples/simpleVRML/simpleVRML.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** simpleVRML.c 31 May 2006 22:09:55 -0000 1.12 --- simpleVRML.c 1 Jun 2006 03:40:14 -0000 1.13 *************** *** 392,395 **** --- 392,396 ---- int main(int argc, char** argv) { + int i; char glutGamemode[32]; const char *cparam_name = |
|
From: Philip L. <phi...@us...> - 2006-05-31 22:10:31
|
Update of /cvsroot/artoolkit/artoolkit/ARToolKit.xcodeproj In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16943 Modified Files: project.pbxproj Log Message: Build vrml stuff only on PPC (for now.) Index: project.pbxproj =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/ARToolKit.xcodeproj/project.pbxproj,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** project.pbxproj 24 May 2006 03:36:58 -0000 1.10 --- project.pbxproj 31 May 2006 22:10:28 -0000 1.11 *************** *** 1679,1683 **** 788C838C089AB5B9003E3825 /* simpleLite.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = simpleLite.app; sourceTree = BUILT_PRODUCTS_DIR; }; 788C83A7089AB67A003E3825 /* simpleLite-Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = "simpleLite-Info.plist"; sourceTree = "<group>"; }; ! 788C83C5089AB6AE003E3825 /* simpleVRML.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = simpleVRML.app; sourceTree = BUILT_PRODUCTS_DIR; }; 788C83F0089AB8B1003E3825 /* simpleVRML-Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = "simpleVRML-Info.plist"; sourceTree = "<group>"; }; 78A519D1089ABA58005197A0 /* twoView.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = twoView.app; sourceTree = BUILT_PRODUCTS_DIR; }; --- 1679,1683 ---- 788C838C089AB5B9003E3825 /* simpleLite.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = simpleLite.app; sourceTree = BUILT_PRODUCTS_DIR; }; 788C83A7089AB67A003E3825 /* simpleLite-Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = "simpleLite-Info.plist"; sourceTree = "<group>"; }; ! 788C83C5089AB6AE003E3825 /* simpleVRML.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = simpleVRML.app; sourceTree = BUILT_PRODUCTS_DIR; }; 788C83F0089AB8B1003E3825 /* simpleVRML-Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = "simpleVRML-Info.plist"; sourceTree = "<group>"; }; 78A519D1089ABA58005197A0 /* twoView.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = twoView.app; sourceTree = BUILT_PRODUCTS_DIR; }; *************** *** 6702,6709 **** isa = XCBuildConfiguration; buildSettings = { ! ARCHS = ( ! ppc, ! i386, ! ); HEADER_SEARCH_PATHS = include; INFOPLIST_FILE = "examples/simpleVRML/simpleVRML-Info.plist"; --- 6702,6706 ---- isa = XCBuildConfiguration; buildSettings = { ! ARCHS = ppc; HEADER_SEARCH_PATHS = include; INFOPLIST_FILE = "examples/simpleVRML/simpleVRML-Info.plist"; *************** *** 6722,6729 **** isa = XCBuildConfiguration; buildSettings = { ! ARCHS = ( ! ppc, ! i386, ! ); HEADER_SEARCH_PATHS = include; INFOPLIST_FILE = "examples/simpleVRML/simpleVRML-Info.plist"; --- 6719,6723 ---- isa = XCBuildConfiguration; buildSettings = { ! ARCHS = ppc; HEADER_SEARCH_PATHS = include; INFOPLIST_FILE = "examples/simpleVRML/simpleVRML-Info.plist"; |
|
From: Philip L. <phi...@us...> - 2006-05-31 22:09:58
|
Update of /cvsroot/artoolkit/artoolkit/examples/simpleVRML In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6503 Modified Files: simpleVRML.c Log Message: Fix bug which prevented marker position filtering being used. Index: simpleVRML.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/examples/simpleVRML/simpleVRML.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** simpleVRML.c 29 May 2006 03:59:40 -0000 1.11 --- simpleVRML.c 31 May 2006 22:09:55 -0000 1.12 *************** *** 276,282 **** for (i = 0; i < gObjectDataCount; i++) { ! ! gObjectData[i].visible = 0; ! // Check through the marker_info array for highest confidence // visible marker matching our object's pattern. --- 276,280 ---- for (i = 0; i < gObjectDataCount; i++) { ! // Check through the marker_info array for highest confidence // visible marker matching our object's pattern. *************** *** 303,306 **** --- 301,306 ---- gObjectData[i].visible = 1; gPatt_found = TRUE; + } else { + gObjectData[i].visible = 0; } } |
|
From: Philip L. <phi...@us...> - 2006-05-29 04:00:40
|
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); } |
|
From: Philip L. <phi...@us...> - 2006-05-29 03:59:53
|
Update of /cvsroot/artoolkit/artoolkit/examples/simpleVRML In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25138 Modified Files: simpleVRML.c Log Message: Followup to simpleLite.c changes. Index: simpleVRML.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/examples/simpleVRML/simpleVRML.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** simpleVRML.c 22 May 2006 22:17:32 -0000 1.10 --- simpleVRML.c 29 May 2006 03:59:40 -0000 1.11 *************** *** 85,94 **** 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 int gPatt_found = FALSE; static ARGL_CONTEXT_SETTINGS_REF gArglSettings = NULL; --- 85,100 ---- 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 int gPatt_found = FALSE; // At least one marker. ! ! // Drawing. ! static ARParam gARTCparam; static ARGL_CONTEXT_SETTINGS_REF gArglSettings = NULL; *************** *** 101,109 **** // ============================================================================ ! // Sets up gARTCparam. ! static int setupCamera(const char *cparam_name, char *vconf) { ! ARParam wparam; ! int xsize, ysize; // Open the video path. --- 107,114 ---- // ============================================================================ ! static int setupCamera(const char *cparam_name, char *vconf, ARParam *cparam) { ! ARParam wparam; ! int xsize, ysize; // Open the video path. *************** *** 122,131 **** return (FALSE); } ! arParamChangeSize(&wparam, xsize, ysize, &gARTCparam); ! arInitCparam(&gARTCparam); fprintf(stdout, "*** Camera Parameter ***\n"); ! arParamDisp(&gARTCparam); ! if (arVideoCapStart() != 0) { fprintf(stderr, "setupCamera(): Unable to begin camera data capture.\n"); return (FALSE); --- 127,137 ---- return (FALSE); } ! 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); *************** *** 171,175 **** fprintf(stderr, "DrawMode (C) : TEXTURE MAPPING (HALF RESOLUTION)\n"); } ! if( arTemplateMatchingMode == AR_TEMPLATE_MATCHING_COLOR ) { fprintf(stderr, "TemplateMatchingMode (M) : Color Template\n"); --- 177,181 ---- fprintf(stderr, "DrawMode (C) : TEXTURE MAPPING (HALF RESOLUTION)\n"); } ! if( arTemplateMatchingMode == AR_TEMPLATE_MATCHING_COLOR ) { fprintf(stderr, "TemplateMatchingMode (M) : Color Template\n"); *************** *** 194,198 **** #endif exit(0); - } --- 200,203 ---- *************** *** 307,311 **** // ! // The function is called on events when the visibility of the // GLUT window changes (including when it first becomes visible). // --- 312,316 ---- // ! // This function is called on events when the visibility of the // GLUT window changes (including when it first becomes visible). // *************** *** 320,324 **** // ! // The function is called when the // GLUT window is resized. // --- 325,329 ---- // ! // This function is called when the // GLUT window is resized. // *************** *** 337,341 **** // ! // The function is called when the window needs redrawing. // static void Display(void) --- 342,346 ---- // ! // This function is called when the window needs redrawing. // static void Display(void) *************** *** 347,351 **** // Select correct buffer for this context. glDrawBuffer(GL_BACK); ! arglDispImage(gARTImage, &gARTCparam, 1.0, gArglSettings); // zoom = 1.0. arVideoCapNext(); --- 352,357 ---- // Select correct buffer for this context. glDrawBuffer(GL_BACK); ! glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); // Clear the buffers for new frame. ! arglDispImage(gARTImage, &gARTCparam, 1.0, gArglSettings); // zoom = 1.0. arVideoCapNext(); *************** *** 353,358 **** if (gPatt_found) { - glClear(GL_DEPTH_BUFFER_BIT); // Clear the buffers for new frame. - // Projection transformation. arglCameraFrustum(&gARTCparam, VIEW_DISTANCE_MIN, VIEW_DISTANCE_MAX, p); --- 359,362 ---- *************** *** 399,403 **** "-dev=/dev/video0 -channel=0 -palette=YUV420P -width=320 -height=240"; #endif ! static char objectDataFilename[] = "Data/object_data_vrml"; // ---------------------------------------------------------------------------- --- 403,407 ---- "-dev=/dev/video0 -channel=0 -palette=YUV420P -width=320 -height=240"; #endif ! char objectDataFilename[] = "Data/object_data_vrml"; // ---------------------------------------------------------------------------- *************** *** 411,419 **** // ! if (!setupCamera(cparam_name, vconf)) { fprintf(stderr, "main(): Unable to set up AR camera.\n"); exit(-1); } - debugReportMode(); #ifdef _WIN32 --- 415,422 ---- // ! if (!setupCamera(cparam_name, vconf, &gARTCparam)) { fprintf(stderr, "main(): Unable to set up AR camera.\n"); exit(-1); } #ifdef _WIN32 *************** *** 442,445 **** --- 445,449 ---- exit(-1); } + debugReportMode(); arUtilTimerReset(); *************** *** 448,452 **** Quit(); } ! // Register GLUT event-handling callbacks. // NB: Idle() is registered by Visibility. --- 452,464 ---- Quit(); } ! ! // Test render all the VRML objects. ! printf("About to render VRML objects \n"); ! glEnable(GL_TEXTURE_2D); ! for (i = 0; i < gObjectDataCount; i++) { ! arVrmlDraw(gObjectData[i].vrml_id); ! } ! glDisable(GL_TEXTURE_2D); ! // Register GLUT event-handling callbacks. // NB: Idle() is registered by Visibility. |
|
From: Philip L. <phi...@us...> - 2006-05-28 23:38:43
|
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(); |
|
From: Philip L. <phi...@us...> - 2006-05-28 09:24:53
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/ARvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2968 Modified Files: arViewer.cpp Log Message: Trivial formatting pickiness. Index: arViewer.cpp =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/ARvrml/arViewer.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** arViewer.cpp 19 Nov 2004 03:26:52 -0000 1.1 --- arViewer.cpp 28 May 2006 09:24:49 -0000 1.2 *************** *** 81,93 **** void arVrmlViewer::redraw() { ! double start = browser::current_time(); glMatrixMode(GL_MODELVIEW); glPushMatrix(); glTranslated( translation[0], translation[1], translation[2] ); ! if( rotation[0] != 0.0 ) { ! glRotated( rotation[0], rotation[1], rotation[2], rotation[3] ); } ! glScaled( scale[0], scale[1], scale[2] ); ! #if USE_STENCIL_SHAPE glEnable(GL_STENCIL_TEST); --- 81,93 ---- void arVrmlViewer::redraw() { ! double start = browser::current_time(); glMatrixMode(GL_MODELVIEW); glPushMatrix(); glTranslated( translation[0], translation[1], translation[2] ); ! if (rotation[0] != 0.0) { ! glRotated(rotation[0], rotation[1], rotation[2], rotation[3]); } ! glScaled(scale[0], scale[1], scale[2]); ! #if USE_STENCIL_SHAPE glEnable(GL_STENCIL_TEST); *************** *** 98,135 **** glDepthFunc(GL_LEQUAL); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); ! glDisable( GL_FOG ); // this is a global attribute ! glDisable( GL_TEXTURE_2D ); ! glEnable( GL_CULL_FACE ); ! glFrontFace( GL_CCW ); ! glCullFace( GL_BACK ); ! ! if( internal_light ) { ! if (lit) glEnable( GL_LIGHTING ); ! glLightModeli(GL_LIGHT_MODEL_TWO_SIDE, GL_TRUE); ! glEnable(GL_NORMALIZE); ! glDisable( GL_COLOR_MATERIAL ); ! glDisable(GL_BLEND); ! glShadeModel( GL_SMOOTH ); ! ! for(int i=0; i<max_lights; ++i) { ! light_info_[i].type = light_unused; ! GLenum light = (GLenum) (GL_LIGHT0 + i); ! glDisable( light ); ! } ! } ! objects = 0; nested_objects = 0; sensitive = 0; ! this->browser.render(*this); ! ! if( internal_light ) { ! if (lit) glDisable( GL_LIGHTING ); ! } glDisable(GL_BLEND); ! glDisable( GL_CULL_FACE ); ! glTexEnvi( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE ); ! glMatrixMode(GL_MODELVIEW); glPopMatrix(); --- 98,135 ---- glDepthFunc(GL_LEQUAL); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); ! glDisable(GL_FOG); // this is a global attribute ! glDisable(GL_TEXTURE_2D); ! glEnable(GL_CULL_FACE); ! glFrontFace(GL_CCW); ! glCullFace(GL_BACK); ! ! if (internal_light) { ! if (lit) glEnable(GL_LIGHTING); ! glLightModeli(GL_LIGHT_MODEL_TWO_SIDE, GL_TRUE); ! glEnable(GL_NORMALIZE); ! glDisable(GL_COLOR_MATERIAL); ! glDisable(GL_BLEND); ! glShadeModel(GL_SMOOTH); ! ! for (int i = 0; i < max_lights; ++i) { ! light_info_[i].type = light_unused; ! GLenum light = (GLenum) (GL_LIGHT0 + i); ! glDisable(light); ! } ! } ! objects = 0; nested_objects = 0; sensitive = 0; ! this->browser.render(*this); ! ! if (internal_light) { ! if (lit) glDisable(GL_LIGHTING); ! } glDisable(GL_BLEND); ! glDisable(GL_CULL_FACE); ! glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); ! glMatrixMode(GL_MODELVIEW); glPopMatrix(); *************** *** 172,176 **** unsigned char ** pixels) { ! return 0; } --- 172,176 ---- unsigned char ** pixels) { ! return 0; } *************** *** 180,184 **** const openvrml::vec3f & direction) { ! if( internal_light ) return gl::viewer::insert_dir_light(ambientIntensity,intensity,color,direction); return 0; } --- 180,184 ---- const openvrml::vec3f & direction) { ! if (internal_light) return gl::viewer::insert_dir_light(ambientIntensity, intensity, color, direction); return 0; } *************** *** 191,195 **** float radius) { ! if( internal_light ) return gl::viewer::insert_point_light(ambientIntensity,attenuation,color,intensity,location,radius); return 0; --- 191,195 ---- float radius) { ! if (internal_light) return gl::viewer::insert_point_light(ambientIntensity, attenuation, color, intensity, location, radius); return 0; *************** *** 207,211 **** float radius) { ! if( internal_light ) return gl::viewer::insert_spot_light(ambientIntensity,attenuation,beamWidth,color,cutOffAngle, direction, intensity, location, radius); return 0; } --- 207,211 ---- float radius) { ! if (internal_light) return gl::viewer::insert_spot_light(ambientIntensity, attenuation, beamWidth, color,cutOffAngle, direction, intensity, location, radius); return 0; } |
|
From: Philip L. <phi...@us...> - 2006-05-25 04:08:41
|
Update of /cvsroot/artoolkit/artoolkit/include/AR In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7838 Modified Files: config.h.in ar.h Log Message: Document and cleanup of labelling. Index: ar.h =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/include/AR/ar.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** ar.h 22 May 2006 22:17:53 -0000 1.8 --- ar.h 25 May 2006 04:08:19 -0000 1.9 *************** *** 516,531 **** /** ! * \brief extracted connected component from image. * ! * Labeling the input image, i.e. extracted connected component from the ! * inptu video image. ! * \param image input image * \param thresh lighting threshold ! * \param label_num number of detected components ! * \param area XXXBK ! * \param pos XXXBK ! * \param clip XXXBK ! * \param label_ref XXXBK ! * \return XXXBK */ ARInt16 *arLabeling( ARUint8 *image, int thresh, --- 516,531 ---- /** ! * \brief extract connected components from image. * ! * Label the input image, i.e. extract connected components from the ! * input video image. ! * \param image input image, as returned by arVideoGetImage() * \param thresh lighting threshold ! * \param label_num Ouput- number of detected components ! * \param area On return, if label_num > 0, points to an array of ints, one for each detected component. ! * \param pos On return, if label_num > 0, points to an array of doubles, one for each detected component. ! * \param clip On return, if label_num > 0, points to an array of ints, one for each detected component. ! * \param label_ref On return, if label_num > 0, points to an array of ints, one for each detected component. ! * \return returns a pointer to the labeled output image, ready for passing onto the next stage of processing. */ ARInt16 *arLabeling( ARUint8 *image, int thresh, Index: config.h.in =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/include/AR/config.h.in,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** config.h.in 21 Apr 2006 04:35:13 -0000 1.5 --- config.h.in 25 May 2006 04:08:19 -0000 1.6 *************** *** 142,146 **** # endif ! # define DEFAULT_IMAGE_PROC_MODE AR_IMAGE_PROC_IN_HALF # define DEFAULT_FITTING_MODE AR_FITTING_TO_IDEAL # define DEFAULT_DRAW_MODE AR_DRAW_BY_TEXTURE_MAPPING --- 142,146 ---- # endif ! # define DEFAULT_IMAGE_PROC_MODE AR_IMAGE_PROC_IN_FULL # define DEFAULT_FITTING_MODE AR_FITTING_TO_IDEAL # define DEFAULT_DRAW_MODE AR_DRAW_BY_TEXTURE_MAPPING *************** *** 152,156 **** # define VIDEO_HALF 1 # define DEFAULT_VIDEO_SIZE VIDEO_FULL ! # define DEFAULT_IMAGE_PROC_MODE AR_IMAGE_PROC_IN_HALF # define DEFAULT_FITTING_MODE AR_FITTING_TO_INPUT # define DEFAULT_DRAW_MODE AR_DRAW_BY_GL_DRAW_PIXELS --- 152,156 ---- # define VIDEO_HALF 1 # define DEFAULT_VIDEO_SIZE VIDEO_FULL ! # define DEFAULT_IMAGE_PROC_MODE AR_IMAGE_PROC_IN_FULL # define DEFAULT_FITTING_MODE AR_FITTING_TO_INPUT # define DEFAULT_DRAW_MODE AR_DRAW_BY_GL_DRAW_PIXELS *************** *** 168,172 **** # define DEFAULT_VIDEO_WIDTH 640 # define DEFAULT_VIDEO_HEIGHT 480 ! # define DEFAULT_IMAGE_PROC_MODE AR_IMAGE_PROC_IN_HALF # define DEFAULT_FITTING_MODE AR_FITTING_TO_IDEAL # define DEFAULT_DRAW_MODE AR_DRAW_BY_TEXTURE_MAPPING --- 168,172 ---- # define DEFAULT_VIDEO_WIDTH 640 # define DEFAULT_VIDEO_HEIGHT 480 ! # define DEFAULT_IMAGE_PROC_MODE AR_IMAGE_PROC_IN_FULL # define DEFAULT_FITTING_MODE AR_FITTING_TO_IDEAL # define DEFAULT_DRAW_MODE AR_DRAW_BY_TEXTURE_MAPPING |
|
From: Philip L. <phi...@us...> - 2006-05-25 04:08:26
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/AR In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7810 Modified Files: arGetMarkerInfo.c arLabeling.c Log Message: Document and cleanup of labelling. Index: arGetMarkerInfo.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/AR/arGetMarkerInfo.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** arGetMarkerInfo.c 4 Nov 2004 08:51:19 -0000 1.1.1.1 --- arGetMarkerInfo.c 25 May 2006 04:08:11 -0000 1.2 *************** *** 22,37 **** int i, j; ! for( i = j = 0; i < *marker_num; i++ ) { marker_infoL[j].area = marker_info2[i].area; marker_infoL[j].pos[0] = marker_info2[i].pos[0]; marker_infoL[j].pos[1] = marker_info2[i].pos[1]; ! if( arGetLine(marker_info2[i].x_coord, marker_info2[i].y_coord, marker_info2[i].coord_num, marker_info2[i].vertex, marker_infoL[j].line, marker_infoL[j].vertex) < 0 ) continue; ! arGetCode( image, ! marker_info2[i].x_coord, marker_info2[i].y_coord, ! marker_info2[i].vertex, &id, &dir, &cf ); marker_infoL[j].id = id; --- 22,37 ---- int i, j; ! for (i = j = 0; i < *marker_num; i++) { marker_infoL[j].area = marker_info2[i].area; marker_infoL[j].pos[0] = marker_info2[i].pos[0]; marker_infoL[j].pos[1] = marker_info2[i].pos[1]; ! if (arGetLine(marker_info2[i].x_coord, marker_info2[i].y_coord, marker_info2[i].coord_num, marker_info2[i].vertex, marker_infoL[j].line, marker_infoL[j].vertex) < 0 ) continue; ! arGetCode(image, ! marker_info2[i].x_coord, marker_info2[i].y_coord, ! marker_info2[i].vertex, &id, &dir, &cf ); marker_infoL[j].id = id; *************** *** 43,47 **** *marker_num = j; ! return( marker_infoL ); } --- 43,47 ---- *marker_num = j; ! return (marker_infoL); } *************** *** 54,72 **** int i, j; ! if( LorR ) info = &marker_infoL[0]; ! else info = &marker_infoR[0]; ! for( i = j = 0; i < *marker_num; i++ ) { info[j].area = marker_info2[i].area; info[j].pos[0] = marker_info2[i].pos[0]; info[j].pos[1] = marker_info2[i].pos[1]; ! if( arsGetLine(marker_info2[i].x_coord, marker_info2[i].y_coord, marker_info2[i].coord_num, marker_info2[i].vertex, info[j].line, info[j].vertex, LorR) < 0 ) continue; ! arGetCode( image, ! marker_info2[i].x_coord, marker_info2[i].y_coord, ! marker_info2[i].vertex, &id, &dir, &cf ); info[j].id = id; --- 54,72 ---- int i, j; ! if (LorR) info = &marker_infoL[0]; ! else info = &marker_infoR[0]; ! for (i = j = 0; i < *marker_num; i++) { info[j].area = marker_info2[i].area; info[j].pos[0] = marker_info2[i].pos[0]; info[j].pos[1] = marker_info2[i].pos[1]; ! if (arsGetLine(marker_info2[i].x_coord, marker_info2[i].y_coord, marker_info2[i].coord_num, marker_info2[i].vertex, info[j].line, info[j].vertex, LorR) < 0 ) continue; ! arGetCode(image, ! marker_info2[i].x_coord, marker_info2[i].y_coord, ! marker_info2[i].vertex, &id, &dir, &cf ); info[j].id = id; *************** *** 78,82 **** *marker_num = j; ! return( info ); } --- 78,82 ---- *marker_num = j; ! return (info); } Index: arLabeling.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/AR/arLabeling.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** arLabeling.c 21 Apr 2006 04:35:41 -0000 1.3 --- arLabeling.c 25 May 2006 04:08:11 -0000 1.4 *************** *** 82,87 **** return( labeling3(image, thresh, label_num, area, pos, clip, label_ref, 1) ); ! } ! else { return( labeling2(image, thresh, label_num, area, pos, clip, label_ref, 1) ); --- 82,86 ---- return( labeling3(image, thresh, label_num, area, pos, clip, label_ref, 1) ); ! } else { return( labeling2(image, thresh, label_num, area, pos, clip, label_ref, 1) ); *************** *** 91,101 **** void arsGetImgFeature( int *num, int **area, int **clip, double **pos, int LorR ) { ! if( LorR ) { *num = wlabel_numL; *area = wareaL; *clip = wclipL; *pos = wposL; ! } ! else { *num = wlabel_numR; *area = wareaR; --- 90,99 ---- void arsGetImgFeature( int *num, int **area, int **clip, double **pos, int LorR ) { ! if (LorR) { *num = wlabel_numL; *area = wareaL; *clip = wclipL; *pos = wposL; ! } else { *num = wlabel_numR; *area = wareaR; *************** *** 114,119 **** return( labeling3(image, thresh, label_num, area, pos, clip, label_ref, LorR) ); ! } ! else { return( labeling2(image, thresh, label_num, area, pos, clip, label_ref, LorR) ); --- 112,116 ---- return( labeling3(image, thresh, label_num, area, pos, clip, label_ref, LorR) ); ! } else { return( labeling2(image, thresh, label_num, area, pos, clip, label_ref, LorR) ); *************** *** 142,147 **** int pnt2_index; // [tp] #endif ! if( LorR ) { l_image = &l_imageL[0]; work = &workL[0]; --- 139,145 ---- int pnt2_index; // [tp] #endif + int thresht3 = thresh * 3; ! if (LorR) { l_image = &l_imageL[0]; work = &workL[0]; *************** *** 151,156 **** wclip = &wclipL[0]; wpos = &wposL[0]; ! } ! else { l_image = &l_imageR[0]; work = &workR[0]; --- 149,153 ---- wclip = &wclipL[0]; wpos = &wposL[0]; ! } else { l_image = &l_imageR[0]; work = &workR[0]; *************** *** 162,177 **** } ! thresh *= 3; ! if( arImageProcMode == AR_IMAGE_PROC_IN_HALF ) { lxsize = arImXsize / 2; lysize = arImYsize / 2; ! } ! else { lxsize = arImXsize; lysize = arImYsize; } ! pnt1 = &l_image[0]; ! pnt2 = &l_image[(lysize-1)*lxsize]; #ifndef USE_OPTIMIZATIONS --- 159,172 ---- } ! if (arImageProcMode == AR_IMAGE_PROC_IN_HALF) { lxsize = arImXsize / 2; lysize = arImYsize / 2; ! } else { lxsize = arImXsize; lysize = arImYsize; } ! pnt1 = &l_image[0]; // Leftmost pixel of top row of image. ! pnt2 = &l_image[(lysize - 1)*lxsize]; // Leftmost pixel of bottom row of image. #ifndef USE_OPTIMIZATIONS *************** *** 181,185 **** #else // 4x loop unrolling ! for(i = 0; i < lxsize-(lxsize%4); i+=4) { *(pnt1++) = *(pnt2++) = 0; *(pnt1++) = *(pnt2++) = 0; --- 176,180 ---- #else // 4x loop unrolling ! for (i = 0; i < lxsize - (lxsize%4); i += 4) { *(pnt1++) = *(pnt2++) = 0; *(pnt1++) = *(pnt2++) = 0; *************** *** 188,193 **** } #endif ! pnt1 = &l_image[0]; ! pnt2 = &l_image[lxsize-1]; #ifndef USE_OPTIMIZATIONS --- 183,188 ---- } #endif ! pnt1 = &l_image[0]; // Leftmost pixel of top row of image. ! pnt2 = &l_image[lxsize - 1]; // Rightmost pixel of top row of image. #ifndef USE_OPTIMIZATIONS *************** *** 199,203 **** #else // 4x loop unrolling ! for(i = 0; i < lysize-(lysize%4); i+=4) { *pnt1 = *pnt2 = 0; pnt1 += lxsize; --- 194,198 ---- #else // 4x loop unrolling ! for (i = 0; i < lysize - (lysize%4); i += 4) { *pnt1 = *pnt2 = 0; pnt1 += lxsize; *************** *** 220,249 **** wk_max = 0; pnt2 = &(l_image[lxsize+1]); ! if( arImageProcMode == AR_IMAGE_PROC_IN_HALF ) { pnt = &(image[(arImXsize*2+2)*AR_PIX_SIZE_DEFAULT]); poff = AR_PIX_SIZE_DEFAULT*2; ! } ! else { pnt = &(image[(arImXsize+1)*AR_PIX_SIZE_DEFAULT]); poff = AR_PIX_SIZE_DEFAULT; } ! for(j = 1; j < lysize-1; j++, pnt+=poff*2, pnt2+=2) { for(i = 1; i < lxsize-1; i++, pnt+=poff, pnt2++) { #if (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ARGB) ! if( *(pnt+1) + *(pnt+2) + *(pnt+3) <= thresh ) { #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ABGR) ! if( *(pnt+1) + *(pnt+2) + *(pnt+3) <= thresh ) { #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGRA) ! if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresh ) { #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGR) ! if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresh ) { #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGBA) ! if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresh ) { #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGB) ! if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresh ) { #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) ! if( *(pnt+1) * 3 <= thresh ) { #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_yuvs) ! if( *(pnt+0) * 3 <= thresh ) { #else # error Unknown default pixel format defined in config.h --- 215,243 ---- wk_max = 0; pnt2 = &(l_image[lxsize+1]); ! if (arImageProcMode == AR_IMAGE_PROC_IN_HALF) { pnt = &(image[(arImXsize*2+2)*AR_PIX_SIZE_DEFAULT]); poff = AR_PIX_SIZE_DEFAULT*2; ! } else { pnt = &(image[(arImXsize+1)*AR_PIX_SIZE_DEFAULT]); poff = AR_PIX_SIZE_DEFAULT; } ! for (j = 1; j < lysize - 1; j++, pnt += poff*2, pnt2 += 2) { for(i = 1; i < lxsize-1; i++, pnt+=poff, pnt2++) { #if (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ARGB) ! if( *(pnt+1) + *(pnt+2) + *(pnt+3) <= thresht3 ) { #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ABGR) ! if( *(pnt+1) + *(pnt+2) + *(pnt+3) <= thresht3 ) { #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGRA) ! if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresht3 ) { #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGR) ! if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresht3 ) { #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGBA) ! if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresht3 ) { #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGB) ! if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresht3 ) { #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) ! if( *(pnt+1) <= thresh ) { #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_yuvs) ! if( *(pnt+0) <= thresh ) { #else # error Unknown default pixel format defined in config.h *************** *** 422,426 **** } } ! if( arImageProcMode == AR_IMAGE_PROC_IN_HALF ) pnt += arImXsize*AR_PIX_SIZE_DEFAULT; } --- 416,420 ---- } } ! if (arImageProcMode == AR_IMAGE_PROC_IN_HALF) pnt += arImXsize*AR_PIX_SIZE_DEFAULT; } *************** *** 463,467 **** *pos = wpos; *clip = wclip; ! return( l_image ); } --- 457,461 ---- *pos = wpos; *clip = wclip; ! return (l_image); } *************** *** 485,490 **** int *wclip; double *wpos; - thresh *= 3; if( arImageProcMode == AR_IMAGE_PROC_IN_HALF ) { lxsize = arImXsize / 2; --- 479,484 ---- int *wclip; double *wpos; + int thresht3 = thresh * 3; if( arImageProcMode == AR_IMAGE_PROC_IN_HALF ) { lxsize = arImXsize / 2; *************** *** 571,596 **** for(i = 1; i < lxsize-1; i++, pnt+=poff, pnt2++, dpnt+=AR_PIX_SIZE_DEFAULT) { #if (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ARGB) ! if( *(pnt+1) + *(pnt+2) + *(pnt+3) <= thresh ) { *(dpnt+1) = *(dpnt+2) = *(dpnt+3) = 255; #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ABGR) ! if( *(pnt+1) + *(pnt+2) + *(pnt+3) <= thresh ) { *(dpnt+1) = *(dpnt+2) = *(dpnt+3) = 255; #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGRA) ! if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresh ) { *(dpnt+0) = *(dpnt+1) = *(dpnt+2) = 255; #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGR) ! if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresh ) { *(dpnt+0) = *(dpnt+1) = *(dpnt+2) = 255; #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGBA) ! if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresh ) { *(dpnt+0) = *(dpnt+1) = *(dpnt+2) = 255; #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGB) ! if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresh ) { *(dpnt+0) = *(dpnt+1) = *(dpnt+2) = 255; #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) ! if( *(pnt+1) * 3 <= thresh ) { *(dpnt+1) = 255; #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_yuvs) ! if( *(pnt+0) * 3 <= thresh ) { *(dpnt+0) = 255; #else --- 565,590 ---- for(i = 1; i < lxsize-1; i++, pnt+=poff, pnt2++, dpnt+=AR_PIX_SIZE_DEFAULT) { #if (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ARGB) ! if( *(pnt+1) + *(pnt+2) + *(pnt+3) <= thresht3 ) { *(dpnt+1) = *(dpnt+2) = *(dpnt+3) = 255; #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ABGR) ! if( *(pnt+1) + *(pnt+2) + *(pnt+3) <= thresht3 ) { *(dpnt+1) = *(dpnt+2) = *(dpnt+3) = 255; #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGRA) ! if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresht3 ) { *(dpnt+0) = *(dpnt+1) = *(dpnt+2) = 255; #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGR) ! if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresht3 ) { *(dpnt+0) = *(dpnt+1) = *(dpnt+2) = 255; #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGBA) ! if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresht3 ) { *(dpnt+0) = *(dpnt+1) = *(dpnt+2) = 255; #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGB) ! if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresht3 ) { *(dpnt+0) = *(dpnt+1) = *(dpnt+2) = 255; #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) ! if( *(pnt+1) <= thresh ) { *(dpnt+1) = 255; #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_yuvs) ! if( *(pnt+0) <= thresh ) { *(dpnt+0) = 255; #else *************** *** 717,721 **** } } ! if( arImageProcMode == AR_IMAGE_PROC_IN_HALF ) pnt += arImXsize*AR_PIX_SIZE_DEFAULT; } --- 711,715 ---- } } ! if (arImageProcMode == AR_IMAGE_PROC_IN_HALF) pnt += arImXsize*AR_PIX_SIZE_DEFAULT; } |
|
From: Philip L. <phi...@us...> - 2006-05-24 03:37:06
|
Update of /cvsroot/artoolkit/artoolkit/ARToolKit.xcodeproj In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22720 Modified Files: project.pbxproj Log Message: Build using 10.4u SDK. Index: project.pbxproj =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/ARToolKit.xcodeproj/project.pbxproj,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** project.pbxproj 27 Apr 2006 18:48:56 -0000 1.9 --- project.pbxproj 24 May 2006 03:36:58 -0000 1.10 *************** *** 4557,4564 **** ); inputPaths = ( ! $SRCROOT/include/AR/gsub_lite.h, ); outputPaths = ( ! $SRCROOT/doc/gsub_lite/CompositePage.html, ); runOnlyForDeploymentPostprocessing = 0; --- 4557,4564 ---- ); inputPaths = ( ! "$(SRCROOT)/include/AR/gsub_lite.h", ); outputPaths = ( ! "$(SRCROOT)/doc/gsub_lite/CompositePage.html", ); runOnlyForDeploymentPostprocessing = 0; *************** *** 4577,4581 **** runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/csh; ! shellScript = "#!/bin/csh\nif (-X doxygen) then\ncd \"${SRCROOT}/doc\"\nmv header.html header.html.tmp\nmv footer.html footer.html.tmp\nrm -f *.html doxygen.css\nmv header.html.tmp header.html\nmv footer.html.tmp footer.html\ndoxygen doxygen_config.dox\nsed -E -i \".bak\" 's/gsub__lite_8h\\.html(#[^\\\"]*)?/gsub_lite\\/index\\.html/' *.html\nrm -f *.bak gsub__lite_8h.html\nrm -f doxygen.png\nendif\n"; }; /* End PBXShellScriptBuildPhase section */ --- 4577,4581 ---- runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/csh; ! shellScript = "#!/bin/csh\nif (-x /sw/bin/doxygen) then\ncd \"${SRCROOT}/doc\"\nmv header.html header.html.tmp\nmv footer.html footer.html.tmp\nrm -f *.html doxygen.css\nmv header.html.tmp header.html\nmv footer.html.tmp footer.html\n/sw/bin/doxygen doxygen_config.dox\nsed -E -i \".bak\" 's/gsub__lite_8h\\.html(#[^\\\"]*)?/gsub_lite\\/index\\.html/' *.html\nrm -f *.bak gsub__lite_8h.html\nrm -f doxygen.png\nendif\n"; }; /* End PBXShellScriptBuildPhase section */ *************** *** 6065,6070 **** --- 6065,6072 ---- GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; + GCC_OPTIMIZATION_LEVEL = 0; GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; GCC_WARN_UNKNOWN_PRAGMAS = NO; + SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; WARNING_CFLAGS = "-Wmost"; ZERO_LINK = NO; *************** *** 6080,6083 **** --- 6082,6086 ---- GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; GCC_WARN_UNKNOWN_PRAGMAS = NO; + SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; WARNING_CFLAGS = "-Wmost"; }; |
|
From: Philip L. <phi...@us...> - 2006-05-24 03:35:21
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/VideoMacOSX In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22308 Modified Files: video.c Log Message: Begin transition from QD to Quartz. Index: video.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoMacOSX/video.c,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** video.c 22 May 2006 22:18:25 -0000 1.16 --- video.c 24 May 2006 03:35:18 -0000 1.17 *************** *** 95,99 **** #define AR_VIDEO_DEBUG_BUFFERCOPY // Uncomment to have ar2VideoGetImage() return a copy of video pixel data. //#define AR_VIDEO_SUPPORT_OLD_QUICKTIME // Uncomment to allow use of non-thread safe QuickTime (pre-6.4). ! //#define AR_VIDEO_DEBUG_FIX_DUAL_PROCESSOR_RACE #define AR_VIDEO_IDLE_INTERVAL_MILLISECONDS_MIN 20L --- 95,99 ---- #define AR_VIDEO_DEBUG_BUFFERCOPY // Uncomment to have ar2VideoGetImage() return a copy of video pixel data. //#define AR_VIDEO_SUPPORT_OLD_QUICKTIME // Uncomment to allow use of non-thread safe QuickTime (pre-6.4). ! #define AR_VIDEO_DEBUG_FIX_DUAL_PROCESSOR_RACE #define AR_VIDEO_IDLE_INTERVAL_MILLISECONDS_MIN 20L *************** *** 993,1010 **** AR2VideoParamT *vid; int keepAlive = 1; struct timeval tv; // Seconds and microseconds since Jan 1, 1970. struct timespec ts; // Seconds and nanoseconds since Jan 1, 1970. - ComponentResult err; int err_i; int isUpdated = 0; - // Variables for fps counter. - //float fps = 0; - //float averagefps = 0; - char status[64]; - Str255 theString; - CGrafPtr theSavedPort; - GDHandle theSavedDevice; - #ifndef AR_VIDEO_SUPPORT_OLD_QUICKTIME --- 993,1005 ---- AR2VideoParamT *vid; int keepAlive = 1; + + #ifndef AR_VIDEO_DEBUG_FIX_DUAL_PROCESSOR_RACE struct timeval tv; // Seconds and microseconds since Jan 1, 1970. struct timespec ts; // Seconds and nanoseconds since Jan 1, 1970. int err_i; + #endif // !AR_VIDEO_DEBUG_FIX_DUAL_PROCESSOR_RACE + ComponentResult err; int isUpdated = 0; #ifndef AR_VIDEO_SUPPORT_OLD_QUICKTIME *************** *** 1032,1036 **** while (keepAlive && vdgIsGrabbing(vid->pVdg)) { ! #ifndef AR_VIDEO_DEBUG_FIX_DUAL_PROCESSOR_RACE gettimeofday(&tv, NULL); ts.tv_sec = tv.tv_sec; --- 1027,1031 ---- while (keepAlive && vdgIsGrabbing(vid->pVdg)) { ! #ifndef AR_VIDEO_DEBUG_FIX_DUAL_PROCESSOR_RACE gettimeofday(&tv, NULL); ts.tv_sec = tv.tv_sec; *************** *** 1084,1087 **** --- 1079,1088 ---- // Write status information onto the frame if so desired. if (vid->showFPS) { + + // Variables for fps counter. + //float fps = 0; + //float averagefps = 0; + char status[64]; + // Reset frame and time counters after a stop/start. /* *************** *** 1100,1103 **** --- 1101,1112 ---- } */ + //fps = (float)vid->timeScale / (float)(time - vid->lastTime); + //averagefps = (float)vid->frameCount * (float)vid->timeScale / (float)time; + //sprintf(status, "time: %ld, fps:%5.1f avg fps:%5.1f", time, fps, averagefps); + sprintf(status, "frame: %ld", vid->frameCount); + #if 0 + Str255 theString; + CGrafPtr theSavedPort; + GDHandle theSavedDevice; GetGWorld(&theSavedPort, &theSavedDevice); SetGWorld(vid->pGWorld, NULL); *************** *** 1105,1115 **** TextMode(srcCopy); MoveTo(vid->theRect.left + 10, vid->theRect.bottom - 14); - //fps = (float)vid->timeScale / (float)(time - vid->lastTime); - //averagefps = (float)vid->frameCount * (float)vid->timeScale / (float)time; - //sprintf(status, "time: %ld, fps:%5.1f avg fps:%5.1f", time, fps, averagefps); - sprintf(status, "frame: %ld", vid->frameCount); CopyCStringToPascal(status, theString); DrawString(theString); SetGWorld(theSavedPort, theSavedDevice); //vid->lastTime = time; } --- 1114,1130 ---- TextMode(srcCopy); MoveTo(vid->theRect.left + 10, vid->theRect.bottom - 14); CopyCStringToPascal(status, theString); DrawString(theString); SetGWorld(theSavedPort, theSavedDevice); + #else + CGContextRef ctx; + QDBeginCGContext(vid->pGWorld, &ctx); + CFStringRef str = CFStringCreateWithCString(NULL, status, kCFStringEncodingMacRoman); + CGContextSelectFont(ctx, "Monaco", 12, kCGEncodingMacRoman); + CGContextSetTextDrawingMode(ctx, kCGTextFillStroke); + CGContextShowTextAtPoint(ctx, 10, 10, status, strlen(status)); + CFRelease(str); + QDEndCGContext(vid->pGWorld, &ctx); + #endif //vid->lastTime = time; } *************** *** 1202,1206 **** a = config; if (a) { ! for(;;) { while (*a == ' ' || *a == '\t') a++; // Skip whitespace. if (*a == '\0') break; --- 1217,1222 ---- a = config; if (a) { ! err_i = 0; ! for (;;) { while (*a == ' ' || *a == '\t') a++; // Skip whitespace. if (*a == '\0') break; *************** *** 1208,1236 **** if (strncmp(a, "-width=", 7) == 0) { sscanf(a, "%s", line); ! if (sscanf( &line[7], "%d", &width) == 0 ) { ! ar2VideoDispOption(); ! return(NULL); ! } } else if (strncmp(a, "-height=", 8) == 0) { sscanf(a, "%s", line); ! if (sscanf(&line[8], "%d", &height) == 0) { ! ar2VideoDispOption(); ! return (NULL); ! } } else if (strncmp(a, "-grabber=", 9) == 0) { sscanf(a, "%s", line); ! if (sscanf(&line[9], "%d", &grabber) == 0) { ! ar2VideoDispOption(); ! return (NULL); ! } } else if (strncmp(a, "-pixelformat=", 13) == 0) { sscanf(a, "%s", line); ! if (sscanf(&line[13], "%c%c%c%c", (char *)&pixFormat, ((char *)&pixFormat) + 1, ! ((char *)&pixFormat) + 2, ((char *)&pixFormat) + 3) < 4) { // Try 4-cc first. ! if (sscanf(&line[13], "%li", (long *)&pixFormat) < 1) { // Fall back to integer. ! ar2VideoDispOption(); ! return (NULL); ! } ! } } else if (strncmp(a, "-fps", 4) == 0) { showFPS = 1; --- 1224,1241 ---- if (strncmp(a, "-width=", 7) == 0) { sscanf(a, "%s", line); ! if (strlen(line) <= 7 || sscanf(&line[7], "%d", &width) == 0) err_i = 1; } else if (strncmp(a, "-height=", 8) == 0) { sscanf(a, "%s", line); ! if (strlen(line) <= 8 || sscanf(&line[8], "%d", &height) == 0) err_i = 1; } else if (strncmp(a, "-grabber=", 9) == 0) { sscanf(a, "%s", line); ! if (strlen(line) <= 9 || sscanf(&line[9], "%d", &grabber) == 0) err_i = 1; } else if (strncmp(a, "-pixelformat=", 13) == 0) { sscanf(a, "%s", line); ! if (strlen(line) <= 13) err_i = 1; ! else { ! if (strlen(line) == 17) err_i = (sscanf(&line[13], "%4c", (char *)&pixFormat) < 1); ! else err_i = (sscanf(&line[13], "%li", (long *)&pixFormat) < 1); // Integer. ! } } else if (strncmp(a, "-fps", 4) == 0) { showFPS = 1; *************** *** 1238,1246 **** showDialog = 0; } else { ! ar2VideoDispOption(); ! return (NULL); } ! ! while (*a != ' ' && *a != '\t' && *a != '\0') a++; // Skip non-whitespace. } } --- 1243,1255 ---- showDialog = 0; } else { ! err_i = 1; } ! ! if (err_i) { ! ar2VideoDispOption(); ! return (NULL); ! } ! ! while (*a != ' ' && *a != '\t' && *a != '\0') a++; // Skip to next whitespace. } } *************** *** 1291,1295 **** // Once only, initialize for Carbon. ! if(initF == 0) { InitCursor(); initF = 1; --- 1300,1304 ---- // Once only, initialize for Carbon. ! if (initF == 0) { InitCursor(); initF = 1; *************** *** 1467,1470 **** --- 1476,1486 ---- // Erase to black. + #if 0 + QDBeginCGContext(vid->pGWorld, &ctx); + CGContextSetRGBFillColor(ctx, 1, 1, 1, 1); + CGContextFillRect(ctx, CGRectMake(0, 0, (vid->theRect).left - (vid->theRect).right, (vid->theRect).top - (vid->theRect).bottom)); + CGContextFlush(ctx); + QDEndCGContext (vid->pGWorld, &ctx); + #else GetGWorld(&theSavedPort, &theSavedDevice); SetGWorld(vid->pGWorld, NULL); *************** *** 1473,1476 **** --- 1489,1493 ---- EraseRect(&(vid->theRect)); SetGWorld(theSavedPort, theSavedDevice); + #endif // Set the decompression destination to the offscreen GWorld. |
|
From: Philip L. <phi...@us...> - 2006-05-24 03:33:43
|
Update of /cvsroot/artoolkit/artoolkit/include/AR/sys In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21642 Modified Files: videoWin32DirectShow.h Log Message: Update copyright date. Index: videoWin32DirectShow.h =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/include/AR/sys/videoWin32DirectShow.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** videoWin32DirectShow.h 8 Dec 2005 18:51:47 -0000 1.3 --- videoWin32DirectShow.h 24 May 2006 03:33:39 -0000 1.4 *************** *** 29,33 **** * ========================================================================*/ /* ! * Copyright (c) 2004-2005 Philip Lamb (PRL) ph...@ed.... All rights reserved. * * Rev Date Who Changes --- 29,33 ---- * ========================================================================*/ /* ! * Copyright (c) 2004-2006 Philip Lamb (PRL) ph...@ed.... All rights reserved. * * Rev Date Who Changes |
|
From: Philip L. <phi...@us...> - 2006-05-23 01:43:26
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/VideoLinux1394Cam In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15330 Modified Files: video.c Log Message: Don't stop video if already stopped in ar2VideoClose (fix for bug 1452403). Index: video.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoLinux1394Cam/video.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** video.c 5 Apr 2006 05:48:24 -0000 1.4 --- video.c 23 May 2006 01:42:41 -0000 1.5 *************** *** 466,470 **** int i; ! if( vid->status > 0 ) ar2VideoCapStop( vid ); #if 0 --- 466,470 ---- int i; ! if (vid->status == 1 || vid->status == 2) ar2VideoCapStop(vid); #if 0 |
|
From: Philip L. <phi...@us...> - 2006-05-22 23:15:51
|
Update of /cvsroot/artoolkit/artoolkit/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21325 Added Files: hierarchy.html Log Message: Documentation update. --- NEW FILE: hierarchy.html --- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"> <title>ARToolKit API Documentation</title> <link href="doxygen.css" rel="stylesheet" type="text/css"> </head> <body> <!-- Generated by Doxygen 1.4.6 --> <div class="tabs"> <ul> <li><a href="index.html"><span>Main Page</span></a></li> <li id="current"><a href="annotated.html"><span>Data Structures</span></a></li> <li><a href="files.html"><span>Files</span></a></li> </ul></div> <div class="tabs"> <ul> <li><a href="annotated.html"><span>Data Structures</span></a></li> <li id="current"><a href="hierarchy.html"><span>Class Hierarchy</span></a></li> </ul></div> <h1>ARToolKit Class Hierarchy</h1>This inheritance list is sorted roughly, but not completely, alphabetically:<ul> <li><a class="el" href="structARMarkerInfo.html">ARMarkerInfo</a> <li><a class="el" href="structARMarkerInfo2.html">ARMarkerInfo2</a> <li><a class="el" href="structARMat.html">ARMat</a> <li><a class="el" href="structARMultiEachMarkerInfoT.html">ARMultiEachMarkerInfoT</a> <li><a class="el" href="structARMultiMarkerInfoT.html">ARMultiMarkerInfoT</a> <li><a class="el" href="structARParam.html">ARParam</a> <li><a class="el" href="structarPrevInfo.html">arPrevInfo</a> <li><a class="el" href="structARVec.html">ARVec</a> </ul> <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> Copyright © 2004-2006. HIT Lab NZ. All Rights Reserved.</small> </body> </html> |
|
From: Philip L. <phi...@us...> - 2006-05-22 23:05:54
|
Update of /cvsroot/artoolkit/artoolkit/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17678 Added Files: tab_b.gif tab_l.gif tab_r.gif tabs.css Log Message: New files from new version of doxygen. --- NEW FILE: tab_l.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: tab_r.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: tab_b.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: tabs.css --- /* tabs styles, based on http://www.alistapart.com/articles/slidingdoors */ DIV.tabs { float : left; width : 100%; background : url("tab_b.gif") repeat-x bottom; margin-bottom : 4px; } DIV.tabs UL { margin : 0px; padding-left : 10px; list-style : none; } DIV.tabs LI, DIV.tabs FORM { display : inline; margin : 0px; padding : 0px; } DIV.tabs FORM { float : right; } DIV.tabs A { float : left; background : url("tab_r.gif") no-repeat right top; border-bottom : 1px solid #84B0C7; font-size : x-small; font-weight : bold; text-decoration : none; } DIV.tabs A:hover { background-position: 100% -150px; } DIV.tabs A:link, DIV.tabs A:visited, DIV.tabs A:active, DIV.tabs A:hover { color: #1A419D; } DIV.tabs SPAN { float : left; display : block; background : url("tab_l.gif") no-repeat left top; padding : 5px 9px; white-space : nowrap; } DIV.tabs INPUT { float : right; display : inline; font-size : 1em; } DIV.tabs TD { font-size : x-small; font-weight : bold; text-decoration : none; } /* Commented Backslash Hack hides rule from IE5-Mac \*/ DIV.tabs SPAN {float : none;} /* End IE5-Mac hack */ DIV.tabs A:hover SPAN { background-position: 0% -150px; } DIV.tabs LI#current A { background-position: 100% -150px; border-width : 0px; } DIV.tabs LI#current SPAN { background-position: 0% -150px; padding-bottom : 6px; } DIV.nav { background : none; border : none; border-bottom : 1px solid #84B0C7; } |
|
From: Philip L. <phi...@us...> - 2006-05-22 23:03:25
|
Update of /cvsroot/artoolkit/artoolkit/doc/gsub_lite/Functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16483/gsub_lite/Functions Modified Files: Functions.html Log Message: Refresh documentation. Index: Functions.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/gsub_lite/Functions/Functions.html,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Functions.html 27 Apr 2006 18:52:45 -0000 1.5 --- Functions.html 22 May 2006 23:03:19 -0000 1.6 *************** *** 30,35 **** <dd>Set compensation for camera lens distortion in arglDispImage to off or on. </dd> <dt><tt><a href="Functions.html#//apple_ref/c/func/arglDrawModeSet" target="doc">arglDrawModeSet</a></tt></dt> ! <dd>Set method by which arglDispImage() transfers pixels. </dd> <dt><tt><a href="Functions.html#//apple_ref/c/func/arglPixelFormatGet" target="doc">arglPixelFormatGet</a></tt></dt> --- 30,38 ---- <dd>Set compensation for camera lens distortion in arglDispImage to off or on. </dd> + <dt><tt><a href="Functions.html#//apple_ref/c/func/arglDrawModeGet" target="doc">arglDrawModeGet</a></tt></dt> + <dd>Get method by which arglDispImage() is transfering pixels. + </dd> <dt><tt><a href="Functions.html#//apple_ref/c/func/arglDrawModeSet" target="doc">arglDrawModeSet</a></tt></dt> ! <dd>Set method by which arglDispImage() will transfer pixels. </dd> <dt><tt><a href="Functions.html#//apple_ref/c/func/arglPixelFormatGet" target="doc">arglPixelFormatGet</a></tt></dt> *************** *** 42,48 **** --- 45,57 ---- <dd>Initialise the gsub_lite library for the current OpenGL context. </dd> + <dt><tt><a href="Functions.html#//apple_ref/c/func/arglTexmapModeGet" target="doc">arglTexmapModeGet</a></tt></dt> + <dd>Enquire whether full or half-resolution TexImage2D pixel-transfer is being used in arglDispImage(). + </dd> <dt><tt><a href="Functions.html#//apple_ref/c/func/arglTexmapModeSet" target="doc">arglTexmapModeSet</a></tt></dt> <dd>Determines use of full or half-resolution TexImage2D pixel-transfer in arglDispImage(). </dd> + <dt><tt><a href="Functions.html#//apple_ref/c/func/arglTexRectangleGet" target="doc">arglTexRectangleGet</a></tt></dt> + <dd>Enquire as to use of rectangular TexImage2D pixel-transfer in arglDispImage(). + </dd> <dt><tt><a href="Functions.html#//apple_ref/c/func/arglTexRectangleSet" target="doc">arglTexRectangleSet</a></tt></dt> <dd>Determines use of rectangular TexImage2D pixel-transfer in arglDispImage(). *************** *** 295,311 **** </dd> </dl> <hr><!-- headerDoc=func; uid=//apple_ref/c/func/arglDrawModeSet; name=arglDrawModeSet --> <a name="//apple_ref/c/func/arglDrawModeSet"></a> <table border="0" cellpadding="2" cellspacing="2" width="300"><tr><td valign="top" height="12" colspan="5"><h3><a name="arglDrawModeSet">arglDrawModeSet</a></h3> ! </td></tr></table><hr><dl></dl><p>Set method by which arglDispImage() transfers pixels. </p> <blockquote><pre><!-- a logicalPath="//apple_ref/c/cl/void //apple_ref/c/cl/void //apple_ref/c/tdef/void //apple_ref/c/tag/void //apple_ref/c/econst/void //apple_ref/c/struct/void //apple_ref/c/clconst/void" --><font class="type">void</font><!-- /a --> <!-- a logicalPath="//apple_ref/c/instm/arglDrawModeSet //apple_ref/c/clm/arglDrawModeSet //apple_ref/c/intfcm/arglDrawModeSet //apple_ref/c/func/arglDrawModeSet //apple_ref/c/ftmplt/arglDrawModeSet //apple_ref/c/defn/arglDrawModeSet //apple_ref/c/macro/arglDrawModeSet" --><font class="function">arglDrawModeSet</font><!-- /a -->( <!-- a logicalPath="//apple_ref/c/cl/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/cl/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/tdef/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/tag/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/econst/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/struct/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/clconst/ARGL_CONTEXT_SETTINGS_REF" --><font class="type">ARGL_CONTEXT_SETTINGS_REF</font><!-- /a --> <font class="param">contextSettings</font>, <font class="keyword">const</font> <!-- a logicalPath="//apple_ref/c/cl/int //apple_ref/c/cl/int //apple_ref/c/tdef/int //apple_ref/c/tag/int //apple_ref/c/econst/int //apple_ref/c/struct/int //apple_ref/c/clconst/int" --><font class="type">int</font><!-- /a --> <font class="param">mode</font>); </pre></blockquote> ! <dl><h5><font face="Lucida Grande,Helvetica,Arial">Discussion</font></h5><p>The value of this setting determines the method by which ! arglDispImage transfers pixels of an image to the display. Setting this ! variable to a value of AR_DRAW_BY_GL_DRAW_PIXELS specifies the use of OpenGL ! DrawPixels to do the transfer. Setting this variable to a value of ! AR_DRAW_BY_TEXTURE_MAPPING specifies the use of OpenGL TexImage2D to do the transfer. The DrawPixels method is guaranteed to be available on all implementations, but arglDispImage does not correct the image --- 304,334 ---- </dd> </dl> + <hr><!-- headerDoc=func; uid=//apple_ref/c/func/arglDrawModeGet; name=arglDrawModeGet --> + <a name="//apple_ref/c/func/arglDrawModeGet"></a> + <table border="0" cellpadding="2" cellspacing="2" width="300"><tr><td valign="top" height="12" colspan="5"><h3><a name="arglDrawModeGet">arglDrawModeGet</a></h3> + </td></tr></table><hr><dl></dl><p>Get method by which arglDispImage() is transfering pixels. + </p> + <blockquote><pre><!-- a logicalPath="//apple_ref/c/cl/int //apple_ref/c/cl/int //apple_ref/c/tdef/int //apple_ref/c/tag/int //apple_ref/c/econst/int //apple_ref/c/struct/int //apple_ref/c/clconst/int" --><font class="type">int</font><!-- /a --> <!-- a logicalPath="//apple_ref/c/instm/arglDrawModeGet //apple_ref/c/clm/arglDrawModeGet //apple_ref/c/intfcm/arglDrawModeGet //apple_ref/c/func/arglDrawModeGet //apple_ref/c/ftmplt/arglDrawModeGet //apple_ref/c/defn/arglDrawModeGet //apple_ref/c/macro/arglDrawModeGet" --><font class="function">arglDrawModeGet</font><!-- /a -->( + <!-- a logicalPath="//apple_ref/c/cl/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/cl/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/tdef/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/tag/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/econst/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/struct/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/clconst/ARGL_CONTEXT_SETTINGS_REF" --><font class="type">ARGL_CONTEXT_SETTINGS_REF</font><!-- /a --> <font class="param">contextSettings</font>); </pre></blockquote> + <dl><h5><font face="Lucida Grande,Helvetica,Arial">Discussion</font></h5><p>Enquires as to the current method by which arglDispImage() is + transferring pixels to OpenGL for display. See arglDrawModeSet() for + more information. + </p> + <dt><i>Availability</i></dt><dd>First appeared in ARToolKit 2.72. + </dd> + </dl> <hr><!-- headerDoc=func; uid=//apple_ref/c/func/arglDrawModeSet; name=arglDrawModeSet --> <a name="//apple_ref/c/func/arglDrawModeSet"></a> <table border="0" cellpadding="2" cellspacing="2" width="300"><tr><td valign="top" height="12" colspan="5"><h3><a name="arglDrawModeSet">arglDrawModeSet</a></h3> ! </td></tr></table><hr><dl></dl><p>Set method by which arglDispImage() will transfer pixels. </p> <blockquote><pre><!-- a logicalPath="//apple_ref/c/cl/void //apple_ref/c/cl/void //apple_ref/c/tdef/void //apple_ref/c/tag/void //apple_ref/c/econst/void //apple_ref/c/struct/void //apple_ref/c/clconst/void" --><font class="type">void</font><!-- /a --> <!-- a logicalPath="//apple_ref/c/instm/arglDrawModeSet //apple_ref/c/clm/arglDrawModeSet //apple_ref/c/intfcm/arglDrawModeSet //apple_ref/c/func/arglDrawModeSet //apple_ref/c/ftmplt/arglDrawModeSet //apple_ref/c/defn/arglDrawModeSet //apple_ref/c/macro/arglDrawModeSet" --><font class="function">arglDrawModeSet</font><!-- /a -->( <!-- a logicalPath="//apple_ref/c/cl/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/cl/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/tdef/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/tag/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/econst/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/struct/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/clconst/ARGL_CONTEXT_SETTINGS_REF" --><font class="type">ARGL_CONTEXT_SETTINGS_REF</font><!-- /a --> <font class="param">contextSettings</font>, <font class="keyword">const</font> <!-- a logicalPath="//apple_ref/c/cl/int //apple_ref/c/cl/int //apple_ref/c/tdef/int //apple_ref/c/tag/int //apple_ref/c/econst/int //apple_ref/c/struct/int //apple_ref/c/clconst/int" --><font class="type">int</font><!-- /a --> <font class="param">mode</font>); </pre></blockquote> ! <dl><h5><font face="Lucida Grande,Helvetica,Arial">Discussion</font></h5><p>This setting determines the method by which arglDispImage transfers pixels ! of an image to OpenGL for display. Setting this ! variable to a value of AR_DRAW_BY_GL_DRAW_PIXELS specifies the use of the ! OpenGL DrawPixels functions to do the transfer. Setting this variable to a value of ! AR_DRAW_BY_TEXTURE_MAPPING specifies the use of OpenGL TexImage2D functions to do the transfer. The DrawPixels method is guaranteed to be available on all implementations, but arglDispImage does not correct the image *************** *** 317,321 **** The initial value is AR_DRAW_BY_TEXTURE_MAPPING. </p> ! <dt><i>Availability</i></dt><dd>First appeared in ARToolKit 2.68. </dd> </dl> --- 340,344 ---- The initial value is AR_DRAW_BY_TEXTURE_MAPPING. </p> ! <dt><i>Availability</i></dt><dd>First appeared in ARToolKit 2.72. </dd> </dl> *************** *** 335,339 **** context, as returned by arglSetupForCurrentContext() for this context.</dd> <dt><code><i>format</i></code></dt><dd>A symbolic constant for the pixel format in use. See ! <!-- a logicalPath="" -->AR_PIXEL_FORMAT <!-- /a --> for a list of all possible formats.</dd> <dt><code><i>size</i></code></dt><dd>The number of bytes of memory occupied per pixel, for the given format.</dd> </dl> --- 358,362 ---- context, as returned by arglSetupForCurrentContext() for this context.</dd> <dt><code><i>format</i></code></dt><dd>A symbolic constant for the pixel format in use. See ! AR_PIXEL_FORMAT in ar.h for a list of all possible formats.</dd> <dt><code><i>size</i></code></dt><dd>The number of bytes of memory occupied per pixel, for the given format.</dd> </dl> *************** *** 362,366 **** context, as returned by arglSetupForCurrentContext() for this context.</dd> <dt><code><i>format</i></code></dt><dd>A symbolic constant for the pixel format being set. See ! <!-- a logicalPath="" -->AR_PIXEL_FORMAT <!-- /a --> for a list of all possible formats.</dd> </dl> </blockquote> --- 385,389 ---- context, as returned by arglSetupForCurrentContext() for this context.</dd> <dt><code><i>format</i></code></dt><dd>A symbolic constant for the pixel format being set. See ! AR_PIXEL_FORMAT in ar.h for a list of all possible formats.</dd> </dl> </blockquote> *************** *** 407,410 **** --- 430,446 ---- </dd> </dl> + <hr><!-- headerDoc=func; uid=//apple_ref/c/func/arglTexmapModeGet; name=arglTexmapModeGet --> + <a name="//apple_ref/c/func/arglTexmapModeGet"></a> + <table border="0" cellpadding="2" cellspacing="2" width="300"><tr><td valign="top" height="12" colspan="5"><h3><a name="arglTexmapModeGet">arglTexmapModeGet</a></h3> + </td></tr></table><hr><dl></dl><p>Enquire whether full or half-resolution TexImage2D pixel-transfer is being used in arglDispImage(). + </p> + <blockquote><pre><!-- a logicalPath="//apple_ref/c/cl/int //apple_ref/c/cl/int //apple_ref/c/tdef/int //apple_ref/c/tag/int //apple_ref/c/econst/int //apple_ref/c/struct/int //apple_ref/c/clconst/int" --><font class="type">int</font><!-- /a --> <!-- a logicalPath="//apple_ref/c/instm/arglTexmapModeGet //apple_ref/c/clm/arglTexmapModeGet //apple_ref/c/intfcm/arglTexmapModeGet //apple_ref/c/func/arglTexmapModeGet //apple_ref/c/ftmplt/arglTexmapModeGet //apple_ref/c/defn/arglTexmapModeGet //apple_ref/c/macro/arglTexmapModeGet" --><font class="function">arglTexmapModeGet</font><!-- /a -->( + <!-- a logicalPath="//apple_ref/c/cl/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/cl/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/tdef/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/tag/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/econst/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/struct/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/clconst/ARGL_CONTEXT_SETTINGS_REF" --><font class="type">ARGL_CONTEXT_SETTINGS_REF</font><!-- /a --> <font class="param">contextSettings</font>); </pre></blockquote> + <dl><h5><font face="Lucida Grande,Helvetica,Arial">Discussion</font></h5><p>Enquires as to the current value of the TexmapMode setting. See arglTexmapModeSet() + for more info. + </p> + <dt><i>Availability</i></dt><dd>First appeared in ARToolKit 2.72. + </dd> + </dl> <hr><!-- headerDoc=func; uid=//apple_ref/c/func/arglTexmapModeSet; name=arglTexmapModeSet --> <a name="//apple_ref/c/func/arglTexmapModeSet"></a> *************** *** 415,422 **** <!-- a logicalPath="//apple_ref/c/cl/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/cl/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/tdef/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/tag/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/econst/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/struct/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/clconst/ARGL_CONTEXT_SETTINGS_REF" --><font class="type">ARGL_CONTEXT_SETTINGS_REF</font><!-- /a --> <font class="param">contextSettings</font>, <font class="keyword">const</font> <!-- a logicalPath="//apple_ref/c/cl/int //apple_ref/c/cl/int //apple_ref/c/tdef/int //apple_ref/c/tag/int //apple_ref/c/econst/int //apple_ref/c/struct/int //apple_ref/c/clconst/int" --><font class="type">int</font><!-- /a --> <font class="param">mode</font>); </pre></blockquote> ! <dl><h5><font face="Lucida Grande,Helvetica,Arial">Discussion</font></h5><p>When arglDrawModeSet(AR_DRAW_BY_TEXTURE_MAPPING) has been called, the value of this setting ! determines whether full or half-resolution data is transferred to the ! texture. A value of AR_DRAW_TEXTURE_FULL_IMAGE uses all available pixels in the ! source image data. A value of AR_DRAW_TEXTURE_HALF_IMAGE discards every second row in the source image data, defining a half-height texture which is then drawn stretched vertically to double its height. --- 451,459 ---- <!-- a logicalPath="//apple_ref/c/cl/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/cl/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/tdef/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/tag/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/econst/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/struct/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/clconst/ARGL_CONTEXT_SETTINGS_REF" --><font class="type">ARGL_CONTEXT_SETTINGS_REF</font><!-- /a --> <font class="param">contextSettings</font>, <font class="keyword">const</font> <!-- a logicalPath="//apple_ref/c/cl/int //apple_ref/c/cl/int //apple_ref/c/tdef/int //apple_ref/c/tag/int //apple_ref/c/econst/int //apple_ref/c/struct/int //apple_ref/c/clconst/int" --><font class="type">int</font><!-- /a --> <font class="param">mode</font>); </pre></blockquote> ! <dl><h5><font face="Lucida Grande,Helvetica,Arial">Discussion</font></h5><p>When arglDrawModeSet(AR_DRAW_BY_TEXTURE_MAPPING) has been called, the value of this ! setting determines whether full or half-resolution data is transferred to the ! texture. Calling this function with a mode value of AR_DRAW_TEXTURE_FULL_IMAGE ! uses all available pixels in the source image data. A value of ! AR_DRAW_TEXTURE_HALF_IMAGE discards every second row in the source image data, defining a half-height texture which is then drawn stretched vertically to double its height. *************** *** 427,431 **** The initial value is AR_DRAW_TEXTURE_FULL_IMAGE. </p> ! <dt><i>Availability</i></dt><dd>First appeared in ARToolKit 2.68. </dd> </dl> --- 464,481 ---- The initial value is AR_DRAW_TEXTURE_FULL_IMAGE. </p> ! <dt><i>Availability</i></dt><dd>First appeared in ARToolKit 2.72. ! </dd> ! </dl> ! <hr><!-- headerDoc=func; uid=//apple_ref/c/func/arglTexRectangleGet; name=arglTexRectangleGet --> ! <a name="//apple_ref/c/func/arglTexRectangleGet"></a> ! <table border="0" cellpadding="2" cellspacing="2" width="300"><tr><td valign="top" height="12" colspan="5"><h3><a name="arglTexRectangleGet">arglTexRectangleGet</a></h3> ! </td></tr></table><hr><dl></dl><p>Enquire as to use of rectangular TexImage2D pixel-transfer in arglDispImage(). ! </p> ! <blockquote><pre><!-- a logicalPath="//apple_ref/c/cl/int //apple_ref/c/cl/int //apple_ref/c/tdef/int //apple_ref/c/tag/int //apple_ref/c/econst/int //apple_ref/c/struct/int //apple_ref/c/clconst/int" --><font class="type">int</font><!-- /a --> <!-- a logicalPath="//apple_ref/c/instm/arglTexRectangleGet //apple_ref/c/clm/arglTexRectangleGet //apple_ref/c/intfcm/arglTexRectangleGet //apple_ref/c/func/arglTexRectangleGet //apple_ref/c/ftmplt/arglTexRectangleGet //apple_ref/c/defn/arglTexRectangleGet //apple_ref/c/macro/arglTexRectangleGet" --><font class="function">arglTexRectangleGet</font><!-- /a -->( ! <!-- a logicalPath="//apple_ref/c/cl/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/cl/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/tdef/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/tag/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/econst/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/struct/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/clconst/ARGL_CONTEXT_SETTINGS_REF" --><font class="type">ARGL_CONTEXT_SETTINGS_REF</font><!-- /a --> <font class="param">contextSettings</font>); </pre></blockquote> ! <dl><h5><font face="Lucida Grande,Helvetica,Arial">Discussion</font></h5><p>Enquires as to the current value of the TexRectangle setting. See arglTexRectangleSet() ! for more info. ! </p> ! <dt><i>Availability</i></dt><dd>First appeared in ARToolKit 2.72. </dd> </dl> *************** *** 445,455 **** <br><br> If the OpenGL driver available at runtime does not support for rectangular textures, ! changing the value of this variable to TRUE will result calls to arglDispImage performing no drawing. </p> ! <dt><i>Availability</i></dt><dd>First appeared in ARToolKit 2.68. </dd> </dl> ! <p><p>© 2003-2005 Philip Lamb ! (Last Updated August 29, 2005) </p></body></html> --- 495,505 ---- <br><br> If the OpenGL driver available at runtime does not support for rectangular textures, ! changing the value of this setting to TRUE will result calls to arglDispImage performing no drawing. </p> ! <dt><i>Availability</i></dt><dd>First appeared in ARToolKit 2.72. </dd> </dl> ! <p><p>© 2003-2006 Philip Lamb ! (Last Updated June 23, 2006) </p></body></html> |
Update of /cvsroot/artoolkit/artoolkit/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16483 Modified Files: annotated.html arMulti_8h.html ar_8h.html doxygen.css files.html footer.html globals.html globals_defs.html globals_func.html globals_type.html globals_vars.html gsubUtil_8h.html gsub_8h.html index.html matrix_8h.html param_8h.html structARMarkerInfo.html structARMarkerInfo2.html structARMat.html structARMultiEachMarkerInfoT.html structARMultiMarkerInfoT.html structARParam.html structARVec.html structarPrevInfo.html video_8h.html Removed Files: functions_rela.html globals_enum.html Log Message: Refresh documentation. Index: structARMultiMarkerInfoT.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/structARMultiMarkerInfoT.html,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** structARMultiMarkerInfoT.html 23 Aug 2005 19:17:00 -0000 1.1 --- structARMultiMarkerInfoT.html 22 May 2006 23:03:18 -0000 1.2 *************** *** 7,13 **** </head> <body> ! <!-- Generated by Doxygen 1.4.3 --> ! <div class="qindex"><a class="qindex" href="index.html">Main Page</a> | <a class="qindex" href="annotated.html">Data Structures</a> | <a class="qindex" href="files.html">File List</a> | <a class="qindex" href="globals.html">Globals</a></div> ! <h1>ARMultiMarkerInfoT Struct Reference</h1><!-- doxytag: class=<ARMultiMarkerInfoT> -->global multi-marker structure <a href="#_details">More...</a> <p> --- 7,23 ---- </head> <body> ! <!-- Generated by Doxygen 1.4.6 --> ! <div class="tabs"> ! <ul> ! <li><a href="index.html"><span>Main Page</span></a></li> ! <li id="current"><a href="annotated.html"><span>Data Structures</span></a></li> ! <li><a href="files.html"><span>Files</span></a></li> ! </ul></div> ! <div class="tabs"> ! <ul> ! <li><a href="annotated.html"><span>Data Structures</span></a></li> ! <li><a href="hierarchy.html"><span>Class Hierarchy</span></a></li> ! </ul></div> ! <h1>ARMultiMarkerInfoT Struct Reference</h1><!-- doxytag: class="ARMultiMarkerInfoT" -->global multi-marker structure <a href="#_details">More...</a> <p> *************** *** 17,33 **** <tr><td></td></tr> <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="anchor" name="o0"></a><!-- doxytag: member=<ARMultiMarkerInfoT::marker> ref=<o0> args=<> --> <a class="el" href="structARMultiEachMarkerInfoT.html">ARMultiEachMarkerInfoT</a> * </td><td class="memItemRight" valign="bottom"><b>marker</b></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="anchor" name="o1"></a><!-- doxytag: member=<ARMultiMarkerInfoT::marker_num> ref=<o1> args=<> --> int </td><td class="memItemRight" valign="bottom"><b>marker_num</b></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="anchor" name="o2"></a><!-- doxytag: member=<ARMultiMarkerInfoT::trans> ref=<o2> args=<[3][4]> --> double </td><td class="memItemRight" valign="bottom"><b>trans</b> [3][4]</td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="anchor" name="o3"></a><!-- doxytag: member=<ARMultiMarkerInfoT::prevF> ref=<o3> args=<> --> int </td><td class="memItemRight" valign="bottom"><b>prevF</b></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="anchor" name="o4"></a><!-- doxytag: member=<ARMultiMarkerInfoT::transR> ref=<o4> args=<[3][4]> --> double </td><td class="memItemRight" valign="bottom"><b>transR</b> [3][4]</td></tr> --- 27,43 ---- <tr><td></td></tr> <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="anchor" name="22539c3c98fa6dd6999f965f40f2be4f"></a><!-- doxytag: member="ARMultiMarkerInfoT::marker" ref="22539c3c98fa6dd6999f965f40f2be4f" args="" --> <a class="el" href="structARMultiEachMarkerInfoT.html">ARMultiEachMarkerInfoT</a> * </td><td class="memItemRight" valign="bottom"><b>marker</b></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="anchor" name="f69b4982b5e1fab6293eac905924936f"></a><!-- doxytag: member="ARMultiMarkerInfoT::marker_num" ref="f69b4982b5e1fab6293eac905924936f" args="" --> int </td><td class="memItemRight" valign="bottom"><b>marker_num</b></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="anchor" name="1999571d071eb26b139eeb30730be49b"></a><!-- doxytag: member="ARMultiMarkerInfoT::trans" ref="1999571d071eb26b139eeb30730be49b" args="[3][4]" --> double </td><td class="memItemRight" valign="bottom"><b>trans</b> [3][4]</td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="anchor" name="bb7db9abf822c3986a83be3a7ada84eb"></a><!-- doxytag: member="ARMultiMarkerInfoT::prevF" ref="bb7db9abf822c3986a83be3a7ada84eb" args="" --> int </td><td class="memItemRight" valign="bottom"><b>prevF</b></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="anchor" name="f85f1d51d3c47000953b4086f4b61b53"></a><!-- doxytag: member="ARMultiMarkerInfoT::transR" ref="f85f1d51d3c47000953b4086f4b61b53" args="[3][4]" --> double </td><td class="memItemRight" valign="bottom"><b>transR</b> [3][4]</td></tr> *************** *** 43,47 **** <tr><td valign="top"></td><td valign="top"><em>trans</em> </td><td>position of the multi-marker pattern (more precisely, the camera position in the multi-marker CS) </td></tr> <tr><td valign="top"></td><td valign="top"><em>prevF</em> </td><td>boolean flag for visibility </td></tr> ! <tr><td valign="top"></td><td valign="top"><em>transR</em> </td><td>last position</td></tr> </table> </dl> --- 53,57 ---- <tr><td valign="top"></td><td valign="top"><em>trans</em> </td><td>position of the multi-marker pattern (more precisely, the camera position in the multi-marker CS) </td></tr> <tr><td valign="top"></td><td valign="top"><em>prevF</em> </td><td>boolean flag for visibility </td></tr> ! <tr><td valign="top"></td><td valign="top"><em>transR</em> </td><td>last position </td></tr> </table> </dl> *************** *** 52,56 **** <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2005. HIT Lab NZ. All Rights Reserved.</small> </body> </html> --- 62,66 ---- <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2006. HIT Lab NZ. All Rights Reserved.</small> </body> </html> Index: structARParam.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/structARParam.html,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** structARParam.html 23 Aug 2005 19:17:00 -0000 1.1 --- structARParam.html 22 May 2006 23:03:18 -0000 1.2 *************** *** 7,13 **** </head> <body> ! <!-- Generated by Doxygen 1.4.3 --> ! <div class="qindex"><a class="qindex" href="index.html">Main Page</a> | <a class="qindex" href="annotated.html">Data Structures</a> | <a class="qindex" href="files.html">File List</a> | <a class="qindex" href="globals.html">Globals</a></div> ! <h1>ARParam Struct Reference</h1><!-- doxytag: class=<ARParam> -->camera intrinsic parameters. <a href="#_details">More...</a> <p> --- 7,23 ---- </head> <body> ! <!-- Generated by Doxygen 1.4.6 --> ! <div class="tabs"> ! <ul> ! <li><a href="index.html"><span>Main Page</span></a></li> ! <li id="current"><a href="annotated.html"><span>Data Structures</span></a></li> ! <li><a href="files.html"><span>Files</span></a></li> ! </ul></div> ! <div class="tabs"> ! <ul> ! <li><a href="annotated.html"><span>Data Structures</span></a></li> ! <li><a href="hierarchy.html"><span>Class Hierarchy</span></a></li> ! </ul></div> ! <h1>ARParam Struct Reference</h1><!-- doxytag: class="ARParam" -->camera intrinsic parameters. <a href="#_details">More...</a> <p> *************** *** 17,30 **** <tr><td></td></tr> <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="anchor" name="o0"></a><!-- doxytag: member=<ARParam::xsize> ref=<o0> args=<> --> int </td><td class="memItemRight" valign="bottom"><b>xsize</b></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="anchor" name="o1"></a><!-- doxytag: member=<ARParam::ysize> ref=<o1> args=<> --> int </td><td class="memItemRight" valign="bottom"><b>ysize</b></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="anchor" name="o2"></a><!-- doxytag: member=<ARParam::mat> ref=<o2> args=<[3][4]> --> double </td><td class="memItemRight" valign="bottom"><b>mat</b> [3][4]</td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="anchor" name="o3"></a><!-- doxytag: member=<ARParam::dist_factor> ref=<o3> args=<[4]> --> double </td><td class="memItemRight" valign="bottom"><b>dist_factor</b> [4]</td></tr> --- 27,40 ---- <tr><td></td></tr> <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="anchor" name="b51328c8a457075bdf5a2f1c28268a7c"></a><!-- doxytag: member="ARParam::xsize" ref="b51328c8a457075bdf5a2f1c28268a7c" args="" --> int </td><td class="memItemRight" valign="bottom"><b>xsize</b></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="anchor" name="3dd7aa7c68c509623292e3967fd942c0"></a><!-- doxytag: member="ARParam::ysize" ref="3dd7aa7c68c509623292e3967fd942c0" args="" --> int </td><td class="memItemRight" valign="bottom"><b>ysize</b></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="anchor" name="ced3b4f9f448d945169381423580ab4f"></a><!-- doxytag: member="ARParam::mat" ref="ced3b4f9f448d945169381423580ab4f" args="[3][4]" --> double </td><td class="memItemRight" valign="bottom"><b>mat</b> [3][4]</td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="anchor" name="29a7115a004935ba7b36796f46ecb109"></a><!-- doxytag: member="ARParam::dist_factor" ref="29a7115a004935ba7b36796f46ecb109" args="[4]" --> double </td><td class="memItemRight" valign="bottom"><b>dist_factor</b> [4]</td></tr> *************** *** 38,42 **** <tr><td valign="top"></td><td valign="top"><em>ysize</em> </td><td>height of the image (in pixels). </td></tr> <tr><td valign="top"></td><td valign="top"><em>mat</em> </td><td>perspective matrix (K). </td></tr> ! <tr><td valign="top"></td><td valign="top"><em>dist_factor</em> </td><td>radial distortions factor dist_factor[0]=x center of distortion dist_factor[1]=y center of distortion dist_factor[2]=distortion factor dist_factor[3]=scale factor</td></tr> </table> </dl> --- 48,52 ---- <tr><td valign="top"></td><td valign="top"><em>ysize</em> </td><td>height of the image (in pixels). </td></tr> <tr><td valign="top"></td><td valign="top"><em>mat</em> </td><td>perspective matrix (K). </td></tr> ! <tr><td valign="top"></td><td valign="top"><em>dist_factor</em> </td><td>radial distortions factor dist_factor[0]=x center of distortion dist_factor[1]=y center of distortion dist_factor[2]=distortion factor dist_factor[3]=scale factor </td></tr> </table> </dl> *************** *** 47,51 **** <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2005. HIT Lab NZ. All Rights Reserved.</small> </body> </html> --- 57,61 ---- <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2006. HIT Lab NZ. All Rights Reserved.</small> </body> </html> Index: globals_vars.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/globals_vars.html,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** globals_vars.html 23 Aug 2005 19:17:00 -0000 1.1 --- globals_vars.html 22 May 2006 23:03:18 -0000 1.2 *************** *** 7,34 **** </head> <body> ! <!-- Generated by Doxygen 1.4.3 --> ! <div class="qindex"><a class="qindex" href="index.html">Main Page</a> | <a class="qindex" href="annotated.html">Data Structures</a> | <a class="qindex" href="files.html">File List</a> | <a class="qindexHL" href="globals.html">Globals</a></div> ! <div class="qindex"><a class="qindex" href="globals.html">All</a> | <a class="qindex" href="globals_func.html">Functions</a> | <a class="qindexHL" href="globals_vars.html">Variables</a> | <a class="qindex" href="globals_type.html">Typedefs</a> | <a class="qindex" href="globals_enum.html">Enumerations</a> | <a class="qindex" href="globals_defs.html">Defines</a></div> ! <p> <ul> <li>arDebug ! : <a class="el" href="ar_8h.html#a7">ar.h</a><li>arFittingMode ! : <a class="el" href="ar_8h.html#a9">ar.h</a><li>argDrawMode ! : <a class="el" href="gsub_8h.html#a0">gsub.h</a><li>arglDrawMode ! : <a class="el" href="gsub_lite/index.html">gsub_lite.h</a><li>arglTexmapMode ! : <a class="el" href="gsub_lite/index.html">gsub_lite.h</a><li>arglTexRectangle ! : <a class="el" href="gsub_lite/index.html">gsub_lite.h</a><li>argTexmapMode ! : <a class="el" href="gsub_8h.html#a1">gsub.h</a><li>arImage ! : <a class="el" href="ar_8h.html#a8">ar.h</a><li>arImageProcMode ! : <a class="el" href="ar_8h.html#a10">ar.h</a><li>arImXsize ! : <a class="el" href="ar_8h.html#a12">ar.h</a><li>arImYsize ! : <a class="el" href="ar_8h.html#a13">ar.h</a><li>arMatchingPCAMode ! : <a class="el" href="ar_8h.html#a15">ar.h</a><li>arParam ! : <a class="el" href="ar_8h.html#a11">ar.h</a><li>arTemplateMatchingMode ! : <a class="el" href="ar_8h.html#a14">ar.h</a></ul> <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2005. HIT Lab NZ. All Rights Reserved.</small> </body> </html> --- 7,49 ---- </head> <body> ! <!-- Generated by Doxygen 1.4.6 --> ! <div class="tabs"> ! <ul> ! <li><a href="index.html"><span>Main Page</span></a></li> ! <li><a href="annotated.html"><span>Data Structures</span></a></li> ! <li id="current"><a href="files.html"><span>Files</span></a></li> ! </ul></div> ! <div class="tabs"> ! <ul> ! <li><a href="files.html"><span>File List</span></a></li> ! <li id="current"><a href="globals.html"><span>Globals</span></a></li> ! </ul></div> ! <div class="tabs"> ! <ul> ! <li><a href="globals.html"><span>All</span></a></li> ! <li><a href="globals_func.html"><span>Functions</span></a></li> ! <li id="current"><a href="globals_vars.html"><span>Variables</span></a></li> ! <li><a href="globals_type.html"><span>Typedefs</span></a></li> ! <li><a href="globals_defs.html"><span>Defines</span></a></li> ! </ul> ! </div> ! <p> <ul> <li>arDebug ! : <a class="el" href="ar_8h.html#de5bfd73c6f13e88ef3ef5d81ab7b423">ar.h</a><li>arFittingMode ! : <a class="el" href="ar_8h.html#00e128be0b9f056317cf4836884a4638">ar.h</a><li>argDrawMode ! : <a class="el" href="gsub_8h.html#ab99b6f68f69ee43f4d0abdae66222fe">gsub.h</a><li>argTexmapMode ! : <a class="el" href="gsub_8h.html#21740edb5e673518101442e9428c0cff">gsub.h</a><li>arImage ! : <a class="el" href="ar_8h.html#79e81de8a750c4ffc4404a91a9588bfc">ar.h</a><li>arImageProcMode ! : <a class="el" href="ar_8h.html#d4045aca4dba2521ac5da187d326a726">ar.h</a><li>arImXsize ! : <a class="el" href="ar_8h.html#849c998539d5da979412026f09a603ca">ar.h</a><li>arImYsize ! : <a class="el" href="ar_8h.html#f37d0b07126866ac30bc35b384ea1661">ar.h</a><li>arMatchingPCAMode ! : <a class="el" href="ar_8h.html#cfa9baadb964cb0cd48764b278cb926c">ar.h</a><li>arParam ! : <a class="el" href="ar_8h.html#639363f64c4e3cd431e90a2fc0fcd8b8">ar.h</a><li>arTemplateMatchingMode ! : <a class="el" href="ar_8h.html#1665da981c98d36c150d8be1ea9828bc">ar.h</a></ul> <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2006. HIT Lab NZ. All Rights Reserved.</small> </body> </html> Index: files.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/files.html,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** files.html 23 Aug 2005 19:17:00 -0000 1.1 --- files.html 22 May 2006 23:03:18 -0000 1.2 *************** *** 7,12 **** </head> <body> ! <!-- Generated by Doxygen 1.4.3 --> ! <div class="qindex"><a class="qindex" href="index.html">Main Page</a> | <a class="qindex" href="annotated.html">Data Structures</a> | <a class="qindexHL" href="files.html">File List</a> | <a class="qindex" href="globals.html">Globals</a></div> <h1>ARToolKit File List</h1>Here is a list of all documented files with brief descriptions:<table> <tr><td class="indexkey"><a class="el" href="ar_8h.html">ar.h</a></td><td class="indexvalue">ARToolKit subroutines </td></tr> --- 7,22 ---- </head> <body> ! <!-- Generated by Doxygen 1.4.6 --> ! <div class="tabs"> ! <ul> ! <li><a href="index.html"><span>Main Page</span></a></li> ! <li><a href="annotated.html"><span>Data Structures</span></a></li> ! <li id="current"><a href="files.html"><span>Files</span></a></li> ! </ul></div> ! <div class="tabs"> ! <ul> ! <li id="current"><a href="files.html"><span>File List</span></a></li> ! <li><a href="globals.html"><span>Globals</span></a></li> ! </ul></div> <h1>ARToolKit File List</h1>Here is a list of all documented files with brief descriptions:<table> <tr><td class="indexkey"><a class="el" href="ar_8h.html">ar.h</a></td><td class="indexvalue">ARToolKit subroutines </td></tr> *************** *** 21,25 **** <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2005. HIT Lab NZ. All Rights Reserved.</small> </body> </html> --- 31,35 ---- <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2006. HIT Lab NZ. All Rights Reserved.</small> </body> </html> Index: footer.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/footer.html,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** footer.html 24 Aug 2005 01:32:38 -0000 1.1 --- footer.html 22 May 2006 23:03:18 -0000 1.2 *************** *** 1,5 **** <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2005. HIT Lab NZ. All Rights Reserved.</small> </body> </html> --- 1,5 ---- <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2006. HIT Lab NZ. All Rights Reserved.</small> </body> </html> --- functions_rela.html DELETED --- Index: structARMat.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/structARMat.html,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** structARMat.html 23 Aug 2005 19:17:00 -0000 1.1 --- structARMat.html 22 May 2006 23:03:18 -0000 1.2 *************** *** 7,13 **** </head> <body> ! <!-- Generated by Doxygen 1.4.3 --> ! <div class="qindex"><a class="qindex" href="index.html">Main Page</a> | <a class="qindex" href="annotated.html">Data Structures</a> | <a class="qindex" href="files.html">File List</a> | <a class="qindex" href="globals.html">Globals</a></div> ! <h1>ARMat Struct Reference</h1><!-- doxytag: class=<ARMat> -->matrix structure. <a href="#_details">More...</a> <p> --- 7,23 ---- </head> <body> ! <!-- Generated by Doxygen 1.4.6 --> ! <div class="tabs"> ! <ul> ! <li><a href="index.html"><span>Main Page</span></a></li> ! <li id="current"><a href="annotated.html"><span>Data Structures</span></a></li> ! <li><a href="files.html"><span>Files</span></a></li> ! </ul></div> ! <div class="tabs"> ! <ul> ! <li><a href="annotated.html"><span>Data Structures</span></a></li> ! <li><a href="hierarchy.html"><span>Class Hierarchy</span></a></li> ! </ul></div> ! <h1>ARMat Struct Reference</h1><!-- doxytag: class="ARMat" -->matrix structure. <a href="#_details">More...</a> <p> *************** *** 17,27 **** <tr><td></td></tr> <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="anchor" name="o0"></a><!-- doxytag: member=<ARMat::m> ref=<o0> args=<> --> double * </td><td class="memItemRight" valign="bottom"><b>m</b></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="anchor" name="o1"></a><!-- doxytag: member=<ARMat::row> ref=<o1> args=<> --> int </td><td class="memItemRight" valign="bottom"><b>row</b></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="anchor" name="o2"></a><!-- doxytag: member=<ARMat::clm> ref=<o2> args=<> --> int </td><td class="memItemRight" valign="bottom"><b>clm</b></td></tr> --- 27,37 ---- <tr><td></td></tr> <tr><td colspan="2"><br><h2>Data Fields</h2></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="anchor" name="3b919177e92815e987b07ab165da01a7"></a><!-- doxytag: member="ARMat::m" ref="3b919177e92815e987b07ab165da01a7" args="" --> double * </td><td class="memItemRight" valign="bottom"><b>m</b></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="anchor" name="0160fe7dfa8111eed279781649c5549a"></a><!-- doxytag: member="ARMat::row" ref="0160fe7dfa8111eed279781649c5549a" args="" --> int </td><td class="memItemRight" valign="bottom"><b>row</b></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="anchor" name="87acc8f1caab5cf519ec7566325915ae"></a><!-- doxytag: member="ARMat::clm" ref="87acc8f1caab5cf519ec7566325915ae" args="" --> int </td><td class="memItemRight" valign="bottom"><b>clm</b></td></tr> *************** *** 42,46 **** <tr><td valign="top"></td><td valign="top"><em>m</em> </td><td>content of matrix </td></tr> <tr><td valign="top"></td><td valign="top"><em>row</em> </td><td>number of lines in matrix </td></tr> ! <tr><td valign="top"></td><td valign="top"><em>clm</em> </td><td>number of column in matrix</td></tr> </table> </dl> --- 52,56 ---- <tr><td valign="top"></td><td valign="top"><em>m</em> </td><td>content of matrix </td></tr> <tr><td valign="top"></td><td valign="top"><em>row</em> </td><td>number of lines in matrix </td></tr> ! <tr><td valign="top"></td><td valign="top"><em>clm</em> </td><td>number of column in matrix </td></tr> </table> </dl> *************** *** 51,55 **** <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2005. HIT Lab NZ. All Rights Reserved.</small> </body> </html> --- 61,65 ---- <small>Generated with <a href="http://www.doxygen.org/index.html">Doxygen</a><br> ! Copyright © 2004-2006. HIT Lab NZ. All Rights Reserved.</small> </body> </html> Index: matrix_8h.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/matrix_8h.html,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** matrix_8h.html 23 Aug 2005 19:17:00 -0000 1.1 --- matrix_8h.html 22 May 2006 23:03:18 -0000 1.2 *************** *** 7,12 **** </head> <body> ! <!-- Generated by Doxygen 1.4.3 --> ! <div class="qindex"><a class="qindex" href="index.html">Main Page</a> | <a class="qindex" href="annotated.html">Data Structures</a> | <a class="qindex" href="files.html">File List</a> | <a class="qindex" href="globals.html">Globals</a></div> <h1>matrix.h File Reference</h1>ARToolkit algebric mathematics subroutines. <a href="#_details">More...</a> <p> --- 7,22 ---- </head> <body> ! <!-- Generated by Doxygen 1.4.6 --> ! <div class="tabs"> ! <ul> ! <li><a href="index.html"><span>Main Page</span></a></li> ! <li><a href="annotated.html"><span>Data Structures</span></a></li> ! <li id="current"><a href="files.html"><span>Files</span></a></li> ! </ul></div> ! <div class="tabs"> ! <ul> ! <li><a href="files.html"><span>File List</span></a></li> ! <li><a href="globals.html"><span>Globals</span></a></li> ! </ul></div> <h1>matrix.h File Reference</h1>ARToolkit algebric mathematics subroutines. <a href="#_details">More...</a> <p> *************** *** 23,104 **** <tr><td class="mdescLeft"> </td><td class="mdescRight">vector structure. <a href="structARVec.html#_details">More...</a><br></td></tr> <tr><td colspan="2"><br><h2>Defines</h2></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="anchor" name="a0"></a><!-- doxytag: member=<matrix.h::ARELEM0> ref=<a0> args=<(mat, r, c)> --> ! #define </td><td class="memItemRight" valign="bottom"><a class="el" href="matrix_8h.html#a0">ARELEM0</a>(mat, r, c) ((mat)->m[(r)*((mat)->clm)+(c)])</td></tr> <tr><td class="mdescLeft"> </td><td class="mdescRight">macro function that give direct access to an element (0 origin) <br></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="anchor" name="a1"></a><!-- doxytag: member=<matrix.h::ARELEM1> ref=<a1> args=<(mat, row, clm)> --> ! #define </td><td class="memItemRight" valign="bottom"><a class="el" href="matrix_8h.html#a1">ARELEM1</a>(mat, row, clm) ARELEM0(mat,row-1,clm-1)</td></tr> <tr><td class="mdescLeft"> </td><td class="mdescRight">macro function that give direct access to an element (1 origin) <br></td></tr> <tr><td colspan="2"><br><h2>Functions</h2></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structARMat.html">ARMat</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="matrix_8h.html#a2">arMatrixAlloc</a> (int row, int clm)</td></tr> ! <tr><td class="mdescLeft"> </td><td class="mdescRight">creates a new matrix. <a href="#a2"></a><br></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="matrix_8h.html#a3">arMatrixFree</a> (<a class="el" href="structARMat.html">ARMat</a> *m)</td></tr> ! <tr><td class="mdescLeft"> </td><td class="mdescRight">deletes a matrix. <a href="#a3"></a><br></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="matrix_8h.html#a4">arMatrixDup</a> (<a class="el" href="structARMat.html">ARMat</a> *dest, <a class="el" href="structARMat.html">ARMat</a> *source)</td></tr> ! <tr><td class="mdescLeft"> </td><td class="mdescRight">copy a matrix <a href="#a4"></a><br></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structARMat.html">ARMat</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="matrix_8h.html#a5">arMatrixAllocDup</a> (<a class="el" href="structARMat.html">ARMat</a> *source)</td></tr> ! <tr><td class="mdescLeft"> </td><td class="mdescRight">dumps a new matrix <a href="#a5"></a><br></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="matrix_8h.html#a6">arMatrixUnit</a> (<a class="el" href="structARMat.html">ARMat</a> *unit)</td></tr> ! <tr><td class="mdescLeft"> </td><td class="mdescRight">Creates a unit matrix. <a href="#a6"></a><br></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structARMat.html">ARMat</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="matrix_8h.html#a7">arMatrixAllocUnit</a> (int dim)</td></tr> ! <tr><td class="mdescLeft"> </td><td class="mdescRight">Creates a unit matrix. <a href="#a7"></a><br></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="matrix_8h.html#a8">arMatrixMul</a> (<a class="el" href="structARMat.html">ARMat</a> *dest, <a class="el" href="structARMat.html">ARMat</a> *a, <a class="el" href="structARMat.html">ARMat</a> *b)</td></tr> ! <tr><td class="mdescLeft"> </td><td class="mdescRight">Multiply two matrix. <a href="#a8"></a><br></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structARMat.html">ARMat</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="matrix_8h.html#a9">arMatrixAllocMul</a> (<a class="el" href="structARMat.html">ARMat</a> *a, <a class="el" href="structARMat.html">ARMat</a> *b)</td></tr> ! <tr><td class="mdescLeft"> </td><td class="mdescRight">Multiply two matrix with memory allocation. <a href="#a9"></a><br></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="matrix_8h.html#a10">arMatrixTrans</a> (<a class="el" href="structARMat.html">ARMat</a> *dest, <a class="el" href="structARMat.html">ARMat</a> *source)</td></tr> ! <tr><td class="mdescLeft"> </td><td class="mdescRight">transposes a matrix. <a href="#a10"></a><br></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structARMat.html">ARMat</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="matrix_8h.html#a11">arMatrixAllocTrans</a> (<a class="el" href="structARMat.html">ARMat</a> *source)</td></tr> ! <tr><td class="mdescLeft"> </td><td class="mdescRight">transposes a matrix with allocation. <a href="#a11"></a><br></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="matrix_8h.html#a12">arMatrixInv</a> (<a class="el" href="structARMat.html">ARMat</a> *dest, <a class="el" href="structARMat.html">ARMat</a> *source)</td></tr> ! <tr><td class="mdescLeft"> </td><td class="mdescRight">inverse a matrix. <a href="#a12"></a><br></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="matrix_8h.html#a13">arMatrixSelfInv</a> (<a class="el" href="structARMat.html">ARMat</a> *m)</td></tr> ! <tr><td class="mdescLeft"> </td><td class="mdescRight">inverses a matrix. <a href="#a13"></a><br></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structARMat.html">ARMat</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="matrix_8h.html#a14">arMatrixAllocInv</a> (<a class="el" href="structARMat.html">ARMat</a> *source)</td></tr> ! <tr><td class="mdescLeft"> </td><td class="mdescRight">inverses a matrix. <a href="#a14"></a><br></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top">double </td><td class="memItemRight" valign="bottom"><a class="el" href="matrix_8h.html#a15">arMatrixDet</a> (<a class="el" href="structARMat.html">ARMat</a> *m)</td></tr> ! <tr><td class="mdescLeft"> </td><td class="mdescRight">compute determinant of a matrix. <a href="#a15"></a><br></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="matrix_8h.html#a16">arMatrixPCA</a> (<a class="el" href="structARMat.html">ARMat</a> *input, <a class="el" href="structARMat.html">ARMat</a> *evec, <a class="el" href="structARVec.html">ARVec</a> *ev, <a class="el" href="structARVec.html">ARVec</a> *mean)</td></tr> ! <tr><td class="mdescLeft"> </td><td class="mdescRight">compute the PCA of a matrix. <a href="#a16"></a><br></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="matrix_8h.html#a17">arMatrixPCA2</a> (<a class="el" href="structARMat.html">ARMat</a> *input, <a class="el" href="structARMat.html">ARMat</a> *evec, <a class="el" href="structARVec.html">ARVec</a> *ev)</td></tr> ! <tr><td class="mdescLeft"> </td><td class="mdescRight">compute the PCA of a matrix. <a href="#a17"></a><br></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="matrix_8h.html#a18">arMatrixDisp</a> (<a class="el" href="structARMat.html">ARMat</a> *m)</td></tr> ! <tr><td class="mdescLeft"> </td><td class="mdescRight">display content of a matrix. <a href="#a18"></a><br></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structARVec.html">ARVec</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="matrix_8h.html#a19">arVecAlloc</a> (int clm)</td></tr> ! <tr><td class="mdescLeft"> </td><td class="mdescRight">creates a new vector. <a href="#a19"></a><br></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="matrix_8h.html#a20">arVecFree</a> (<a class="el" href="structARVec.html">ARVec</a> *v)</td></tr> ! <tr><td class="mdescLeft"> </td><td class="mdescRight">delete a vector. <a href="#a20"></a><br></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="matrix_8h.html#a21">arVecDisp</a> (<a class="el" href="structARVec.html">ARVec</a> *v)</td></tr> ! <tr><td class="mdescLeft"> </td><td class="mdescRight">display a vector. <a href="#a21"></a><br></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top">double </td><td class="memItemRight" valign="bottom"><a class="el" href="matrix_8h.html#a22">arVecHousehold</a> (<a class="el" href="structARVec.html">ARVec</a> *x)</td></tr> ! <tr><td class="mdescLeft"> </td><td class="mdescRight">XXXBK. <a href="#a22"></a><br></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top">double </td><td class="memItemRight" valign="bottom"><a class="el" href="matrix_8h.html#a23">arVecInnerproduct</a> (<a class="el" href="structARVec.html">ARVec</a> *x, <a class="el" href="structARVec.html">ARVec</a> *y)</td></tr> ! <tr><td class="mdescLeft"> </td><td class="mdescRight">Computes the inner product of 2 vectors. <a href="#a23"></a><br></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="matrix_8h.html#a24">arVecTridiagonalize</a> (<a class="el" href="structARMat.html">ARMat</a> *a, <a class="el" href="structARVec.html">ARVec</a> *d, <a class="el" href="structARVec.html">ARVec</a> *e)</td></tr> ! <tr><td class="mdescLeft"> </td><td class="mdescRight">XXXBK. <a href="#a24"></a><br></td></tr> </table> <hr><a name="_details"></a><h2>Detailed Description</h2> --- 33,114 ---- <tr><td class="mdescLeft"> </td><td class="mdescRight">vector structure. <a href="structARVec.html#_details">More...</a><br></td></tr> <tr><td colspan="2"><br><h2>Defines</h2></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="anchor" name="7a935ae1197adde7e3476dbfbfc4f99e"></a><!-- doxytag: member="matrix.h::ARELEM0" ref="7a935ae1197adde7e3476dbfbfc4f99e" args="(mat, r, c)" --> ! #define </td><td class="memItemRight" valign="bottom"><a class="el" href="matrix_8h.html#7a935ae1197adde7e3476dbfbfc4f99e">ARELEM0</a>(mat, r, c) ((mat)->m[(r)*((mat)->clm)+(c)])</td></tr> <tr><td class="mdescLeft"> </td><td class="mdescRight">macro function that give direct access to an element (0 origin) <br></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="anchor" name="f33714038d5eb3748816c2361af9d7b2"></a><!-- doxytag: member="matrix.h::ARELEM1" ref="f33714038d5eb3748816c2361af9d7b2" args="(mat, row, clm)" --> ! #define </td><td class="memItemRight" valign="bottom"><a class="el" href="matrix_8h.html#f33714038d5eb3748816c2361af9d7b2">ARELEM1</a>(mat, row, clm) ARELEM0(mat,row-1,clm-1)</td></tr> <tr><td class="mdescLeft"> </td><td class="mdescRight">macro function that give direct access to an element (1 origin) <br></td></tr> <tr><td colspan="2"><br><h2>Functions</h2></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structARMat.html">ARMat</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="matrix_8h.html#69c9a974dc5a3963148ebb2c4a80f969">arMatrixAlloc</a> (int row, int clm)</td></tr> ! <tr><td class="mdescLeft"> </td><td class="mdescRight">creates a new matrix. <a href="#69c9a974dc5a3963148ebb2c4a80f969"></a><br></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="matrix_8h.html#c4b7a714cce9fffda773d86363380454">arMatrixFree</a> (<a class="el" href="structARMat.html">ARMat</a> *m)</td></tr> ! <tr><td class="mdescLeft"> </td><td class="mdescRight">deletes a matrix. <a href="#c4b7a714cce9fffda773d86363380454"></a><br></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="matrix_8h.html#988e4c76394edccbf1e86005b97f725a">arMatrixDup</a> (<a class="el" href="structARMat.html">ARMat</a> *dest, <a class="el" href="structARMat.html">ARMat</a> *source)</td></tr> ! <tr><td class="mdescLeft"> </td><td class="mdescRight">copy a matrix <a href="#988e4c76394edccbf1e86005b97f725a"></a><br></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structARMat.html">ARMat</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="matrix_8h.html#ce5d8c6eb6524469fbc3770081658081">arMatrixAllocDup</a> (<a class="el" href="structARMat.html">ARMat</a> *source)</td></tr> ! <tr><td class="mdescLeft"> </td><td class="mdescRight">dumps a new matrix <a href="#ce5d8c6eb6524469fbc3770081658081"></a><br></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="matrix_8h.html#8c8ecb09b4faa2e37ea4b0a48be9fa5f">arMatrixUnit</a> (<a class="el" href="structARMat.html">ARMat</a> *unit)</td></tr> ! <tr><td class="mdescLeft"> </td><td class="mdescRight">Creates a unit matrix. <a href="#8c8ecb09b4faa2e37ea4b0a48be9fa5f"></a><br></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structARMat.html">ARMat</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="matrix_8h.html#df89adb96eae03112c40dd44455632ba">arMatrixAllocUnit</a> (int dim)</td></tr> ! <tr><td class="mdescLeft"> </td><td class="mdescRight">Creates a unit matrix. <a href="#df89adb96eae03112c40dd44455632ba"></a><br></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="matrix_8h.html#202bc2db43d563792c99e852ea0b7ba4">arMatrixMul</a> (<a class="el" href="structARMat.html">ARMat</a> *dest, <a class="el" href="structARMat.html">ARMat</a> *a, <a class="el" href="structARMat.html">ARMat</a> *b)</td></tr> ! <tr><td class="mdescLeft"> </td><td class="mdescRight">Multiply two matrix. <a href="#202bc2db43d563792c99e852ea0b7ba4"></a><br></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structARMat.html">ARMat</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="matrix_8h.html#8e99293b68c38ce8a8d1920884d69f73">arMatrixAllocMul</a> (<a class="el" href="structARMat.html">ARMat</a> *a, <a class="el" href="structARMat.html">ARMat</a> *b)</td></tr> ! <tr><td class="mdescLeft"> </td><td class="mdescRight">Multiply two matrix with memory allocation. <a href="#8e99293b68c38ce8a8d1920884d69f73"></a><br></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="matrix_8h.html#d3d9712dd27f655902a8a3315e623d85">arMatrixTrans</a> (<a class="el" href="structARMat.html">ARMat</a> *dest, <a class="el" href="structARMat.html">ARMat</a> *source)</td></tr> ! <tr><td class="mdescLeft"> </td><td class="mdescRight">transposes a matrix. <a href="#d3d9712dd27f655902a8a3315e623d85"></a><br></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structARMat.html">ARMat</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="matrix_8h.html#4e2bf8cd529487fb1ff4d0bbc52eee1e">arMatrixAllocTrans</a> (<a class="el" href="structARMat.html">ARMat</a> *source)</td></tr> ! <tr><td class="mdescLeft"> </td><td class="mdescRight">transposes a matrix with allocation. <a href="#4e2bf8cd529487fb1ff4d0bbc52eee1e"></a><br></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="matrix_8h.html#bebae87acb77ccf8cd0c5da106238a86">arMatrixInv</a> (<a class="el" href="structARMat.html">ARMat</a> *dest, <a class="el" href="structARMat.html">ARMat</a> *source)</td></tr> ! <tr><td class="mdescLeft"> </td><td class="mdescRight">inverse a matrix. <a href="#bebae87acb77ccf8cd0c5da106238a86"></a><br></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="matrix_8h.html#929738025b539a0c1bbd2f395ad4d981">arMatrixSelfInv</a> (<a class="el" href="structARMat.html">ARMat</a> *m)</td></tr> ! <tr><td class="mdescLeft"> </td><td class="mdescRight">inverses a matrix. <a href="#929738025b539a0c1bbd2f395ad4d981"></a><br></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structARMat.html">ARMat</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="matrix_8h.html#fa96447f0f5d980c24357f31c635ab3e">arMatrixAllocInv</a> (<a class="el" href="structARMat.html">ARMat</a> *source)</td></tr> ! <tr><td class="mdescLeft"> </td><td class="mdescRight">inverses a matrix. <a href="#fa96447f0f5d980c24357f31c635ab3e"></a><br></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top">double </td><td class="memItemRight" valign="bottom"><a class="el" href="matrix_8h.html#d62b7d75215876f66f92fdafc468f476">arMatrixDet</a> (<a class="el" href="structARMat.html">ARMat</a> *m)</td></tr> ! <tr><td class="mdescLeft"> </td><td class="mdescRight">compute determinant of a matrix. <a href="#d62b7d75215876f66f92fdafc468f476"></a><br></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="matrix_8h.html#04d062f49b83d57ac0dec5e906dfcd32">arMatrixPCA</a> (<a class="el" href="structARMat.html">ARMat</a> *input, <a class="el" href="structARMat.html">ARMat</a> *evec, <a class="el" href="structARVec.html">ARVec</a> *ev, <a class="el" href="structARVec.html">ARVec</a> *mean)</td></tr> ! <tr><td class="mdescLeft"> </td><td class="mdescRight">compute the PCA of a matrix. <a href="#04d062f49b83d57ac0dec5e906dfcd32"></a><br></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="matrix_8h.html#c30a83b25ff3599f4b0082203dff0fac">arMatrixPCA2</a> (<a class="el" href="structARMat.html">ARMat</a> *input, <a class="el" href="structARMat.html">ARMat</a> *evec, <a class="el" href="structARVec.html">ARVec</a> *ev)</td></tr> ! <tr><td class="mdescLeft"> </td><td class="mdescRight">compute the PCA of a matrix. <a href="#c30a83b25ff3599f4b0082203dff0fac"></a><br></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="matrix_8h.html#60f36997579d355f6030f872faad84a2">arMatrixDisp</a> (<a class="el" href="structARMat.html">ARMat</a> *m)</td></tr> ! <tr><td class="mdescLeft"> </td><td class="mdescRight">display content of a matrix. <a href="#60f36997579d355f6030f872faad84a2"></a><br></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="el" href="structARVec.html">ARVec</a> * </td><td class="memItemRight" valign="bottom"><a class="el" href="matrix_8h.html#24a15cbbf606806e8a494f4943fb12fe">arVecAlloc</a> (int clm)</td></tr> ! <tr><td class="mdescLeft"> </td><td class="mdescRight">creates a new vector. <a href="#24a15cbbf606806e8a494f4943fb12fe"></a><br></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="matrix_8h.html#08c0d02dd8ddfb8a05d07f3fb80db2c4">arVecFree</a> (<a class="el" href="structARVec.html">ARVec</a> *v)</td></tr> ! <tr><td class="mdescLeft"> </td><td class="mdescRight">delete a vector. <a href="#08c0d02dd8ddfb8a05d07f3fb80db2c4"></a><br></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="matrix_8h.html#217351e5d447becfd775ba7d8bb72881">arVecDisp</a> (<a class="el" href="structARVec.html">ARVec</a> *v)</td></tr> ! <tr><td class="mdescLeft"> </td><td class="mdescRight">display a vector. <a href="#217351e5d447becfd775ba7d8bb72881"></a><br></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top">double </td><td class="memItemRight" valign="bottom"><a class="el" href="matrix_8h.html#2bac850b0a541eeca80cd83b81d2e44e">arVecHousehold</a> (<a class="el" href="structARVec.html">ARVec</a> *x)</td></tr> ! <tr><td class="mdescLeft"> </td><td class="mdescRight">XXXBK. <a href="#2bac850b0a541eeca80cd83b81d2e44e"></a><br></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top">double </td><td class="memItemRight" valign="bottom"><a class="el" href="matrix_8h.html#c10c5bda849bb765f1371ee2267e3ea5">arVecInnerproduct</a> (<a class="el" href="structARVec.html">ARVec</a> *x, <a class="el" href="structARVec.html">ARVec</a> *y)</td></tr> ! <tr><td class="mdescLeft"> </td><td class="mdescRight">Computes the inner product of 2 vectors. <a href="#c10c5bda849bb765f1371ee2267e3ea5"></a><br></td></tr> ! <tr><td class="memItemLeft" nowrap align="right" valign="top">int </td><td class="memItemRight" valign="bottom"><a class="el" href="matrix_8h.html#0411e88f92b95ecf0697c27f9bf9163d">arVecTridiagonalize</a> (<a class="el" href="structARMat.html">ARMat</a> *a, <a class="el" href="structARVec.html">ARVec</a> *d, <a class="el" href="structARVec.html">ARVec</a> *e)</td></tr> ! <tr><td class="mdescLeft"> </td><td class="mdescRight">XXXBK. <a href="#0411e88f92b95ecf0697c27f9bf9163d"></a><br></td></tr> </table> <hr><a name="_details"></a><h2>Detailed Description</h2> *************** *** 111,115 **** <dl compact><dt><b>Date:</b></dt><dd></dd></dl> <hr><h2>Function Documentation</h2> ! <a class="anchor" name="a2"></a><!-- doxytag: member=<matrix.h::arMatrixAlloc> ref=<a2> args=<(int row, int clm)> --><p> <table class="mdTable" cellpadding="2" cellspacing="0"> <tr> --- 121,125 ---- <dl compact><dt><b>Date:</b></dt><dd></dd></dl> <hr><h2>Function Documentation</h2> ! <a class="anchor" name="69c9a974dc5a3963148ebb2c4a80f969"></a><!-- doxytag: member="matrix.h::arMatrixAlloc" ref="69c9a974dc5a3963148ebb2c4a80f969" args="(int row, int clm)" --><p> <table class="mdTable" cellpadding="2" cellspacing="0"> <tr> *************** *** 153,161 **** </table> </dl> ! <dl compact><dt><b>Returns:</b></dt><dd>the matrix structure, NULL if allocation is impossible</dd></dl> </td> </tr> </table> ! <a class="anchor" name="a5"></a><!-- doxytag: member=<matrix.h::arMatrixAllocDup> ref=<a5> args=<(ARMat *source)> --><p> <table class="mdTable" cellpadding="2" cellspacing="0"> <tr> --- 163,171 ---- </table> </dl> ! <dl compact><dt><b>Returns:</b></dt><dd>the matrix structure, NULL if allocation is impossible </dd></dl> </td> </tr> </table> ! <a class="anchor" name="ce5d8c6eb6524469fbc3770081658081"></a><!-- doxytag: member="matrix.h::arMatrixAllocDup" ref="ce5d8c6eb6524469fbc3770081658081" args="(ARMat *source)" --><p> <table class="mdTable" cellpadding="2" cellspacing="0"> <tr> *************** *** 189,197 **** </table> </dl> ! <dl compact><dt><b>Returns:</b></dt><dd>the matrix if success, NULL if error</dd></dl> </td> </tr> </table> ! <a class="anchor" name="a14"></a><!-- doxytag: member=<matrix.h::arMatrixAllocInv> ref=<a14> args=<(ARMat *source)> --><p> <table class="mdTable" cellpadding="2" cellspacing="0"> <tr> --- 199,207 ---- </table> </dl> ! <dl compact><dt><b>Returns:</b></dt><dd>the matrix if success, NULL if error </dd></dl> </td> </tr> </table> ! <a class="anchor" name="fa96447f0f5d980c24357f31c635ab3e"></a><!-- doxytag: member="matrix.h::arMatrixAllocInv" ref="fa96447f0f5d980c24357f31c635ab3e" args="(ARMat *source)" --><p> <table class="mdTable" cellpadding="2" cellspacing="0"> <tr> *************** *** 225,233 **** </table> </dl> ! <dl compact><dt><b>Returns:</b></dt><dd>the inversed matrix if success, NULL if error</dd></dl> </td> </tr> </table> ! <a class="anchor" name="a9"></a><!-- doxytag: member=<matrix.h::arMatrixAllocMul> ref=<a9> args=<(ARMat *a, ARMat *b)> --><p> <table class="mdTable" cellpadding="2" cellspacing="0"> <tr> --- 235,243 ---- </table> </dl> ! <dl compact><dt><b>Returns:</b></dt><dd>the inversed matrix if success, NULL if error </dd></dl> </td> </tr> </table> ! <a class="anchor" name="8e99293b68c38ce8a8d1920884d69f73"></a><!-- doxytag: member="matrix.h::arMatrixAllocMul" ref="8e99293b68c38ce8a8d1920884d69f73" args="(ARMat *a, ARMat *b)" --><p> <table class="mdTable" cellpadding="2" cellspacing="0"> <tr> *************** *** 272,280 **** </table> </dl> ! <dl compact><dt><b>Returns:</b></dt><dd>the allocated matrix if success, NULL if error</dd></dl> </td> </tr> </table> ! <a class="anchor" name="a11"></a><!-- doxytag: member=<matrix.h::arMatrixAllocTrans> ref=<a11> args=<(ARMat *source)> --><p> <table class="mdTable" cellpadding="2" cellspacing="0"> <tr> --- 282,290 ---- </table> </dl> ! <dl compact><dt><b>Returns:</b></dt><dd>the allocated matrix if success, NULL if error </dd></dl> </td> </tr> </table> ! <a class="anchor" name="4e2bf8cd529487fb1ff4d0bbc52eee1e"></a><!-- doxytag: member="matrix.h::arMatrixAllocTrans" ref="4e2bf8cd529487fb1ff4d0bbc52eee1e" args="(ARMat *source)" --><p> <table class="mdTable" cellpadding="2" cellspacing="0"> <tr> *************** *** 308,316 **** </table> </dl> ! <dl compact><dt><b>Returns:</b></dt><dd>the allocated matrix if success, NULL if error (creation or transposition impossible)</dd></dl> </td> </tr> </table> ! <a class="anchor" name="a7"></a><!-- doxytag: member=<matrix.h::arMatrixAllocUnit> ref=<a7> args=<(int dim)> --><p> <table class="mdTable" cellpadding="2" cellspacing="0"> <tr> --- 318,326 ---- </table> </dl> ! <dl compact><dt><b>Returns:</b></dt><dd>the allocated matrix if success, NULL if error (creation or transposition impossible) </dd></dl> </td> </tr> </table> ! <a class="anchor" name="df89adb96eae03112c40dd44455632ba"></a><!-- doxytag: member="matrix.h::arMatrixAllocUnit" ref="df89adb96eae03112c40dd44455632ba" args="(int dim)" --><p> <table class="mdTable" cellpadding="2" cellspacing="0"> <tr> *************** *** 344,352 **** </table> </dl> ! <dl compact><dt><b>Returns:</b></dt><dd>the matrix allocated if success, NULL if error</dd></dl> </td> </tr> </table> ! <a class="anchor" name="a15"></a><!-- doxytag: member=<matrix.h::arMatrixDet> ref=<a15> args=<(ARMat *m)> --><p> <table class="mdTable" cellpadding="2" cellspacing="0"> <tr> --- 354,362 ---- </table> </dl> ! <dl compact><dt><b>Returns:</b></dt><dd>the matrix allocated if success, NULL if error </dd></dl> </td> </tr> </table> ! <a class="anchor" name="d62b7d75215876f66f92fdafc468f476"></a><!-- doxytag: member="matrix.h::arMatrixDet" ref="d62b7d75215876f66f92fdafc468f476" args="(ARMat *m)" --><p> <table class="mdTable" cellpadding="2" cellspacing="0"> <tr> *************** *** 380,388 **** </table> </dl> ! <dl compact><dt><b>Returns:</b></dt><dd>the computed determinant</dd></dl> </td> </tr> </table> ! <a class="anchor" name="a18"></a><!-- doxytag: member=<matrix.h::arMatrixDisp> ref=<a18> args=<(ARMat *m)> --><p> <table class="mdTable" cellpadding="2" cellspacing="0"> <tr> --- 390,398 ---- </table> </dl> ! <dl compact><dt><b>Returns:</b></dt><dd>the computed determinant </dd></dl> </td> </tr> </table> ! <a class="anchor" name="60f36997579d355f6030f872faad84a2"></a><!-- doxytag: member="matrix.h::arMatrixDisp" ref="60f36997579d355f6030f872faad84a2" args="(ARMat *m)" --><p> <table class="mdTable" cellpadding="2" cellspacing="0"> <tr> *************** *** 416,424 **** </table> </dl> ! <dl compact><dt><b>Returns:</b></dt><dd>0</dd></dl> </td> </tr> </table> ! <a class="anchor" name="a4"></a><!-- doxytag: member=<matrix.h::arMatrixDup> ref=<a4> args=<(ARMat *dest, ARMat *source)> --><p> <table class="mdTable" cellpadding="2" cellspacing="0"> <tr> --- 426,434 ---- </table> </dl> ! <dl compact><dt><b>Returns:</b></dt><dd>0 </dd></dl> </td> </tr> </table> ! <a class="anchor" name="988e4c76394edccbf1e86005b97f725a"></a><!-- doxytag: member="matrix.h::arMatrixDup" ref="988e4c76394edccbf1e86005b97f725a" args="(ARMat *dest, ARMat *source)" --><p> <table class="mdTable" cellpadding="2" cellspacing="0"> <tr> *************** *** 462,470 **** </table> </dl> ! <dl compact><dt><b>Returns:</b></dt><dd>0 if success, -1 if error (matrix with different size)</dd></dl> </td> </tr> </table> ! <a class="anchor" name="a3"></a><!-- doxytag: member=<matrix.h::arMatrixFree> ref=<a3> args=<(ARMat *m)> --><p> <table class="mdTable" cellpadding="2" cellspacing="0"> <tr> --- 472,480 ---- </table> </dl> ! <dl compact><dt><b>Returns:</b></dt><dd>0 if success, -1 if error (matrix with different size) </dd></dl> </td> </tr> </table> ! <a class="anchor" name="c4b7a714cce9fffda773d86363380454"></a><!-- doxytag: member="matrix.h::arMatrixFree" ref="c4b7a714cce9fffda773d86363380454" args="(ARMat *m)" --><p> <table class="mdTable" cellpadding="2" cellspacing="0"> <tr> *************** *** 498,506 **** </table> </dl> ! <dl compact><dt><b>Returns:</b></dt><dd>0</dd></dl> </td> </tr> </table> ! <a class="anchor" name="a12"></a><!-- doxytag: member=<matrix.h::arMatrixInv> ref=<a12> args=<(ARMat *dest, ARMat *source)> --><p> <table class="mdTable" cellpadding="2" cellspacing="0"> <tr> --- 508,516 ---- </table> </dl> ! <dl compact><dt><b>Returns:</b></dt><dd>0 </dd></dl> </td> </tr> </table> ! <a class="anchor" name="bebae87acb77ccf8cd0c5da106238a86"></a><!-- doxytag: member="matrix.h::arMatrixInv" ref="bebae87acb77ccf8cd0c5da106238a86" args="(ARMat *dest, ARMat *source)" --><p> <table class="mdTable" cellpadding="2" cellspacing="0"> <tr> *************** *** 544,552 **** </table> </dl> ! <dl compact><dt><b>Returns:</b></dt><dd>0 if success, -1 if error (not square matrix)</dd></dl> </td> </tr> </table> ! <a class="anchor" name="a8"></a><!-- doxytag: member=<matrix.h::arMatrixMul> ref=<a8> args=<(ARMat *dest, ARMat *a, ARMat *b)> --><p> <table class="mdTable" cellpadding="2" cellspacing="0"> <tr> --- 554,562 ---- </table> </dl> ! <dl compact><dt><b>Returns:</b></dt><dd>0 if success, -1 if error (not square matrix) </dd></dl> </td> </tr> </table> ! <a class="anchor" name="202bc2db43d563792c99e852ea0b7ba4"></a><!-- doxytag: member="matrix.h::arMatrixMul" ref="202bc2db43d563792c99e852ea0b7ba4" args="(ARMat *dest, ARMat *a, ARMat *b)" --><p> <table class="mdTable" cellpadding="2" cellspacing="0"> <tr> *************** *** 597,605 **** </table> </dl> ! <dl compact><dt><b>Returns:</b></dt><dd>0 if success, -1 if error (multiplication impossible, or destination matrix have not comptabile size)</dd></dl> </td> </tr> </table> ! <a class="anchor" name="a16"></a><!-- doxytag: member=<matrix.h::arMatrixPCA> ref=<a16> args=<(ARMat *input, ARMat *evec, ARVec *ev, ARVec *mean)> --><p> <table class="mdTable" cellpadding="2" cellspacing="0"> <tr> --- 607,615 ---- </table> </dl> ! <dl compact><dt><b>Returns:</b></dt><dd>0 if success, -1 if error (multiplication impossible, or destination matrix have not comptabile size) </dd></dl> </td> </tr> </table> ! <a class="anchor" name="04d062f49b83d57ac0dec5e906dfcd32"></a><!-- doxytag: member="matrix.h::arMatrixPCA" ref="04d062f49b83d57ac0dec5e906dfcd32" args="(ARMat *input, ARMat *evec, ARVec *ev, ARVec *mean)" --><p> <table class="mdTable" cellpadding="2" cellspacing="0"> <tr> *************** *** 657,665 **** </table> </dl> ! <dl compact><dt><b>Returns:</b></dt><dd>0 if success to compute, -1 otherwise</dd></dl> </td> </tr> </table> ! <a class="anchor" name="a17"></a><!-- doxytag: member=<matrix.h::arMatrixPCA2> ref=<a17> args=<(ARMat *input, ARMat *evec, ARVec *ev)> --><p> <table class="mdTable" cellpadding="2" cellspacing="0"> <tr> --- 667,675 ---- </table> </dl> ! <dl compact><dt><b>Returns:</b></dt><dd>0 if success to compute, -1 otherwise </dd></dl> </td> </tr> </table> ! <a class="anchor" name="c30a83b25ff3599f4b0082203dff0fac"></a><!-- doxytag: member="matrix.h::arMatrixPCA2" ref="c30a83b25ff3599f4b0082203dff0fac" args="(ARMat *input, ARMat *evec, ARVec *ev)" --><p> <table class="mdTable" cellpadding="2" cellspacing="0"> <tr> *************** *** 710,718 **** </table> </dl> ! <dl compact><dt><b>Returns:</b></dt><dd>0 if success to compute, -1 otherwise</dd></dl> </td> </tr> </table> ! <a class="anchor" name="a13"></a><!-- doxytag: member=<matrix.h::arMatrixSelfInv> ref=<a13> args=<(ARMat *m)> --><p> <table class="mdTable" cellpadding="2" cellspacing="0"> <tr> --- 720,728 ---- </table> </dl> ! <dl compact><dt><b>Returns:</b></dt><dd>0 if success to compute, -1 otherwise </dd></dl> </td> </tr> </table> ! <a class="anchor" name="929738025b539a0c1bbd2f395ad4d981"></a><!-- doxytag: member="matrix.h::arMatrixSelfInv" ref="929738025b539a0c1bbd2f395ad4d981" args="(ARMat *m)" --><p> <table class="mdTable" cellpadding="2" cellspacing="0"> <tr> *************** *** 746,754 **** </table> </dl> ! <dl compact><dt><b>Returns:</b></dt><dd>0 if success, -1 if error</dd></dl> </td> </tr> </table> ! <a class="anchor" name="a10"></a><!-- doxytag: member=<matrix.h::arMatrixTrans> ref=<a10> args=<(ARMat *dest, ARMat *source)> --><p> <table class="mdTable" cellpadding="2" cellspacing="0"> <tr> --- 756,764 ---- </table> </dl> ! <dl compact><dt><b>Returns:</b></dt><dd>0 if success, -1 if error </dd></dl> </td> </tr> </table> ! <a class="anchor" name="d3d9712dd27f655902a8a3315e623d85"></a><!-- doxytag: member="matrix.h::arMatrixTrans" ref="d3d9712dd27f655902a8a3315e623d85" args="(ARMat *dest, ARMat *source)" --><p> <table class="mdTable" cellpadding="2" cellspacing="0"> <tr> ... [truncated message content] |
|
From: Philip L. <phi...@us...> - 2006-05-22 23:03:23
|
Update of /cvsroot/artoolkit/artoolkit/doc/gsub_lite/DataTypes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16483/gsub_lite/DataTypes Modified Files: DataTypes.html Log Message: Refresh documentation. Index: DataTypes.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/gsub_lite/DataTypes/DataTypes.html,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DataTypes.html 27 Apr 2006 18:52:34 -0000 1.5 --- DataTypes.html 22 May 2006 23:03:19 -0000 1.6 *************** *** 34,38 **** </dd> </dl> ! <p><p>© 2003-2005 Philip Lamb ! (Last Updated August 29, 2005) </p></body></html> --- 34,38 ---- </dd> </dl> ! <p><p>© 2003-2006 Philip Lamb ! (Last Updated June 23, 2006) </p></body></html> |
|
From: Philip L. <phi...@us...> - 2006-05-22 23:03:23
|
Update of /cvsroot/artoolkit/artoolkit/doc/gsub_lite In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16483/gsub_lite Modified Files: CompositePage.html gsub_lite.html toc.html Log Message: Refresh documentation. Index: CompositePage.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/gsub_lite/CompositePage.html,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** CompositePage.html 27 Apr 2006 18:52:55 -0000 1.6 --- CompositePage.html 22 May 2006 23:03:19 -0000 1.7 *************** *** 91,96 **** <dd>Set compensation for camera lens distortion in arglDispImage to off or on. </dd> <dt><tt><a href="CompositePage.html#//apple_ref/doc/compositePage/c/func/arglDrawModeSet" target="_top">arglDrawModeSet</a></tt></dt> ! <dd>Set method by which arglDispImage() transfers pixels. </dd> <dt><tt><a href="CompositePage.html#//apple_ref/doc/compositePage/c/func/arglPixelFormatGet" target="_top">arglPixelFormatGet</a></tt></dt> --- 91,99 ---- <dd>Set compensation for camera lens distortion in arglDispImage to off or on. </dd> + <dt><tt><a href="CompositePage.html#//apple_ref/doc/compositePage/c/func/arglDrawModeGet" target="_top">arglDrawModeGet</a></tt></dt> + <dd>Get method by which arglDispImage() is transfering pixels. + </dd> <dt><tt><a href="CompositePage.html#//apple_ref/doc/compositePage/c/func/arglDrawModeSet" target="_top">arglDrawModeSet</a></tt></dt> ! <dd>Set method by which arglDispImage() will transfer pixels. </dd> <dt><tt><a href="CompositePage.html#//apple_ref/doc/compositePage/c/func/arglPixelFormatGet" target="_top">arglPixelFormatGet</a></tt></dt> *************** *** 103,109 **** --- 106,118 ---- <dd>Initialise the gsub_lite library for the current OpenGL context. </dd> + <dt><tt><a href="CompositePage.html#//apple_ref/doc/compositePage/c/func/arglTexmapModeGet" target="_top">arglTexmapModeGet</a></tt></dt> + <dd>Enquire whether full or half-resolution TexImage2D pixel-transfer is being used in arglDispImage(). + </dd> <dt><tt><a href="CompositePage.html#//apple_ref/doc/compositePage/c/func/arglTexmapModeSet" target="_top">arglTexmapModeSet</a></tt></dt> <dd>Determines use of full or half-resolution TexImage2D pixel-transfer in arglDispImage(). </dd> + <dt><tt><a href="CompositePage.html#//apple_ref/doc/compositePage/c/func/arglTexRectangleGet" target="_top">arglTexRectangleGet</a></tt></dt> + <dd>Enquire as to use of rectangular TexImage2D pixel-transfer in arglDispImage(). + </dd> <dt><tt><a href="CompositePage.html#//apple_ref/doc/compositePage/c/func/arglTexRectangleSet" target="_top">arglTexRectangleSet</a></tt></dt> <dd>Determines use of rectangular TexImage2D pixel-transfer in arglDispImage(). *************** *** 356,372 **** </dd> </dl> <hr><!-- headerDoc=func; uid=//apple_ref/doc/compositePage/c/func/arglDrawModeSet; name=arglDrawModeSet --> <a name="//apple_ref/doc/compositePage/c/func/arglDrawModeSet"></a> <table border="0" cellpadding="2" cellspacing="2" width="300"><tr><td valign="top" height="12" colspan="5"><h3><a name="arglDrawModeSet">arglDrawModeSet</a></h3> ! </td></tr></table><hr><dl></dl><p>Set method by which arglDispImage() transfers pixels. </p> <blockquote><pre><!-- a logicalPath="//apple_ref/c/cl/void //apple_ref/c/cl/void //apple_ref/c/tdef/void //apple_ref/c/tag/void //apple_ref/c/econst/void //apple_ref/c/struct/void //apple_ref/c/clconst/void" --><font class="type">void</font><!-- /a --> <!-- a logicalPath="//apple_ref/c/instm/arglDrawModeSet //apple_ref/c/clm/arglDrawModeSet //apple_ref/c/intfcm/arglDrawModeSet //apple_ref/c/func/arglDrawModeSet //apple_ref/c/ftmplt/arglDrawModeSet //apple_ref/c/defn/arglDrawModeSet //apple_ref/c/macro/arglDrawModeSet" --><font class="function">arglDrawModeSet</font><!-- /a -->( <!-- a logicalPath="//apple_ref/c/cl/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/cl/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/tdef/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/tag/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/econst/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/struct/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/clconst/ARGL_CONTEXT_SETTINGS_REF" --><font class="type">ARGL_CONTEXT_SETTINGS_REF</font><!-- /a --> <font class="param">contextSettings</font>, <font class="keyword">const</font> <!-- a logicalPath="//apple_ref/c/cl/int //apple_ref/c/cl/int //apple_ref/c/tdef/int //apple_ref/c/tag/int //apple_ref/c/econst/int //apple_ref/c/struct/int //apple_ref/c/clconst/int" --><font class="type">int</font><!-- /a --> <font class="param">mode</font>); </pre></blockquote> ! <dl><h5><font face="Lucida Grande,Helvetica,Arial">Discussion</font></h5><p>The value of this setting determines the method by which ! arglDispImage transfers pixels of an image to the display. Setting this ! variable to a value of AR_DRAW_BY_GL_DRAW_PIXELS specifies the use of OpenGL ! DrawPixels to do the transfer. Setting this variable to a value of ! AR_DRAW_BY_TEXTURE_MAPPING specifies the use of OpenGL TexImage2D to do the transfer. The DrawPixels method is guaranteed to be available on all implementations, but arglDispImage does not correct the image --- 365,395 ---- </dd> </dl> + <hr><!-- headerDoc=func; uid=//apple_ref/doc/compositePage/c/func/arglDrawModeGet; name=arglDrawModeGet --> + <a name="//apple_ref/doc/compositePage/c/func/arglDrawModeGet"></a> + <table border="0" cellpadding="2" cellspacing="2" width="300"><tr><td valign="top" height="12" colspan="5"><h3><a name="arglDrawModeGet">arglDrawModeGet</a></h3> + </td></tr></table><hr><dl></dl><p>Get method by which arglDispImage() is transfering pixels. + </p> + <blockquote><pre><!-- a logicalPath="//apple_ref/c/cl/int //apple_ref/c/cl/int //apple_ref/c/tdef/int //apple_ref/c/tag/int //apple_ref/c/econst/int //apple_ref/c/struct/int //apple_ref/c/clconst/int" --><font class="type">int</font><!-- /a --> <!-- a logicalPath="//apple_ref/c/instm/arglDrawModeGet //apple_ref/c/clm/arglDrawModeGet //apple_ref/c/intfcm/arglDrawModeGet //apple_ref/c/func/arglDrawModeGet //apple_ref/c/ftmplt/arglDrawModeGet //apple_ref/c/defn/arglDrawModeGet //apple_ref/c/macro/arglDrawModeGet" --><font class="function">arglDrawModeGet</font><!-- /a -->( + <!-- a logicalPath="//apple_ref/c/cl/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/cl/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/tdef/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/tag/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/econst/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/struct/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/clconst/ARGL_CONTEXT_SETTINGS_REF" --><font class="type">ARGL_CONTEXT_SETTINGS_REF</font><!-- /a --> <font class="param">contextSettings</font>); </pre></blockquote> + <dl><h5><font face="Lucida Grande,Helvetica,Arial">Discussion</font></h5><p>Enquires as to the current method by which arglDispImage() is + transferring pixels to OpenGL for display. See arglDrawModeSet() for + more information. + </p> + <dt><i>Availability</i></dt><dd>First appeared in ARToolKit 2.72. + </dd> + </dl> <hr><!-- headerDoc=func; uid=//apple_ref/doc/compositePage/c/func/arglDrawModeSet; name=arglDrawModeSet --> <a name="//apple_ref/doc/compositePage/c/func/arglDrawModeSet"></a> <table border="0" cellpadding="2" cellspacing="2" width="300"><tr><td valign="top" height="12" colspan="5"><h3><a name="arglDrawModeSet">arglDrawModeSet</a></h3> ! </td></tr></table><hr><dl></dl><p>Set method by which arglDispImage() will transfer pixels. </p> <blockquote><pre><!-- a logicalPath="//apple_ref/c/cl/void //apple_ref/c/cl/void //apple_ref/c/tdef/void //apple_ref/c/tag/void //apple_ref/c/econst/void //apple_ref/c/struct/void //apple_ref/c/clconst/void" --><font class="type">void</font><!-- /a --> <!-- a logicalPath="//apple_ref/c/instm/arglDrawModeSet //apple_ref/c/clm/arglDrawModeSet //apple_ref/c/intfcm/arglDrawModeSet //apple_ref/c/func/arglDrawModeSet //apple_ref/c/ftmplt/arglDrawModeSet //apple_ref/c/defn/arglDrawModeSet //apple_ref/c/macro/arglDrawModeSet" --><font class="function">arglDrawModeSet</font><!-- /a -->( <!-- a logicalPath="//apple_ref/c/cl/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/cl/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/tdef/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/tag/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/econst/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/struct/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/clconst/ARGL_CONTEXT_SETTINGS_REF" --><font class="type">ARGL_CONTEXT_SETTINGS_REF</font><!-- /a --> <font class="param">contextSettings</font>, <font class="keyword">const</font> <!-- a logicalPath="//apple_ref/c/cl/int //apple_ref/c/cl/int //apple_ref/c/tdef/int //apple_ref/c/tag/int //apple_ref/c/econst/int //apple_ref/c/struct/int //apple_ref/c/clconst/int" --><font class="type">int</font><!-- /a --> <font class="param">mode</font>); </pre></blockquote> ! <dl><h5><font face="Lucida Grande,Helvetica,Arial">Discussion</font></h5><p>This setting determines the method by which arglDispImage transfers pixels ! of an image to OpenGL for display. Setting this ! variable to a value of AR_DRAW_BY_GL_DRAW_PIXELS specifies the use of the ! OpenGL DrawPixels functions to do the transfer. Setting this variable to a value of ! AR_DRAW_BY_TEXTURE_MAPPING specifies the use of OpenGL TexImage2D functions to do the transfer. The DrawPixels method is guaranteed to be available on all implementations, but arglDispImage does not correct the image *************** *** 378,382 **** The initial value is AR_DRAW_BY_TEXTURE_MAPPING. </p> ! <dt><i>Availability</i></dt><dd>First appeared in ARToolKit 2.68. </dd> </dl> --- 401,405 ---- The initial value is AR_DRAW_BY_TEXTURE_MAPPING. </p> ! <dt><i>Availability</i></dt><dd>First appeared in ARToolKit 2.72. </dd> </dl> *************** *** 396,400 **** context, as returned by arglSetupForCurrentContext() for this context.</dd> <dt><code><i>format</i></code></dt><dd>A symbolic constant for the pixel format in use. See ! <!-- a logicalPath="" -->AR_PIXEL_FORMAT <!-- /a --> for a list of all possible formats.</dd> <dt><code><i>size</i></code></dt><dd>The number of bytes of memory occupied per pixel, for the given format.</dd> </dl> --- 419,423 ---- context, as returned by arglSetupForCurrentContext() for this context.</dd> <dt><code><i>format</i></code></dt><dd>A symbolic constant for the pixel format in use. See ! AR_PIXEL_FORMAT in ar.h for a list of all possible formats.</dd> <dt><code><i>size</i></code></dt><dd>The number of bytes of memory occupied per pixel, for the given format.</dd> </dl> *************** *** 423,427 **** context, as returned by arglSetupForCurrentContext() for this context.</dd> <dt><code><i>format</i></code></dt><dd>A symbolic constant for the pixel format being set. See ! <!-- a logicalPath="" -->AR_PIXEL_FORMAT <!-- /a --> for a list of all possible formats.</dd> </dl> </blockquote> --- 446,450 ---- context, as returned by arglSetupForCurrentContext() for this context.</dd> <dt><code><i>format</i></code></dt><dd>A symbolic constant for the pixel format being set. See ! AR_PIXEL_FORMAT in ar.h for a list of all possible formats.</dd> </dl> </blockquote> *************** *** 468,471 **** --- 491,507 ---- </dd> </dl> + <hr><!-- headerDoc=func; uid=//apple_ref/doc/compositePage/c/func/arglTexmapModeGet; name=arglTexmapModeGet --> + <a name="//apple_ref/doc/compositePage/c/func/arglTexmapModeGet"></a> + <table border="0" cellpadding="2" cellspacing="2" width="300"><tr><td valign="top" height="12" colspan="5"><h3><a name="arglTexmapModeGet">arglTexmapModeGet</a></h3> + </td></tr></table><hr><dl></dl><p>Enquire whether full or half-resolution TexImage2D pixel-transfer is being used in arglDispImage(). + </p> + <blockquote><pre><!-- a logicalPath="//apple_ref/c/cl/int //apple_ref/c/cl/int //apple_ref/c/tdef/int //apple_ref/c/tag/int //apple_ref/c/econst/int //apple_ref/c/struct/int //apple_ref/c/clconst/int" --><font class="type">int</font><!-- /a --> <!-- a logicalPath="//apple_ref/c/instm/arglTexmapModeGet //apple_ref/c/clm/arglTexmapModeGet //apple_ref/c/intfcm/arglTexmapModeGet //apple_ref/c/func/arglTexmapModeGet //apple_ref/c/ftmplt/arglTexmapModeGet //apple_ref/c/defn/arglTexmapModeGet //apple_ref/c/macro/arglTexmapModeGet" --><font class="function">arglTexmapModeGet</font><!-- /a -->( + <!-- a logicalPath="//apple_ref/c/cl/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/cl/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/tdef/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/tag/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/econst/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/struct/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/clconst/ARGL_CONTEXT_SETTINGS_REF" --><font class="type">ARGL_CONTEXT_SETTINGS_REF</font><!-- /a --> <font class="param">contextSettings</font>); </pre></blockquote> + <dl><h5><font face="Lucida Grande,Helvetica,Arial">Discussion</font></h5><p>Enquires as to the current value of the TexmapMode setting. See arglTexmapModeSet() + for more info. + </p> + <dt><i>Availability</i></dt><dd>First appeared in ARToolKit 2.72. + </dd> + </dl> <hr><!-- headerDoc=func; uid=//apple_ref/doc/compositePage/c/func/arglTexmapModeSet; name=arglTexmapModeSet --> <a name="//apple_ref/doc/compositePage/c/func/arglTexmapModeSet"></a> *************** *** 476,483 **** <!-- a logicalPath="//apple_ref/c/cl/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/cl/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/tdef/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/tag/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/econst/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/struct/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/clconst/ARGL_CONTEXT_SETTINGS_REF" --><font class="type">ARGL_CONTEXT_SETTINGS_REF</font><!-- /a --> <font class="param">contextSettings</font>, <font class="keyword">const</font> <!-- a logicalPath="//apple_ref/c/cl/int //apple_ref/c/cl/int //apple_ref/c/tdef/int //apple_ref/c/tag/int //apple_ref/c/econst/int //apple_ref/c/struct/int //apple_ref/c/clconst/int" --><font class="type">int</font><!-- /a --> <font class="param">mode</font>); </pre></blockquote> ! <dl><h5><font face="Lucida Grande,Helvetica,Arial">Discussion</font></h5><p>When arglDrawModeSet(AR_DRAW_BY_TEXTURE_MAPPING) has been called, the value of this setting ! determines whether full or half-resolution data is transferred to the ! texture. A value of AR_DRAW_TEXTURE_FULL_IMAGE uses all available pixels in the ! source image data. A value of AR_DRAW_TEXTURE_HALF_IMAGE discards every second row in the source image data, defining a half-height texture which is then drawn stretched vertically to double its height. --- 512,520 ---- <!-- a logicalPath="//apple_ref/c/cl/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/cl/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/tdef/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/tag/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/econst/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/struct/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/clconst/ARGL_CONTEXT_SETTINGS_REF" --><font class="type">ARGL_CONTEXT_SETTINGS_REF</font><!-- /a --> <font class="param">contextSettings</font>, <font class="keyword">const</font> <!-- a logicalPath="//apple_ref/c/cl/int //apple_ref/c/cl/int //apple_ref/c/tdef/int //apple_ref/c/tag/int //apple_ref/c/econst/int //apple_ref/c/struct/int //apple_ref/c/clconst/int" --><font class="type">int</font><!-- /a --> <font class="param">mode</font>); </pre></blockquote> ! <dl><h5><font face="Lucida Grande,Helvetica,Arial">Discussion</font></h5><p>When arglDrawModeSet(AR_DRAW_BY_TEXTURE_MAPPING) has been called, the value of this ! setting determines whether full or half-resolution data is transferred to the ! texture. Calling this function with a mode value of AR_DRAW_TEXTURE_FULL_IMAGE ! uses all available pixels in the source image data. A value of ! AR_DRAW_TEXTURE_HALF_IMAGE discards every second row in the source image data, defining a half-height texture which is then drawn stretched vertically to double its height. *************** *** 488,492 **** The initial value is AR_DRAW_TEXTURE_FULL_IMAGE. </p> ! <dt><i>Availability</i></dt><dd>First appeared in ARToolKit 2.68. </dd> </dl> --- 525,542 ---- The initial value is AR_DRAW_TEXTURE_FULL_IMAGE. </p> ! <dt><i>Availability</i></dt><dd>First appeared in ARToolKit 2.72. ! </dd> ! </dl> ! <hr><!-- headerDoc=func; uid=//apple_ref/doc/compositePage/c/func/arglTexRectangleGet; name=arglTexRectangleGet --> ! <a name="//apple_ref/doc/compositePage/c/func/arglTexRectangleGet"></a> ! <table border="0" cellpadding="2" cellspacing="2" width="300"><tr><td valign="top" height="12" colspan="5"><h3><a name="arglTexRectangleGet">arglTexRectangleGet</a></h3> ! </td></tr></table><hr><dl></dl><p>Enquire as to use of rectangular TexImage2D pixel-transfer in arglDispImage(). ! </p> ! <blockquote><pre><!-- a logicalPath="//apple_ref/c/cl/int //apple_ref/c/cl/int //apple_ref/c/tdef/int //apple_ref/c/tag/int //apple_ref/c/econst/int //apple_ref/c/struct/int //apple_ref/c/clconst/int" --><font class="type">int</font><!-- /a --> <!-- a logicalPath="//apple_ref/c/instm/arglTexRectangleGet //apple_ref/c/clm/arglTexRectangleGet //apple_ref/c/intfcm/arglTexRectangleGet //apple_ref/c/func/arglTexRectangleGet //apple_ref/c/ftmplt/arglTexRectangleGet //apple_ref/c/defn/arglTexRectangleGet //apple_ref/c/macro/arglTexRectangleGet" --><font class="function">arglTexRectangleGet</font><!-- /a -->( ! <!-- a logicalPath="//apple_ref/c/cl/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/cl/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/tdef/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/tag/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/econst/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/struct/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/clconst/ARGL_CONTEXT_SETTINGS_REF" --><font class="type">ARGL_CONTEXT_SETTINGS_REF</font><!-- /a --> <font class="param">contextSettings</font>); </pre></blockquote> ! <dl><h5><font face="Lucida Grande,Helvetica,Arial">Discussion</font></h5><p>Enquires as to the current value of the TexRectangle setting. See arglTexRectangleSet() ! for more info. ! </p> ! <dt><i>Availability</i></dt><dd>First appeared in ARToolKit 2.72. </dd> </dl> *************** *** 506,513 **** <br><br> If the OpenGL driver available at runtime does not support for rectangular textures, ! changing the value of this variable to TRUE will result calls to arglDispImage performing no drawing. </p> ! <dt><i>Availability</i></dt><dd>First appeared in ARToolKit 2.68. </dd> </dl> --- 556,563 ---- <br><br> If the OpenGL driver available at runtime does not support for rectangular textures, ! changing the value of this setting to TRUE will result calls to arglDispImage performing no drawing. </p> ! <dt><i>Availability</i></dt><dd>First appeared in ARToolKit 2.72. </dd> </dl> *************** *** 540,544 **** </dd> </dl> ! <p><p>© 2003-2005 Philip Lamb ! (Last Updated August 29, 2005) </p></body></html> --- 590,594 ---- </dd> </dl> ! <p><p>© 2003-2006 Philip Lamb ! (Last Updated June 23, 2006) </p></body></html> Index: gsub_lite.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/gsub_lite/gsub_lite.html,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** gsub_lite.html 16 Aug 2005 00:49:34 -0000 1.4 --- gsub_lite.html 22 May 2006 23:03:19 -0000 1.5 *************** *** 12,16 **** <br> <p></p> ! <b>Updated:</b> August 29, 2005<br> <b>Includes:</b> <!-- a logicalPath="//apple_ref/doc/header/config.h" --><AR/config.h><!-- /a -->, <!-- a logicalPath="//apple_ref/doc/header/ar.h" --><AR/ar.h><!-- /a -->, --- 12,16 ---- <br> <p></p> ! <b>Updated:</b> June 23, 2006<br> <b>Includes:</b> <!-- a logicalPath="//apple_ref/doc/header/config.h" --><AR/config.h><!-- /a -->, <!-- a logicalPath="//apple_ref/doc/header/ar.h" --><AR/ar.h><!-- /a -->, *************** *** 76,81 **** <br><br> ! <hr><br><center>© 2003-2005 Philip Lamb ! (Last Updated August 29, 2005) <br><font size="-1">HTML documentation generated by <a href="http://www.opensource.apple.com/projects" target="_blank">HeaderDoc</a></font> </center> --- 76,81 ---- <br><br> ! <hr><br><center>© 2003-2006 Philip Lamb ! (Last Updated June 23, 2006) <br><font size="-1">HTML documentation generated by <a href="http://www.opensource.apple.com/projects" target="_blank">HeaderDoc</a></font> </center> Index: toc.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/gsub_lite/toc.html,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** toc.html 27 Apr 2006 18:52:55 -0000 1.6 --- toc.html 22 May 2006 23:03:19 -0000 1.7 *************** *** 24,32 **** --- 24,35 ---- <nobr> <a href="Functions/Functions.html#//apple_ref/c/func/arglDistortionCompensationGet" target="doc">arglDistortionCompensationGet</a></nobr><br> <nobr> <a href="Functions/Functions.html#//apple_ref/c/func/arglDistortionCompensationSet" target="doc">arglDistortionCompensationSet</a></nobr><br> + <nobr> <a href="Functions/Functions.html#//apple_ref/c/func/arglDrawModeGet" target="doc">arglDrawModeGet</a></nobr><br> <nobr> <a href="Functions/Functions.html#//apple_ref/c/func/arglDrawModeSet" target="doc">arglDrawModeSet</a></nobr><br> <nobr> <a href="Functions/Functions.html#//apple_ref/c/func/arglPixelFormatGet" target="doc">arglPixelFormatGet</a></nobr><br> <nobr> <a href="Functions/Functions.html#//apple_ref/c/func/arglPixelFormatSet" target="doc">arglPixelFormatSet</a></nobr><br> <nobr> <a href="Functions/Functions.html#//apple_ref/c/func/arglSetupForCurrentContext" target="doc">arglSetupForCurrentContext</a></nobr><br> + <nobr> <a href="Functions/Functions.html#//apple_ref/c/func/arglTexmapModeGet" target="doc">arglTexmapModeGet</a></nobr><br> <nobr> <a href="Functions/Functions.html#//apple_ref/c/func/arglTexmapModeSet" target="doc">arglTexmapModeSet</a></nobr><br> + <nobr> <a href="Functions/Functions.html#//apple_ref/c/func/arglTexRectangleGet" target="doc">arglTexRectangleGet</a></nobr><br> <nobr> <a href="Functions/Functions.html#//apple_ref/c/func/arglTexRectangleSet" target="doc">arglTexRectangleSet</a></nobr><br> <h4><a href="DataTypes/DataTypes.html" target="doc">Defined Types *************** *** 35,39 **** <nobr> <a href="DataTypes/DataTypes.html#//apple_ref/c/tdef/ARGL_CONTEXT_SETTINGS_REF" target="doc">ARGL_CONTEXT_SETTINGS_REF</a></nobr><br> <br><hr><a href="CompositePage.html" target="_blank">[Printable HTML Page]</a> ! <p><i>Updated: August 29, 2005</i><p></td></tr> </table><p> <p> </body></html> --- 38,42 ---- <nobr> <a href="DataTypes/DataTypes.html#//apple_ref/c/tdef/ARGL_CONTEXT_SETTINGS_REF" target="doc">ARGL_CONTEXT_SETTINGS_REF</a></nobr><br> <br><hr><a href="CompositePage.html" target="_blank">[Printable HTML Page]</a> ! <p><i>Updated: June 23, 2006</i><p></td></tr> </table><p> <p> </body></html> |
|
From: Philip L. <phi...@us...> - 2006-05-22 23:03:22
|
Update of /cvsroot/artoolkit/artoolkit/doc/gsub_lite/Vars In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16483/gsub_lite/Vars Removed Files: Vars.html Log Message: Refresh documentation. --- Vars.html DELETED --- |
|
From: Philip L. <phi...@us...> - 2006-05-22 22:18:33
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/VideoMacOSX In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31763 Modified Files: video.c ARVideoSettingsController.m videoInternal.h ARVideoSettingsController.h Log Message: Copyright date and documentation update. Index: ARVideoSettingsController.h =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoMacOSX/ARVideoSettingsController.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ARVideoSettingsController.h 10 Mar 2005 04:00:38 -0000 1.1 --- ARVideoSettingsController.h 22 May 2006 22:18:25 -0000 1.2 *************** *** 1,4 **** /* ! * Copyright (c) 2005-2005 Philip Lamb (PRL) ph...@ed.... All rights reserved. * * Rev Date Who Changes --- 1,4 ---- /* ! * Copyright (c) 2005-2006 Philip Lamb (PRL) ph...@ed.... All rights reserved. * * Rev Date Who Changes Index: video.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoMacOSX/video.c,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** video.c 21 Apr 2006 04:35:34 -0000 1.15 --- video.c 22 May 2006 22:18:25 -0000 1.16 *************** *** 8,12 **** */ /* ! * Copyright (c) 2003-2005 Philip Lamb (PRL) ph...@ed.... All rights reserved. * * Rev Date Who Changes --- 8,12 ---- */ /* ! * Copyright (c) 2003-2006 Philip Lamb (PRL) ph...@ed.... All rights reserved. * * Rev Date Who Changes Index: videoInternal.h =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoMacOSX/videoInternal.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** videoInternal.h 10 Mar 2005 04:00:38 -0000 1.1 --- videoInternal.h 22 May 2006 22:18:25 -0000 1.2 *************** *** 1,4 **** /* ! * Copyright (c) 2005-2005 Philip Lamb (PRL) ph...@ed.... All rights reserved. * * Rev Date Who Changes --- 1,4 ---- /* ! * Copyright (c) 2005-2006 Philip Lamb (PRL) ph...@ed.... All rights reserved. * * Rev Date Who Changes Index: ARVideoSettingsController.m =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoMacOSX/ARVideoSettingsController.m,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ARVideoSettingsController.m 18 Aug 2005 19:23:57 -0000 1.4 --- ARVideoSettingsController.m 22 May 2006 22:18:25 -0000 1.5 *************** *** 1,4 **** /* ! * Copyright (c) 2005-2005 Philip Lamb (PRL) ph...@ed.... All rights reserved. * * Rev Date Who Changes --- 1,4 ---- /* ! * Copyright (c) 2005-2006 Philip Lamb (PRL) ph...@ed.... All rights reserved. * * Rev Date Who Changes |
|
From: Philip L. <phi...@us...> - 2006-05-22 22:18:22
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/Gl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31738 Modified Files: gsub_lite.c Log Message: Copyright date and documentation update. Index: gsub_lite.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/Gl/gsub_lite.c,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** gsub_lite.c 27 Apr 2006 18:49:12 -0000 1.15 --- gsub_lite.c 22 May 2006 22:18:18 -0000 1.16 *************** *** 4,8 **** * Graphics Subroutines (Lite) for ARToolKit. * ! * Copyright (c) 2003-2005 Philip Lamb (PRL) ph...@ed.... All rights reserved. * * Rev Date Who Changes --- 4,8 ---- * Graphics Subroutines (Lite) for ARToolKit. * ! * Copyright (c) 2003-2006 Philip Lamb (PRL) ph...@ed.... All rights reserved. * * Rev Date Who Changes |
