artoolkit-commits Mailing List for ARToolKit (Page 12)
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-05-22 22:18:14
|
Update of /cvsroot/artoolkit/artoolkit/examples/twoView In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31700 Modified Files: twoView.c Log Message: Copyright date and documentation update. Index: twoView.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/examples/twoView/twoView.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** twoView.c 21 Apr 2006 08:33:03 -0000 1.13 --- twoView.c 22 May 2006 22:18:12 -0000 1.14 *************** *** 5,9 **** * Press '?' while running for help. * ! * Copyright (c) 2004-2005 Philip Lamb (PRL) ph...@ed.... All rights reserved. * * Rev Date Who Changes --- 5,9 ---- * Press '?' while running for help. * ! * Copyright (c) 2004-2006 Philip Lamb (PRL) ph...@ed.... All rights reserved. * * Rev Date Who Changes |
|
From: Philip L. <phi...@us...> - 2006-05-22 22:18:08
|
Update of /cvsroot/artoolkit/artoolkit/examples/simpleLite In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31397 Modified Files: simpleLite.c Log Message: Copyright date and documentation update. Index: simpleLite.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/examples/simpleLite/simpleLite.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** simpleLite.c 21 Apr 2006 08:32:38 -0000 1.12 --- simpleLite.c 22 May 2006 22:18:00 -0000 1.13 *************** *** 8,12 **** * Press '?' while running for help on available key commands. * ! * Copyright (c) 2001-2005 Philip Lamb (PRL) ph...@ed.... All rights reserved. * * Rev Date Who Changes --- 8,12 ---- * Press '?' while running for help on available key commands. * ! * Copyright (c) 2001-2006 Philip Lamb (PRL) ph...@ed.... All rights reserved. * * Rev Date Who Changes |
|
From: Philip L. <phi...@us...> - 2006-05-22 22:17:56
|
Update of /cvsroot/artoolkit/artoolkit/include/AR In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31373 Modified Files: gsub_lite.h ar.h video.h Log Message: Copyright date and documentation update. Index: video.h =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/include/AR/video.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** video.h 20 Oct 2005 19:56:03 -0000 1.5 --- video.h 22 May 2006 22:17:53 -0000 1.6 *************** *** 1,4 **** /* -------------------------------------------------------------------------- ! * Copyright (c) 2004-2005 Philip Lamb (PRL) ph...@ed.... All rights reserved. * This file is part of ARToolKit. * --- 1,4 ---- /* -------------------------------------------------------------------------- ! * Copyright (c) 2004-2006 Philip Lamb (PRL) ph...@ed.... All rights reserved. * This file is part of ARToolKit. * Index: ar.h =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/include/AR/ar.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ar.h 5 Apr 2006 05:48:43 -0000 1.7 --- ar.h 22 May 2006 22:17:53 -0000 1.8 *************** *** 1,4 **** /* -------------------------------------------------------------------------- ! * Copyright (c) 20042-2005 HIT Lab NZ. * The distribution policy is described in the file COPYING.txt furnished * with this library. --- 1,4 ---- /* -------------------------------------------------------------------------- ! * Copyright (c) 20042-2006 HIT Lab NZ. * The distribution policy is described in the file COPYING.txt furnished * with this library. *************** *** 81,106 **** ARToolKit function is in a particular pixel format. ! \var AR_PIXEL_FORMAT_RGB Each pixel is represented by 24 bits. Eight bits per each Red, Green, and Blue component. This is the native 24 bit format for the Mac platform. ! \var AR_PIXEL_FORMAT_BGR Each pixel is represented by 24 bits. Eight bits per each Blue, Red, and Green component. This is the native 24 bit format for the Win32 platform. ! \var AR_PIXEL_FORMAT_RGBA Each pixel is represented by 32 bits. Eight bits per each Red, Green, Blue, and Alpha component. ! \var AR_PIXEL_FORMAT_BGRA Each pixel is represented by 32 bits. Eight bits per each Blue, Green, Red, and Alpha component. This is the native 32 bit format for the Win32 platform. ! \var AR_PIXEL_FORMAT_ABGR Each pixel is represented by 32 bits. Eight bits per each Alpha, Blue, Green, and Red component. This is the native 32 bit format for the SGI platform. ! \var AR_PIXEL_FORMAT_ARGB Each pixel is represented by 32 bits. Eight bits per each Alpha, Red, Green, and Blue component. This is the native 32 bit format for the Mac platform. ! \var AR_PIXEL_FORMAT_2vuy 8-bit 4:2:2 Component Y'CbCr format. Each 16 bit pixel is represented by an unsigned eight bit luminance component and two unsigned eight bit --- 81,112 ---- ARToolKit function is in a particular pixel format. ! AR_PIXEL_FORMAT_RGB Each pixel is represented by 24 bits. Eight bits per each Red, Green, and Blue component. This is the native 24 bit format for the Mac platform. ! ! AR_PIXEL_FORMAT_BGR Each pixel is represented by 24 bits. Eight bits per each Blue, Red, and Green component. This is the native 24 bit format for the Win32 platform. ! ! AR_PIXEL_FORMAT_RGBA Each pixel is represented by 32 bits. Eight bits per each Red, Green, Blue, and Alpha component. ! ! AR_PIXEL_FORMAT_BGRA Each pixel is represented by 32 bits. Eight bits per each Blue, Green, Red, and Alpha component. This is the native 32 bit format for the Win32 platform. ! ! AR_PIXEL_FORMAT_ABGR Each pixel is represented by 32 bits. Eight bits per each Alpha, Blue, Green, and Red component. This is the native 32 bit format for the SGI platform. ! ! AR_PIXEL_FORMAT_ARGB Each pixel is represented by 32 bits. Eight bits per each Alpha, Red, Green, and Blue component. This is the native 32 bit format for the Mac platform. ! ! AR_PIXEL_FORMAT_2vuy 8-bit 4:2:2 Component Y'CbCr format. Each 16 bit pixel is represented by an unsigned eight bit luminance component and two unsigned eight bit *************** *** 112,116 **** '2vuy' is the Apple QuickTime four-character code for this pixel format. The equivalent Microsoft fourCC is 'UYVY'. ! \var AR_PIXEL_FORMAT_yuvs 8-bit 4:2:2 Component Y'CbCr format. Identical to the AR_PIXEL_FORMAT_2vuy except each 16 bit word has been byte swapped. This results in a component --- 118,123 ---- '2vuy' is the Apple QuickTime four-character code for this pixel format. The equivalent Microsoft fourCC is 'UYVY'. ! ! AR_PIXEL_FORMAT_yuvs 8-bit 4:2:2 Component Y'CbCr format. Identical to the AR_PIXEL_FORMAT_2vuy except each 16 bit word has been byte swapped. This results in a component Index: gsub_lite.h =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/include/AR/gsub_lite.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** gsub_lite.h 21 Apr 2006 04:35:13 -0000 1.10 --- gsub_lite.h 22 May 2006 22:17:53 -0000 1.11 *************** *** 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 *************** *** 109,114 **** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ! @copyright 2003-2005 Philip Lamb ! @updated 2005-07-29 */ --- 109,114 ---- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ! @copyright 2003-2006 Philip Lamb ! @updated 2006-05-23 */ *************** *** 133,137 **** #endif #include <AR/config.h> ! #include <AR/ar.h> // ARUint8 #include <AR/param.h> // ARParam, arParamDecompMat(), arParamObserv2Ideal() --- 133,137 ---- #endif #include <AR/config.h> ! #include <AR/ar.h> // ARUint8, AR_PIXEL_FORMAT #include <AR/param.h> // ARParam, arParamDecompMat(), arParamObserv2Ideal() *************** *** 188,192 **** /*! ! @function arglSetupForCurrentContext @abstract Initialise the gsub_lite library for the current OpenGL context. @discussion --- 188,192 ---- /*! ! @function @abstract Initialise the gsub_lite library for the current OpenGL context. @discussion *************** *** 211,215 **** /*! ! @function arglCleanup @abstract Free memory used by gsub_lite associated with the specified context. @discussion --- 211,215 ---- /*! ! @function @abstract Free memory used by gsub_lite associated with the specified context. @discussion *************** *** 226,230 **** /*! ! @function arglCameraFrustum @abstract Create an OpenGL perspective projection matrix. @discussion --- 226,230 ---- /*! ! @function @abstract Create an OpenGL perspective projection matrix. @discussion *************** *** 259,263 **** /*! ! @function arglCameraView @abstract Create an OpenGL viewing transformation matrix. @discussion --- 259,263 ---- /*! ! @function @abstract Create an OpenGL viewing transformation matrix. @discussion *************** *** 280,284 **** /*! ! @function arglDispImage @abstract Display an ARVideo image, by drawing it using OpenGL. @discussion --- 280,284 ---- /*! ! @function @abstract Display an ARVideo image, by drawing it using OpenGL. @discussion *************** *** 333,337 **** /*! ! @function arglDispImageStateful @abstract Display an ARVideo image, by drawing it using OpenGL, using and modifying current OpenGL state. @discussion --- 333,337 ---- /*! ! @function @abstract Display an ARVideo image, by drawing it using OpenGL, using and modifying current OpenGL state. @discussion *************** *** 355,359 **** /*! ! @function arglDistortionCompensationSet @abstract Set compensation for camera lens distortion in arglDispImage to off or on. @discussion --- 355,359 ---- /*! ! @function @abstract Set compensation for camera lens distortion in arglDispImage to off or on. @discussion *************** *** 376,380 **** /*! ! @function arglDistortionCompensationGet @abstract Enquire as to the enable state of camera lens distortion compensation in arglDispImage. @discussion --- 376,380 ---- /*! ! @function @abstract Enquire as to the enable state of camera lens distortion compensation in arglDispImage. @discussion *************** *** 392,396 **** /*! ! @function arglPixelFormatSet @abstract Set the format of pixel data which will be passed to arglDispImage*() @discussion (description) --- 392,396 ---- /*! ! @function @abstract Set the format of pixel data which will be passed to arglDispImage*() @discussion (description) *************** *** 406,410 **** context, as returned by arglSetupForCurrentContext() for this context. @param format A symbolic constant for the pixel format being set. See ! @link AR_PIXEL_FORMAT AR_PIXEL_FORMAT @/link for a list of all possible formats. @result TRUE if the pixel format value was set, FALSE if an error occurred. @availability First appeared in ARToolKit 2.71. --- 406,410 ---- context, as returned by arglSetupForCurrentContext() for this context. @param format A symbolic constant for the pixel format being set. See ! AR_PIXEL_FORMAT in ar.h for a list of all possible formats. @result TRUE if the pixel format value was set, FALSE if an error occurred. @availability First appeared in ARToolKit 2.71. *************** *** 413,417 **** /*! ! @function arglPixelFormatGet @abstract Get the format of pixel data in which arglDispImage*() is expecting data to be passed. @discussion This function enquires as to the current format of pixel data being --- 413,417 ---- /*! ! @function @abstract Get the format of pixel data in which arglDispImage*() is expecting data to be passed. @discussion This function enquires as to the current format of pixel data being *************** *** 421,425 **** context, as returned by arglSetupForCurrentContext() for this context. @param format A symbolic constant for the pixel format in use. See ! @link AR_PIXEL_FORMAT AR_PIXEL_FORMAT @/link for a list of all possible formats. @param size The number of bytes of memory occupied per pixel, for the given format. @result TRUE if the pixel format and size values were retreived, FALSE if an error occurred. --- 421,425 ---- context, as returned by arglSetupForCurrentContext() for this context. @param format A symbolic constant for the pixel format in use. See ! AR_PIXEL_FORMAT in ar.h for a list of all possible formats. @param size The number of bytes of memory occupied per pixel, for the given format. @result TRUE if the pixel format and size values were retreived, FALSE if an error occurred. *************** *** 430,440 **** /*! @function ! @abstract Set method by which arglDispImage() transfers pixels. @discussion ! 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 --- 430,440 ---- /*! @function ! @abstract Set method by which arglDispImage() will transfer pixels. @discussion ! 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 *************** *** 445,451 **** The initial value is AR_DRAW_BY_TEXTURE_MAPPING. ! @availability First appeared in ARToolKit 2.68. */ void arglDrawModeSet(ARGL_CONTEXT_SETTINGS_REF contextSettings, const int mode); int arglDrawModeGet(ARGL_CONTEXT_SETTINGS_REF contextSettings); --- 445,461 ---- The initial value is AR_DRAW_BY_TEXTURE_MAPPING. ! @availability First appeared in ARToolKit 2.72. */ void arglDrawModeSet(ARGL_CONTEXT_SETTINGS_REF contextSettings, const int mode); + + /*! + @function + @abstract Get method by which arglDispImage() is transfering pixels. + @discussion + Enquires as to the current method by which arglDispImage() is + transferring pixels to OpenGL for display. See arglDrawModeSet() for + more information. + @availability First appeared in ARToolKit 2.72. + */ int arglDrawModeGet(ARGL_CONTEXT_SETTINGS_REF contextSettings); *************** *** 454,461 **** @abstract Determines use of full or half-resolution TexImage2D pixel-transfer in arglDispImage(). @discussion ! 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. --- 464,472 ---- @abstract Determines use of full or half-resolution TexImage2D pixel-transfer in arglDispImage(). @discussion ! 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. *************** *** 465,471 **** The initial value is AR_DRAW_TEXTURE_FULL_IMAGE. ! @availability First appeared in ARToolKit 2.68. */ void arglTexmapModeSet(ARGL_CONTEXT_SETTINGS_REF contextSettings, const int mode); int arglTexmapModeGet(ARGL_CONTEXT_SETTINGS_REF contextSettings); --- 476,491 ---- The initial value is AR_DRAW_TEXTURE_FULL_IMAGE. ! @availability First appeared in ARToolKit 2.72. */ void arglTexmapModeSet(ARGL_CONTEXT_SETTINGS_REF contextSettings, const int mode); + + /*! + @function + @abstract Enquire whether full or half-resolution TexImage2D pixel-transfer is being used in arglDispImage(). + @discussion + Enquires as to the current value of the TexmapMode setting. See arglTexmapModeSet() + for more info. + @availability First appeared in ARToolKit 2.72. + */ int arglTexmapModeGet(ARGL_CONTEXT_SETTINGS_REF contextSettings); *************** *** 481,489 **** 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. ! @availability First appeared in ARToolKit 2.68. */ void arglTexRectangleSet(ARGL_CONTEXT_SETTINGS_REF contextSettings, const int state); int arglTexRectangleGet(ARGL_CONTEXT_SETTINGS_REF contextSettings); --- 501,518 ---- 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. ! @availability First appeared in ARToolKit 2.72. */ void arglTexRectangleSet(ARGL_CONTEXT_SETTINGS_REF contextSettings, const int state); + + /*! + @function + @abstract Enquire as to use of rectangular TexImage2D pixel-transfer in arglDispImage(). + @discussion + Enquires as to the current value of the TexRectangle setting. See arglTexRectangleSet() + for more info. + @availability First appeared in ARToolKit 2.72. + */ int arglTexRectangleGet(ARGL_CONTEXT_SETTINGS_REF contextSettings); |
|
From: Philip L. <phi...@us...> - 2006-05-22 22:17:50
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/VideoWin32DirectShow In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31359 Modified Files: videoWin32DirectShow.cpp Log Message: Copyright date and documentation update. Index: videoWin32DirectShow.cpp =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoWin32DirectShow/videoWin32DirectShow.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** videoWin32DirectShow.cpp 8 Dec 2005 18:51:41 -0000 1.5 --- videoWin32DirectShow.cpp 22 May 2006 22:17:46 -0000 1.6 *************** *** 32,36 **** */ /* ! * Copyright (c) 2004-2005 Philip Lamb (PRL) ph...@ed.... All rights reserved. * * Rev Date Who Changes --- 32,36 ---- */ /* ! * Copyright (c) 2004-2006 Philip Lamb (PRL) ph...@ed.... All rights reserved. * * Rev Date Who Changes |
|
From: Philip L. <phi...@us...> - 2006-05-22 22:17:43
|
Update of /cvsroot/artoolkit/artoolkit/include/AR/sys In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31348 Modified Files: videoMacOSX.h Log Message: Copyright date and documentation update. Index: videoMacOSX.h =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/include/AR/sys/videoMacOSX.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** videoMacOSX.h 20 Oct 2005 19:55:58 -0000 1.6 --- videoMacOSX.h 22 May 2006 22:17:40 -0000 1.7 *************** *** 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 |
|
From: Philip L. <phi...@us...> - 2006-05-22 22:17:36
|
Update of /cvsroot/artoolkit/artoolkit/examples/simpleVRML In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31332 Modified Files: simpleVRML.c Log Message: Copyright date and documentation update. Index: simpleVRML.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/examples/simpleVRML/simpleVRML.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** simpleVRML.c 21 Apr 2006 08:32:52 -0000 1.9 --- simpleVRML.c 22 May 2006 22:17:32 -0000 1.10 *************** *** 8,12 **** * Copyright (c) 2002 Mark Billinghurst (MB) gr...@hi... * Copyright (c) 2004 Raphael Grasset (RG) rap...@hi.... ! * Copyright (c) 2004-2005 Philip Lamb (PRL) ph...@ed.... * * Rev Date Who Changes --- 8,12 ---- * Copyright (c) 2002 Mark Billinghurst (MB) gr...@hi... * Copyright (c) 2004 Raphael Grasset (RG) rap...@hi.... ! * Copyright (c) 2004-2006 Philip Lamb (PRL) ph...@ed.... * * Rev Date Who Changes |
|
From: Philip L. <phi...@us...> - 2006-04-27 18:53:04
|
Update of /cvsroot/artoolkit/artoolkit/doc/gsub_lite In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24806 Modified Files: toc.html CompositePage.html Log Message: Update for gsub_lite rev 2.8.1. Index: toc.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/gsub_lite/toc.html,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** toc.html 5 Apr 2006 05:47:02 -0000 1.5 --- toc.html 27 Apr 2006 18:52:55 -0000 1.6 *************** *** 24,39 **** <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/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> <h4><a href="DataTypes/DataTypes.html" target="doc">Defined Types </a></h4> <nobr> <a href="DataTypes/DataTypes.html#//apple_ref/c/tdef/ARGL_CONTEXT_SETTINGS_REF" target="doc">ARGL_CONTEXT_SETTINGS_REF</a></nobr><br> - <h4><a href="Vars/Vars.html" target="doc">Globals</a></h4> - - <nobr> <a href="Vars/Vars.html#//apple_ref/c/data/arglDrawMode" target="doc">arglDrawMode</a></nobr><br> - <nobr> <a href="Vars/Vars.html#//apple_ref/c/data/arglTexmapMode" target="doc">arglTexmapMode</a></nobr><br> - <nobr> <a href="Vars/Vars.html#//apple_ref/c/data/arglTexRectangle" target="doc">arglTexRectangle</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> --- 24,37 ---- <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/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/arglTexmapModeSet" target="doc">arglTexmapModeSet</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 </a></h4> <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> Index: CompositePage.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/gsub_lite/CompositePage.html,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** CompositePage.html 22 Sep 2005 00:08:15 -0000 1.5 --- CompositePage.html 27 Apr 2006 18:52:55 -0000 1.6 *************** *** 91,94 **** --- 91,97 ---- <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> <dd>Get the format of pixel data in which arglDispImage*() is expecting data to be passed. *************** *** 100,103 **** --- 103,112 ---- <dd>Initialise the gsub_lite library for the current OpenGL context. </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/arglTexRectangleSet" target="_top">arglTexRectangleSet</a></tt></dt> + <dd>Determines use of rectangular TexImage2D pixel-transfer in arglDispImage(). + </dd> </dl> <hr><!-- headerDoc=func; uid=//apple_ref/doc/compositePage/c/func/arglCameraFrustum; name=arglCameraFrustum --> *************** *** 163,167 **** is specified in column major order.</dd> <dt><code><i>scale</i></code></dt><dd>Specifies a scaling between ARToolKit's ! units (usually millimeters) and OpenGL's coordinate system units.</dd> </dl> </blockquote> --- 172,179 ---- is specified in column major order.</dd> <dt><code><i>scale</i></code></dt><dd>Specifies a scaling between ARToolKit's ! units (usually millimeters) and OpenGL's coordinate system units. ! What you pass for the scalefactor parameter depends on what units you ! want to do your OpenGL drawing in. If you use a scalefactor of 1.0, then<br> ! To use different OpenGL units, e.g. metres, then you would pass 0.001.</li></ol></dd> </dl> </blockquote> *************** *** 344,347 **** --- 356,384 ---- </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 + for camera lens distortion under this method. In contrast, TexImage2D is only + available on some implementations, but allows arglDispImage() to apply a correction + for camera lens distortion, and additionally offers greater potential for + accelerated drawing on some implementations. + <br><br> + The initial value is AR_DRAW_BY_TEXTURE_MAPPING. + </p> + <dt><i>Availability</i></dt><dd>First appeared in ARToolKit 2.68. + </dd> + </dl> <hr><!-- headerDoc=func; uid=//apple_ref/doc/compositePage/c/func/arglPixelFormatGet; name=arglPixelFormatGet --> <a name="//apple_ref/doc/compositePage/c/func/arglPixelFormatGet"></a> *************** *** 351,355 **** <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/arglPixelFormatGet //apple_ref/c/clm/arglPixelFormatGet //apple_ref/c/intfcm/arglPixelFormatGet //apple_ref/c/func/arglPixelFormatGet //apple_ref/c/ftmplt/arglPixelFormatGet //apple_ref/c/defn/arglPixelFormatGet //apple_ref/c/macro/arglPixelFormatGet" --><font class="function">arglPixelFormatGet</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>, ! <!-- a logicalPath="//apple_ref/c/cl/ARGL_PIX_FORMAT //apple_ref/c/cl/ARGL_PIX_FORMAT //apple_ref/c/tdef/ARGL_PIX_FORMAT //apple_ref/c/tag/ARGL_PIX_FORMAT //apple_ref/c/econst/ARGL_PIX_FORMAT //apple_ref/c/struct/ARGL_PIX_FORMAT //apple_ref/c/clconst/ARGL_PIX_FORMAT" --><font class="type">ARGL_PIX_FORMAT</font><!-- /a --> *<font class="param">format</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">size</font>); </pre></blockquote> <h5><font face="Lucida Grande,Helvetica,Arial">Parameter Descriptions</font></h5> --- 388,392 ---- <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/arglPixelFormatGet //apple_ref/c/clm/arglPixelFormatGet //apple_ref/c/intfcm/arglPixelFormatGet //apple_ref/c/func/arglPixelFormatGet //apple_ref/c/ftmplt/arglPixelFormatGet //apple_ref/c/defn/arglPixelFormatGet //apple_ref/c/macro/arglPixelFormatGet" --><font class="function">arglPixelFormatGet</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>, ! <!-- a logicalPath="//apple_ref/c/cl/AR_PIXEL_FORMAT //apple_ref/c/cl/AR_PIXEL_FORMAT //apple_ref/c/tdef/AR_PIXEL_FORMAT //apple_ref/c/tag/AR_PIXEL_FORMAT //apple_ref/c/econst/AR_PIXEL_FORMAT //apple_ref/c/struct/AR_PIXEL_FORMAT //apple_ref/c/clconst/AR_PIXEL_FORMAT" --><font class="type">AR_PIXEL_FORMAT</font><!-- /a --> *<font class="param">format</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">size</font>); </pre></blockquote> <h5><font face="Lucida Grande,Helvetica,Arial">Parameter Descriptions</font></h5> *************** *** 359,363 **** 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="//apple_ref/c/tdef/ARGL_PIX_FORMAT" -->ARGL_PIX_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> --- 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> *************** *** 367,372 **** <h5><font face="Lucida Grande,Helvetica,Arial">Discussion</font></h5><p>This function enquires as to the current format of pixel data being expected by the arglDispImage*() functions. The default format is determined by ! which of the possible AR_PIXEL_FORMAT_xxxx symbols was defined at the time the ! library was built. </p> <dt><i>Availability</i></dt><dd>First appeared in ARToolKit 2.71. --- 404,408 ---- <h5><font face="Lucida Grande,Helvetica,Arial">Discussion</font></h5><p>This function enquires as to the current format of pixel data being expected by the arglDispImage*() functions. The default format is determined by ! the value of AR_DEFAULT_PIXEL_FORMAT at the time the library was built. </p> <dt><i>Availability</i></dt><dd>First appeared in ARToolKit 2.71. *************** *** 380,384 **** <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/arglPixelFormatSet //apple_ref/c/clm/arglPixelFormatSet //apple_ref/c/intfcm/arglPixelFormatSet //apple_ref/c/func/arglPixelFormatSet //apple_ref/c/ftmplt/arglPixelFormatSet //apple_ref/c/defn/arglPixelFormatSet //apple_ref/c/macro/arglPixelFormatSet" --><font class="function">arglPixelFormatSet</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>, ! <!-- a logicalPath="//apple_ref/c/cl/ARGL_PIX_FORMAT //apple_ref/c/cl/ARGL_PIX_FORMAT //apple_ref/c/tdef/ARGL_PIX_FORMAT //apple_ref/c/tag/ARGL_PIX_FORMAT //apple_ref/c/econst/ARGL_PIX_FORMAT //apple_ref/c/struct/ARGL_PIX_FORMAT //apple_ref/c/clconst/ARGL_PIX_FORMAT" --><font class="type">ARGL_PIX_FORMAT</font><!-- /a --> <font class="param">format</font>); </pre></blockquote> <h5><font face="Lucida Grande,Helvetica,Arial">Parameter Descriptions</font></h5> <blockquote> --- 416,420 ---- <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/arglPixelFormatSet //apple_ref/c/clm/arglPixelFormatSet //apple_ref/c/intfcm/arglPixelFormatSet //apple_ref/c/func/arglPixelFormatSet //apple_ref/c/ftmplt/arglPixelFormatSet //apple_ref/c/defn/arglPixelFormatSet //apple_ref/c/macro/arglPixelFormatSet" --><font class="function">arglPixelFormatSet</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>, ! <!-- a logicalPath="//apple_ref/c/cl/AR_PIXEL_FORMAT //apple_ref/c/cl/AR_PIXEL_FORMAT //apple_ref/c/tdef/AR_PIXEL_FORMAT //apple_ref/c/tag/AR_PIXEL_FORMAT //apple_ref/c/econst/AR_PIXEL_FORMAT //apple_ref/c/struct/AR_PIXEL_FORMAT //apple_ref/c/clconst/AR_PIXEL_FORMAT" --><font class="type">AR_PIXEL_FORMAT</font><!-- /a --> <font class="param">format</font>); </pre></blockquote> <h5><font face="Lucida Grande,Helvetica,Arial">Parameter Descriptions</font></h5> <blockquote> *************** *** 387,391 **** 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="//apple_ref/c/tdef/ARGL_PIX_FORMAT" -->ARGL_PIX_FORMAT <!-- /a --> for a list of all possible formats.</dd> </dl> </blockquote> --- 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> *************** *** 397,402 **** gsub_lite the format the pixels being passed to arglDispImage*() functions are in. This setting applies only to the context passed in parameter ! contextSettings. The default format is determined by which of the possible ! AR_PIXEL_FORMAT_xxxx symbols was defined at the time the library was built. Usually, image data is passed in directly from images generated by ARVideo, and so you should ensure that ARVideo is generating pixels of the same format. --- 433,438 ---- gsub_lite the format the pixels being passed to arglDispImage*() functions are in. This setting applies only to the context passed in parameter ! contextSettings. The default format is determined by ! the value of AR_DEFAULT_PIXEL_FORMAT at the time the library was built. Usually, image data is passed in directly from images generated by ARVideo, and so you should ensure that ARVideo is generating pixels of the same format. *************** *** 432,554 **** </dd> </dl> ! <h2>Typedefs</h2> ! <hr><!-- headerDoc=tdef; uid=//apple_ref/doc/compositePage/c/tdef/ARGL_CONTEXT_SETTINGS_REF; name=ARGL_CONTEXT_SETTINGS_REF --> ! <a name="//apple_ref/doc/compositePage/c/tdef/ARGL_CONTEXT_SETTINGS_REF"></a> ! <table border="0" cellpadding="2" cellspacing="2" width="300"><tr><td valign="top" height="12" colspan="5"><h3><a name="ARGL_CONTEXT_SETTINGS_REF">ARGL_CONTEXT_SETTINGS_REF</a></h3> ! </td></tr></table><hr><dl></dl><p>Opaque type to hold ARGL settings for a given OpenGL context. ! </p> ! <blockquote><pre><font class="keyword">typedef</font> <font class="keyword">struct</font> <!-- a logicalPath="//apple_ref/c/cl/_ARGL_CONTEXT_SETTINGS //apple_ref/c/cl/_ARGL_CONTEXT_SETTINGS //apple_ref/c/tdef/_ARGL_CONTEXT_SETTINGS //apple_ref/c/tag/_ARGL_CONTEXT_SETTINGS //apple_ref/c/econst/_ARGL_CONTEXT_SETTINGS //apple_ref/c/struct/_ARGL_CONTEXT_SETTINGS //apple_ref/c/clconst/_ARGL_CONTEXT_SETTINGS" --><font class="type">_ARGL_CONTEXT_SETTINGS</font><!-- /a --> <font class="type">*</font><font class="var">ARGL_CONTEXT_SETTINGS_REF</font>; </pre></blockquote> ! <dl><h5><font face="Lucida Grande,Helvetica,Arial">Discussion</font></h5><p>An OpenGL context is an implementation-defined structure which ! keeps track of OpenGL state, including textures and display lists. ! Typically, individual OpenGL windows will have distinct OpenGL ! contexts assigned to them by the host operating system. ! <br><br> ! As gsub_lite uses textures and display lists, it must be able to ! track which OpenGL context a given texture or display list it is using ! belongs to. This is especially important when gsub_lite is being used to ! draw into more than one window (and therefore more than one context.) ! <br><br> ! Basically, functions which depend on OpenGL state, will require an ! ARGL_CONTEXT_SETTINGS_REF to be passed to them. An ARGL_CONTEXT_SETTINGS_REF ! is generated by setting the current OpenGL context (e.g. if using GLUT, ! you might call glutSetWindow()) and then calling arglSetupForCurrentContext(). ! When you have finished using ARGL in a given context, you should call ! arglCleanup(), passing in an ARGL_CONTEXT_SETTINGS_REF, to free the ! memory used by the settings structure. ! </p> ! <dt><i>Availability</i></dt><dd>First appeared in ARToolKit 2.68. ! </dd> ! </dl> ! <hr><!-- headerDoc=tdef; uid=//apple_ref/doc/compositePage/c/tdef/ARGL_PIX_FORMAT; name=ARGL_PIX_FORMAT --> ! <a name="//apple_ref/doc/compositePage/c/tdef/ARGL_PIX_FORMAT"></a> ! <table border="0" cellpadding="2" cellspacing="2" width="300"><tr><td valign="top" height="12" colspan="5"><h3><a name="ARGL_PIX_FORMAT">ARGL_PIX_FORMAT</a></h3> ! </td></tr></table><hr><dl></dl><p>ARToolKit pixel-format specifiers. ! </p> ! <blockquote><pre><font class="keyword">typedef</font> <font class="keyword">enum</font> { ! <!-- a logicalPath="//apple_ref/c/cl/ARGL_PIX_FORMAT_RGBA //apple_ref/c/cl/ARGL_PIX_FORMAT_RGBA //apple_ref/c/tdef/ARGL_PIX_FORMAT_RGBA //apple_ref/c/tag/ARGL_PIX_FORMAT_RGBA //apple_ref/c/econst/ARGL_PIX_FORMAT_RGBA //apple_ref/c/struct/ARGL_PIX_FORMAT_RGBA //apple_ref/c/clconst/ARGL_PIX_FORMAT_RGBA" --><font class="type">ARGL_PIX_FORMAT_RGBA</font><!-- /a --> = <font class="number">1</font>, ! <!-- a logicalPath="//apple_ref/c/cl/ARGL_PIX_FORMAT_ABGR //apple_ref/c/cl/ARGL_PIX_FORMAT_ABGR //apple_ref/c/tdef/ARGL_PIX_FORMAT_ABGR //apple_ref/c/tag/ARGL_PIX_FORMAT_ABGR //apple_ref/c/econst/ARGL_PIX_FORMAT_ABGR //apple_ref/c/struct/ARGL_PIX_FORMAT_ABGR //apple_ref/c/clconst/ARGL_PIX_FORMAT_ABGR" --><font class="type">ARGL_PIX_FORMAT_ABGR</font><!-- /a --> = <font class="number">2</font>, ! <!-- a logicalPath="//apple_ref/c/cl/ARGL_PIX_FORMAT_BGRA //apple_ref/c/cl/ARGL_PIX_FORMAT_BGRA //apple_ref/c/tdef/ARGL_PIX_FORMAT_BGRA //apple_ref/c/tag/ARGL_PIX_FORMAT_BGRA //apple_ref/c/econst/ARGL_PIX_FORMAT_BGRA //apple_ref/c/struct/ARGL_PIX_FORMAT_BGRA //apple_ref/c/clconst/ARGL_PIX_FORMAT_BGRA" --><font class="type">ARGL_PIX_FORMAT_BGRA</font><!-- /a --> = <font class="number">3</font>, ! <!-- a logicalPath="//apple_ref/c/cl/ARGL_PIX_FORMAT_ARGB //apple_ref/c/cl/ARGL_PIX_FORMAT_ARGB //apple_ref/c/tdef/ARGL_PIX_FORMAT_ARGB //apple_ref/c/tag/ARGL_PIX_FORMAT_ARGB //apple_ref/c/econst/ARGL_PIX_FORMAT_ARGB //apple_ref/c/struct/ARGL_PIX_FORMAT_ARGB //apple_ref/c/clconst/ARGL_PIX_FORMAT_ARGB" --><font class="type">ARGL_PIX_FORMAT_ARGB</font><!-- /a --> = <font class="number">4</font>, ! <!-- a logicalPath="//apple_ref/c/cl/ARGL_PIX_FORMAT_RGB //apple_ref/c/cl/ARGL_PIX_FORMAT_RGB //apple_ref/c/tdef/ARGL_PIX_FORMAT_RGB //apple_ref/c/tag/ARGL_PIX_FORMAT_RGB //apple_ref/c/econst/ARGL_PIX_FORMAT_RGB //apple_ref/c/struct/ARGL_PIX_FORMAT_RGB //apple_ref/c/clconst/ARGL_PIX_FORMAT_RGB" --><font class="type">ARGL_PIX_FORMAT_RGB</font><!-- /a --> = <font class="number">5</font>, ! <!-- a logicalPath="//apple_ref/c/cl/ARGL_PIX_FORMAT_BGR //apple_ref/c/cl/ARGL_PIX_FORMAT_BGR //apple_ref/c/tdef/ARGL_PIX_FORMAT_BGR //apple_ref/c/tag/ARGL_PIX_FORMAT_BGR //apple_ref/c/econst/ARGL_PIX_FORMAT_BGR //apple_ref/c/struct/ARGL_PIX_FORMAT_BGR //apple_ref/c/clconst/ARGL_PIX_FORMAT_BGR" --><font class="type">ARGL_PIX_FORMAT_BGR</font><!-- /a --> = <font class="number">6</font>, ! <!-- a logicalPath="//apple_ref/c/cl/ARGL_PIX_FORMAT_2vuy //apple_ref/c/cl/ARGL_PIX_FORMAT_2vuy //apple_ref/c/tdef/ARGL_PIX_FORMAT_2vuy //apple_ref/c/tag/ARGL_PIX_FORMAT_2vuy //apple_ref/c/econst/ARGL_PIX_FORMAT_2vuy //apple_ref/c/struct/ARGL_PIX_FORMAT_2vuy //apple_ref/c/clconst/ARGL_PIX_FORMAT_2vuy" --><font class="type">ARGL_PIX_FORMAT_2vuy</font><!-- /a --> = <font class="number">7</font>, ! <!-- a logicalPath="//apple_ref/c/cl/ARGL_PIX_FORMAT_UYVY //apple_ref/c/cl/ARGL_PIX_FORMAT_UYVY //apple_ref/c/tdef/ARGL_PIX_FORMAT_UYVY //apple_ref/c/tag/ARGL_PIX_FORMAT_UYVY //apple_ref/c/econst/ARGL_PIX_FORMAT_UYVY //apple_ref/c/struct/ARGL_PIX_FORMAT_UYVY //apple_ref/c/clconst/ARGL_PIX_FORMAT_UYVY" --><font class="type">ARGL_PIX_FORMAT_UYVY</font><!-- /a --> = <font class="var">ARGL_PIX_FORMAT_2vuy</font>, ! <!-- a logicalPath="//apple_ref/c/cl/ARGL_PIX_FORMAT_yuvs //apple_ref/c/cl/ARGL_PIX_FORMAT_yuvs //apple_ref/c/tdef/ARGL_PIX_FORMAT_yuvs //apple_ref/c/tag/ARGL_PIX_FORMAT_yuvs //apple_ref/c/econst/ARGL_PIX_FORMAT_yuvs //apple_ref/c/struct/ARGL_PIX_FORMAT_yuvs //apple_ref/c/clconst/ARGL_PIX_FORMAT_yuvs" --><font class="type">ARGL_PIX_FORMAT_yuvs</font><!-- /a --> = <font class="number">8</font>, ! <!-- a logicalPath="//apple_ref/c/cl/ARGL_PIX_FORMAT_YUY2 //apple_ref/c/cl/ARGL_PIX_FORMAT_YUY2 //apple_ref/c/tdef/ARGL_PIX_FORMAT_YUY2 //apple_ref/c/tag/ARGL_PIX_FORMAT_YUY2 //apple_ref/c/econst/ARGL_PIX_FORMAT_YUY2 //apple_ref/c/struct/ARGL_PIX_FORMAT_YUY2 //apple_ref/c/clconst/ARGL_PIX_FORMAT_YUY2" --><font class="type">ARGL_PIX_FORMAT_YUY2</font><!-- /a --> = <font class="var">ARGL_PIX_FORMAT_yuvs</font>, ! } <font class="var">ARGL_PIX_FORMAT</font>; </pre></blockquote> ! <h5><font face="Lucida Grande,Helvetica,Arial">Constants</font></h5> ! <blockquote> ! <dl> ! <dt><code>ARGL_PIX_FORMAT_RGBA</code></dt><dd>Each pixel is represented by 32 bits. Eight bits per each Red, Green, ! Blue, and Alpha component.</dd> ! <dt><code>ARGL_PIX_FORMAT_ABGR</code></dt><dd>Each pixel is represented by 32 bits. Eight bits per each Alpha, Blue, ! Green, and Red component. This is the native 32 bit format for the SGI ! platform.</dd> ! <dt><code>ARGL_PIX_FORMAT_BGRA</code></dt><dd>Each pixel is represented by 32 bits. Eight bits per each Blue, Green, ! Red, and Alpha component. This is the native 32 bit format for the Win32 ! platform.</dd> ! <dt><code>ARGL_PIX_FORMAT_ARGB</code></dt><dd>Each pixel is represented by 32 bits. Eight bits per each Alpha, Red, ! Green, and Blue component. This is the native 32 bit format for the Mac ! platform.</dd> ! <dt><code>ARGL_PIX_FORMAT_RGB</code></dt><dd>Each pixel is represented by 24 bits. Eight bits per each Red, Green, ! and Blue component. This is the native 24 bit format for the Mac platform.</dd> ! <dt><code>ARGL_PIX_FORMAT_BGR</code></dt><dd>Each pixel is represented by 24 bits. Eight bits per each Blue, Red, and ! Green component. This is the native 24 bit format for the Win32 platform.</dd> ! <dt><code>ARGL_PIX_FORMAT_2vuy</code></dt><dd>8-bit 4:2:2 Component Y'CbCr format. Each 16 bit pixel is represented ! by an unsigned eight bit luminance component and two unsigned eight bit ! chroma components. Each pair of pixels shares a common set of chroma ! values. The components are ordered in memory; Cb, Y0, Cr, Y1. The ! luminance components have a range of [16, 235], while the chroma value ! has a range of [16, 240]. This is consistent with the CCIR601 spec. ! This format is fairly prevalent on both Mac and Win32 platforms. ! '2vuy' is the Apple QuickTime four-character code for this pixel format. ! The equivalent Microsoft fourCC is 'UYVY'.</dd> ! <dt><code>ARGL_PIX_FORMAT_yuvs</code></dt><dd>8-bit 4:2:2 Component Y'CbCr format. Identical to the ARGL_PIX_FORMAT_2vuy except ! each 16 bit word has been byte swapped. This results in a component ! ordering of; Y0, Cb, Y1, Cr. ! This is most prevalent yuv 4:2:2 format on both Mac and Win32 platforms. ! 'yuvs' is the Apple QuickTime four-character code for this pixel format. ! The equivalent Microsoft fourCC is 'YUY2'.</dd> ! </dl> ! </blockquote> ! <dl><h5><font face="Lucida Grande,Helvetica,Arial">Discussion</font></h5><p>ARToolKit functions can accept pixel data in a variety of formats. ! This enumerations provides a set of constants you can use to request ! data in a particular pixel format from an ARToolKit function that ! returns data to you, or to specify that data you are providing to an ! ARToolKit function is in a particular pixel format. ! </p> ! </dl> ! <h2>Globals</h2> ! <hr><!-- headerDoc=data; uid=//apple_ref/doc/compositePage/c/data/arglDrawMode; name=arglDrawMode --> ! <a name="//apple_ref/doc/compositePage/c/data/arglDrawMode"></a> ! <table border="0" cellpadding="2" cellspacing="2" width="300"><tr><td valign="top" height="12" colspan="5"><h3><a name="arglDrawMode">arglDrawMode</a></h3> ! </td></tr></table><hr><dl></dl><p>Determines display method by which arglDispImage() transfers pixels. ! </p> ! <blockquote><pre><font class="keyword">extern</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="var">arglDrawMode</font>; </pre></blockquote> ! <dl><h5><font face="Lucida Grande,Helvetica,Arial">Discussion</font></h5><p>The value of this variable 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 ! for camera lens distortion under this method. In contrast, TexImage2D is only ! available on some implementations, but allows arglDispImage() to apply a correction ! for camera lens distortion, and additionally offers greater potential for ! accelerated drawing on some implementations. ! <br><br> ! The initial value is defined to the value of the symbolic constant DEFAULT_DRAW_MODE ! (defined in <AR/config.h>). ! </p> ! <dt><i>Availability</i></dt><dd>First appeared in ARToolKit 2.68. ! </dd> ! </dl> ! <hr><!-- headerDoc=data; uid=//apple_ref/doc/compositePage/c/data/arglTexmapMode; name=arglTexmapMode --> ! <a name="//apple_ref/doc/compositePage/c/data/arglTexmapMode"></a> ! <table border="0" cellpadding="2" cellspacing="2" width="300"><tr><td valign="top" height="12" colspan="5"><h3><a name="arglTexmapMode">arglTexmapMode</a></h3> </td></tr></table><hr><dl></dl><p>Determines use of full or half-resolution TexImage2D pixel-transfer in arglDispImage(). </p> ! <blockquote><pre><font class="keyword">extern</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="var">arglTexmapMode</font>; </pre></blockquote> ! <dl><h5><font face="Lucida Grande,Helvetica,Arial">Discussion</font></h5><p>When arglDrawMode is set to AR_DRAW_BY_TEXTURE_MAPPING, the value of this variable 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 --- 468,480 ---- </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> ! <table border="0" cellpadding="2" cellspacing="2" width="300"><tr><td valign="top" height="12" colspan="5"><h3><a name="arglTexmapModeSet">arglTexmapModeSet</a></h3> </td></tr></table><hr><dl></dl><p>Determines use of full or half-resolution TexImage2D pixel-transfer in arglDispImage(). </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/arglTexmapModeSet //apple_ref/c/clm/arglTexmapModeSet //apple_ref/c/intfcm/arglTexmapModeSet //apple_ref/c/func/arglTexmapModeSet //apple_ref/c/ftmplt/arglTexmapModeSet //apple_ref/c/defn/arglTexmapModeSet //apple_ref/c/macro/arglTexmapModeSet" --><font class="function">arglTexmapModeSet</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>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 *************** *** 559,572 **** The latter method is well-suited to drawing interlaced images, as would be obtained from DV camera sources in interlaced mode or composite video sources. </p> <dt><i>Availability</i></dt><dd>First appeared in ARToolKit 2.68. </dd> </dl> ! <hr><!-- headerDoc=data; uid=//apple_ref/doc/compositePage/c/data/arglTexRectangle; name=arglTexRectangle --> ! <a name="//apple_ref/doc/compositePage/c/data/arglTexRectangle"></a> ! <table border="0" cellpadding="2" cellspacing="2" width="300"><tr><td valign="top" height="12" colspan="5"><h3><a name="arglTexRectangle">arglTexRectangle</a></h3> </td></tr></table><hr><dl></dl><p>Determines use of rectangular TexImage2D pixel-transfer in arglDispImage(). </p> ! <blockquote><pre><font class="keyword">extern</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="var">arglTexRectangle</font>; </pre></blockquote> <dl><h5><font face="Lucida Grande,Helvetica,Arial">Discussion</font></h5><p>On implementations which support the OpenGL extension for rectangular textures (of non power-of-two size), and when arglDrawMode is set to AR_DRAW_BY_TEXTURE_MAPPING, --- 485,502 ---- The latter method is well-suited to drawing interlaced images, as would be obtained from DV camera sources in interlaced mode or composite video sources. + <br><br> + The initial value is AR_DRAW_TEXTURE_FULL_IMAGE. </p> <dt><i>Availability</i></dt><dd>First appeared in ARToolKit 2.68. </dd> </dl> ! <hr><!-- headerDoc=func; uid=//apple_ref/doc/compositePage/c/func/arglTexRectangleSet; name=arglTexRectangleSet --> ! <a name="//apple_ref/doc/compositePage/c/func/arglTexRectangleSet"></a> ! <table border="0" cellpadding="2" cellspacing="2" width="300"><tr><td valign="top" height="12" colspan="5"><h3><a name="arglTexRectangleSet">arglTexRectangleSet</a></h3> </td></tr></table><hr><dl></dl><p>Determines use of rectangular TexImage2D pixel-transfer in arglDispImage(). </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/arglTexRectangleSet //apple_ref/c/clm/arglTexRectangleSet //apple_ref/c/intfcm/arglTexRectangleSet //apple_ref/c/func/arglTexRectangleSet //apple_ref/c/ftmplt/arglTexRectangleSet //apple_ref/c/defn/arglTexRectangleSet //apple_ref/c/macro/arglTexRectangleSet" --><font class="function">arglTexRectangleSet</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">state</font>); </pre></blockquote> <dl><h5><font face="Lucida Grande,Helvetica,Arial">Discussion</font></h5><p>On implementations which support the OpenGL extension for rectangular textures (of non power-of-two size), and when arglDrawMode is set to AR_DRAW_BY_TEXTURE_MAPPING, *************** *** 582,585 **** --- 512,543 ---- </dd> </dl> + <h2>Typedefs</h2> + <hr><!-- headerDoc=tdef; uid=//apple_ref/doc/compositePage/c/tdef/ARGL_CONTEXT_SETTINGS_REF; name=ARGL_CONTEXT_SETTINGS_REF --> + <a name="//apple_ref/doc/compositePage/c/tdef/ARGL_CONTEXT_SETTINGS_REF"></a> + <table border="0" cellpadding="2" cellspacing="2" width="300"><tr><td valign="top" height="12" colspan="5"><h3><a name="ARGL_CONTEXT_SETTINGS_REF">ARGL_CONTEXT_SETTINGS_REF</a></h3> + </td></tr></table><hr><dl></dl><p>Opaque type to hold ARGL settings for a given OpenGL context. + </p> + <blockquote><pre><font class="keyword">typedef</font> <font class="keyword">struct</font> <!-- a logicalPath="//apple_ref/c/cl/_ARGL_CONTEXT_SETTINGS //apple_ref/c/cl/_ARGL_CONTEXT_SETTINGS //apple_ref/c/tdef/_ARGL_CONTEXT_SETTINGS //apple_ref/c/tag/_ARGL_CONTEXT_SETTINGS //apple_ref/c/econst/_ARGL_CONTEXT_SETTINGS //apple_ref/c/struct/_ARGL_CONTEXT_SETTINGS //apple_ref/c/clconst/_ARGL_CONTEXT_SETTINGS" --><font class="type">_ARGL_CONTEXT_SETTINGS</font><!-- /a --> <font class="type">*</font><font class="var">ARGL_CONTEXT_SETTINGS_REF</font>; </pre></blockquote> + <dl><h5><font face="Lucida Grande,Helvetica,Arial">Discussion</font></h5><p>An OpenGL context is an implementation-defined structure which + keeps track of OpenGL state, including textures and display lists. + Typically, individual OpenGL windows will have distinct OpenGL + contexts assigned to them by the host operating system. + <br><br> + As gsub_lite uses textures and display lists, it must be able to + track which OpenGL context a given texture or display list it is using + belongs to. This is especially important when gsub_lite is being used to + draw into more than one window (and therefore more than one context.) + <br><br> + Basically, functions which depend on OpenGL state, will require an + ARGL_CONTEXT_SETTINGS_REF to be passed to them. An ARGL_CONTEXT_SETTINGS_REF + is generated by setting the current OpenGL context (e.g. if using GLUT, + you might call glutSetWindow()) and then calling arglSetupForCurrentContext(). + When you have finished using ARGL in a given context, you should call + arglCleanup(), passing in an ARGL_CONTEXT_SETTINGS_REF, to free the + memory used by the settings structure. + </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) |
|
From: Philip L. <phi...@us...> - 2006-04-27 18:52:48
|
Update of /cvsroot/artoolkit/artoolkit/doc/gsub_lite/Functions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24680 Modified Files: Functions.html Log Message: Update for gsub_lite rev 2.8.1. Index: Functions.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/gsub_lite/Functions/Functions.html,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Functions.html 16 Aug 2005 00:49:40 -0000 1.4 --- Functions.html 27 Apr 2006 18:52:45 -0000 1.5 *************** *** 30,33 **** --- 30,36 ---- <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> <dd>Get the format of pixel data in which arglDispImage*() is expecting data to be passed. *************** *** 39,42 **** --- 42,51 ---- <dd>Initialise the gsub_lite library for the current OpenGL context. </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/arglTexRectangleSet" target="doc">arglTexRectangleSet</a></tt></dt> + <dd>Determines use of rectangular TexImage2D pixel-transfer in arglDispImage(). + </dd> </dl> <hr><!-- headerDoc=func; uid=//apple_ref/c/func/arglCameraFrustum; name=arglCameraFrustum --> *************** *** 102,106 **** is specified in column major order.</dd> <dt><code><i>scale</i></code></dt><dd>Specifies a scaling between ARToolKit's ! units (usually millimeters) and OpenGL's coordinate system units.</dd> </dl> </blockquote> --- 111,118 ---- is specified in column major order.</dd> <dt><code><i>scale</i></code></dt><dd>Specifies a scaling between ARToolKit's ! units (usually millimeters) and OpenGL's coordinate system units. ! What you pass for the scalefactor parameter depends on what units you ! want to do your OpenGL drawing in. If you use a scalefactor of 1.0, then<br> ! To use different OpenGL units, e.g. metres, then you would pass 0.001.</li></ol></dd> </dl> </blockquote> *************** *** 283,286 **** --- 295,323 ---- </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 + for camera lens distortion under this method. In contrast, TexImage2D is only + available on some implementations, but allows arglDispImage() to apply a correction + for camera lens distortion, and additionally offers greater potential for + accelerated drawing on some implementations. + <br><br> + The initial value is AR_DRAW_BY_TEXTURE_MAPPING. + </p> + <dt><i>Availability</i></dt><dd>First appeared in ARToolKit 2.68. + </dd> + </dl> <hr><!-- headerDoc=func; uid=//apple_ref/c/func/arglPixelFormatGet; name=arglPixelFormatGet --> <a name="//apple_ref/c/func/arglPixelFormatGet"></a> *************** *** 290,294 **** <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/arglPixelFormatGet //apple_ref/c/clm/arglPixelFormatGet //apple_ref/c/intfcm/arglPixelFormatGet //apple_ref/c/func/arglPixelFormatGet //apple_ref/c/ftmplt/arglPixelFormatGet //apple_ref/c/defn/arglPixelFormatGet //apple_ref/c/macro/arglPixelFormatGet" --><font class="function">arglPixelFormatGet</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>, ! <!-- a logicalPath="//apple_ref/c/cl/ARGL_PIX_FORMAT //apple_ref/c/cl/ARGL_PIX_FORMAT //apple_ref/c/tdef/ARGL_PIX_FORMAT //apple_ref/c/tag/ARGL_PIX_FORMAT //apple_ref/c/econst/ARGL_PIX_FORMAT //apple_ref/c/struct/ARGL_PIX_FORMAT //apple_ref/c/clconst/ARGL_PIX_FORMAT" --><font class="type">ARGL_PIX_FORMAT</font><!-- /a --> *<font class="param">format</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">size</font>); </pre></blockquote> <h5><font face="Lucida Grande,Helvetica,Arial">Parameter Descriptions</font></h5> --- 327,331 ---- <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/arglPixelFormatGet //apple_ref/c/clm/arglPixelFormatGet //apple_ref/c/intfcm/arglPixelFormatGet //apple_ref/c/func/arglPixelFormatGet //apple_ref/c/ftmplt/arglPixelFormatGet //apple_ref/c/defn/arglPixelFormatGet //apple_ref/c/macro/arglPixelFormatGet" --><font class="function">arglPixelFormatGet</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>, ! <!-- a logicalPath="//apple_ref/c/cl/AR_PIXEL_FORMAT //apple_ref/c/cl/AR_PIXEL_FORMAT //apple_ref/c/tdef/AR_PIXEL_FORMAT //apple_ref/c/tag/AR_PIXEL_FORMAT //apple_ref/c/econst/AR_PIXEL_FORMAT //apple_ref/c/struct/AR_PIXEL_FORMAT //apple_ref/c/clconst/AR_PIXEL_FORMAT" --><font class="type">AR_PIXEL_FORMAT</font><!-- /a --> *<font class="param">format</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">size</font>); </pre></blockquote> <h5><font face="Lucida Grande,Helvetica,Arial">Parameter Descriptions</font></h5> *************** *** 298,302 **** 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="//apple_ref/c/tdef/ARGL_PIX_FORMAT" -->ARGL_PIX_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> --- 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> *************** *** 306,311 **** <h5><font face="Lucida Grande,Helvetica,Arial">Discussion</font></h5><p>This function enquires as to the current format of pixel data being expected by the arglDispImage*() functions. The default format is determined by ! which of the possible AR_PIXEL_FORMAT_xxxx symbols was defined at the time the ! library was built. </p> <dt><i>Availability</i></dt><dd>First appeared in ARToolKit 2.71. --- 343,347 ---- <h5><font face="Lucida Grande,Helvetica,Arial">Discussion</font></h5><p>This function enquires as to the current format of pixel data being expected by the arglDispImage*() functions. The default format is determined by ! the value of AR_DEFAULT_PIXEL_FORMAT at the time the library was built. </p> <dt><i>Availability</i></dt><dd>First appeared in ARToolKit 2.71. *************** *** 319,323 **** <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/arglPixelFormatSet //apple_ref/c/clm/arglPixelFormatSet //apple_ref/c/intfcm/arglPixelFormatSet //apple_ref/c/func/arglPixelFormatSet //apple_ref/c/ftmplt/arglPixelFormatSet //apple_ref/c/defn/arglPixelFormatSet //apple_ref/c/macro/arglPixelFormatSet" --><font class="function">arglPixelFormatSet</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>, ! <!-- a logicalPath="//apple_ref/c/cl/ARGL_PIX_FORMAT //apple_ref/c/cl/ARGL_PIX_FORMAT //apple_ref/c/tdef/ARGL_PIX_FORMAT //apple_ref/c/tag/ARGL_PIX_FORMAT //apple_ref/c/econst/ARGL_PIX_FORMAT //apple_ref/c/struct/ARGL_PIX_FORMAT //apple_ref/c/clconst/ARGL_PIX_FORMAT" --><font class="type">ARGL_PIX_FORMAT</font><!-- /a --> <font class="param">format</font>); </pre></blockquote> <h5><font face="Lucida Grande,Helvetica,Arial">Parameter Descriptions</font></h5> <blockquote> --- 355,359 ---- <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/arglPixelFormatSet //apple_ref/c/clm/arglPixelFormatSet //apple_ref/c/intfcm/arglPixelFormatSet //apple_ref/c/func/arglPixelFormatSet //apple_ref/c/ftmplt/arglPixelFormatSet //apple_ref/c/defn/arglPixelFormatSet //apple_ref/c/macro/arglPixelFormatSet" --><font class="function">arglPixelFormatSet</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>, ! <!-- a logicalPath="//apple_ref/c/cl/AR_PIXEL_FORMAT //apple_ref/c/cl/AR_PIXEL_FORMAT //apple_ref/c/tdef/AR_PIXEL_FORMAT //apple_ref/c/tag/AR_PIXEL_FORMAT //apple_ref/c/econst/AR_PIXEL_FORMAT //apple_ref/c/struct/AR_PIXEL_FORMAT //apple_ref/c/clconst/AR_PIXEL_FORMAT" --><font class="type">AR_PIXEL_FORMAT</font><!-- /a --> <font class="param">format</font>); </pre></blockquote> <h5><font face="Lucida Grande,Helvetica,Arial">Parameter Descriptions</font></h5> <blockquote> *************** *** 326,330 **** 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="//apple_ref/c/tdef/ARGL_PIX_FORMAT" -->ARGL_PIX_FORMAT <!-- /a --> for a list of all possible formats.</dd> </dl> </blockquote> --- 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> *************** *** 336,341 **** gsub_lite the format the pixels being passed to arglDispImage*() functions are in. This setting applies only to the context passed in parameter ! contextSettings. The default format is determined by which of the possible ! AR_PIXEL_FORMAT_xxxx symbols was defined at the time the library was built. Usually, image data is passed in directly from images generated by ARVideo, and so you should ensure that ARVideo is generating pixels of the same format. --- 372,377 ---- gsub_lite the format the pixels being passed to arglDispImage*() functions are in. This setting applies only to the context passed in parameter ! contextSettings. The default format is determined by ! the value of AR_DEFAULT_PIXEL_FORMAT at the time the library was built. Usually, image data is passed in directly from images generated by ARVideo, and so you should ensure that ARVideo is generating pixels of the same format. *************** *** 371,374 **** --- 407,454 ---- </dd> </dl> + <hr><!-- headerDoc=func; uid=//apple_ref/c/func/arglTexmapModeSet; name=arglTexmapModeSet --> + <a name="//apple_ref/c/func/arglTexmapModeSet"></a> + <table border="0" cellpadding="2" cellspacing="2" width="300"><tr><td valign="top" height="12" colspan="5"><h3><a name="arglTexmapModeSet">arglTexmapModeSet</a></h3> + </td></tr></table><hr><dl></dl><p>Determines use of full or half-resolution TexImage2D pixel-transfer in arglDispImage(). + </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/arglTexmapModeSet //apple_ref/c/clm/arglTexmapModeSet //apple_ref/c/intfcm/arglTexmapModeSet //apple_ref/c/func/arglTexmapModeSet //apple_ref/c/ftmplt/arglTexmapModeSet //apple_ref/c/defn/arglTexmapModeSet //apple_ref/c/macro/arglTexmapModeSet" --><font class="function">arglTexmapModeSet</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>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. + <br><br> + The latter method is well-suited to drawing interlaced images, as would be obtained + from DV camera sources in interlaced mode or composite video sources. + <br><br> + The initial value is AR_DRAW_TEXTURE_FULL_IMAGE. + </p> + <dt><i>Availability</i></dt><dd>First appeared in ARToolKit 2.68. + </dd> + </dl> + <hr><!-- headerDoc=func; uid=//apple_ref/c/func/arglTexRectangleSet; name=arglTexRectangleSet --> + <a name="//apple_ref/c/func/arglTexRectangleSet"></a> + <table border="0" cellpadding="2" cellspacing="2" width="300"><tr><td valign="top" height="12" colspan="5"><h3><a name="arglTexRectangleSet">arglTexRectangleSet</a></h3> + </td></tr></table><hr><dl></dl><p>Determines use of rectangular TexImage2D pixel-transfer in arglDispImage(). + </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/arglTexRectangleSet //apple_ref/c/clm/arglTexRectangleSet //apple_ref/c/intfcm/arglTexRectangleSet //apple_ref/c/func/arglTexRectangleSet //apple_ref/c/ftmplt/arglTexRectangleSet //apple_ref/c/defn/arglTexRectangleSet //apple_ref/c/macro/arglTexRectangleSet" --><font class="function">arglTexRectangleSet</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">state</font>); </pre></blockquote> + <dl><h5><font face="Lucida Grande,Helvetica,Arial">Discussion</font></h5><p>On implementations which support the OpenGL extension for rectangular textures (of + non power-of-two size), and when arglDrawMode is set to AR_DRAW_BY_TEXTURE_MAPPING, + the value of this variable determines whether rectangular textures or ordinary + (power-of-two) textures are used by arglDispImage(). A value of TRUE specifies the + use of rectangluar textures. A value of FALSE specifies the use of ordinary textures. + <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) |
|
From: Philip L. <phi...@us...> - 2006-04-27 18:52:41
|
Update of /cvsroot/artoolkit/artoolkit/doc/gsub_lite/DataTypes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24599 Modified Files: DataTypes.html Log Message: Update for gsub_lite rev 2.8.1. Index: DataTypes.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/gsub_lite/DataTypes/DataTypes.html,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** DataTypes.html 16 Aug 2005 00:49:49 -0000 1.4 --- DataTypes.html 27 Apr 2006 18:52:34 -0000 1.5 *************** *** 34,96 **** </dd> </dl> - <hr><!-- headerDoc=tdef; uid=//apple_ref/c/tdef/ARGL_PIX_FORMAT; name=ARGL_PIX_FORMAT --> - <a name="//apple_ref/c/tdef/ARGL_PIX_FORMAT"></a> - <table border="0" cellpadding="2" cellspacing="2" width="300"><tr><td valign="top" height="12" colspan="5"><h3><a name="ARGL_PIX_FORMAT">ARGL_PIX_FORMAT</a></h3> - </td></tr></table><hr><dl></dl><p>ARToolKit pixel-format specifiers. - </p> - <blockquote><pre><font class="keyword">typedef</font> <font class="keyword">enum</font> { - <!-- a logicalPath="//apple_ref/c/cl/ARGL_PIX_FORMAT_RGBA //apple_ref/c/cl/ARGL_PIX_FORMAT_RGBA //apple_ref/c/tdef/ARGL_PIX_FORMAT_RGBA //apple_ref/c/tag/ARGL_PIX_FORMAT_RGBA //apple_ref/c/econst/ARGL_PIX_FORMAT_RGBA //apple_ref/c/struct/ARGL_PIX_FORMAT_RGBA //apple_ref/c/clconst/ARGL_PIX_FORMAT_RGBA" --><font class="type">ARGL_PIX_FORMAT_RGBA</font><!-- /a --> = <font class="number">1</font>, - <!-- a logicalPath="//apple_ref/c/cl/ARGL_PIX_FORMAT_ABGR //apple_ref/c/cl/ARGL_PIX_FORMAT_ABGR //apple_ref/c/tdef/ARGL_PIX_FORMAT_ABGR //apple_ref/c/tag/ARGL_PIX_FORMAT_ABGR //apple_ref/c/econst/ARGL_PIX_FORMAT_ABGR //apple_ref/c/struct/ARGL_PIX_FORMAT_ABGR //apple_ref/c/clconst/ARGL_PIX_FORMAT_ABGR" --><font class="type">ARGL_PIX_FORMAT_ABGR</font><!-- /a --> = <font class="number">2</font>, - <!-- a logicalPath="//apple_ref/c/cl/ARGL_PIX_FORMAT_BGRA //apple_ref/c/cl/ARGL_PIX_FORMAT_BGRA //apple_ref/c/tdef/ARGL_PIX_FORMAT_BGRA //apple_ref/c/tag/ARGL_PIX_FORMAT_BGRA //apple_ref/c/econst/ARGL_PIX_FORMAT_BGRA //apple_ref/c/struct/ARGL_PIX_FORMAT_BGRA //apple_ref/c/clconst/ARGL_PIX_FORMAT_BGRA" --><font class="type">ARGL_PIX_FORMAT_BGRA</font><!-- /a --> = <font class="number">3</font>, - <!-- a logicalPath="//apple_ref/c/cl/ARGL_PIX_FORMAT_ARGB //apple_ref/c/cl/ARGL_PIX_FORMAT_ARGB //apple_ref/c/tdef/ARGL_PIX_FORMAT_ARGB //apple_ref/c/tag/ARGL_PIX_FORMAT_ARGB //apple_ref/c/econst/ARGL_PIX_FORMAT_ARGB //apple_ref/c/struct/ARGL_PIX_FORMAT_ARGB //apple_ref/c/clconst/ARGL_PIX_FORMAT_ARGB" --><font class="type">ARGL_PIX_FORMAT_ARGB</font><!-- /a --> = <font class="number">4</font>, - <!-- a logicalPath="//apple_ref/c/cl/ARGL_PIX_FORMAT_RGB //apple_ref/c/cl/ARGL_PIX_FORMAT_RGB //apple_ref/c/tdef/ARGL_PIX_FORMAT_RGB //apple_ref/c/tag/ARGL_PIX_FORMAT_RGB //apple_ref/c/econst/ARGL_PIX_FORMAT_RGB //apple_ref/c/struct/ARGL_PIX_FORMAT_RGB //apple_ref/c/clconst/ARGL_PIX_FORMAT_RGB" --><font class="type">ARGL_PIX_FORMAT_RGB</font><!-- /a --> = <font class="number">5</font>, - <!-- a logicalPath="//apple_ref/c/cl/ARGL_PIX_FORMAT_BGR //apple_ref/c/cl/ARGL_PIX_FORMAT_BGR //apple_ref/c/tdef/ARGL_PIX_FORMAT_BGR //apple_ref/c/tag/ARGL_PIX_FORMAT_BGR //apple_ref/c/econst/ARGL_PIX_FORMAT_BGR //apple_ref/c/struct/ARGL_PIX_FORMAT_BGR //apple_ref/c/clconst/ARGL_PIX_FORMAT_BGR" --><font class="type">ARGL_PIX_FORMAT_BGR</font><!-- /a --> = <font class="number">6</font>, - <!-- a logicalPath="//apple_ref/c/cl/ARGL_PIX_FORMAT_2vuy //apple_ref/c/cl/ARGL_PIX_FORMAT_2vuy //apple_ref/c/tdef/ARGL_PIX_FORMAT_2vuy //apple_ref/c/tag/ARGL_PIX_FORMAT_2vuy //apple_ref/c/econst/ARGL_PIX_FORMAT_2vuy //apple_ref/c/struct/ARGL_PIX_FORMAT_2vuy //apple_ref/c/clconst/ARGL_PIX_FORMAT_2vuy" --><font class="type">ARGL_PIX_FORMAT_2vuy</font><!-- /a --> = <font class="number">7</font>, - <!-- a logicalPath="//apple_ref/c/cl/ARGL_PIX_FORMAT_UYVY //apple_ref/c/cl/ARGL_PIX_FORMAT_UYVY //apple_ref/c/tdef/ARGL_PIX_FORMAT_UYVY //apple_ref/c/tag/ARGL_PIX_FORMAT_UYVY //apple_ref/c/econst/ARGL_PIX_FORMAT_UYVY //apple_ref/c/struct/ARGL_PIX_FORMAT_UYVY //apple_ref/c/clconst/ARGL_PIX_FORMAT_UYVY" --><font class="type">ARGL_PIX_FORMAT_UYVY</font><!-- /a --> = <font class="var">ARGL_PIX_FORMAT_2vuy</font>, - <!-- a logicalPath="//apple_ref/c/cl/ARGL_PIX_FORMAT_yuvs //apple_ref/c/cl/ARGL_PIX_FORMAT_yuvs //apple_ref/c/tdef/ARGL_PIX_FORMAT_yuvs //apple_ref/c/tag/ARGL_PIX_FORMAT_yuvs //apple_ref/c/econst/ARGL_PIX_FORMAT_yuvs //apple_ref/c/struct/ARGL_PIX_FORMAT_yuvs //apple_ref/c/clconst/ARGL_PIX_FORMAT_yuvs" --><font class="type">ARGL_PIX_FORMAT_yuvs</font><!-- /a --> = <font class="number">8</font>, - <!-- a logicalPath="//apple_ref/c/cl/ARGL_PIX_FORMAT_YUY2 //apple_ref/c/cl/ARGL_PIX_FORMAT_YUY2 //apple_ref/c/tdef/ARGL_PIX_FORMAT_YUY2 //apple_ref/c/tag/ARGL_PIX_FORMAT_YUY2 //apple_ref/c/econst/ARGL_PIX_FORMAT_YUY2 //apple_ref/c/struct/ARGL_PIX_FORMAT_YUY2 //apple_ref/c/clconst/ARGL_PIX_FORMAT_YUY2" --><font class="type">ARGL_PIX_FORMAT_YUY2</font><!-- /a --> = <font class="var">ARGL_PIX_FORMAT_yuvs</font>, - } <font class="var">ARGL_PIX_FORMAT</font>; </pre></blockquote> - <h5><font face="Lucida Grande,Helvetica,Arial">Constants</font></h5> - <blockquote> - <dl> - <dt><a name="//apple_ref/c/econst/ARGL_PIX_FORMAT_RGBA"><code>ARGL_PIX_FORMAT_RGBA</code></a></dt><dd>Each pixel is represented by 32 bits. Eight bits per each Red, Green, - Blue, and Alpha component.</dd> - <dt><a name="//apple_ref/c/econst/ARGL_PIX_FORMAT_ABGR"><code>ARGL_PIX_FORMAT_ABGR</code></a></dt><dd>Each pixel is represented by 32 bits. Eight bits per each Alpha, Blue, - Green, and Red component. This is the native 32 bit format for the SGI - platform.</dd> - <dt><a name="//apple_ref/c/econst/ARGL_PIX_FORMAT_BGRA"><code>ARGL_PIX_FORMAT_BGRA</code></a></dt><dd>Each pixel is represented by 32 bits. Eight bits per each Blue, Green, - Red, and Alpha component. This is the native 32 bit format for the Win32 - platform.</dd> - <dt><a name="//apple_ref/c/econst/ARGL_PIX_FORMAT_ARGB"><code>ARGL_PIX_FORMAT_ARGB</code></a></dt><dd>Each pixel is represented by 32 bits. Eight bits per each Alpha, Red, - Green, and Blue component. This is the native 32 bit format for the Mac - platform.</dd> - <dt><a name="//apple_ref/c/econst/ARGL_PIX_FORMAT_RGB"><code>ARGL_PIX_FORMAT_RGB</code></a></dt><dd>Each pixel is represented by 24 bits. Eight bits per each Red, Green, - and Blue component. This is the native 24 bit format for the Mac platform.</dd> - <dt><a name="//apple_ref/c/econst/ARGL_PIX_FORMAT_BGR"><code>ARGL_PIX_FORMAT_BGR</code></a></dt><dd>Each pixel is represented by 24 bits. Eight bits per each Blue, Red, and - Green component. This is the native 24 bit format for the Win32 platform.</dd> - <dt><a name="//apple_ref/c/econst/ARGL_PIX_FORMAT_2vuy"><code>ARGL_PIX_FORMAT_2vuy</code></a></dt><dd>8-bit 4:2:2 Component Y'CbCr format. Each 16 bit pixel is represented - by an unsigned eight bit luminance component and two unsigned eight bit - chroma components. Each pair of pixels shares a common set of chroma - values. The components are ordered in memory; Cb, Y0, Cr, Y1. The - luminance components have a range of [16, 235], while the chroma value - has a range of [16, 240]. This is consistent with the CCIR601 spec. - This format is fairly prevalent on both Mac and Win32 platforms. - '2vuy' is the Apple QuickTime four-character code for this pixel format. - The equivalent Microsoft fourCC is 'UYVY'.</dd> - <dt><a name="//apple_ref/c/econst/ARGL_PIX_FORMAT_yuvs"><code>ARGL_PIX_FORMAT_yuvs</code></a></dt><dd>8-bit 4:2:2 Component Y'CbCr format. Identical to the ARGL_PIX_FORMAT_2vuy except - each 16 bit word has been byte swapped. This results in a component - ordering of; Y0, Cb, Y1, Cr. - This is most prevalent yuv 4:2:2 format on both Mac and Win32 platforms. - 'yuvs' is the Apple QuickTime four-character code for this pixel format. - The equivalent Microsoft fourCC is 'YUY2'.</dd> - </dl> - </blockquote> - <dl><h5><font face="Lucida Grande,Helvetica,Arial">Discussion</font></h5><p>ARToolKit functions can accept pixel data in a variety of formats. - This enumerations provides a set of constants you can use to request - data in a particular pixel format from an ARToolKit function that - returns data to you, or to specify that data you are providing to an - ARToolKit function is in a particular pixel format. - </p> - </dl> <p><p>© 2003-2005 Philip Lamb (Last Updated August 29, 2005) --- 34,37 ---- |
|
From: Philip L. <phi...@us...> - 2006-04-27 18:49:18
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/Gl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21391 Modified Files: gsub.c gsub_lite.c Log Message: Update to build Universal Binaries for PPC & Intel-based macs. Index: gsub.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/Gl/gsub.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** gsub.c 21 Apr 2006 04:35:28 -0000 1.5 --- gsub.c 27 Apr 2006 18:49:12 -0000 1.6 *************** *** 420,424 **** --- 420,428 ---- #if (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ARGB) + # ifdef AR_BIG_ENDIAN glDrawPixels( gImXsize, gImYsize, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); + # else + glDrawPixels( gImXsize, gImYsize, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8, image ); + # endif #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ABGR) glDrawPixels( gImXsize, gImYsize, GL_ABGR, GL_UNSIGNED_BYTE, image ); *************** *** 432,438 **** glDrawPixels( gImXsize, gImYsize, GL_RGB, GL_UNSIGNED_BYTE, image ); #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) glDrawPixels( gImXsize, gImYsize, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_yuvs) glDrawPixels( gImXsize, gImYsize, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else # error Unknown default pixel format defined in config.h --- 436,450 ---- glDrawPixels( gImXsize, gImYsize, GL_RGB, GL_UNSIGNED_BYTE, image ); #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) + # ifdef AR_BIG_ENDIAN glDrawPixels( gImXsize, gImYsize, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! # else glDrawPixels( gImXsize, gImYsize, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); + # endif + #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_yuvs) + # ifdef AR_BIG_ENDIAN + glDrawPixels( gImXsize, gImYsize, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); + # else + glDrawPixels( gImXsize, gImYsize, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); + # endif #else # error Unknown default pixel format defined in config.h *************** *** 496,500 **** --- 508,516 ---- if( size_adjust_factor == old_size_adjust_factor ) { #if (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ARGB) + # ifdef AR_BIG_ENDIAN glTexSubImage2D( AR_TEXTURE_RECTANGLE, 0, 0, 0, gImXsize, gImYsize/size_adjust_factor, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); + # else + glTexSubImage2D( AR_TEXTURE_RECTANGLE, 0, 0, 0, gImXsize, gImYsize/size_adjust_factor, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8, image ); + # endif #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ABGR) glTexSubImage2D( AR_TEXTURE_RECTANGLE, 0, 0, 0, gImXsize, gImYsize/size_adjust_factor, GL_ABGR, GL_UNSIGNED_BYTE, image ); *************** *** 508,514 **** --- 524,538 ---- glTexSubImage2D( AR_TEXTURE_RECTANGLE, 0, 0, 0, gImXsize, gImYsize/size_adjust_factor, GL_RGB, GL_UNSIGNED_BYTE, image ); #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) + # ifdef AR_BIG_ENDIAN glTexSubImage2D( AR_TEXTURE_RECTANGLE, 0, 0, 0, gImXsize, gImYsize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); + # else + glTexSubImage2D( AR_TEXTURE_RECTANGLE, 0, 0, 0, gImXsize, gImYsize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); + # endif #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_yuvs) + # ifdef AR_BIG_ENDIAN glTexSubImage2D( AR_TEXTURE_RECTANGLE, 0, 0, 0, gImXsize, gImYsize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); + # else + glTexSubImage2D( AR_TEXTURE_RECTANGLE, 0, 0, 0, gImXsize, gImYsize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_REV_8_8_APPLE, image ); + # endif #else # error Unknown default pixel format defined in config.h *************** *** 517,521 **** --- 541,549 ---- else { #if (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ARGB) + # ifdef AR_BIG_ENDIAN glTexImage2D( AR_TEXTURE_RECTANGLE, 0, 3, gImXsize, gImYsize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); + # else + glTexImage2D( AR_TEXTURE_RECTANGLE, 0, 3, gImXsize, gImYsize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8, image ); + # endif #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ABGR) glTexImage2D( AR_TEXTURE_RECTANGLE, 0, 3, gImXsize, gImYsize/size_adjust_factor, 0, GL_ABGR, GL_UNSIGNED_BYTE, image ); *************** *** 529,535 **** --- 557,571 ---- glTexImage2D( AR_TEXTURE_RECTANGLE, 0, 3, gImXsize, gImYsize/size_adjust_factor, 0, GL_RGB, GL_UNSIGNED_BYTE, image ); #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) + # ifdef AR_BIG_ENDIAN glTexImage2D( AR_TEXTURE_RECTANGLE, 0, 3, gImXsize, gImYsize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); + # else + glTexImage2D( AR_TEXTURE_RECTANGLE, 0, 3, gImXsize, gImYsize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); + # endif #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_yuvs) + # ifdef AR_BIG_ENDIAN glTexImage2D( AR_TEXTURE_RECTANGLE, 0, 3, gImXsize, gImYsize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); + # else + glTexImage2D( AR_TEXTURE_RECTANGLE, 0, 3, gImXsize, gImYsize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); + # endif #else # error Unknown default pixel format defined in config.h *************** *** 662,666 **** --- 698,706 ---- if( size_adjust_factor == old_size_adjust_factor ) { #if (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ARGB) + # ifdef AR_BIG_ENDIAN glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); + # else + glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8, image ); + # endif #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ABGR) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_ABGR, GL_UNSIGNED_BYTE, image ); *************** *** 674,680 **** --- 714,728 ---- glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_RGB, GL_UNSIGNED_BYTE, image ); #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) + # ifdef AR_BIG_ENDIAN glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); + # else + glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); + # endif #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_yuvs) + # ifdef AR_BIG_ENDIAN glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); + # else + glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); + # endif #else # error Unknown default pixel format defined in config.h *************** *** 683,687 **** --- 731,739 ---- else { #if (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ARGB) + # ifdef AR_BIG_ENDIAN glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); + # else + glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8, image ); + # endif #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ABGR) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_ABGR, GL_UNSIGNED_BYTE, image ); *************** *** 695,701 **** --- 747,761 ---- glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_RGB, GL_UNSIGNED_BYTE, image ); #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) + # ifdef AR_BIG_ENDIAN glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); + # else + glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); + # endif #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_yuvs) + # ifdef AR_BIG_ENDIAN glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); + # else + glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); + # endif #else # error Unknown default pixel format defined in config.h *************** *** 851,855 **** --- 911,919 ---- if( size_adjust_factor == old_size_adjust_factor ) { #if (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ARGB) + # ifdef AR_BIG_ENDIAN glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); + # else + glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8, image ); + # endif #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ABGR) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_ABGR, GL_UNSIGNED_BYTE, image ); *************** *** 863,869 **** --- 927,941 ---- glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_RGB, GL_UNSIGNED_BYTE, image ); #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) + # ifdef AR_BIG_ENDIAN glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); + # else + glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); + # endif #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_yuvs) + # ifdef AR_BIG_ENDIAN glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); + # else + glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); + # endif #else # error Unknown default pixel format defined in config.h *************** *** 872,876 **** --- 944,952 ---- else { #if (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ARGB) + # ifdef AR_BIG_ENDIAN glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); + # else + glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8, image ); + # endif #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ABGR) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_ABGR, GL_UNSIGNED_BYTE, image ); *************** *** 884,890 **** --- 960,974 ---- glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_RGB, GL_UNSIGNED_BYTE, image ); #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) + # ifdef AR_BIG_ENDIAN glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); + # else + glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); + # endif #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_yuvs) + # ifdef AR_BIG_ENDIAN glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); + # else + glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); + # endif #else # error Unknown default pixel format defined in config.h *************** *** 980,984 **** --- 1064,1072 ---- if( size_adjust_factor == old_size_adjust_factor ) { #if (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ARGB) + # ifdef AR_BIG_ENDIAN glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize2, tex1Ysize/size_adjust_factor, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); + # else + glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize2, tex1Ysize/size_adjust_factor, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); + # endif #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ABGR) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize2, tex1Ysize/size_adjust_factor, GL_ABGR, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); *************** *** 992,998 **** --- 1080,1094 ---- glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize2, tex1Ysize/size_adjust_factor, GL_RGB, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) + # ifdef AR_BIG_ENDIAN glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize2, tex1Ysize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); + # else + glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize2, tex1Ysize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); + # endif #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_yuvs) + # ifdef AR_BIG_ENDIAN glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize2, tex1Ysize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); + # else + glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize2, tex1Ysize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); + # endif #else # error Unknown default pixel format defined in config.h *************** *** 1001,1005 **** --- 1097,1105 ---- else { #if (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ARGB) + # ifdef AR_BIG_ENDIAN glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); + # else + glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); + # endif #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ABGR) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_ABGR, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); *************** *** 1013,1019 **** --- 1113,1127 ---- glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_RGB, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) + # ifdef AR_BIG_ENDIAN glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); + # else + glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); + # endif #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_yuvs) + # ifdef AR_BIG_ENDIAN glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); + # else + glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); + # endif #else # error Unknown default pixel format defined in config.h *************** *** 1152,1156 **** --- 1260,1268 ---- #if (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ARGB) + # ifdef AR_BIG_ENDIAN glDrawPixels( gImXsize/2, gImYsize/2, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); + # else + glDrawPixels( gImXsize/2, gImYsize/2, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8, image ); + # endif #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ABGR) glDrawPixels( gImXsize/2, gImYsize/2, GL_ABGR, GL_UNSIGNED_BYTE, image ); *************** *** 1164,1170 **** --- 1276,1290 ---- glDrawPixels( gImXsize/2, gImYsize/2, GL_RGB, GL_UNSIGNED_BYTE, image ); #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) + # ifdef AR_BIG_ENDIAN glDrawPixels( gImXsize/2, gImYsize/2, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); + # else + glDrawPixels( gImXsize/2, gImYsize/2, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); + # endif #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_yuvs) + # ifdef AR_BIG_ENDIAN glDrawPixels( gImXsize/2, gImYsize/2, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); + # else + glDrawPixels( gImXsize/2, gImYsize/2, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); + # endif #else # error Unknown default pixel format defined in config.h *************** *** 1231,1235 **** --- 1351,1359 ---- if( initf == 0 ) { #if (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ARGB) + # ifdef AR_BIG_ENDIAN glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex2Xsize, tex2Ysize, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); + # else + glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex2Xsize, tex2Ysize, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8, image ); + # endif #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ABGR) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex2Xsize, tex2Ysize, GL_ABGR, GL_UNSIGNED_BYTE, image ); *************** *** 1243,1249 **** --- 1367,1381 ---- glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex2Xsize, tex2Ysize, GL_RGB, GL_UNSIGNED_BYTE, image ); #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) + # ifdef AR_BIG_ENDIAN glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex2Xsize, tex2Ysize, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); + # else + glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex2Xsize, tex2Ysize, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); + # endif #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_yuvs) + # ifdef AR_BIG_ENDIAN glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex2Xsize, tex2Ysize, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); + # else + glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex2Xsize, tex2Ysize, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); + # endif #else # error Unknown default pixel format defined in config.h *************** *** 1252,1256 **** --- 1384,1392 ---- else { #if (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ARGB) + # ifdef AR_BIG_ENDIAN glTexImage2D( GL_TEXTURE_2D, 0, 3, tex2Xsize, tex2Ysize, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); + # else + glTexImage2D( GL_TEXTURE_2D, 0, 3, tex2Xsize, tex2Ysize, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8, image ); + # endif #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ABGR) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex2Xsize, tex2Ysize, 0, GL_ABGR, GL_UNSIGNED_BYTE, image ); *************** *** 1264,1270 **** --- 1400,1414 ---- glTexImage2D( GL_TEXTURE_2D, 0, 3, tex2Xsize, tex2Ysize, 0, GL_RGB, GL_UNSIGNED_BYTE, image ); #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) + # ifdef AR_BIG_ENDIAN glTexImage2D( GL_TEXTURE_2D, 0, 3, tex2Xsize, tex2Ysize, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); + # else + glTexImage2D( GL_TEXTURE_2D, 0, 3, tex2Xsize, tex2Ysize, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); + # endif #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_yuvs) + # ifdef AR_BIG_ENDIAN glTexImage2D( GL_TEXTURE_2D, 0, 3, tex2Xsize, tex2Ysize, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); + # else + glTexImage2D( GL_TEXTURE_2D, 0, 3, tex2Xsize, tex2Ysize, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); + # endif #else # error Unknown default pixel format defined in config.h Index: gsub_lite.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/Gl/gsub_lite.c,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** gsub_lite.c 21 Apr 2006 04:35:28 -0000 1.14 --- gsub_lite.c 27 Apr 2006 18:49:12 -0000 1.15 *************** *** 79,82 **** --- 79,83 ---- # endif # ifndef GL_APPLE_packed_pixels + # define GL_UNSIGNED_INT_8_8_8_8 0x8035 # define GL_UNSIGNED_INT_8_8_8_8_REV 0x8367 # endif *************** *** 860,864 **** --- 861,869 ---- contextSettings->pixIntFormat = GL_RGBA; contextSettings->pixFormat = GL_BGRA; + #ifdef AR_BIG_ENDIAN contextSettings->pixType = GL_UNSIGNED_INT_8_8_8_8_REV; + #else + contextSettings->pixType = GL_UNSIGNED_INT_8_8_8_8; + #endif contextSettings->pixSize = 4; break; *************** *** 878,882 **** --- 883,891 ---- contextSettings->pixIntFormat = GL_RGB; contextSettings->pixFormat = GL_YCBCR_422_APPLE; + #ifdef AR_BIG_ENDIAN contextSettings->pixType = GL_UNSIGNED_SHORT_8_8_REV_APPLE; + #else + contextSettings->pixType = GL_UNSIGNED_SHORT_8_8_APPLE; + #endif contextSettings->pixSize = 2; break; *************** *** 884,888 **** --- 893,901 ---- contextSettings->pixIntFormat = GL_RGB; contextSettings->pixFormat = GL_YCBCR_422_APPLE; + #ifdef AR_BIG_ENDIAN contextSettings->pixType = GL_UNSIGNED_SHORT_8_8_APPLE; + #else + contextSettings->pixType = GL_UNSIGNED_SHORT_8_8_REV_APPLE; + #endif contextSettings->pixSize = 2; break; *************** *** 909,913 **** case GL_BGRA: if (contextSettings->pixType == GL_UNSIGNED_BYTE) *format = AR_PIXEL_FORMAT_BGRA; ! else *format = AR_PIXEL_FORMAT_ARGB; *size = 4; break; --- 922,931 ---- case GL_BGRA: if (contextSettings->pixType == GL_UNSIGNED_BYTE) *format = AR_PIXEL_FORMAT_BGRA; ! #ifdef AR_BIG_ENDIAN ! else if (contextSettings->pixType == GL_UNSIGNED_INT_8_8_8_8_REV) *format = AR_PIXEL_FORMAT_ARGB; ! #else ! else if (contextSettings->pixType == GL_UNSIGNED_INT_8_8_8_8) *format = AR_PIXEL_FORMAT_ARGB; ! #endif ! else return (FALSE); *size = 4; break; *************** *** 921,926 **** break; case GL_YCBCR_422_APPLE: if (contextSettings->pixType == GL_UNSIGNED_SHORT_8_8_REV_APPLE) *format = AR_PIXEL_FORMAT_2vuy; ! else *format = AR_PIXEL_FORMAT_yuvs; *size = 2; break; --- 939,950 ---- break; case GL_YCBCR_422_APPLE: + #ifdef AR_BIG_ENDIAN if (contextSettings->pixType == GL_UNSIGNED_SHORT_8_8_REV_APPLE) *format = AR_PIXEL_FORMAT_2vuy; ! else if (contextSettings->pixType == GL_UNSIGNED_SHORT_8_8_APPLE) *format = AR_PIXEL_FORMAT_yuvs; ! #else ! if (contextSettings->pixType == GL_UNSIGNED_SHORT_8_8_APPLE) *format = AR_PIXEL_FORMAT_2vuy; ! else if (contextSettings->pixType == GL_UNSIGNED_SHORT_8_8_REV_APPLE) *format = AR_PIXEL_FORMAT_yuvs; ! #endif ! else return (FALSE); *size = 2; break; |
|
From: Philip L. <phi...@us...> - 2006-04-27 18:49:04
|
Update of /cvsroot/artoolkit/artoolkit/ARToolKit.xcodeproj In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20900 Modified Files: project.pbxproj Log Message: Update to build Universal Binaries for PPC & Intel-based macs. Index: project.pbxproj =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/ARToolKit.xcodeproj/project.pbxproj,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** project.pbxproj 6 Apr 2006 05:32:24 -0000 1.8 --- project.pbxproj 27 Apr 2006 18:48:56 -0000 1.9 *************** *** 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\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 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 */ *************** *** 5491,5494 **** --- 5491,5498 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); COPY_PHASE_STRIP = NO; DEPLOYMENT_LOCATION = YES; *************** *** 5511,5514 **** --- 5515,5522 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); COPY_PHASE_STRIP = YES; DEPLOYMENT_LOCATION = YES; *************** *** 5529,5532 **** --- 5537,5544 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); COPY_PHASE_STRIP = NO; DEPLOYMENT_LOCATION = YES; *************** *** 5549,5552 **** --- 5561,5568 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); COPY_PHASE_STRIP = YES; DEPLOYMENT_LOCATION = YES; *************** *** 5567,5570 **** --- 5583,5590 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); COPY_PHASE_STRIP = NO; DEPLOYMENT_LOCATION = YES; *************** *** 5587,5590 **** --- 5607,5614 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); COPY_PHASE_STRIP = YES; DEPLOYMENT_LOCATION = YES; *************** *** 5605,5608 **** --- 5629,5636 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); COPY_PHASE_STRIP = NO; DEPLOYMENT_LOCATION = YES; *************** *** 5625,5628 **** --- 5653,5660 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); COPY_PHASE_STRIP = YES; DEPLOYMENT_LOCATION = YES; *************** *** 5643,5646 **** --- 5675,5682 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); COPY_PHASE_STRIP = NO; DEPLOYMENT_LOCATION = YES; *************** *** 5663,5666 **** --- 5699,5706 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); COPY_PHASE_STRIP = YES; DEPLOYMENT_LOCATION = YES; *************** *** 5681,5684 **** --- 5721,5728 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); COPY_PHASE_STRIP = NO; DEPLOYMENT_LOCATION = YES; *************** *** 5701,5704 **** --- 5745,5752 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); COPY_PHASE_STRIP = YES; DEPLOYMENT_LOCATION = YES; *************** *** 5919,5922 **** --- 5967,5974 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); COPY_PHASE_STRIP = NO; DEPLOYMENT_LOCATION = YES; *************** *** 5943,5946 **** --- 5995,6002 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); COPY_PHASE_STRIP = YES; DEPLOYMENT_LOCATION = YES; *************** *** 6031,6034 **** --- 6087,6094 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); HEADER_SEARCH_PATHS = include; INFOPLIST_FILE = "examples/collide/collideTest-Info.plist"; *************** *** 6045,6048 **** --- 6105,6112 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); HEADER_SEARCH_PATHS = include; INFOPLIST_FILE = "examples/collide/collideTest-Info.plist"; *************** *** 6059,6062 **** --- 6123,6130 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); HEADER_SEARCH_PATHS = include; INFOPLIST_FILE = "examples/exview/exview-Info.plist"; *************** *** 6073,6076 **** --- 6141,6148 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); HEADER_SEARCH_PATHS = include; INFOPLIST_FILE = "examples/exview/exview-Info.plist"; *************** *** 6087,6090 **** --- 6159,6166 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); HEADER_SEARCH_PATHS = include; INFOPLIST_FILE = "examples/range/rangeTest-Info.plist"; *************** *** 6101,6104 **** --- 6177,6184 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); HEADER_SEARCH_PATHS = include; INFOPLIST_FILE = "examples/range/rangeTest-Info.plist"; *************** *** 6115,6118 **** --- 6195,6202 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); HEADER_SEARCH_PATHS = include; INFOPLIST_FILE = "examples/relation/relationTest-Info.plist"; *************** *** 6129,6132 **** --- 6213,6220 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); HEADER_SEARCH_PATHS = include; INFOPLIST_FILE = "examples/relation/relationTest-Info.plist"; *************** *** 6143,6146 **** --- 6231,6238 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); HEADER_SEARCH_PATHS = include; INFOPLIST_FILE = "examples/simple/simpleTest-Info.plist"; *************** *** 6157,6160 **** --- 6249,6256 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); HEADER_SEARCH_PATHS = include; INFOPLIST_FILE = "examples/simple/simpleTest-Info.plist"; *************** *** 6171,6174 **** --- 6267,6274 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); HEADER_SEARCH_PATHS = include; INFOPLIST_FILE = "examples/simple2/simpleTest2-Info.plist"; *************** *** 6185,6188 **** --- 6285,6292 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); HEADER_SEARCH_PATHS = include; INFOPLIST_FILE = "examples/simple2/simpleTest2-Info.plist"; *************** *** 6199,6202 **** --- 6303,6310 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); HEADER_SEARCH_PATHS = include; INFOPLIST_FILE = "util/videoTest/videoTest-Info.plist"; *************** *** 6213,6216 **** --- 6321,6328 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); HEADER_SEARCH_PATHS = include; INFOPLIST_FILE = "util/videoTest/videoTest-Info.plist"; *************** *** 6227,6230 **** --- 6339,6346 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); HEADER_SEARCH_PATHS = include; INFOPLIST_FILE = "util/graphicsTest/graphicsTest-Info.plist"; *************** *** 6241,6244 **** --- 6357,6364 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); HEADER_SEARCH_PATHS = include; INFOPLIST_FILE = "util/graphicsTest/graphicsTest-Info.plist"; *************** *** 6255,6258 **** --- 6375,6382 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); HEADER_SEARCH_PATHS = include; INFOPLIST_FILE = "examples/paddle/paddleTest-Info.plist"; *************** *** 6269,6272 **** --- 6393,6400 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); HEADER_SEARCH_PATHS = include; INFOPLIST_FILE = "examples/paddle/paddleTest-Info.plist"; *************** *** 6283,6286 **** --- 6411,6418 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); HEADER_SEARCH_PATHS = include; INFOPLIST_FILE = "examples/paddleDemo/paddleDemo-Info.plist"; *************** *** 6297,6300 **** --- 6429,6436 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); HEADER_SEARCH_PATHS = include; INFOPLIST_FILE = "examples/paddleDemo/paddleDemo-Info.plist"; *************** *** 6311,6314 **** --- 6447,6454 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); HEADER_SEARCH_PATHS = include; INFOPLIST_FILE = "examples/paddleInteraction/paddleInteractionTest-Info.plist"; *************** *** 6325,6328 **** --- 6465,6472 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); HEADER_SEARCH_PATHS = include; INFOPLIST_FILE = "examples/paddleInteraction/paddleInteractionTest-Info.plist"; *************** *** 6339,6342 **** --- 6483,6490 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); HEADER_SEARCH_PATHS = include; INFOPLIST_FILE = "util/calib_camera2/calib_camera2-Info.plist"; *************** *** 6353,6356 **** --- 6501,6508 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); HEADER_SEARCH_PATHS = include; INFOPLIST_FILE = "util/calib_camera2/calib_camera2-Info.plist"; *************** *** 6367,6370 **** --- 6519,6526 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); HEADER_SEARCH_PATHS = include; INFOPLIST_FILE = "util/calib_cparam/calib_cparam-Info.plist"; *************** *** 6381,6384 **** --- 6537,6544 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); HEADER_SEARCH_PATHS = include; INFOPLIST_FILE = "util/calib_cparam/calib_cparam-Info.plist"; *************** *** 6395,6398 **** --- 6555,6562 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); HEADER_SEARCH_PATHS = include; INFOPLIST_FILE = "util/calib_distortion/calib_dist-Info.plist"; *************** *** 6409,6412 **** --- 6573,6580 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); HEADER_SEARCH_PATHS = include; INFOPLIST_FILE = "util/calib_distortion/calib_dist-Info.plist"; *************** *** 6423,6426 **** --- 6591,6598 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); HEADER_SEARCH_PATHS = include; INFOPLIST_FILE = "util/mk_patt/mk_patt-Info.plist"; *************** *** 6437,6440 **** --- 6609,6616 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); HEADER_SEARCH_PATHS = include; INFOPLIST_FILE = "util/mk_patt/mk_patt-Info.plist"; *************** *** 6451,6454 **** --- 6627,6634 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); HEADER_SEARCH_PATHS = include; INFOPLIST_FILE = "examples/optical/optical-Info.plist"; *************** *** 6465,6468 **** --- 6645,6652 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); HEADER_SEARCH_PATHS = include; INFOPLIST_FILE = "examples/optical/optical-Info.plist"; *************** *** 6479,6482 **** --- 6663,6670 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); HEADER_SEARCH_PATHS = include; INFOPLIST_FILE = "examples/simpleLite/simpleLite-Info.plist"; *************** *** 6493,6496 **** --- 6681,6688 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); HEADER_SEARCH_PATHS = include; INFOPLIST_FILE = "examples/simpleLite/simpleLite-Info.plist"; *************** *** 6507,6510 **** --- 6699,6706 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); HEADER_SEARCH_PATHS = include; INFOPLIST_FILE = "examples/simpleVRML/simpleVRML-Info.plist"; *************** *** 6523,6526 **** --- 6719,6726 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); HEADER_SEARCH_PATHS = include; INFOPLIST_FILE = "examples/simpleVRML/simpleVRML-Info.plist"; *************** *** 6539,6542 **** --- 6739,6746 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); HEADER_SEARCH_PATHS = include; INFOPLIST_FILE = "examples/twoView/twoView-Info.plist"; *************** *** 6553,6556 **** --- 6757,6764 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); HEADER_SEARCH_PATHS = include; INFOPLIST_FILE = "examples/twoView/twoView-Info.plist"; *************** *** 6567,6570 **** --- 6775,6782 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); HEADER_SEARCH_PATHS = include; INFOPLIST_FILE = "examples/loadMultiple/loadMultiple-Info.plist"; *************** *** 6581,6584 **** --- 6793,6800 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); HEADER_SEARCH_PATHS = include; INFOPLIST_FILE = "examples/loadMultiple/loadMultiple-Info.plist"; *************** *** 6595,6598 **** --- 6811,6818 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); HEADER_SEARCH_PATHS = include; INFOPLIST_FILE = "examples/modeTest/modeTest-Info.plist"; *************** *** 6609,6612 **** --- 6829,6836 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); HEADER_SEARCH_PATHS = include; INFOPLIST_FILE = "examples/modeTest/modeTest-Info.plist"; *************** *** 6623,6626 **** --- 6847,6854 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); HEADER_SEARCH_PATHS = include; INFOPLIST_FILE = "examples/multi/multiTest-Info.plist"; *************** *** 6637,6640 **** --- 6865,6872 ---- isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + ppc, + i386, + ); HEADER_SEARCH_PATHS = include; INFOPLIST_FILE = "examples/multi/multiTest-Info.plist"; |
|
From: Philip L. <phi...@us...> - 2006-04-21 08:33:09
|
Update of /cvsroot/artoolkit/artoolkit/examples/twoView In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15432 Modified Files: twoView.c Log Message: Remove ugly function names. Index: twoView.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/examples/twoView/twoView.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** twoView.c 6 Apr 2006 05:33:48 -0000 1.12 --- twoView.c 21 Apr 2006 08:33:03 -0000 1.13 *************** *** 192,196 **** // Sets up fields ARTVideo, ARTCparam of gContextsActive[0] through gContextsActive[cameraCount - 1]. ! static int demoARSetupCameras(const int cameraCount, const char *cparam_names[], char *vconfs[]) { int i; --- 192,196 ---- // Sets up fields ARTVideo, ARTCparam of gContextsActive[0] through gContextsActive[cameraCount - 1]. ! static int setupCameras(const int cameraCount, const char *cparam_names[], char *vconfs[]) { int i; *************** *** 202,206 **** // Open the video path. if ((gContextsActive[i].ARTVideo = ar2VideoOpen(vconfs[i])) == NULL) { ! fprintf(stderr, "demoARSetupCameras(): Unable to open connection to camera %d.\n", i + 1); return (FALSE); } --- 202,206 ---- // Open the video path. if ((gContextsActive[i].ARTVideo = ar2VideoOpen(vconfs[i])) == NULL) { ! fprintf(stderr, "setupCameras(): Unable to open connection to camera %d.\n", i + 1); return (FALSE); } *************** *** 208,216 **** // Find the size of the window. if (ar2VideoInqSize(gContextsActive[i].ARTVideo, &xsize, &ysize) < 0) return (FALSE); ! fprintf(stderr, "demoARSetupCameras(): Camera %d image size (x,y) = (%d,%d)\n", i + 1, xsize, ysize); // Load the camera parameters, resize for the window and init. if (arParamLoad(cparam_names[i], 1, &wparam) < 0) { ! fprintf(stderr, "demoARSetupCameras(): Error loading parameter file %s for camera %d.\n", cparam_names[i], i + 1); return (FALSE); } --- 208,216 ---- // Find the size of the window. if (ar2VideoInqSize(gContextsActive[i].ARTVideo, &xsize, &ysize) < 0) return (FALSE); ! fprintf(stderr, "setupCameras(): Camera %d image size (x,y) = (%d,%d)\n", i + 1, xsize, ysize); // Load the camera parameters, resize for the window and init. if (arParamLoad(cparam_names[i], 1, &wparam) < 0) { ! fprintf(stderr, "setupCameras(): Error loading parameter file %s for camera %d.\n", cparam_names[i], i + 1); return (FALSE); } *************** *** 223,227 **** // Start the video capture for this camera. if (ar2VideoCapStart(gContextsActive[i].ARTVideo) != 0) { ! fprintf(stderr, "demoARSetupCameras(): Unable to begin camera data capture for camera %d.\n", i + 1); return (FALSE); } --- 223,227 ---- // Start the video capture for this camera. if (ar2VideoCapStart(gContextsActive[i].ARTVideo) != 0) { ! fprintf(stderr, "setupCameras(): Unable to begin camera data capture for camera %d.\n", i + 1); return (FALSE); } *************** *** 231,239 **** } ! static int demoARSetupMarker(const char *patt_name, int *patt_id) { if((*patt_id = arLoadPatt(patt_name)) < 0) { ! fprintf(stderr, "demoARSetupMarker(): pattern load error !!\n"); return (FALSE); } --- 231,239 ---- } ! static int setupMarker(const char *patt_name, int *patt_id) { if((*patt_id = arLoadPatt(patt_name)) < 0) { ! fprintf(stderr, "setupMarker(): pattern load error !!\n"); return (FALSE); } *************** *** 244,248 **** // Report state of ARToolKit global variables arFittingMode, // arImageProcMode, arglDrawMode, arTemplateMatchingMode, arMatchingPCAMode. ! static void demoARDebugReportMode(ARGL_CONTEXT_SETTINGS_REF arglSettings) { if (arFittingMode == AR_FITTING_TO_INPUT) { --- 244,248 ---- // Report state of ARToolKit global variables arFittingMode, // arImageProcMode, arglDrawMode, arTemplateMatchingMode, arMatchingPCAMode. ! static void debugReportMode(ARGL_CONTEXT_SETTINGS_REF arglSettings) { if (arFittingMode == AR_FITTING_TO_INPUT) { *************** *** 354,358 **** fprintf(stderr, "*** Camera %2d - %f (frame/sec)\n", i + 1, (double)(gContextsActive[i].callCountMarkerDetect)/arUtilTimer()); gContextsActive[i].callCountMarkerDetect = 0; ! demoARDebugReportMode(gContextsActive[i].arglSettings); } arUtilTimerReset(); --- 354,358 ---- fprintf(stderr, "*** Camera %2d - %f (frame/sec)\n", i + 1, (double)(gContextsActive[i].callCountMarkerDetect)/arUtilTimer()); gContextsActive[i].callCountMarkerDetect = 0; ! debugReportMode(gContextsActive[i].arglSettings); } arUtilTimerReset(); *************** *** 580,590 **** if ((gContextsActive = (CONTEXT_INFO *)calloc(CONTEXTSACTIVECOUNTMAX, sizeof(CONTEXT_INFO))) == NULL) exit(-1); ! if (!demoARSetupCameras(CONTEXTSACTIVECOUNT, cparam_names, vconfs)) { fprintf(stderr, "main(): Unable to set up %d AR cameras.\n", CONTEXTSACTIVECOUNT); exit(-1); } gContextsActiveCount = CONTEXTSACTIVECOUNT; ! for (i = 0; i < gContextsActiveCount; i++) demoARDebugReportMode(gContextsActive[i].arglSettings); ! if (!demoARSetupMarker(patt_name, &gPatt_id)) { fprintf(stderr, "main(): Unable to set up AR marker.\n"); exit(-1); --- 580,590 ---- if ((gContextsActive = (CONTEXT_INFO *)calloc(CONTEXTSACTIVECOUNTMAX, sizeof(CONTEXT_INFO))) == NULL) exit(-1); ! if (!setupCameras(CONTEXTSACTIVECOUNT, cparam_names, vconfs)) { fprintf(stderr, "main(): Unable to set up %d AR cameras.\n", CONTEXTSACTIVECOUNT); exit(-1); } 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); |
|
From: Philip L. <phi...@us...> - 2006-04-21 08:32:58
|
Update of /cvsroot/artoolkit/artoolkit/examples/simpleVRML In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15374 Modified Files: simpleVRML.c Log Message: Remove ugly function names. Index: simpleVRML.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/examples/simpleVRML/simpleVRML.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** simpleVRML.c 6 Apr 2006 05:33:21 -0000 1.8 --- simpleVRML.c 21 Apr 2006 08:32:52 -0000 1.9 *************** *** 102,106 **** // Sets up gARTCparam. ! static int demoARSetupCamera(const char *cparam_name, char *vconf) { ARParam wparam; --- 102,106 ---- // Sets up gARTCparam. ! static int setupCamera(const char *cparam_name, char *vconf) { ARParam wparam; *************** *** 109,113 **** // Open the video path. if (arVideoOpen(vconf) < 0) { ! fprintf(stderr, "demoARSetupCamera(): Unable to open connection to camera.\n"); return (FALSE); } --- 109,113 ---- // Open the video path. if (arVideoOpen(vconf) < 0) { ! fprintf(stderr, "setupCamera(): Unable to open connection to camera.\n"); return (FALSE); } *************** *** 119,123 **** // Load the camera parameters, resize for the window and init. if (arParamLoad(cparam_name, 1, &wparam) < 0) { ! fprintf(stderr, "demoARSetupCamera(): Error loading parameter file %s for camera.\n", cparam_name); return (FALSE); } --- 119,123 ---- // Load the camera parameters, resize for the window and init. if (arParamLoad(cparam_name, 1, &wparam) < 0) { ! fprintf(stderr, "setupCamera(): Error loading parameter file %s for camera.\n", cparam_name); return (FALSE); } *************** *** 128,132 **** if (arVideoCapStart() != 0) { ! fprintf(stderr, "demoARSetupCamera(): Unable to begin camera data capture.\n"); return (FALSE); } --- 128,132 ---- if (arVideoCapStart() != 0) { ! fprintf(stderr, "setupCamera(): Unable to begin camera data capture.\n"); return (FALSE); } *************** *** 135,143 **** } ! static int demoARSetupMarkersObjects(char *objectDataFilename) { // Load in the object data - trained markers and associated bitmap files. if ((gObjectData = read_VRMLdata(objectDataFilename, &gObjectDataCount)) == NULL) { ! fprintf(stderr, "demoARSetupMarkersObjects(): read_VRMLdata returned error !!\n"); return (FALSE); } --- 135,143 ---- } ! static int setupMarkersObjects(char *objectDataFilename) { // Load in the object data - trained markers and associated bitmap files. if ((gObjectData = read_VRMLdata(objectDataFilename, &gObjectDataCount)) == NULL) { ! fprintf(stderr, "setupMarkersObjects(): read_VRMLdata returned error !!\n"); return (FALSE); } *************** *** 150,154 **** // Report state of ARToolKit global variables arFittingMode, // arImageProcMode, arglDrawMode, arTemplateMatchingMode, arMatchingPCAMode. ! static void demoARDebugReportMode(void) { if(arFittingMode == AR_FITTING_TO_INPUT ) { --- 150,154 ---- // Report state of ARToolKit global variables arFittingMode, // arImageProcMode, arglDrawMode, arTemplateMatchingMode, arMatchingPCAMode. ! static void debugReportMode(void) { if(arFittingMode == AR_FITTING_TO_INPUT ) { *************** *** 220,224 **** gCallCountMarkerDetect = 0; arUtilTimerReset(); ! demoARDebugReportMode(); break; case '?': --- 220,224 ---- gCallCountMarkerDetect = 0; arUtilTimerReset(); ! debugReportMode(); break; case '?': *************** *** 411,419 **** // ! if (!demoARSetupCamera(cparam_name, vconf)) { fprintf(stderr, "main(): Unable to set up AR camera.\n"); exit(-1); } ! demoARDebugReportMode(); #ifdef _WIN32 --- 411,419 ---- // ! if (!setupCamera(cparam_name, vconf)) { fprintf(stderr, "main(): Unable to set up AR camera.\n"); exit(-1); } ! debugReportMode(); #ifdef _WIN32 *************** *** 444,448 **** arUtilTimerReset(); ! if (!demoARSetupMarkersObjects(objectDataFilename)) { fprintf(stderr, "main(): Unable to set up AR objects and markers.\n"); Quit(); --- 444,448 ---- arUtilTimerReset(); ! if (!setupMarkersObjects(objectDataFilename)) { fprintf(stderr, "main(): Unable to set up AR objects and markers.\n"); Quit(); |
|
From: Philip L. <phi...@us...> - 2006-04-21 08:32:42
|
Update of /cvsroot/artoolkit/artoolkit/examples/simpleLite In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15286 Modified Files: simpleLite.c Log Message: Remove ugly function names. Index: simpleLite.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/examples/simpleLite/simpleLite.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** simpleLite.c 6 Apr 2006 05:33:40 -0000 1.11 --- simpleLite.c 21 Apr 2006 08:32:38 -0000 1.12 *************** *** 148,152 **** // Sets up gARTCparam. ! static int demoARSetupCamera(const char *cparam_name, char *vconf) { ARParam wparam; --- 148,152 ---- // Sets up gARTCparam. ! static int setupCamera(const char *cparam_name, char *vconf) { ARParam wparam; *************** *** 155,159 **** // Open the video path. if (arVideoOpen(vconf) < 0) { ! fprintf(stderr, "demoARSetupCamera(): Unable to open connection to camera.\n"); return (FALSE); } --- 155,159 ---- // Open the video path. if (arVideoOpen(vconf) < 0) { ! fprintf(stderr, "setupCamera(): Unable to open connection to camera.\n"); return (FALSE); } *************** *** 165,169 **** // Load the camera parameters, resize for the window and init. if (arParamLoad(cparam_name, 1, &wparam) < 0) { ! fprintf(stderr, "demoARSetupCamera(): Error loading parameter file %s for camera.\n", cparam_name); return (FALSE); } --- 165,169 ---- // Load the camera parameters, resize for the window and init. if (arParamLoad(cparam_name, 1, &wparam) < 0) { ! fprintf(stderr, "setupCamera(): Error loading parameter file %s for camera.\n", cparam_name); return (FALSE); } *************** *** 174,178 **** if (arVideoCapStart() != 0) { ! fprintf(stderr, "demoARSetupCamera(): Unable to begin camera data capture.\n"); return (FALSE); } --- 174,178 ---- if (arVideoCapStart() != 0) { ! fprintf(stderr, "setupCamera(): Unable to begin camera data capture.\n"); return (FALSE); } *************** *** 181,189 **** } ! static int demoARSetupMarker(const char *patt_name, int *patt_id) { if((*patt_id = arLoadPatt(patt_name)) < 0) { ! fprintf(stderr, "demoARSetupMarker(): pattern load error !!\n"); return (FALSE); } --- 181,189 ---- } ! static int setupMarker(const char *patt_name, int *patt_id) { if((*patt_id = arLoadPatt(patt_name)) < 0) { ! fprintf(stderr, "setupMarker(): pattern load error !!\n"); return (FALSE); } *************** *** 194,198 **** // Report state of ARToolKit global variables arFittingMode, // arImageProcMode, arglDrawMode, arTemplateMatchingMode, arMatchingPCAMode. ! static void demoARDebugReportMode(void) { if(arFittingMode == AR_FITTING_TO_INPUT ) { --- 194,198 ---- // Report state of ARToolKit global variables arFittingMode, // arImageProcMode, arglDrawMode, arTemplateMatchingMode, arMatchingPCAMode. ! static void debugReportMode(void) { if(arFittingMode == AR_FITTING_TO_INPUT ) { *************** *** 263,267 **** gCallCountMarkerDetect = 0; arUtilTimerReset(); ! demoARDebugReportMode(); break; case '?': --- 263,267 ---- gCallCountMarkerDetect = 0; arUtilTimerReset(); ! debugReportMode(); break; case '?': *************** *** 430,439 **** // ! if (!demoARSetupCamera(cparam_name, vconf)) { fprintf(stderr, "main(): Unable to set up AR camera.\n"); exit(-1); } ! demoARDebugReportMode(); ! if (!demoARSetupMarker(patt_name, &gPatt_id)) { fprintf(stderr, "main(): Unable to set up AR marker.\n"); exit(-1); --- 430,439 ---- // ! if (!setupCamera(cparam_name, vconf)) { fprintf(stderr, "main(): Unable to set up AR camera.\n"); exit(-1); } ! debugReportMode(); ! if (!setupMarker(patt_name, &gPatt_id)) { fprintf(stderr, "main(): Unable to set up AR marker.\n"); exit(-1); |
|
From: Philip L. <phi...@us...> - 2006-04-21 04:35:45
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/AR In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25834 Modified Files: arLabeling.c arGetCode.c Log Message: Rename AR_PIXEL_FORMAT_DEFAULT to AR_DEFAULT_PIXEL_FORMAT, fix pow2 half-res tex in gsub_lite. Index: arLabeling.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/AR/arLabeling.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** arLabeling.c 5 Apr 2006 05:47:43 -0000 1.2 --- arLabeling.c 21 Apr 2006 04:35:41 -0000 1.3 *************** *** 230,248 **** for(j = 1; j < lysize-1; j++, pnt+=poff*2, pnt2+=2) { for(i = 1; i < lxsize-1; i++, pnt+=poff, pnt2++) { ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ARGB) if( *(pnt+1) + *(pnt+2) + *(pnt+3) <= thresh ) { ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ABGR) if( *(pnt+1) + *(pnt+2) + *(pnt+3) <= thresh ) { ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresh ) { ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresh ) { ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGBA) if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresh ) { ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresh ) { ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_2vuy) if( *(pnt+1) * 3 <= thresh ) { ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_yuvs) if( *(pnt+0) * 3 <= thresh ) { #else --- 230,248 ---- 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 *************** *** 570,595 **** for(j = 1; j < lysize-1; j++, pnt+=poff*2, pnt2+=2, dpnt+=AR_PIX_SIZE_DEFAULT*2) { for(i = 1; i < lxsize-1; i++, pnt+=poff, pnt2++, dpnt+=AR_PIX_SIZE_DEFAULT) { ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ARGB) if( *(pnt+1) + *(pnt+2) + *(pnt+3) <= thresh ) { *(dpnt+1) = *(dpnt+2) = *(dpnt+3) = 255; ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ABGR) if( *(pnt+1) + *(pnt+2) + *(pnt+3) <= thresh ) { *(dpnt+1) = *(dpnt+2) = *(dpnt+3) = 255; ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresh ) { *(dpnt+0) = *(dpnt+1) = *(dpnt+2) = 255; ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresh ) { *(dpnt+0) = *(dpnt+1) = *(dpnt+2) = 255; ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGBA) if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresh ) { *(dpnt+0) = *(dpnt+1) = *(dpnt+2) = 255; ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresh ) { *(dpnt+0) = *(dpnt+1) = *(dpnt+2) = 255; ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_2vuy) if( *(pnt+1) * 3 <= thresh ) { *(dpnt+1) = 255; ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_yuvs) if( *(pnt+0) * 3 <= thresh ) { *(dpnt+0) = 255; --- 570,595 ---- for(j = 1; j < lysize-1; j++, pnt+=poff*2, pnt2+=2, dpnt+=AR_PIX_SIZE_DEFAULT*2) { 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; *************** *** 696,714 **** else { *pnt2 = 0; ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ARGB) *(dpnt+1) = *(dpnt+2) = *(dpnt+3) = 0; ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ABGR) *(dpnt+1) = *(dpnt+2) = *(dpnt+3) = 0; ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) *(dpnt+0) = *(dpnt+1) = *(dpnt+2) = 0; ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) *(dpnt+0) = *(dpnt+1) = *(dpnt+2) = 0; ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGBA) *(dpnt+0) = *(dpnt+1) = *(dpnt+2) = 0; ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) *(dpnt+0) = *(dpnt+1) = *(dpnt+2) = 0; ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_2vuy) *(dpnt+1) = 0; ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_yuvs) *(dpnt+0) = 0; #else --- 696,714 ---- else { *pnt2 = 0; ! #if (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ARGB) *(dpnt+1) = *(dpnt+2) = *(dpnt+3) = 0; ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ABGR) *(dpnt+1) = *(dpnt+2) = *(dpnt+3) = 0; ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGRA) *(dpnt+0) = *(dpnt+1) = *(dpnt+2) = 0; ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGR) *(dpnt+0) = *(dpnt+1) = *(dpnt+2) = 0; ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGBA) *(dpnt+0) = *(dpnt+1) = *(dpnt+2) = 0; ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGB) *(dpnt+0) = *(dpnt+1) = *(dpnt+2) = 0; ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) *(dpnt+1) = 0; ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_yuvs) *(dpnt+0) = 0; #else Index: arGetCode.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/AR/arGetCode.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** arGetCode.c 5 Apr 2006 05:47:43 -0000 1.2 --- arGetCode.c 21 Apr 2006 04:35:41 -0000 1.3 *************** *** 264,296 **** ext_pat2_x_index = i/xdiv; image_index = (yc*arImXsize+xc)*AR_PIX_SIZE_DEFAULT; ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ARGB) ext_pat2[ext_pat2_y_index][ext_pat2_x_index][0] += image[image_index+3]; ext_pat2[ext_pat2_y_index][ext_pat2_x_index][1] += image[image_index+2]; ext_pat2[ext_pat2_y_index][ext_pat2_x_index][2] += image[image_index+1]; ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ABGR) ext_pat2[ext_pat2_y_index][ext_pat2_x_index][0] += image[image_index+1]; ext_pat2[ext_pat2_y_index][ext_pat2_x_index][1] += image[image_index+2]; ext_pat2[ext_pat2_y_index][ext_pat2_x_index][2] += image[image_index+3]; ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) ext_pat2[ext_pat2_y_index][ext_pat2_x_index][0] += image[image_index+0]; ext_pat2[ext_pat2_y_index][ext_pat2_x_index][1] += image[image_index+1]; ext_pat2[ext_pat2_y_index][ext_pat2_x_index][2] += image[image_index+2]; ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) ext_pat2[ext_pat2_y_index][ext_pat2_x_index][0] += image[image_index+0]; ext_pat2[ext_pat2_y_index][ext_pat2_x_index][1] += image[image_index+1]; ext_pat2[ext_pat2_y_index][ext_pat2_x_index][2] += image[image_index+2]; ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGBA) ext_pat2[ext_pat2_y_index][ext_pat2_x_index][0] += image[image_index+2]; ext_pat2[ext_pat2_y_index][ext_pat2_x_index][1] += image[image_index+1]; ext_pat2[ext_pat2_y_index][ext_pat2_x_index][2] += image[image_index+0]; ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) ext_pat2[ext_pat2_y_index][ext_pat2_x_index][0] += image[image_index+2]; ext_pat2[ext_pat2_y_index][ext_pat2_x_index][1] += image[image_index+1]; ext_pat2[ext_pat2_y_index][ext_pat2_x_index][2] += image[image_index+0]; ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_2vuy) ext_pat2[ext_pat2_y_index][ext_pat2_x_index][0] += image[image_index+1]; ext_pat2[ext_pat2_y_index][ext_pat2_x_index][1] += image[image_index+1]; ext_pat2[ext_pat2_y_index][ext_pat2_x_index][2] += image[image_index+1]; ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_yuvs) ext_pat2[ext_pat2_y_index][ext_pat2_x_index][0] += image[image_index+0]; ext_pat2[ext_pat2_y_index][ext_pat2_x_index][1] += image[image_index+0]; --- 264,296 ---- ext_pat2_x_index = i/xdiv; image_index = (yc*arImXsize+xc)*AR_PIX_SIZE_DEFAULT; ! #if (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ARGB) ext_pat2[ext_pat2_y_index][ext_pat2_x_index][0] += image[image_index+3]; ext_pat2[ext_pat2_y_index][ext_pat2_x_index][1] += image[image_index+2]; ext_pat2[ext_pat2_y_index][ext_pat2_x_index][2] += image[image_index+1]; ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ABGR) ext_pat2[ext_pat2_y_index][ext_pat2_x_index][0] += image[image_index+1]; ext_pat2[ext_pat2_y_index][ext_pat2_x_index][1] += image[image_index+2]; ext_pat2[ext_pat2_y_index][ext_pat2_x_index][2] += image[image_index+3]; ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGRA) ext_pat2[ext_pat2_y_index][ext_pat2_x_index][0] += image[image_index+0]; ext_pat2[ext_pat2_y_index][ext_pat2_x_index][1] += image[image_index+1]; ext_pat2[ext_pat2_y_index][ext_pat2_x_index][2] += image[image_index+2]; ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGR) ext_pat2[ext_pat2_y_index][ext_pat2_x_index][0] += image[image_index+0]; ext_pat2[ext_pat2_y_index][ext_pat2_x_index][1] += image[image_index+1]; ext_pat2[ext_pat2_y_index][ext_pat2_x_index][2] += image[image_index+2]; ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGBA) ext_pat2[ext_pat2_y_index][ext_pat2_x_index][0] += image[image_index+2]; ext_pat2[ext_pat2_y_index][ext_pat2_x_index][1] += image[image_index+1]; ext_pat2[ext_pat2_y_index][ext_pat2_x_index][2] += image[image_index+0]; ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGB) ext_pat2[ext_pat2_y_index][ext_pat2_x_index][0] += image[image_index+2]; ext_pat2[ext_pat2_y_index][ext_pat2_x_index][1] += image[image_index+1]; ext_pat2[ext_pat2_y_index][ext_pat2_x_index][2] += image[image_index+0]; ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) ext_pat2[ext_pat2_y_index][ext_pat2_x_index][0] += image[image_index+1]; ext_pat2[ext_pat2_y_index][ext_pat2_x_index][1] += image[image_index+1]; ext_pat2[ext_pat2_y_index][ext_pat2_x_index][2] += image[image_index+1]; ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_yuvs) ext_pat2[ext_pat2_y_index][ext_pat2_x_index][0] += image[image_index+0]; ext_pat2[ext_pat2_y_index][ext_pat2_x_index][1] += image[image_index+0]; *************** *** 353,357 **** } if( xc >= 0 && xc < arImXsize && yc >= 0 && yc < arImYsize ) { ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ARGB) k1 = image[(yc*arImXsize+xc)*AR_PIX_SIZE_DEFAULT+3]; k1 = ext_pat[j*AR_PATT_SIZE_Y/AR_PATT_SAMPLE_NUM][i*AR_PATT_SIZE_X/AR_PATT_SAMPLE_NUM][0] --- 353,357 ---- } if( xc >= 0 && xc < arImXsize && yc >= 0 && yc < arImYsize ) { ! #if (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ARGB) k1 = image[(yc*arImXsize+xc)*AR_PIX_SIZE_DEFAULT+3]; k1 = ext_pat[j*AR_PATT_SIZE_Y/AR_PATT_SAMPLE_NUM][i*AR_PATT_SIZE_X/AR_PATT_SAMPLE_NUM][0] *************** *** 366,370 **** + k3*(AR_PATT_SIZE_Y*AR_PATT_SIZE_X)/(AR_PATT_SAMPLE_NUM*AR_PATT_SAMPLE_NUM); ext_pat[j*AR_PATT_SIZE_Y/AR_PATT_SAMPLE_NUM][i*AR_PATT_SIZE_X/AR_PATT_SAMPLE_NUM][2] = (k3 > 255)? 255: k3; ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ABGR) k1 = image[(yc*arImXsize+xc)*AR_PIX_SIZE_DEFAULT+1]; k1 = ext_pat[j*AR_PATT_SIZE_Y/AR_PATT_SAMPLE_NUM][i*AR_PATT_SIZE_X/AR_PATT_SAMPLE_NUM][0] --- 366,370 ---- + k3*(AR_PATT_SIZE_Y*AR_PATT_SIZE_X)/(AR_PATT_SAMPLE_NUM*AR_PATT_SAMPLE_NUM); ext_pat[j*AR_PATT_SIZE_Y/AR_PATT_SAMPLE_NUM][i*AR_PATT_SIZE_X/AR_PATT_SAMPLE_NUM][2] = (k3 > 255)? 255: k3; ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ABGR) k1 = image[(yc*arImXsize+xc)*AR_PIX_SIZE_DEFAULT+1]; k1 = ext_pat[j*AR_PATT_SIZE_Y/AR_PATT_SAMPLE_NUM][i*AR_PATT_SIZE_X/AR_PATT_SAMPLE_NUM][0] *************** *** 379,383 **** + k3*(AR_PATT_SIZE_Y*AR_PATT_SIZE_X)/(AR_PATT_SAMPLE_NUM*AR_PATT_SAMPLE_NUM); ext_pat[j*AR_PATT_SIZE_Y/AR_PATT_SAMPLE_NUM][i*AR_PATT_SIZE_X/AR_PATT_SAMPLE_NUM][2] = (k3 > 255)? 255: k3; ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) k1 = image[(yc*arImXsize+xc)*AR_PIX_SIZE_DEFAULT+0]; k1 = ext_pat[j*AR_PATT_SIZE_Y/AR_PATT_SAMPLE_NUM][i*AR_PATT_SIZE_X/AR_PATT_SAMPLE_NUM][0] --- 379,383 ---- + k3*(AR_PATT_SIZE_Y*AR_PATT_SIZE_X)/(AR_PATT_SAMPLE_NUM*AR_PATT_SAMPLE_NUM); ext_pat[j*AR_PATT_SIZE_Y/AR_PATT_SAMPLE_NUM][i*AR_PATT_SIZE_X/AR_PATT_SAMPLE_NUM][2] = (k3 > 255)? 255: k3; ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGRA) k1 = image[(yc*arImXsize+xc)*AR_PIX_SIZE_DEFAULT+0]; k1 = ext_pat[j*AR_PATT_SIZE_Y/AR_PATT_SAMPLE_NUM][i*AR_PATT_SIZE_X/AR_PATT_SAMPLE_NUM][0] *************** *** 392,396 **** + k3*(AR_PATT_SIZE_Y*AR_PATT_SIZE_X)/(AR_PATT_SAMPLE_NUM*AR_PATT_SAMPLE_NUM); ext_pat[j*AR_PATT_SIZE_Y/AR_PATT_SAMPLE_NUM][i*AR_PATT_SIZE_X/AR_PATT_SAMPLE_NUM][2] = (k3 > 255)? 255: k3; ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) k1 = image[(yc*arImXsize+xc)*AR_PIX_SIZE_DEFAULT+0]; k1 = ext_pat[j*AR_PATT_SIZE_Y/AR_PATT_SAMPLE_NUM][i*AR_PATT_SIZE_X/AR_PATT_SAMPLE_NUM][0] --- 392,396 ---- + k3*(AR_PATT_SIZE_Y*AR_PATT_SIZE_X)/(AR_PATT_SAMPLE_NUM*AR_PATT_SAMPLE_NUM); ext_pat[j*AR_PATT_SIZE_Y/AR_PATT_SAMPLE_NUM][i*AR_PATT_SIZE_X/AR_PATT_SAMPLE_NUM][2] = (k3 > 255)? 255: k3; ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGR) k1 = image[(yc*arImXsize+xc)*AR_PIX_SIZE_DEFAULT+0]; k1 = ext_pat[j*AR_PATT_SIZE_Y/AR_PATT_SAMPLE_NUM][i*AR_PATT_SIZE_X/AR_PATT_SAMPLE_NUM][0] *************** *** 405,409 **** + k3*(AR_PATT_SIZE_Y*AR_PATT_SIZE_X)/(AR_PATT_SAMPLE_NUM*AR_PATT_SAMPLE_NUM); ext_pat[j*AR_PATT_SIZE_Y/AR_PATT_SAMPLE_NUM][i*AR_PATT_SIZE_X/AR_PATT_SAMPLE_NUM][2] = (k3 > 255)? 255: k3; ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGBA) k1 = image[(yc*arImXsize+xc)*AR_PIX_SIZE_DEFAULT+2]; k1 = ext_pat[j*AR_PATT_SIZE_Y/AR_PATT_SAMPLE_NUM][i*AR_PATT_SIZE_X/AR_PATT_SAMPLE_NUM][0] --- 405,409 ---- + k3*(AR_PATT_SIZE_Y*AR_PATT_SIZE_X)/(AR_PATT_SAMPLE_NUM*AR_PATT_SAMPLE_NUM); ext_pat[j*AR_PATT_SIZE_Y/AR_PATT_SAMPLE_NUM][i*AR_PATT_SIZE_X/AR_PATT_SAMPLE_NUM][2] = (k3 > 255)? 255: k3; ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGBA) k1 = image[(yc*arImXsize+xc)*AR_PIX_SIZE_DEFAULT+2]; k1 = ext_pat[j*AR_PATT_SIZE_Y/AR_PATT_SAMPLE_NUM][i*AR_PATT_SIZE_X/AR_PATT_SAMPLE_NUM][0] *************** *** 418,422 **** + k3*(AR_PATT_SIZE_Y*AR_PATT_SIZE_X)/(AR_PATT_SAMPLE_NUM*AR_PATT_SAMPLE_NUM); ext_pat[j*AR_PATT_SIZE_Y/AR_PATT_SAMPLE_NUM][i*AR_PATT_SIZE_X/AR_PATT_SAMPLE_NUM][2] = (k3 > 255)? 255: k3; ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) k1 = image[(yc*arImXsize+xc)*AR_PIX_SIZE_DEFAULT+2]; k1 = ext_pat[j*AR_PATT_SIZE_Y/AR_PATT_SAMPLE_NUM][i*AR_PATT_SIZE_X/AR_PATT_SAMPLE_NUM][0] --- 418,422 ---- + k3*(AR_PATT_SIZE_Y*AR_PATT_SIZE_X)/(AR_PATT_SAMPLE_NUM*AR_PATT_SAMPLE_NUM); ext_pat[j*AR_PATT_SIZE_Y/AR_PATT_SAMPLE_NUM][i*AR_PATT_SIZE_X/AR_PATT_SAMPLE_NUM][2] = (k3 > 255)? 255: k3; ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGB) k1 = image[(yc*arImXsize+xc)*AR_PIX_SIZE_DEFAULT+2]; k1 = ext_pat[j*AR_PATT_SIZE_Y/AR_PATT_SAMPLE_NUM][i*AR_PATT_SIZE_X/AR_PATT_SAMPLE_NUM][0] *************** *** 431,435 **** + k3*(AR_PATT_SIZE_Y*AR_PATT_SIZE_X)/(AR_PATT_SAMPLE_NUM*AR_PATT_SAMPLE_NUM); ext_pat[j*AR_PATT_SIZE_Y/AR_PATT_SAMPLE_NUM][i*AR_PATT_SIZE_X/AR_PATT_SAMPLE_NUM][2] = (k3 > 255)? 255: k3; ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_2vuy) k1 = image[(yc*arImXsize+xc)*AR_PIX_SIZE_DEFAULT+1]; k1 = ext_pat[j*AR_PATT_SIZE_Y/AR_PATT_SAMPLE_NUM][i*AR_PATT_SIZE_X/AR_PATT_SAMPLE_NUM][0] --- 431,435 ---- + k3*(AR_PATT_SIZE_Y*AR_PATT_SIZE_X)/(AR_PATT_SAMPLE_NUM*AR_PATT_SAMPLE_NUM); ext_pat[j*AR_PATT_SIZE_Y/AR_PATT_SAMPLE_NUM][i*AR_PATT_SIZE_X/AR_PATT_SAMPLE_NUM][2] = (k3 > 255)? 255: k3; ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) k1 = image[(yc*arImXsize+xc)*AR_PIX_SIZE_DEFAULT+1]; k1 = ext_pat[j*AR_PATT_SIZE_Y/AR_PATT_SAMPLE_NUM][i*AR_PATT_SIZE_X/AR_PATT_SAMPLE_NUM][0] *************** *** 444,448 **** + k3*(AR_PATT_SIZE_Y*AR_PATT_SIZE_X)/(AR_PATT_SAMPLE_NUM*AR_PATT_SAMPLE_NUM); ext_pat[j*AR_PATT_SIZE_Y/AR_PATT_SAMPLE_NUM][i*AR_PATT_SIZE_X/AR_PATT_SAMPLE_NUM][2] = (k3 > 255)? 255: k3; ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_yuvs) k1 = image[(yc*arImXsize+xc)*AR_PIX_SIZE_DEFAULT+0]; k1 = ext_pat[j*AR_PATT_SIZE_Y/AR_PATT_SAMPLE_NUM][i*AR_PATT_SIZE_X/AR_PATT_SAMPLE_NUM][0] --- 444,448 ---- + k3*(AR_PATT_SIZE_Y*AR_PATT_SIZE_X)/(AR_PATT_SAMPLE_NUM*AR_PATT_SAMPLE_NUM); ext_pat[j*AR_PATT_SIZE_Y/AR_PATT_SAMPLE_NUM][i*AR_PATT_SIZE_X/AR_PATT_SAMPLE_NUM][2] = (k3 > 255)? 255: k3; ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_yuvs) k1 = image[(yc*arImXsize+xc)*AR_PIX_SIZE_DEFAULT+0]; k1 = ext_pat[j*AR_PATT_SIZE_Y/AR_PATT_SAMPLE_NUM][i*AR_PATT_SIZE_X/AR_PATT_SAMPLE_NUM][0] |
|
From: Philip L. <phi...@us...> - 2006-04-21 04:35:37
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/VideoMacOSX In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25790 Modified Files: video.c Log Message: Rename AR_PIXEL_FORMAT_DEFAULT to AR_DEFAULT_PIXEL_FORMAT, fix pow2 half-res tex in gsub_lite. Index: video.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoMacOSX/video.c,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** video.c 5 Apr 2006 05:46:53 -0000 1.14 --- video.c 21 Apr 2006 04:35:34 -0000 1.15 *************** *** 1248,1266 **** // assign the one specified at compile-time as the default. if (!pixFormat) { ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_2vuy) pixFormat = k2vuyPixelFormat; // k422YpCbCr8CodecType, k422YpCbCr8PixelFormat ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_yuvs) pixFormat = kYUVSPixelFormat; // kComponentVideoUnsigned ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) pixFormat = k24RGBPixelFormat; ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) pixFormat = k24BGRPixelFormat; ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ARGB) pixFormat = k32ARGBPixelFormat; ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGBA) pixFormat = k32RGBAPixelFormat; ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ABGR) pixFormat = k32ABGRPixelFormat; ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) pixFormat = k32BGRAPixelFormat; #else --- 1248,1266 ---- // assign the one specified at compile-time as the default. if (!pixFormat) { ! #if (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) pixFormat = k2vuyPixelFormat; // k422YpCbCr8CodecType, k422YpCbCr8PixelFormat ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_yuvs) pixFormat = kYUVSPixelFormat; // kComponentVideoUnsigned ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGB) pixFormat = k24RGBPixelFormat; ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGR) pixFormat = k24BGRPixelFormat; ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ARGB) pixFormat = k32ARGBPixelFormat; ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGBA) pixFormat = k32RGBAPixelFormat; ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ABGR) pixFormat = k32ABGRPixelFormat; ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGRA) pixFormat = k32BGRAPixelFormat; #else |
|
From: Philip L. <phi...@us...> - 2006-04-21 04:35:31
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/Gl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25757 Modified Files: gsub.c gsub_lite.c Log Message: Rename AR_PIXEL_FORMAT_DEFAULT to AR_DEFAULT_PIXEL_FORMAT, fix pow2 half-res tex in gsub_lite. Index: gsub.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/Gl/gsub.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** gsub.c 5 Apr 2006 05:48:03 -0000 1.4 --- gsub.c 21 Apr 2006 04:35:28 -0000 1.5 *************** *** 419,437 **** glRasterPos3f( sx, sy, -1.0 ); ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ARGB) glDrawPixels( gImXsize, gImYsize, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ABGR) glDrawPixels( gImXsize, gImYsize, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) glDrawPixels( gImXsize, gImYsize, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) glDrawPixels( gImXsize, gImYsize, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGBA) glDrawPixels( gImXsize, gImYsize, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) glDrawPixels( gImXsize, gImYsize, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_2vuy) glDrawPixels( gImXsize, gImYsize, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_yuvs) glDrawPixels( gImXsize, gImYsize, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else --- 419,437 ---- glRasterPos3f( sx, sy, -1.0 ); ! #if (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ARGB) glDrawPixels( gImXsize, gImYsize, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ABGR) glDrawPixels( gImXsize, gImYsize, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGRA) glDrawPixels( gImXsize, gImYsize, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGR) glDrawPixels( gImXsize, gImYsize, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGBA) glDrawPixels( gImXsize, gImYsize, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGB) glDrawPixels( gImXsize, gImYsize, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) glDrawPixels( gImXsize, gImYsize, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_yuvs) glDrawPixels( gImXsize, gImYsize, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else *************** *** 495,513 **** glPixelStorei( GL_UNPACK_ROW_LENGTH, gImXsize*size_adjust_factor ); if( size_adjust_factor == old_size_adjust_factor ) { ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ARGB) glTexSubImage2D( AR_TEXTURE_RECTANGLE, 0, 0, 0, gImXsize, gImYsize/size_adjust_factor, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ABGR) glTexSubImage2D( AR_TEXTURE_RECTANGLE, 0, 0, 0, gImXsize, gImYsize/size_adjust_factor, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) glTexSubImage2D( AR_TEXTURE_RECTANGLE, 0, 0, 0, gImXsize, gImYsize/size_adjust_factor, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) glTexSubImage2D( AR_TEXTURE_RECTANGLE, 0, 0, 0, gImXsize, gImYsize/size_adjust_factor, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGBA) glTexSubImage2D( AR_TEXTURE_RECTANGLE, 0, 0, 0, gImXsize, gImYsize/size_adjust_factor, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) glTexSubImage2D( AR_TEXTURE_RECTANGLE, 0, 0, 0, gImXsize, gImYsize/size_adjust_factor, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_2vuy) glTexSubImage2D( AR_TEXTURE_RECTANGLE, 0, 0, 0, gImXsize, gImYsize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_yuvs) glTexSubImage2D( AR_TEXTURE_RECTANGLE, 0, 0, 0, gImXsize, gImYsize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else --- 495,513 ---- glPixelStorei( GL_UNPACK_ROW_LENGTH, gImXsize*size_adjust_factor ); if( size_adjust_factor == old_size_adjust_factor ) { ! #if (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ARGB) glTexSubImage2D( AR_TEXTURE_RECTANGLE, 0, 0, 0, gImXsize, gImYsize/size_adjust_factor, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ABGR) glTexSubImage2D( AR_TEXTURE_RECTANGLE, 0, 0, 0, gImXsize, gImYsize/size_adjust_factor, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGRA) glTexSubImage2D( AR_TEXTURE_RECTANGLE, 0, 0, 0, gImXsize, gImYsize/size_adjust_factor, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGR) glTexSubImage2D( AR_TEXTURE_RECTANGLE, 0, 0, 0, gImXsize, gImYsize/size_adjust_factor, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGBA) glTexSubImage2D( AR_TEXTURE_RECTANGLE, 0, 0, 0, gImXsize, gImYsize/size_adjust_factor, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGB) glTexSubImage2D( AR_TEXTURE_RECTANGLE, 0, 0, 0, gImXsize, gImYsize/size_adjust_factor, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) glTexSubImage2D( AR_TEXTURE_RECTANGLE, 0, 0, 0, gImXsize, gImYsize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_yuvs) glTexSubImage2D( AR_TEXTURE_RECTANGLE, 0, 0, 0, gImXsize, gImYsize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else *************** *** 516,534 **** } else { ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ARGB) glTexImage2D( AR_TEXTURE_RECTANGLE, 0, 3, gImXsize, gImYsize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ABGR) glTexImage2D( AR_TEXTURE_RECTANGLE, 0, 3, gImXsize, gImYsize/size_adjust_factor, 0, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) glTexImage2D( AR_TEXTURE_RECTANGLE, 0, 3, gImXsize, gImYsize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) glTexImage2D( AR_TEXTURE_RECTANGLE, 0, 3, gImXsize, gImYsize/size_adjust_factor, 0, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGBA) glTexImage2D( AR_TEXTURE_RECTANGLE, 0, 3, gImXsize, gImYsize/size_adjust_factor, 0, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) glTexImage2D( AR_TEXTURE_RECTANGLE, 0, 3, gImXsize, gImYsize/size_adjust_factor, 0, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_2vuy) glTexImage2D( AR_TEXTURE_RECTANGLE, 0, 3, gImXsize, gImYsize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_yuvs) glTexImage2D( AR_TEXTURE_RECTANGLE, 0, 3, gImXsize, gImYsize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else --- 516,534 ---- } else { ! #if (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ARGB) glTexImage2D( AR_TEXTURE_RECTANGLE, 0, 3, gImXsize, gImYsize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ABGR) glTexImage2D( AR_TEXTURE_RECTANGLE, 0, 3, gImXsize, gImYsize/size_adjust_factor, 0, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGRA) glTexImage2D( AR_TEXTURE_RECTANGLE, 0, 3, gImXsize, gImYsize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGR) glTexImage2D( AR_TEXTURE_RECTANGLE, 0, 3, gImXsize, gImYsize/size_adjust_factor, 0, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGBA) glTexImage2D( AR_TEXTURE_RECTANGLE, 0, 3, gImXsize, gImYsize/size_adjust_factor, 0, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGB) glTexImage2D( AR_TEXTURE_RECTANGLE, 0, 3, gImXsize, gImYsize/size_adjust_factor, 0, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) glTexImage2D( AR_TEXTURE_RECTANGLE, 0, 3, gImXsize, gImYsize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_yuvs) glTexImage2D( AR_TEXTURE_RECTANGLE, 0, 3, gImXsize, gImYsize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else *************** *** 661,679 **** if( size_adjust_factor == old_size_adjust_factor ) { ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ARGB) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ABGR) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGBA) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_2vuy) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_yuvs) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else --- 661,679 ---- if( size_adjust_factor == old_size_adjust_factor ) { ! #if (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ARGB) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ABGR) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGRA) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGR) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGBA) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGB) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_yuvs) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else *************** *** 682,700 **** } else { ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ARGB) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ABGR) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGBA) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_2vuy) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_yuvs) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else --- 682,700 ---- } else { ! #if (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ARGB) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ABGR) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGRA) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGR) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGBA) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGB) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_yuvs) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else *************** *** 850,868 **** if( size_adjust_factor == old_size_adjust_factor ) { ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ARGB) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ABGR) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGBA) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_2vuy) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_yuvs) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else --- 850,868 ---- if( size_adjust_factor == old_size_adjust_factor ) { ! #if (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ARGB) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ABGR) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGRA) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGR) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGBA) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGB) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_yuvs) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else *************** *** 871,889 **** } else { ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ARGB) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ABGR) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGBA) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_2vuy) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_yuvs) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else --- 871,889 ---- } else { ! #if (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ARGB) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ABGR) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGRA) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGR) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGBA) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGB) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_yuvs) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else *************** *** 979,997 **** if( size_adjust_factor == old_size_adjust_factor ) { ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ARGB) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize2, tex1Ysize/size_adjust_factor, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ABGR) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize2, tex1Ysize/size_adjust_factor, GL_ABGR, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize2, tex1Ysize/size_adjust_factor, GL_BGRA, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize2, tex1Ysize/size_adjust_factor, GL_BGR, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGBA) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize2, tex1Ysize/size_adjust_factor, GL_RGBA, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize2, tex1Ysize/size_adjust_factor, GL_RGB, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_2vuy) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize2, tex1Ysize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_yuvs) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize2, tex1Ysize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); #else --- 979,997 ---- if( size_adjust_factor == old_size_adjust_factor ) { ! #if (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ARGB) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize2, tex1Ysize/size_adjust_factor, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ABGR) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize2, tex1Ysize/size_adjust_factor, GL_ABGR, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGRA) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize2, tex1Ysize/size_adjust_factor, GL_BGRA, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGR) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize2, tex1Ysize/size_adjust_factor, GL_BGR, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGBA) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize2, tex1Ysize/size_adjust_factor, GL_RGBA, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGB) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize2, tex1Ysize/size_adjust_factor, GL_RGB, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize2, tex1Ysize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_yuvs) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize2, tex1Ysize/size_adjust_factor, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); #else *************** *** 1000,1018 **** } else { ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ARGB) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ABGR) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_ABGR, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_BGR, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGBA) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_RGBA, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_RGB, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_2vuy) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_yuvs) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); #else --- 1000,1018 ---- } else { ! #if (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ARGB) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ABGR) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_ABGR, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGRA) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGR) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_BGR, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGBA) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_RGBA, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGB) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_RGB, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_yuvs) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); #else *************** *** 1151,1169 **** glRasterPos3f( sx, sy, -1.0 ); ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ARGB) glDrawPixels( gImXsize/2, gImYsize/2, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ABGR) glDrawPixels( gImXsize/2, gImYsize/2, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) glDrawPixels( gImXsize/2, gImYsize/2, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) glDrawPixels( gImXsize/2, gImYsize/2, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGBA) glDrawPixels( gImXsize/2, gImYsize/2, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) glDrawPixels( gImXsize/2, gImYsize/2, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_2vuy) glDrawPixels( gImXsize/2, gImYsize/2, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_yuvs) glDrawPixels( gImXsize/2, gImYsize/2, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else --- 1151,1169 ---- glRasterPos3f( sx, sy, -1.0 ); ! #if (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ARGB) glDrawPixels( gImXsize/2, gImYsize/2, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ABGR) glDrawPixels( gImXsize/2, gImYsize/2, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGRA) glDrawPixels( gImXsize/2, gImYsize/2, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGR) glDrawPixels( gImXsize/2, gImYsize/2, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGBA) glDrawPixels( gImXsize/2, gImYsize/2, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGB) glDrawPixels( gImXsize/2, gImYsize/2, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) glDrawPixels( gImXsize/2, gImYsize/2, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_yuvs) glDrawPixels( gImXsize/2, gImYsize/2, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else *************** *** 1230,1248 **** if( initf == 0 ) { ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ARGB) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex2Xsize, tex2Ysize, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ABGR) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex2Xsize, tex2Ysize, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex2Xsize, tex2Ysize, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex2Xsize, tex2Ysize, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGBA) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex2Xsize, tex2Ysize, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex2Xsize, tex2Ysize, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_2vuy) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex2Xsize, tex2Ysize, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_yuvs) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex2Xsize, tex2Ysize, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else --- 1230,1248 ---- if( initf == 0 ) { ! #if (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ARGB) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex2Xsize, tex2Ysize, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ABGR) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex2Xsize, tex2Ysize, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGRA) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex2Xsize, tex2Ysize, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGR) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex2Xsize, tex2Ysize, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGBA) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex2Xsize, tex2Ysize, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGB) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex2Xsize, tex2Ysize, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex2Xsize, tex2Ysize, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_yuvs) glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex2Xsize, tex2Ysize, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else *************** *** 1251,1269 **** } else { ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ARGB) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex2Xsize, tex2Ysize, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ABGR) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex2Xsize, tex2Ysize, 0, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex2Xsize, tex2Ysize, 0, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex2Xsize, tex2Ysize, 0, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGBA) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex2Xsize, tex2Ysize, 0, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex2Xsize, tex2Ysize, 0, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_2vuy) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex2Xsize, tex2Ysize, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_yuvs) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex2Xsize, tex2Ysize, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else --- 1251,1269 ---- } else { ! #if (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ARGB) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex2Xsize, tex2Ysize, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ABGR) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex2Xsize, tex2Ysize, 0, GL_ABGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGRA) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex2Xsize, tex2Ysize, 0, GL_BGRA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGR) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex2Xsize, tex2Ysize, 0, GL_BGR, GL_UNSIGNED_BYTE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGBA) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex2Xsize, tex2Ysize, 0, GL_RGBA, GL_UNSIGNED_BYTE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGB) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex2Xsize, tex2Ysize, 0, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex2Xsize, tex2Ysize, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_yuvs) glTexImage2D( GL_TEXTURE_2D, 0, 3, tex2Xsize, tex2Ysize, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); #else Index: gsub_lite.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/Gl/gsub_lite.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** gsub_lite.c 6 Apr 2006 05:33:59 -0000 1.13 --- gsub_lite.c 21 Apr 2006 04:35:28 -0000 1.14 *************** *** 350,353 **** --- 350,355 ---- if (!arglDispImageTexRectangleCapabilitiesCheck(cparam, contextSettings)) { fprintf(stderr, "argl error: Your OpenGL implementation and/or hardware's texturing capabilities are insufficient to support rectangle textures.\n"); + // Fall back to power of 2 texturing. + contextSettings->arglTexRectangle = FALSE; return; } *************** *** 575,581 **** // Request OpenGL allocate memory for a power-of-two texture of the appropriate size. glPixelStorei(GL_UNPACK_ALIGNMENT, 1); ! glTexImage2D(GL_TEXTURE_2D, 0, contextSettings->pixIntFormat, contextSettings->texturePow2SizeX, contextSettings->texturePow2SizeY, 0, contextSettings->pixFormat, contextSettings->pixType, NULL); ! // Set up the surface which we will texture upon. contextSettings->listPow2 = glGenLists(1); --- 577,592 ---- // Request OpenGL allocate memory for a power-of-two texture of the appropriate size. + if (texmapScaleFactor == 2) { + // If texmapScaleFactor is 2, pretend lines in the source image are + // twice as long as they are; glTexImage2D will read only the first + // half of each line, effectively discarding every second line in the source image. + glPixelStorei(GL_UNPACK_ROW_LENGTH, cparam->xsize*texmapScaleFactor); + } glPixelStorei(GL_UNPACK_ALIGNMENT, 1); ! glTexImage2D(GL_TEXTURE_2D, 0, contextSettings->pixIntFormat, contextSettings->texturePow2SizeX, contextSettings->texturePow2SizeY/texmapScaleFactor, 0, contextSettings->pixFormat, contextSettings->pixType, NULL); ! if (texmapScaleFactor == 2) { ! glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); ! } ! // Set up the surface which we will texture upon. contextSettings->listPow2 = glGenLists(1); *************** *** 682,686 **** contextSettings = (ARGL_CONTEXT_SETTINGS_REF)calloc(1, sizeof(ARGL_CONTEXT_SETTINGS)); // Use default pixel format handed to us by <AR/config.h>. ! if (!arglPixelFormatSet(contextSettings, AR_PIXEL_FORMAT_DEFAULT)) { fprintf(stderr, "Unknown default pixel format defined in config.h.\n"); return (NULL); --- 693,697 ---- contextSettings = (ARGL_CONTEXT_SETTINGS_REF)calloc(1, sizeof(ARGL_CONTEXT_SETTINGS)); // Use default pixel format handed to us by <AR/config.h>. ! if (!arglPixelFormatSet(contextSettings, AR_DEFAULT_PIXEL_FORMAT)) { fprintf(stderr, "Unknown default pixel format defined in config.h.\n"); return (NULL); *************** *** 688,696 **** arglDrawModeSet(contextSettings, AR_DRAW_BY_TEXTURE_MAPPING); arglTexmapModeSet(contextSettings, AR_DRAW_TEXTURE_FULL_IMAGE); - #ifdef AR_OPENGL_TEXTURE_RECTANGLE arglTexRectangleSet(contextSettings, TRUE); - #else - arglTexRectangleSet(contextSettings, FALSE); - #endif // AR_OPENGL_TEXTURE_RECTANGLE return (contextSettings); --- 699,703 ---- |
|
From: Philip L. <phi...@us...> - 2006-04-21 04:35:27
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/VideoLinuxV4L In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25730 Modified Files: video.c Log Message: Rename AR_PIXEL_FORMAT_DEFAULT to AR_DEFAULT_PIXEL_FORMAT, fix pow2 half-res tex in gsub_lite. Index: video.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoLinuxV4L/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:13 -0000 1.4 --- video.c 21 Apr 2006 04:35:20 -0000 1.5 *************** *** 159,165 **** vid->width = DEFAULT_VIDEO_WIDTH; vid->height = DEFAULT_VIDEO_HEIGHT; ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) vid->palette = VIDEO_PALETTE_RGB32; /* palette format */ ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) || (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) vid->palette = VIDEO_PALETTE_RGB24; /* palette format */ #endif --- 159,165 ---- vid->width = DEFAULT_VIDEO_WIDTH; vid->height = DEFAULT_VIDEO_HEIGHT; ! #if (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGRA) vid->palette = VIDEO_PALETTE_RGB32; /* palette format */ ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGR) || (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGB) vid->palette = VIDEO_PALETTE_RGB24; /* palette format */ #endif *************** *** 212,218 **** else if( strncmp( a, "-palette=", 9 ) == 0 ) { if( strncmp( &a[9], "RGB", 3) == 0 ) { ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) vid->palette = VIDEO_PALETTE_RGB32; /* palette format */ ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR)|| (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) vid->palette = VIDEO_PALETTE_RGB24; /* palette format */ #endif --- 212,218 ---- else if( strncmp( a, "-palette=", 9 ) == 0 ) { if( strncmp( &a[9], "RGB", 3) == 0 ) { ! #if (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGRA) vid->palette = VIDEO_PALETTE_RGB32; /* palette format */ ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGR)|| (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGB) vid->palette = VIDEO_PALETTE_RGB24; /* palette format */ #endif |
|
From: Philip L. <phi...@us...> - 2006-04-21 04:35:19
|
Update of /cvsroot/artoolkit/artoolkit/include/AR In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25700 Modified Files: gsub_lite.h config.h.in Log Message: Rename AR_PIXEL_FORMAT_DEFAULT to AR_DEFAULT_PIXEL_FORMAT, fix pow2 half-res tex in gsub_lite. Index: config.h.in =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/include/AR/config.h.in,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** config.h.in 5 Apr 2006 05:48:43 -0000 1.4 --- config.h.in 21 Apr 2006 04:35:13 -0000 1.5 *************** *** 28,43 **** # ifdef AR_INPUT_V4L # ifdef USE_EYETOY ! # define AR_PIXEL_FORMAT_DEFAULT AR_PIXEL_FORMAT_RGB # else ! # define AR_PIXEL_FORMAT_DEFAULT AR_PIXEL_FORMAT_BGR # endif # endif # ifdef AR_INPUT_DV ! # define AR_PIXEL_FORMAT_DEFAULT AR_PIXEL_FORMAT_RGB # endif # ifdef AR_INPUT_1394CAM ! # define AR_PIXEL_FORMAT_DEFAULT AR_PIXEL_FORMAT_RGB # endif --- 28,43 ---- # ifdef AR_INPUT_V4L # ifdef USE_EYETOY ! # define AR_DEFAULT_PIXEL_FORMAT AR_PIXEL_FORMAT_RGB # else ! # define AR_DEFAULT_PIXEL_FORMAT AR_PIXEL_FORMAT_BGR # endif # endif # ifdef AR_INPUT_DV ! # define AR_DEFAULT_PIXEL_FORMAT AR_PIXEL_FORMAT_RGB # endif # ifdef AR_INPUT_1394CAM ! # define AR_DEFAULT_PIXEL_FORMAT AR_PIXEL_FORMAT_RGB # endif *************** *** 53,57 **** # define AR_BIG_ENDIAN # undef AR_LITTLE_ENDIAN ! # define AR_PIXEL_FORMAT_DEFAULT AR_PIXEL_FORMAT_ABGR #endif --- 53,57 ---- # define AR_BIG_ENDIAN # undef AR_LITTLE_ENDIAN ! # define AR_DEFAULT_PIXEL_FORMAT AR_PIXEL_FORMAT_ABGR #endif *************** *** 62,66 **** # undef AR_BIG_ENDIAN # define AR_LITTLE_ENDIAN ! # define AR_PIXEL_FORMAT_DEFAULT AR_PIXEL_FORMAT_BGRA #endif --- 62,66 ---- # undef AR_BIG_ENDIAN # define AR_LITTLE_ENDIAN ! # define AR_DEFAULT_PIXEL_FORMAT AR_PIXEL_FORMAT_BGRA #endif *************** *** 76,80 **** # define AR_LITTLE_ENDIAN # endif ! # define AR_PIXEL_FORMAT_DEFAULT AR_PIXEL_FORMAT_2vuy #endif --- 76,80 ---- # define AR_LITTLE_ENDIAN # endif ! # define AR_DEFAULT_PIXEL_FORMAT AR_PIXEL_FORMAT_2vuy #endif *************** *** 181,189 **** ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ABGR) || (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) || (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGBA) || (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ARGB) # define AR_PIX_SIZE_DEFAULT 4 ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) || (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) # define AR_PIX_SIZE_DEFAULT 3 ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_2vuy) || (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_yuvs) # define AR_PIX_SIZE_DEFAULT 2 #else --- 181,189 ---- ! #if (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ABGR) || (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGRA) || (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGBA) || (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ARGB) # define AR_PIX_SIZE_DEFAULT 4 ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGR) || (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGB) # define AR_PIX_SIZE_DEFAULT 3 ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) || (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_yuvs) # define AR_PIX_SIZE_DEFAULT 2 #else Index: gsub_lite.h =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/include/AR/gsub_lite.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** gsub_lite.h 6 Apr 2006 11:19:08 -0000 1.9 --- gsub_lite.h 21 Apr 2006 04:35:13 -0000 1.10 *************** *** 400,404 **** are in. This setting applies only to the context passed in parameter contextSettings. The default format is determined by ! the value of AR_PIXEL_FORMAT_DEFAULT at the time the library was built. Usually, image data is passed in directly from images generated by ARVideo, and so you should ensure that ARVideo is generating pixels of the same format. --- 400,404 ---- are in. This setting applies only to the context passed in parameter contextSettings. The default format is determined by ! the value of AR_DEFAULT_PIXEL_FORMAT at the time the library was built. Usually, image data is passed in directly from images generated by ARVideo, and so you should ensure that ARVideo is generating pixels of the same format. *************** *** 417,421 **** @discussion This function enquires as to the current format of pixel data being expected by the arglDispImage*() functions. The default format is determined by ! the value of AR_PIXEL_FORMAT_DEFAULT at the time the library was built. @param contextSettings A reference to ARGL's settings for the current OpenGL context, as returned by arglSetupForCurrentContext() for this context. --- 417,421 ---- @discussion This function enquires as to the current format of pixel data being expected by the arglDispImage*() functions. The default format is determined by ! the value of AR_DEFAULT_PIXEL_FORMAT at the time the library was built. @param contextSettings A reference to ARGL's settings for the current OpenGL context, as returned by arglSetupForCurrentContext() for this context. |
|
From: Philip L. <phi...@us...> - 2006-04-21 04:35:09
|
Update of /cvsroot/artoolkit/artoolkit/util/calib_camera2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25655 Modified Files: main.c Log Message: Rename AR_PIXEL_FORMAT_DEFAULT to AR_DEFAULT_PIXEL_FORMAT, fix pow2 half-res tex in gsub_lite. Index: main.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/calib_camera2/main.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** main.c 5 Apr 2006 05:48:33 -0000 1.9 --- main.c 21 Apr 2006 04:35:07 -0000 1.10 *************** *** 414,432 **** p = &(gPatt.savedImage[gPatt.loop_num-1][(j*gXsize+ssx)*AR_PIX_SIZE_DEFAULT]); for (i = ssx; i <= eex; i++) { ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) *p1 = (((255*3 - (*(p+0) + *(p+1) + *(p+2))) / 3) < gThresh ? 0 : 255); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ABGR) *p1 = (((255*3 - (*(p+1) + *(p+2) + *(p+3))) / 3) < gThresh ? 0 : 255); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ARGB) *p1 = (((255*3 - (*(p+1) + *(p+2) + *(p+3))) / 3) < gThresh ? 0 : 255); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) *p1 = (((255*3 - (*(p+0) + *(p+1) + *(p+2))) / 3) < gThresh ? 0 : 255); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGBA) *p1 = (((255*3 - (*(p+0) + *(p+1) + *(p+2))) / 3) < gThresh ? 0 : 255); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) *p1 = (((255*3 - (*(p+0) + *(p+1) + *(p+2))) / 3) < gThresh ? 0 : 255); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_2vuy) *p1 = ((255 - *(p+1)) < gThresh ? 0 : 255); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_yuvs) *p1 = ((255 - *(p+0)) < gThresh ? 0 : 255); #else --- 414,432 ---- p = &(gPatt.savedImage[gPatt.loop_num-1][(j*gXsize+ssx)*AR_PIX_SIZE_DEFAULT]); for (i = ssx; i <= eex; i++) { ! #if (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGRA) *p1 = (((255*3 - (*(p+0) + *(p+1) + *(p+2))) / 3) < gThresh ? 0 : 255); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ABGR) *p1 = (((255*3 - (*(p+1) + *(p+2) + *(p+3))) / 3) < gThresh ? 0 : 255); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ARGB) *p1 = (((255*3 - (*(p+1) + *(p+2) + *(p+3))) / 3) < gThresh ? 0 : 255); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGR) *p1 = (((255*3 - (*(p+0) + *(p+1) + *(p+2))) / 3) < gThresh ? 0 : 255); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGBA) *p1 = (((255*3 - (*(p+0) + *(p+1) + *(p+2))) / 3) < gThresh ? 0 : 255); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGB) *p1 = (((255*3 - (*(p+0) + *(p+1) + *(p+2))) / 3) < gThresh ? 0 : 255); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) *p1 = ((255 - *(p+1)) < gThresh ? 0 : 255); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_yuvs) *p1 = ((255 - *(p+0)) < gThresh ? 0 : 255); #else |
|
From: Philip L. <phi...@us...> - 2006-04-21 04:35:04
|
Update of /cvsroot/artoolkit/artoolkit/util/calib_distortion In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25382 Modified Files: calib_dist.c Log Message: Rename AR_PIXEL_FORMAT_DEFAULT to AR_DEFAULT_PIXEL_FORMAT, fix pow2 half-res tex in gsub_lite. Index: calib_dist.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/calib_distortion/calib_dist.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** calib_dist.c 5 Apr 2006 05:47:34 -0000 1.12 --- calib_dist.c 21 Apr 2006 04:34:59 -0000 1.13 *************** *** 387,405 **** p = &(gPatt.savedImage[gPatt.loop_num-1][(j*gXsize+ssx)*AR_PIX_SIZE_DEFAULT]); for (i = ssx; i <= eex; i++) { ! #if (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGRA) *p1 = (((255*3 - (*(p+0) + *(p+1) + *(p+2))) / 3) < gThresh ? 0 : 255); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ABGR) *p1 = (((255*3 - (*(p+1) + *(p+2) + *(p+3))) / 3) < gThresh ? 0 : 255); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_ARGB) *p1 = (((255*3 - (*(p+1) + *(p+2) + *(p+3))) / 3) < gThresh ? 0 : 255); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_BGR) *p1 = (((255*3 - (*(p+0) + *(p+1) + *(p+2))) / 3) < gThresh ? 0 : 255); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGBA) *p1 = (((255*3 - (*(p+0) + *(p+1) + *(p+2))) / 3) < gThresh ? 0 : 255); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_RGB) *p1 = (((255*3 - (*(p+0) + *(p+1) + *(p+2))) / 3) < gThresh ? 0 : 255); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_2vuy) *p1 = ((255 - *(p+1)) < gThresh ? 0 : 255); ! #elif (AR_PIXEL_FORMAT_DEFAULT == AR_PIXEL_FORMAT_yuvs) *p1 = ((255 - *(p+0)) < gThresh ? 0 : 255); #else --- 387,405 ---- p = &(gPatt.savedImage[gPatt.loop_num-1][(j*gXsize+ssx)*AR_PIX_SIZE_DEFAULT]); for (i = ssx; i <= eex; i++) { ! #if (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGRA) *p1 = (((255*3 - (*(p+0) + *(p+1) + *(p+2))) / 3) < gThresh ? 0 : 255); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ABGR) *p1 = (((255*3 - (*(p+1) + *(p+2) + *(p+3))) / 3) < gThresh ? 0 : 255); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ARGB) *p1 = (((255*3 - (*(p+1) + *(p+2) + *(p+3))) / 3) < gThresh ? 0 : 255); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGR) *p1 = (((255*3 - (*(p+0) + *(p+1) + *(p+2))) / 3) < gThresh ? 0 : 255); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGBA) *p1 = (((255*3 - (*(p+0) + *(p+1) + *(p+2))) / 3) < gThresh ? 0 : 255); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGB) *p1 = (((255*3 - (*(p+0) + *(p+1) + *(p+2))) / 3) < gThresh ? 0 : 255); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) *p1 = ((255 - *(p+1)) < gThresh ? 0 : 255); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_yuvs) *p1 = ((255 - *(p+0)) < gThresh ? 0 : 255); #else |
|
From: Philip L. <phi...@us...> - 2006-04-06 11:19:21
|
Update of /cvsroot/artoolkit/artoolkit/include/AR In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7157 Modified Files: gsub_lite.h Log Message: Comment update. Index: gsub_lite.h =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/include/AR/gsub_lite.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** gsub_lite.h 6 Apr 2006 05:33:32 -0000 1.8 --- gsub_lite.h 6 Apr 2006 11:19:08 -0000 1.9 *************** *** 271,275 **** @param scale Specifies a scaling between ARToolKit's units (usually millimeters) and OpenGL's coordinate system units. ! @availability First appeared in ARToolKit 2.68. */ void arglCameraView(double para[3][4], GLdouble m_modelview[16], double scale); --- 271,279 ---- @param scale Specifies a scaling between ARToolKit's units (usually millimeters) and OpenGL's coordinate system units. ! What you pass for the scalefactor parameter depends on what units you ! want to do your OpenGL drawing in. If you use a scalefactor of 1.0, then ! 1.0 OpenGL unit will equal 1.0 millimetre (ARToolKit's default units). ! To use different OpenGL units, e.g. metres, then you would pass 0.001. ! @availability First appeared in ARToolKit 2.68. */ void arglCameraView(double para[3][4], GLdouble m_modelview[16], double scale); |
|
From: Philip L. <phi...@us...> - 2006-04-06 05:34:04
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/Gl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4158 Modified Files: gsub_lite.c Log Message: Moved some gsub_lite globals into state structure. Index: gsub_lite.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/Gl/gsub_lite.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** gsub_lite.c 5 Apr 2006 05:48:03 -0000 1.12 --- gsub_lite.c 6 Apr 2006 05:33:59 -0000 1.13 *************** *** 19,22 **** --- 19,23 ---- * 2.7.9 2005-08-15 PRL Added complete support for runtime selection of pixel format and rectangle/power-of-2 textures. * 2.8.0 2006-04-04 PRL Move pixel format constants into toolkit global namespace (in config.h). + * 2.8.1 2006-04-06 PRL Move arglDrawMode, arglTexmapMode, arglTexRectangle out of global variables. * */ *************** *** 134,137 **** --- 135,141 ---- GLenum pixType; GLenum pixSize; + int arglDrawMode; + int arglTexmapMode; + int arglTexRectangle; }; typedef struct _ARGL_CONTEXT_SETTINGS ARGL_CONTEXT_SETTINGS; *************** *** 142,153 **** // It'd be nice if we could wrap these in accessor functions! - int arglDrawMode = DEFAULT_DRAW_MODE; - int arglTexmapMode = DEFAULT_DRAW_TEXTURE_IMAGE; - #ifdef AR_OPENGL_TEXTURE_RECTANGLE - int arglTexRectangle = TRUE; - #else - int arglTexRectangle = FALSE; - #endif // AR_OPENGL_TEXTURE_RECTANGLE - // These items relate to Apple's fast texture transfer support. //#define ARGL_USE_TEXTURE_RANGE // Commented out due to conflicts with GL_APPLE_ycbcr_422 extension. --- 146,149 ---- *************** *** 686,694 **** contextSettings = (ARGL_CONTEXT_SETTINGS_REF)calloc(1, sizeof(ARGL_CONTEXT_SETTINGS)); // Use default pixel format handed to us by <AR/config.h>. - fprintf(stderr, "pix fmt is %d \n", AR_PIXEL_FORMAT_DEFAULT); if (!arglPixelFormatSet(contextSettings, AR_PIXEL_FORMAT_DEFAULT)) { fprintf(stderr, "Unknown default pixel format defined in config.h.\n"); return (NULL); } return (contextSettings); } --- 682,697 ---- contextSettings = (ARGL_CONTEXT_SETTINGS_REF)calloc(1, sizeof(ARGL_CONTEXT_SETTINGS)); // Use default pixel format handed to us by <AR/config.h>. if (!arglPixelFormatSet(contextSettings, AR_PIXEL_FORMAT_DEFAULT)) { fprintf(stderr, "Unknown default pixel format defined in config.h.\n"); return (NULL); } + arglDrawModeSet(contextSettings, AR_DRAW_BY_TEXTURE_MAPPING); + arglTexmapModeSet(contextSettings, AR_DRAW_TEXTURE_FULL_IMAGE); + #ifdef AR_OPENGL_TEXTURE_RECTANGLE + arglTexRectangleSet(contextSettings, TRUE); + #else + arglTexRectangleSet(contextSettings, FALSE); + #endif // AR_OPENGL_TEXTURE_RECTANGLE + return (contextSettings); } *************** *** 785,790 **** zoomf = (float)zoom; ! texmapScaleFactor = arglTexmapMode + 1; ! if (arglDrawMode == AR_DRAW_BY_GL_DRAW_PIXELS) { glDisable(GL_TEXTURE_2D); glPixelZoom(zoomf, -zoomf); --- 788,793 ---- zoomf = (float)zoom; ! texmapScaleFactor = contextSettings->arglTexmapMode + 1; ! if (contextSettings->arglDrawMode == AR_DRAW_BY_GL_DRAW_PIXELS) { glDisable(GL_TEXTURE_2D); glPixelZoom(zoomf, -zoomf); *************** *** 802,806 **** } ! if (arglTexRectangle) { arglDispImageTexRectangle(image, cparam, zoomf, contextSettings, texmapScaleFactor); } else { --- 805,809 ---- } ! if (contextSettings->arglTexRectangle) { arglDispImageTexRectangle(image, cparam, zoomf, contextSettings, texmapScaleFactor); } else { *************** *** 921,922 **** --- 924,962 ---- return (TRUE); } + + void arglDrawModeSet(ARGL_CONTEXT_SETTINGS_REF contextSettings, const int mode) + { + if (!contextSettings || mode < 0 || mode > 1) return; // Sanity check. + contextSettings->arglDrawMode = mode; + } + + int arglDrawModeGet(ARGL_CONTEXT_SETTINGS_REF contextSettings) + { + if (!contextSettings) return (-1); // Sanity check. + return (contextSettings->arglDrawMode); + } + + void arglTexmapModeSet(ARGL_CONTEXT_SETTINGS_REF contextSettings, const int mode) + { + if (!contextSettings || mode < 0 || mode > 1) return; // Sanity check. + contextSettings->arglTexmapMode = mode; + } + + int arglTexmapModeGet(ARGL_CONTEXT_SETTINGS_REF contextSettings) + { + if (!contextSettings) return (-1); // Sanity check. + return (contextSettings->arglTexmapMode); + } + + void arglTexRectangleSet(ARGL_CONTEXT_SETTINGS_REF contextSettings, const int state) + { + if (!contextSettings) return; // Sanity check. + contextSettings->arglTexRectangle = state; + } + + int arglTexRectangleGet(ARGL_CONTEXT_SETTINGS_REF contextSettings) + { + if (!contextSettings) return (-1); // Sanity check. + return (contextSettings->arglTexRectangle); + } + |
|
From: Philip L. <phi...@us...> - 2006-04-06 05:33:53
|
Update of /cvsroot/artoolkit/artoolkit/examples/twoView In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4111 Modified Files: twoView.c Log Message: Moved some gsub_lite globals into state structure. Index: twoView.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/examples/twoView/twoView.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** twoView.c 22 Sep 2005 19:35:40 -0000 1.11 --- twoView.c 6 Apr 2006 05:33:48 -0000 1.12 *************** *** 244,250 **** // Report state of ARToolKit global variables arFittingMode, // arImageProcMode, arglDrawMode, arTemplateMatchingMode, arMatchingPCAMode. ! static void demoARDebugReportMode(void) { ! if(arFittingMode == AR_FITTING_TO_INPUT ) { fprintf(stderr, "FittingMode (Z): INPUT IMAGE\n"); } else { --- 244,250 ---- // Report state of ARToolKit global variables arFittingMode, // arImageProcMode, arglDrawMode, arTemplateMatchingMode, arMatchingPCAMode. ! static void demoARDebugReportMode(ARGL_CONTEXT_SETTINGS_REF arglSettings) { ! if (arFittingMode == AR_FITTING_TO_INPUT) { fprintf(stderr, "FittingMode (Z): INPUT IMAGE\n"); } else { *************** *** 252,256 **** } ! if( arImageProcMode == AR_IMAGE_PROC_IN_FULL ) { fprintf(stderr, "ProcMode (X) : FULL IMAGE\n"); } else { --- 252,256 ---- } ! if (arImageProcMode == AR_IMAGE_PROC_IN_FULL) { fprintf(stderr, "ProcMode (X) : FULL IMAGE\n"); } else { *************** *** 258,264 **** } ! if( arglDrawMode == AR_DRAW_BY_GL_DRAW_PIXELS ) { fprintf(stderr, "DrawMode (C) : GL_DRAW_PIXELS\n"); ! } else if( arglTexmapMode == AR_DRAW_TEXTURE_FULL_IMAGE ) { fprintf(stderr, "DrawMode (C) : TEXTURE MAPPING (FULL RESOLUTION)\n"); } else { --- 258,264 ---- } ! if (arglDrawModeGet(arglSettings) == AR_DRAW_BY_GL_DRAW_PIXELS) { fprintf(stderr, "DrawMode (C) : GL_DRAW_PIXELS\n"); ! } else if (arglTexmapModeGet(arglSettings) == AR_DRAW_TEXTURE_FULL_IMAGE) { fprintf(stderr, "DrawMode (C) : TEXTURE MAPPING (FULL RESOLUTION)\n"); } else { *************** *** 266,270 **** } ! if( arTemplateMatchingMode == AR_TEMPLATE_MATCHING_COLOR ) { fprintf(stderr, "TemplateMatchingMode (M) : Color Template\n"); } else { --- 266,270 ---- } ! if (arTemplateMatchingMode == AR_TEMPLATE_MATCHING_COLOR) { fprintf(stderr, "TemplateMatchingMode (M) : Color Template\n"); } else { *************** *** 272,276 **** } ! if( arMatchingPCAMode == AR_MATCHING_WITHOUT_PCA ) { fprintf(stderr, "MatchingPCAMode (P) : Without PCA\n"); } else { --- 272,276 ---- } ! if (arMatchingPCAMode == AR_MATCHING_WITHOUT_PCA) { fprintf(stderr, "MatchingPCAMode (P) : Without PCA\n"); } else { *************** *** 329,332 **** --- 329,333 ---- { int i; + int mode; switch (key) { *************** *** 341,367 **** case 'C': case 'c': - if( arglDrawMode == AR_DRAW_BY_GL_DRAW_PIXELS ) { - arglDrawMode = AR_DRAW_BY_TEXTURE_MAPPING; - arglTexmapMode = AR_DRAW_TEXTURE_FULL_IMAGE; - } else if( arglTexmapMode == AR_DRAW_TEXTURE_FULL_IMAGE ) { - arglTexmapMode = AR_DRAW_TEXTURE_HALF_IMAGE; - } else { - arglDrawMode = AR_DRAW_BY_GL_DRAW_PIXELS; - } for (i = 0; i < gContextsActiveCount; i++) { fprintf(stderr, "*** Camera %2d - %f (frame/sec)\n", i + 1, (double)(gContextsActive[i].callCountMarkerDetect)/arUtilTimer()); gContextsActive[i].callCountMarkerDetect = 0; } arUtilTimerReset(); gCallCountGetImage = 0; - demoARDebugReportMode(); break; - #ifdef AR_OPENGL_TEXTURE_RECTANGLE - case 'R': - case 'r': - arglTexRectangle = !arglTexRectangle; - fprintf(stderr, "Toggled arglTexRectangle to %d.\n", arglTexRectangle); - break; - #endif // AR_OPENGL_TEXTURE_RECTANGLE case '?': case '/': --- 342,362 ---- case 'C': case 'c': for (i = 0; i < gContextsActiveCount; i++) { + mode = arglDrawModeGet(gContextsActive[i].arglSettings); + if (mode == AR_DRAW_BY_GL_DRAW_PIXELS) { + arglDrawModeSet(gContextsActive[i].arglSettings, AR_DRAW_BY_TEXTURE_MAPPING); + arglTexmapModeSet(gContextsActive[i].arglSettings, AR_DRAW_TEXTURE_FULL_IMAGE); + } else { + mode = arglTexmapModeGet(gContextsActive[i].arglSettings); + if (mode == AR_DRAW_TEXTURE_FULL_IMAGE) arglTexmapModeSet(gContextsActive[i].arglSettings, AR_DRAW_TEXTURE_HALF_IMAGE); + else arglDrawModeSet(gContextsActive[i].arglSettings, AR_DRAW_BY_GL_DRAW_PIXELS); + } fprintf(stderr, "*** Camera %2d - %f (frame/sec)\n", i + 1, (double)(gContextsActive[i].callCountMarkerDetect)/arUtilTimer()); gContextsActive[i].callCountMarkerDetect = 0; + demoARDebugReportMode(gContextsActive[i].arglSettings); } arUtilTimerReset(); gCallCountGetImage = 0; break; case '?': case '/': *************** *** 369,375 **** printf(" q or [esc] Quit demo.\n"); printf(" c Change arglDrawMode and arglTexmapMode.\n"); - #ifdef AR_OPENGL_TEXTURE_RECTANGLE - printf(" r Toggle arglTexRectangle.\n"); - #endif // AR_OPENGL_TEXTURE_RECTANGLE printf(" ? or / Show this help.\n"); printf("\nAdditionally, the ARVideo library supplied the following help text:\n"); --- 364,367 ---- *************** *** 593,597 **** } gContextsActiveCount = CONTEXTSACTIVECOUNT; ! demoARDebugReportMode(); if (!demoARSetupMarker(patt_name, &gPatt_id)) { fprintf(stderr, "main(): Unable to set up AR marker.\n"); --- 585,589 ---- } gContextsActiveCount = CONTEXTSACTIVECOUNT; ! for (i = 0; i < gContextsActiveCount; i++) demoARDebugReportMode(gContextsActive[i].arglSettings); if (!demoARSetupMarker(patt_name, &gPatt_id)) { fprintf(stderr, "main(): Unable to set up AR marker.\n"); |
|
From: Philip L. <phi...@us...> - 2006-04-06 05:33:43
|
Update of /cvsroot/artoolkit/artoolkit/examples/simpleLite In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4034 Modified Files: simpleLite.c Log Message: Moved some gsub_lite globals into state structure. Index: simpleLite.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/examples/simpleLite/simpleLite.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** simpleLite.c 22 Sep 2005 19:15:24 -0000 1.10 --- simpleLite.c 6 Apr 2006 05:33:40 -0000 1.11 *************** *** 208,219 **** } ! if( arglDrawMode == AR_DRAW_BY_GL_DRAW_PIXELS ) { fprintf(stderr, "DrawMode (C) : GL_DRAW_PIXELS\n"); ! } else if( arglTexmapMode == AR_DRAW_TEXTURE_FULL_IMAGE ) { fprintf(stderr, "DrawMode (C) : TEXTURE MAPPING (FULL RESOLUTION)\n"); } else { fprintf(stderr, "DrawMode (C) : TEXTURE MAPPING (HALF RESOLUTION)\n"); } ! if( arTemplateMatchingMode == AR_TEMPLATE_MATCHING_COLOR ) { fprintf(stderr, "TemplateMatchingMode (M) : Color Template\n"); --- 208,219 ---- } ! if (arglDrawModeGet(gArglSettings) == AR_DRAW_BY_GL_DRAW_PIXELS) { fprintf(stderr, "DrawMode (C) : GL_DRAW_PIXELS\n"); ! } else if (arglTexmapModeGet(gArglSettings) == AR_DRAW_TEXTURE_FULL_IMAGE) { fprintf(stderr, "DrawMode (C) : TEXTURE MAPPING (FULL RESOLUTION)\n"); } else { fprintf(stderr, "DrawMode (C) : TEXTURE MAPPING (HALF RESOLUTION)\n"); } ! if( arTemplateMatchingMode == AR_TEMPLATE_MATCHING_COLOR ) { fprintf(stderr, "TemplateMatchingMode (M) : Color Template\n"); *************** *** 239,242 **** --- 239,243 ---- static void Keyboard(unsigned char key, int x, int y) { + int mode; switch (key) { case 0x1B: // Quit. *************** *** 250,260 **** case 'C': case 'c': ! if( arglDrawMode == AR_DRAW_BY_GL_DRAW_PIXELS ) { ! arglDrawMode = AR_DRAW_BY_TEXTURE_MAPPING; ! arglTexmapMode = AR_DRAW_TEXTURE_FULL_IMAGE; ! } else if( arglTexmapMode == AR_DRAW_TEXTURE_FULL_IMAGE ) { ! arglTexmapMode = AR_DRAW_TEXTURE_HALF_IMAGE; } else { ! arglDrawMode = AR_DRAW_BY_GL_DRAW_PIXELS; } fprintf(stderr, "*** Camera - %f (frame/sec)\n", (double)gCallCountMarkerDetect/arUtilTimer()); --- 251,262 ---- case 'C': case 'c': ! mode = arglDrawModeGet(gArglSettings); ! if (mode == AR_DRAW_BY_GL_DRAW_PIXELS) { ! arglDrawModeSet(gArglSettings, AR_DRAW_BY_TEXTURE_MAPPING); ! arglTexmapModeSet(gArglSettings, AR_DRAW_TEXTURE_FULL_IMAGE); } else { ! mode = arglTexmapModeGet(gArglSettings); ! if (mode == AR_DRAW_TEXTURE_FULL_IMAGE) arglTexmapModeSet(gArglSettings, AR_DRAW_TEXTURE_HALF_IMAGE); ! else arglDrawModeSet(gArglSettings, AR_DRAW_BY_GL_DRAW_PIXELS); } fprintf(stderr, "*** Camera - %f (frame/sec)\n", (double)gCallCountMarkerDetect/arUtilTimer()); *************** *** 263,273 **** demoARDebugReportMode(); break; - #ifdef AR_OPENGL_TEXTURE_RECTANGLE - case 'R': - case 'r': - arglTexRectangle = !arglTexRectangle; - fprintf(stderr, "Toggled arglTexRectangle to %d.\n", arglTexRectangle); - break; - #endif // AR_OPENGL_TEXTURE_RECTANGLE case '?': case '/': --- 265,268 ---- *************** *** 275,281 **** printf(" q or [esc] Quit demo.\n"); printf(" c Change arglDrawMode and arglTexmapMode.\n"); - #ifdef AR_OPENGL_TEXTURE_RECTANGLE - printf(" r Toggle arglTexRectangle.\n"); - #endif // AR_OPENGL_TEXTURE_RECTANGLE printf(" ? or / Show this help.\n"); printf("\nAdditionally, the ARVideo library supplied the following help text:\n"); --- 270,273 ---- |
