artoolkit-commits Mailing List for ARToolKit (Page 5)
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-11-19 21:21:16
|
Update of /cvsroot/artoolkit/artoolkit/include/AR In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv11071 Modified Files: config.h.in Log Message: Adjust default Mac pixel format. Index: config.h.in =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/include/AR/config.h.in,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** config.h.in 3 Oct 2006 21:35:37 -0000 1.13 --- config.h.in 19 Nov 2006 21:21:11 -0000 1.14 *************** *** 129,133 **** # define AR_LITTLE_ENDIAN # endif ! # define AR_DEFAULT_PIXEL_FORMAT AR_PIXEL_FORMAT_2vuy #endif --- 129,133 ---- # define AR_LITTLE_ENDIAN # endif ! # define AR_DEFAULT_PIXEL_FORMAT AR_PIXEL_FORMAT_ARGB #endif |
|
From: Philip L. <phi...@us...> - 2006-11-19 19:39:26
|
Update of /cvsroot/artoolkit/artoolkit In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv4722 Modified Files: ChangeLog.txt README.txt Log Message: Added license model text to readme. Added known issues to readme. Fix up some lines for readibility. Index: ChangeLog.txt =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/ChangeLog.txt,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** ChangeLog.txt 17 Nov 2006 03:47:02 -0000 1.13 --- ChangeLog.txt 19 Nov 2006 19:39:21 -0000 1.14 *************** *** 6,24 **** ------------------------------------------------------ All platforms: ! New feature: ARToolKit now supports querying of SDK and runtime versions. ! New feature: There are now right-hand coordinate system versions of the OpenGL projection and modelview matrix functions, named arglCameraFrustumRH and arglCameraViewRH, respectively. These will help when integrating ARToolKit into existing OpenGL drawing. ! Enhancement: Support for AR_PIXEL_FORMAT_MONO is now included. ! Enhancement: gsub_lite now supports arDebug mode. ! Enhancement: ARvrml now builds against OpenVRML-0.16.1. Mac OS X: ! Bug fix: Fix for an error in the VRML library inclusion on Mac OS X. ! Bug fix: Now detects if running emulated on Intel Macs, and optimises video for this case. ! Enhancement: Two new video config tokens are now available; -fliph and -flipv, which will mirror the video image horizontally and vertically respectively. Linux: ! New feature: Support for gstreamer video capture added, thanks to Hartmut Seichter. ! Enhancement: Major changes to Video1394DC- add PointGray DragonFly support, add LGPL/GPL license info, better config string support, stabilised interfaces, lots of clean ups to make the code easier to work with. ! Bug fix: Using PAL in VideoLinuxDV as reported at http://www.hitlabnz.org/forum/showthread.php?t=412. --- 6,25 ---- ------------------------------------------------------ All platforms: ! - New feature: ARToolKit now supports querying of SDK and runtime versions. ! - New feature: There are now right-hand coordinate system versions of the OpenGL projection and modelview matrix functions, named arglCameraFrustumRH and arglCameraViewRH, respectively. These will help when integrating ARToolKit into existing OpenGL drawing. ! - Enhancement: Support for AR_PIXEL_FORMAT_MONO is now included. ! - Enhancement: gsub_lite now supports arDebug mode. ! - Enhancement: ARvrml now builds against OpenVRML-0.16.1. ! - Enhancement: The license model is now stated more clearly in the readme. Mac OS X: ! - Bug fix: Fix for an error in the VRML library inclusion on Mac OS X. ! - Bug fix: Now detects if running emulated on Intel Macs, and optimises video for this case. ! - Enhancement: Two new video config tokens are now available; -fliph and -flipv, which will mirror the video image horizontally and vertically respectively. Linux: ! - New feature: Support for gstreamer video capture added, thanks to Hartmut Seichter. ! - Enhancement: Major changes to Video1394DC- add PointGray DragonFly support, add LGPL/GPL license info, better config string support, stabilised interfaces, lots of clean ups to make the code easier to work with. ! - Bug fix: Using PAL in VideoLinuxDV as reported at http://www.hitlabnz.org/forum/showthread.php?t=412. Index: README.txt =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/README.txt,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** README.txt 17 Nov 2006 03:47:02 -0000 1.25 --- README.txt 19 Nov 2006 19:39:21 -0000 1.26 *************** *** 6,9 **** --- 6,10 ---- --------- About this archive. + The ARToolKit license model. Building on Windows. Building on Linux / SGI Irix. *************** *** 18,22 **** This archive contains the ARToolKit libraries, utilities and examples, version 2.72. ! ARToolKit is released under the GNU General Public License (GPL). Please read the file COPYING.txt. The latest version of ARToolKit is available from http://sf.net/projects/artoolkit. --- 19,23 ---- This archive contains the ARToolKit libraries, utilities and examples, version 2.72. ! ARToolKit version 2.72 is released under the GNU General Public License (GPL). Please read the file COPYING.txt. The latest version of ARToolKit is available from http://sf.net/projects/artoolkit. *************** *** 31,34 **** --- 32,55 ---- + The ARToolKit license model. + ---------------------------- + + ARToolKit is made available under a dual-license model. As it has been since the first public release of version 1.0, ARToolKit is freely available for non-commercial use under the terms of the GNU General Public License. A proprietary version of ARToolKit developed in parallel for professional commercial use by ARToolworks, Inc. is made available under different license terms, to suit end-user need. + + We believe this model offers the best of both worlds. Persons developing their software under an open source model are freely availed of the ARToolKit source code, and the ARToolKit open source project benefits in return from enhancements, bug reports, and external development ideas. Those persons developing under a proprietary source model, from whom the ARToolKit code base does not benefit through reciprocal openness, contribute financially instead. License fees fund research and development of today's and tomorrow's versions of the ARToolKit through research activities at partner institutions. + + The GPL-licensed toolkit.: + + ARToolKit versions 1.0 through 2.x are available under the GPL. Please read the full text of the GPL prior to downloading and/or using the ARToolKit source code. Your downloading and/or use of the code signifies acceptance of the terms and conditions of the license. If you are unable to comply with the license terms, please immediately destroy all copies of the code in your possession. + + Please be aware that while the GPL allows you to freely use the source code, it also imposes certain restrictions on the way in which you can use the code. Your attention is drawn particularly to section 2b of the GPL: "You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.", i.e. your software incorporating or linking to ARToolKit must also be open-source software, licensed under the GPL. Use of the ARToolKit in breach of the terms of the GPL will be subject to legal action by the copyright holders. + + Licenses for professional and commercial use.: + + In response to demand from toolkit users, the holders of the copyright on much of the ARToolKit version 1.0 - 2.x code have elected to make this code and other substantially advanced ARToolKit and AR code available under proprietary licenses for professional and commercial use by persons for whom the GPL license is not ideal. These license arrangements are managed by ARToolworks, Inc., Seattle, WA, USA. A variety of license types are available at reasonable cost. Please contact ARToolworks, Inc. directly for information on products, license terms, and pricing. + + ARToolworks also provide a variety of value-added services, including professional support, customization and other modifications, and end-user turnkey applications. + + Building on Windows. -------------------- *************** *** 128,146 **** ------------------------------------------------------ All platforms: ! New feature: ARToolKit now supports querying of SDK and runtime versions. ! New feature: There are now right-hand coordinate system versions of the OpenGL projection and modelview matrix functions, named arglCameraFrustumRH and arglCameraViewRH, respectively. These will help when integrating ARToolKit into existing OpenGL drawing. ! Enhancement: Support for AR_PIXEL_FORMAT_MONO is now included. ! Enhancement: gsub_lite now supports arDebug mode. ! Enhancement: ARvrml now builds against OpenVRML-0.16.1. Mac OS X: ! Bug fix: Fix for an error in the VRML library inclusion on Mac OS X. ! Bug fix: Now detects if running emulated on Intel Macs, and optimises video for this case. ! Enhancement: Two new video config tokens are now available; -fliph and -flipv, which will mirror the video image horizontally and vertically respectively. Linux: ! New feature: Support for gstreamer video capture added, thanks to Hartmut Seichter. ! Enhancement: Major changes to Video1394DC- add PointGray DragonFly support, add LGPL/GPL license info, better config string support, stabilised interfaces, lots of clean ups to make the code easier to work with. ! Bug fix: Using PAL in VideoLinuxDV as reported at http://www.hitlabnz.org/forum/showthread.php?t=412. --- 149,175 ---- ------------------------------------------------------ All platforms: ! - New feature: ARToolKit now supports querying of SDK and runtime versions. ! - New feature: There are now right-hand coordinate system versions of the OpenGL projection and modelview matrix functions, named arglCameraFrustumRH and arglCameraViewRH, respectively. These will help when integrating ARToolKit into existing OpenGL drawing. ! - Enhancement: Support for AR_PIXEL_FORMAT_MONO is now included. ! - Enhancement: gsub_lite now supports arDebug mode. ! - Enhancement: ARvrml now builds against OpenVRML-0.16.1. ! - Enhancement: The license model is now stated more clearly in the readme. Mac OS X: ! - Bug fix: Fix for an error in the VRML library inclusion on Mac OS X. ! - Bug fix: Now detects if running emulated on Intel Macs, and optimises video for this case. ! - Enhancement: Two new video config tokens are now available; -fliph and -flipv, which will mirror the video image horizontally and vertically respectively. Linux: ! - New feature: Support for gstreamer video capture added, thanks to Hartmut Seichter. ! - Enhancement: Major changes to Video1394DC- add PointGray DragonFly support, add LGPL/GPL license info, better config string support, stabilised interfaces, lots of clean ups to make the code easier to work with. ! - Bug fix: Using PAL in VideoLinuxDV as reported at http://www.hitlabnz.org/forum/showthread.php?t=412. ! ! ! Known issues in this release. ! ----------------------------- ! - On Windows, it is not easy to work out what to put into the DSVideoLib xml config file. Particularly, DirectShow IDs may include a "&" character, which needs to be escaped in xml (i.e. changed to "&" wherever it occurs). ! - The Mac video library does not yet use the new QuickTime 7 video pipeline. ! - Changing the pixel format requires recompilation of libAR. This problem is solved in ARToolKit Professional v4 (commercially-licensed). *************** *** 149,152 **** --- 178,182 ---- Please see the file ChangeLog.txt. + -- EOF |
|
From: Philip L. <phi...@us...> - 2006-11-17 03:47:06
|
Update of /cvsroot/artoolkit/artoolkit In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv10559 Modified Files: ChangeLog.txt README.txt Log Message: Prepare for 2.72 release. Index: ChangeLog.txt =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/ChangeLog.txt,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** ChangeLog.txt 4 Oct 2006 03:45:16 -0000 1.12 --- ChangeLog.txt 17 Nov 2006 03:47:02 -0000 1.13 *************** *** 3,17 **** ! Changes in version 2.72 (this release) (2006-XX-XX). ------------------------------------------------------ ! - All platforms: ARToolKit now supports querying of SDK and runtime versions. ! - All platforms: Support for AR_PIXEL_FORMAT_MONO is now included. ! - All platforms: There are now right-hand coordinate system versions of the OpenGL projection and modelview matrix functions, named arglCameraFrustumRH and arglCameraViewRH, respectively. These will help when integrating ARToolKit into existing OpenGL drawing. ! - Mac OS X: Fix for an error in the VRML library inclusion on Mac OS X. ! - Mac OS X: Now detects if running emulated on Intel Macs, and optimises video for this case. ! - Mac OS X: Two new video config tokens are now available; -fliph and -flipv, which will mirror the video image horizontally and vertically respectively. ! - Linux: Support for gstreamer video capture added, thanks to Hartmut Seichter. ! - Linux 1394 DC: Major changes to add PointGray DragonFly support, add LGPL/GPL license info, better config string support, stabilised interfaces, lots of clean ups to make the code easier to work with ! - Linux DV: Fix for bugs when using PAL in videoLinuxDV as reported at http://www.hitlabnz.org/forum/showthread.php?t=412. --- 3,24 ---- ! Changes in version 2.72 (this release) (2006-11-20). ------------------------------------------------------ ! All platforms: ! New feature: ARToolKit now supports querying of SDK and runtime versions. ! New feature: There are now right-hand coordinate system versions of the OpenGL projection and modelview matrix functions, named arglCameraFrustumRH and arglCameraViewRH, respectively. These will help when integrating ARToolKit into existing OpenGL drawing. ! Enhancement: Support for AR_PIXEL_FORMAT_MONO is now included. ! Enhancement: gsub_lite now supports arDebug mode. ! Enhancement: ARvrml now builds against OpenVRML-0.16.1. ! ! Mac OS X: ! Bug fix: Fix for an error in the VRML library inclusion on Mac OS X. ! Bug fix: Now detects if running emulated on Intel Macs, and optimises video for this case. ! Enhancement: Two new video config tokens are now available; -fliph and -flipv, which will mirror the video image horizontally and vertically respectively. ! ! Linux: ! New feature: Support for gstreamer video capture added, thanks to Hartmut Seichter. ! Enhancement: Major changes to Video1394DC- add PointGray DragonFly support, add LGPL/GPL license info, better config string support, stabilised interfaces, lots of clean ups to make the code easier to work with. ! Bug fix: Using PAL in VideoLinuxDV as reported at http://www.hitlabnz.org/forum/showthread.php?t=412. Index: README.txt =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/README.txt,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** README.txt 27 Sep 2006 23:31:56 -0000 1.24 --- README.txt 17 Nov 2006 03:47:02 -0000 1.25 *************** *** 1,4 **** ! Read me for ARToolKit-2.71.3. ! ============================= --- 1,4 ---- ! Read me for ARToolKit-2.72. ! =========================== *************** *** 16,20 **** About this archive. ------------------- ! This archive contains the ARToolKit libraries, utilities and examples, version 2.71.3. ARToolKit is released under the GNU General Public License (GPL). Please read the file COPYING.txt. --- 16,20 ---- About this archive. ------------------- ! This archive contains the ARToolKit libraries, utilities and examples, version 2.72. ARToolKit is released under the GNU General Public License (GPL). Please read the file COPYING.txt. *************** *** 28,32 **** HIT Lab NZ http://www.hitlabnz.org ! 2006-06-19 --- 28,32 ---- HIT Lab NZ http://www.hitlabnz.org ! 2006-11-20 *************** *** 38,42 **** * DSVideoLib-0.0.8b-win32. Download from http://sf.net/projects/artoolkit. * GLUT. Download from http://www.xmission.com/~nate/glut/glut-3.7.6-bin.zip. ! * (Optional, for VRML renderer only) OpenVRML-0.14.3-win32. Download from http://sf.net/projects/artoolkit. Build steps: --- 38,42 ---- * DSVideoLib-0.0.8b-win32. Download from http://sf.net/projects/artoolkit. * GLUT. Download from http://www.xmission.com/~nate/glut/glut-3.7.6-bin.zip. ! * (Optional, for VRML renderer only) OpenVRML-0.16.1-bin-win32. Download from http://sf.net/projects/artoolkit. Build steps: *************** *** 59,66 **** Prerequisites: ! * (Optional, for VRML renderer only) openvrml-0.14.3 and dependencies. Download from http://sf.net/projects/openvrml. Unpack the ARToolKit to a convenient location. The root of this location will be referred to below as {ARToolKit}: ! tar zxvf ARToolKit-2.71.3.tgz Configure and build. The Linux builds support video input using either Video4Linux, an IIDC-compliant or DV camera connected via IEEE-1394, or a Sony EyeToy camera connected via USB. Alternatively you can use GStreamer 0.10 (0.8 is not supported and also not recommended) as input method. This requires you to install the gstreamer development packages for your Linux distribution. You will be prompted as to which of the four Linux video drivers you wish to use at the Configure step. cd {ARToolKit} --- 59,66 ---- Prerequisites: ! * (Optional, for VRML renderer only) openvrml-0.16.1 and dependencies. Download from http://sf.net/projects/openvrml. Unpack the ARToolKit to a convenient location. The root of this location will be referred to below as {ARToolKit}: ! tar zxvf ARToolKit-2.72.tgz Configure and build. The Linux builds support video input using either Video4Linux, an IIDC-compliant or DV camera connected via IEEE-1394, or a Sony EyeToy camera connected via USB. Alternatively you can use GStreamer 0.10 (0.8 is not supported and also not recommended) as input method. This requires you to install the gstreamer development packages for your Linux distribution. You will be prompted as to which of the four Linux video drivers you wish to use at the Configure step. cd {ARToolKit} *************** *** 85,91 **** Prerequisites: * Apple's Developer Tools. http://developer.apple.com ! * Camera driver. Mac OS X 10.3 and later include an inbuilt IIDC and DV FireWire camera driver. USB camera drivers, and Firewire camera drivers for pre-10.3 systems can be obtained from ioXperts at http://www.ioxperts.com. * (Optional, for VRML renderer only) Apple X11. Install X11 from the Mac OS X installer, from the "Optional installs" package, or download an install disk image from http://www.apple.com/downloads/macosx/apple/x11formacosx.html. ! * (Optional, for VRML renderer only) OpenVRML-0.14.3-MacOSX.tar.gz. Download from http://sf.net/projects/artoolkit, or alternatively install via Fink. Download Fink (and optionally, FinkCommander) from http://fink.sourceforge.net/download/. Building using the XCode IDE: --- 85,91 ---- Prerequisites: * Apple's Developer Tools. http://developer.apple.com ! * Camera driver. Mac OS X 10.3 and later include an inbuilt IIDC and DV FireWire camera driver. The macam project provides USB camera drivers for OS X, http://webcam-osx.sf.net. * (Optional, for VRML renderer only) Apple X11. Install X11 from the Mac OS X installer, from the "Optional installs" package, or download an install disk image from http://www.apple.com/downloads/macosx/apple/x11formacosx.html. ! * (Optional, for VRML renderer only) OpenVRML-0.16.16-bin-MacOSX.tar.gz. Download from http://sf.net/projects/artoolkit, or alternatively install via Fink. Download Fink (and optionally, FinkCommander) from http://fink.sourceforge.net/download/. Building using the XCode IDE: *************** *** 101,105 **** Drop the ARToolKit into a convenient location, e.g. your Desktop, then open a Terminal window and type: cd ~/Desktop ! tar zxvf ARToolKit-2.71.3.tgz Configure and build cd ~/ARToolKit --- 101,105 ---- Drop the ARToolKit into a convenient location, e.g. your Desktop, then open a Terminal window and type: cd ~/Desktop ! tar zxvf ARToolKit-2.72.tgz Configure and build cd ~/ARToolKit *************** *** 112,119 **** The VRML renderering library and example (libARvrml & simpleVRML) are optional builds: Either: ! tar xzvf OpenVRML-0.14.3-MacOSX.tar.gz ~/Desktop/ARToolKit Or: fink -b install mozilla-dev ! fink install openvrml4-dev openvrml-gl5-dev Then: cd ~/Desktop/ARToolKit/lib/SRC/ARvrml --- 112,119 ---- The VRML renderering library and example (libARvrml & simpleVRML) are optional builds: Either: ! tar xzvf OpenVRML-0.16.16-bin-MacOSX.tar.gz ~/Desktop/ARToolKit Or: fink -b install mozilla-dev ! fink install openvrml6-dev openvrml-gl6-dev Then: cd ~/Desktop/ARToolKit/lib/SRC/ARvrml *************** *** 125,180 **** ! Changes in version 2.72 (this release) (2006-XX-XX). ------------------------------------------------------ ! - All platforms: ARToolKit now supports querying of SDK and runtime versions. ! - Mac OS X: Fix for an error in the VRML library inclusion on Mac OS X. ! - Mac OS X: Now detects if running emulated on Intel Macs, and optimises video for this case. ! - Mac OS X: Two new video config tokens are now available; -fliph and -flipv, which will mirror the video image horizontally and vertically respectively. ! - Linux: Support for gstreamer video capture added, thanks to Hartmut Seichter. ! - Linux 1394 DC: Major changes to add PointGray DragonFly support, add LGPL/GPL license info, better config string support, stabilised interfaces, lots of clean ups to make the code easier to work with ! - Linux DV: Fix for bugs when using PAL in videoLinuxDV as reported at http://www.hitlabnz.org/forum/showthread.php?t=412. ! ! ! Changes in version 2.71.3 (2006-06-19). ! --------------------------------------- ! - This release supports Mac OS X on Intel, and builds Universal binaries, with the exception of the VRML projects (since OpenVRML does not yet build on Mac OS X i386). ! - Fixed line endings in MS Visual Studio 6 project files calib_distortion.dsp and calib_camera2.dsp. ! - Fix for a bug in VideoLinuxDV identified by Simon Goodall, where video stream could be incorrectly closed twice (SF 1452403). ! - The Win32 video library now accepts in the config string either the pathname of an XML file, or raw XML. The string is treated as raw XML if the first 5 characters are "<?xml". ! - The Mac OS X video library won't return a copy of the acquired image if running on an Intel Mac. This is a workaround for a driver issue. It may cause problems and a more robust solution is coming. ! - Fixed a bug in pattern extraction which occured when AR_PATTERN_SIZE_X and AR_PATTERN_SIZE_Y were not equal. ! - Rewrite of mk_patt.c to use gsub_lite. ! - Cleaned up pixel format specification in config.h, borrowing code from gsub_lite. ! - Fix long-standing bug in gsub_lite when drawing to fullscreen windows in drawpixels mode. ! ! ! Known issues in this release. ! ----------------------------- ! - On Mac OS X, the macam webcam driver may cause problems such as the camera settings dialog exploding and hanging the app. A workaround is to either remove the file /Library/Quicktime/macam.component, or to add "-standarddialog" to the video configuration string. ! - On Windows, MSVS.Net 2005 is not yet supported. The toolkit will build under it, with the exception of libARvrml and simpleVRML. ! ! ! Changes in version 2.71.2 (2005-10-11). ! ------------------------------------- ! - Fixed line endings in MS Visual Studio 6 workspace (.dsw) file. ! ! ! Changes in version 2.71.1 (2005-09-22). ! --------------------------------------- ! - Mac OS X XCode builds: An outdated version of the project file slipped into the 2.71 release. This has been corrected. ! - Mac OS X XCode builds: Version 2.1 of XCode is required. The obsolete XCode 2.0 .xcode project file has been removed. Users running on Mac OS X versions prior to 10.4 can still build using the command-line Makefiles. ! - A bug in libARgsub_lite incorrectly restored OpenGL state. Fixed. Also corrected for this fix in simpleLite and twoView examples. ! - Builds of calib_cparam now correctly link against libARgsub_lite. ! Changes in version 2.71 (2005-09-21). ! ------------------------------------- ! - Mac OS X video driver: QuickTime 6.4 is now required by default. (Support for versions back to 4.0 can be enabled at compile-time if required). ! - Mac OS X libARgsub and binaries which call it: fix for bug "GLUT Warning: glutInit being called a second time" by moving glutInit to main so that it is called before calling arVideoOpen. ! - Linux V4L video driver: Apply patch by Wayne Piekarski to auto-adjust video resolution. ! - Windows video driver: Uses updated (0.0.8b) DSVideoLib. Building ARToolKit on Windows no longer requires installation of DirectX SDK, or registering of DS filters. It also includes many bug fixes. ! - gsub_lite: Added complete support for runtime specification of pixel format and rectangle/power-of-2 textures. ! - Mac OS X XCode builds now build the examples as bundled applications. The contents of the "Data" directory are copied into the application bundle at build time. The applications can thus be moved from their build locations. The utilities are still (mostly) built as command-line tools. ! - The calibration utilties have been rewritten to use gsub_lite. They should now run much more reliably across different platforms. --- 125,146 ---- ! Changes in version 2.72 (this release) (2006-11-20). ------------------------------------------------------ ! All platforms: ! New feature: ARToolKit now supports querying of SDK and runtime versions. ! New feature: There are now right-hand coordinate system versions of the OpenGL projection and modelview matrix functions, named arglCameraFrustumRH and arglCameraViewRH, respectively. These will help when integrating ARToolKit into existing OpenGL drawing. ! Enhancement: Support for AR_PIXEL_FORMAT_MONO is now included. ! Enhancement: gsub_lite now supports arDebug mode. ! Enhancement: ARvrml now builds against OpenVRML-0.16.1. + Mac OS X: + Bug fix: Fix for an error in the VRML library inclusion on Mac OS X. + Bug fix: Now detects if running emulated on Intel Macs, and optimises video for this case. + Enhancement: Two new video config tokens are now available; -fliph and -flipv, which will mirror the video image horizontally and vertically respectively. ! Linux: ! New feature: Support for gstreamer video capture added, thanks to Hartmut Seichter. ! Enhancement: Major changes to Video1394DC- add PointGray DragonFly support, add LGPL/GPL license info, better config string support, stabilised interfaces, lots of clean ups to make the code easier to work with. ! Bug fix: Using PAL in VideoLinuxDV as reported at http://www.hitlabnz.org/forum/showthread.php?t=412. |
|
From: Philip L. <phi...@us...> - 2006-11-17 03:41:31
|
Update of /cvsroot/artoolkit/artoolkit/ARToolKit.xcodeproj In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv9082 Modified Files: project.pbxproj Log Message: Prepare for 2.72 release. Index: project.pbxproj =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/ARToolKit.xcodeproj/project.pbxproj,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** project.pbxproj 10 Jul 2006 04:35:17 -0000 1.16 --- project.pbxproj 17 Nov 2006 03:41:28 -0000 1.17 *************** *** 117,135 **** /* Begin PBXBuildFile section */ 4A304AE30A4B8D98003AD621 /* libjpeg.62.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A304AD90A4B8D98003AD621 /* libjpeg.62.0.0.dylib */; }; ! 4A304AE40A4B8D98003AD621 /* libmozjs.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A304ADA0A4B8D98003AD621 /* libmozjs.dylib */; }; ! 4A304AE50A4B8D98003AD621 /* libnspr4.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A304ADB0A4B8D98003AD621 /* libnspr4.dylib */; }; ! 4A304AEA0A4B8D98003AD621 /* libplc4.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A304AE00A4B8D98003AD621 /* libplc4.dylib */; }; ! 4A304AEB0A4B8D98003AD621 /* libplds4.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A304AE10A4B8D98003AD621 /* libplds4.dylib */; }; ! 4A304AEC0A4B8D98003AD621 /* libpng.3.1.2.7.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A304AE20A4B8D98003AD621 /* libpng.3.1.2.7.dylib */; }; ! 4A304AF50A4B8F67003AD621 /* libopenvrml-gl.5.0.1.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A304ADC0A4B8D98003AD621 /* libopenvrml-gl.5.0.1.dylib */; }; ! 4A304AF60A4B8F67003AD621 /* libopenvrml.4.0.1.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A304ADE0A4B8D98003AD621 /* libopenvrml.4.0.1.dylib */; }; 4A304B020A4B905A003AD621 /* libjpeg.62.0.0.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4A304AD90A4B8D98003AD621 /* libjpeg.62.0.0.dylib */; }; ! 4A304B030A4B905A003AD621 /* libmozjs.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4A304ADA0A4B8D98003AD621 /* libmozjs.dylib */; }; ! 4A304B040A4B905A003AD621 /* libnspr4.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4A304ADB0A4B8D98003AD621 /* libnspr4.dylib */; }; ! 4A304B050A4B905A003AD621 /* libopenvrml-gl.5.0.1.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4A304ADC0A4B8D98003AD621 /* libopenvrml-gl.5.0.1.dylib */; }; ! 4A304B060A4B905A003AD621 /* libopenvrml.4.0.1.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4A304ADE0A4B8D98003AD621 /* libopenvrml.4.0.1.dylib */; }; ! 4A304B070A4B905A003AD621 /* libplc4.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4A304AE00A4B8D98003AD621 /* libplc4.dylib */; }; ! 4A304B080A4B905A003AD621 /* libplds4.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4A304AE10A4B8D98003AD621 /* libplds4.dylib */; }; ! 4A304B090A4B905A003AD621 /* libpng.3.1.2.7.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4A304AE20A4B8D98003AD621 /* libpng.3.1.2.7.dylib */; }; 4A3F11510649F8040042B0D7 /* mAlloc.c in Sources */ = {isa = PBXBuildFile; fileRef = 4A427D2B0484329900B56093 /* mAlloc.c */; }; 4A3F11570649F8050042B0D7 /* mAllocDup.c in Sources */ = {isa = PBXBuildFile; fileRef = 4A427D2C0484329900B56093 /* mAllocDup.c */; }; --- 117,127 ---- /* Begin PBXBuildFile section */ 4A304AE30A4B8D98003AD621 /* libjpeg.62.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A304AD90A4B8D98003AD621 /* libjpeg.62.0.0.dylib */; }; ! 4A304AEC0A4B8D98003AD621 /* libpng12.0.12.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A304AE20A4B8D98003AD621 /* libpng12.0.12.0.dylib */; }; ! 4A304AF50A4B8F67003AD621 /* libopenvrml-gl.6.0.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A304ADC0A4B8D98003AD621 /* libopenvrml-gl.6.0.3.dylib */; }; ! 4A304AF60A4B8F67003AD621 /* libopenvrml.6.1.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A304ADE0A4B8D98003AD621 /* libopenvrml.6.1.0.dylib */; }; 4A304B020A4B905A003AD621 /* libjpeg.62.0.0.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4A304AD90A4B8D98003AD621 /* libjpeg.62.0.0.dylib */; }; ! 4A304B050A4B905A003AD621 /* libopenvrml-gl.6.0.3.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4A304ADC0A4B8D98003AD621 /* libopenvrml-gl.6.0.3.dylib */; }; ! 4A304B060A4B905A003AD621 /* libopenvrml.6.1.0.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4A304ADE0A4B8D98003AD621 /* libopenvrml.6.1.0.dylib */; }; ! 4A304B090A4B905A003AD621 /* libpng12.0.12.0.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4A304AE20A4B8D98003AD621 /* libpng12.0.12.0.dylib */; }; 4A3F11510649F8040042B0D7 /* mAlloc.c in Sources */ = {isa = PBXBuildFile; fileRef = 4A427D2B0484329900B56093 /* mAlloc.c */; }; 4A3F11570649F8050042B0D7 /* mAllocDup.c in Sources */ = {isa = PBXBuildFile; fileRef = 4A427D2C0484329900B56093 /* mAllocDup.c */; }; *************** *** 201,205 **** --- 193,200 ---- 4A8EA5B00658754A00ADDDD1 /* gsub_lite.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A8EA5AF0658754A00ADDDD1 /* gsub_lite.h */; }; 4AC48C650A37BA7F007A153D /* libARgsub_lite.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A66475606598B950061DA76 /* libARgsub_lite.a */; }; + 4ADBC7C10B0C0A5E00A1431F /* libboost_thread-1_33_1.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4ADBC7C00B0C0A5E00A1431F /* libboost_thread-1_33_1.dylib */; }; + 4ADBCB3B0B0C157400A1431F /* libboost_thread-1_33_1.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4ADBC7C00B0C0A5E00A1431F /* libboost_thread-1_33_1.dylib */; }; 4ADF303606A78E0B00F6204E /* arMultiGetTransMat.c in Sources */ = {isa = PBXBuildFile; fileRef = 4A427D490484329900B56093 /* arMultiGetTransMat.c */; }; + 4AF15F2E0AB129780015588E /* libstdc++.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 4AF15F2D0AB129780015588E /* libstdc++.6.dylib */; }; 4AF4982B066FFEBD00EEDF04 /* videoMacOSX.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A427D0C0484329800B56093 /* videoMacOSX.h */; }; 4AF49830066FFED200EEDF04 /* ar.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A427D000484329800B56093 /* ar.h */; }; *************** *** 398,403 **** 788C83CD089AB795003E3825 /* simpleVRML.c in Sources */ = {isa = PBXBuildFile; fileRef = 4A1308B1075BE4A700D62ACD /* simpleVRML.c */; }; 788C83DE089AB7E5003E3825 /* libARvrml.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A934D80086A2DB700DF2FAC /* libARvrml.a */; }; - 788C83E1089AB808003E3825 /* libstdc++.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A130A19075C284C00D62ACD /* libstdc++.a */; }; - 788C83E2089AB80D003E3825 /* libSystemStubs.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A934D7C086A2BB900DF2FAC /* libSystemStubs.a */; }; 78A519C2089ABA58005197A0 /* Data in Resources */ = {isa = PBXBuildFile; fileRef = 782EA555089995C300A8A712 /* Data */; }; 78A519C6089ABA58005197A0 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A3F167F064A0E270042B0D7 /* Carbon.framework */; }; --- 393,396 ---- *************** *** 446,476 **** /* End PBXBuildFile section */ - /* Begin PBXBuildRule section */ - 4A934B4D086A137B00DF2FAC /* PBXBuildRule */ = { - isa = PBXBuildRule; - compilerSpec = com.apple.compilers.gcc.3_3; - fileType = sourcecode.cpp; - isEditable = 1; - outputFiles = ( - ); - }; - 788C83E3089AB869003E3825 /* PBXBuildRule */ = { - isa = PBXBuildRule; - compilerSpec = com.apple.compilers.gcc.3_3; - fileType = sourcecode.c; - isEditable = 1; - outputFiles = ( - ); - }; - 788C83E4089AB870003E3825 /* PBXBuildRule */ = { - isa = PBXBuildRule; - compilerSpec = com.apple.compilers.gcc.3_3; - fileType = sourcecode.cpp; - isEditable = 1; - outputFiles = ( - ); - }; - /* End PBXBuildRule section */ - /* Begin PBXContainerItemProxy section */ 4A3F14A9064A0B100042B0D7 /* PBXContainerItemProxy */ = { --- 439,442 ---- *************** *** 1282,1292 **** files = ( 4A304B020A4B905A003AD621 /* libjpeg.62.0.0.dylib in CopyFiles */, ! 4A304B030A4B905A003AD621 /* libmozjs.dylib in CopyFiles */, ! 4A304B040A4B905A003AD621 /* libnspr4.dylib in CopyFiles */, ! 4A304B050A4B905A003AD621 /* libopenvrml-gl.5.0.1.dylib in CopyFiles */, ! 4A304B060A4B905A003AD621 /* libopenvrml.4.0.1.dylib in CopyFiles */, ! 4A304B070A4B905A003AD621 /* libplc4.dylib in CopyFiles */, ! 4A304B080A4B905A003AD621 /* libplds4.dylib in CopyFiles */, ! 4A304B090A4B905A003AD621 /* libpng.3.1.2.7.dylib in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; --- 1248,1255 ---- files = ( 4A304B020A4B905A003AD621 /* libjpeg.62.0.0.dylib in CopyFiles */, ! 4A304B050A4B905A003AD621 /* libopenvrml-gl.6.0.3.dylib in CopyFiles */, ! 4A304B060A4B905A003AD621 /* libopenvrml.6.1.0.dylib in CopyFiles */, ! 4A304B090A4B905A003AD621 /* libpng12.0.12.0.dylib in CopyFiles */, ! 4ADBCB3B0B0C157400A1431F /* libboost_thread-1_33_1.dylib in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; *************** *** 1300,1316 **** 4A1308B0075BE4A700D62ACD /* object.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = object.h; sourceTree = "<group>"; }; 4A1308B1075BE4A700D62ACD /* simpleVRML.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = simpleVRML.c; sourceTree = "<group>"; }; - 4A130A19075C284C00D62ACD /* libstdc++.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libstdc++.a"; path = "/usr/lib/gcc/darwin/3.3/libstdc++.a"; sourceTree = "<absolute>"; }; 4A130A48075C2C1B00D62ACD /* simpleVRML.vcproj */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = simpleVRML.vcproj; sourceTree = "<group>"; }; 4A2244940659A20D0014DA8E /* simpleLite.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = simpleLite.c; sourceTree = "<group>"; }; 4A2244950659A20D0014DA8E /* Makefile.in */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = Makefile.in; sourceTree = "<group>"; }; 4A2246520659B1EA0014DA8E /* simpleLite */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = simpleLite; sourceTree = "<group>"; }; ! 4A304AD90A4B8D98003AD621 /* libjpeg.62.0.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libjpeg.62.0.0.dylib; path = openvrml/lib/libjpeg.62.0.0.dylib; sourceTree = "<group>"; }; ! 4A304ADA0A4B8D98003AD621 /* libmozjs.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libmozjs.dylib; path = openvrml/lib/libmozjs.dylib; sourceTree = "<group>"; }; ! 4A304ADB0A4B8D98003AD621 /* libnspr4.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libnspr4.dylib; path = openvrml/lib/libnspr4.dylib; sourceTree = "<group>"; }; ! 4A304ADC0A4B8D98003AD621 /* libopenvrml-gl.5.0.1.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libopenvrml-gl.5.0.1.dylib"; path = "openvrml/lib/libopenvrml-gl.5.0.1.dylib"; sourceTree = "<group>"; }; ! 4A304ADE0A4B8D98003AD621 /* libopenvrml.4.0.1.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libopenvrml.4.0.1.dylib; path = openvrml/lib/libopenvrml.4.0.1.dylib; sourceTree = "<group>"; }; ! 4A304AE00A4B8D98003AD621 /* libplc4.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libplc4.dylib; path = openvrml/lib/libplc4.dylib; sourceTree = "<group>"; }; ! 4A304AE10A4B8D98003AD621 /* libplds4.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libplds4.dylib; path = openvrml/lib/libplds4.dylib; sourceTree = "<group>"; }; ! 4A304AE20A4B8D98003AD621 /* libpng.3.1.2.7.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libpng.3.1.2.7.dylib; path = openvrml/lib/libpng.3.1.2.7.dylib; sourceTree = "<group>"; }; 4A307DCF07DD3E7B00613859 /* ARVideoSettingsController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ARVideoSettingsController.m; sourceTree = "<group>"; }; 4A3F14FC064A0C510042B0D7 /* GLUT.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GLUT.framework; path = /System/Library/Frameworks/GLUT.framework; sourceTree = "<absolute>"; }; --- 1263,1274 ---- 4A1308B0075BE4A700D62ACD /* object.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = object.h; sourceTree = "<group>"; }; 4A1308B1075BE4A700D62ACD /* simpleVRML.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = simpleVRML.c; sourceTree = "<group>"; }; 4A130A48075C2C1B00D62ACD /* simpleVRML.vcproj */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; path = simpleVRML.vcproj; sourceTree = "<group>"; }; 4A2244940659A20D0014DA8E /* simpleLite.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = simpleLite.c; sourceTree = "<group>"; }; 4A2244950659A20D0014DA8E /* Makefile.in */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = Makefile.in; sourceTree = "<group>"; }; 4A2246520659B1EA0014DA8E /* simpleLite */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = simpleLite; sourceTree = "<group>"; }; ! 4A304AD90A4B8D98003AD621 /* libjpeg.62.0.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libjpeg.62.0.0.dylib; path = "openvrml-0.16.1-bin-macosx/lib/libjpeg.62.0.0.dylib"; sourceTree = "<group>"; }; ! 4A304ADC0A4B8D98003AD621 /* libopenvrml-gl.6.0.3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libopenvrml-gl.6.0.3.dylib"; path = "openvrml-0.16.1-bin-macosx/lib/libopenvrml-gl.6.0.3.dylib"; sourceTree = "<group>"; }; ! 4A304ADE0A4B8D98003AD621 /* libopenvrml.6.1.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libopenvrml.6.1.0.dylib; path = "openvrml-0.16.1-bin-macosx/lib/libopenvrml.6.1.0.dylib"; sourceTree = "<group>"; }; ! 4A304AE20A4B8D98003AD621 /* libpng12.0.12.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libpng12.0.12.0.dylib; path = "openvrml-0.16.1-bin-macosx/lib/libpng12.0.12.0.dylib"; sourceTree = "<group>"; }; 4A307DCF07DD3E7B00613859 /* ARVideoSettingsController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ARVideoSettingsController.m; sourceTree = "<group>"; }; 4A3F14FC064A0C510042B0D7 /* GLUT.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GLUT.framework; path = /System/Library/Frameworks/GLUT.framework; sourceTree = "<absolute>"; }; *************** *** 1470,1475 **** 4A8EA5A30658752200ADDDD1 /* gsub_lite.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = gsub_lite.c; sourceTree = "<group>"; }; 4A8EA5AF0658754A00ADDDD1 /* gsub_lite.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = gsub_lite.h; sourceTree = "<group>"; }; 4A934B5C086A150A00DF2FAC /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; }; - 4A934D7C086A2BB900DF2FAC /* libSystemStubs.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSystemStubs.a; path = /usr/lib/libSystemStubs.a; sourceTree = "<absolute>"; }; 4A934D80086A2DB700DF2FAC /* libARvrml.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libARvrml.a; sourceTree = "<group>"; }; 4A99C6520A59DCC3001B4C35 /* Makefile.in */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = Makefile.in; sourceTree = "<group>"; }; --- 1428,1435 ---- 4A8EA5A30658752200ADDDD1 /* gsub_lite.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = gsub_lite.c; sourceTree = "<group>"; }; 4A8EA5AF0658754A00ADDDD1 /* gsub_lite.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = gsub_lite.h; sourceTree = "<group>"; }; + 4A928ED20AAE82DB00732556 /* conversions.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = conversions.c; sourceTree = "<group>"; }; + 4A928ED30AAE82DB00732556 /* conversions.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = conversions.h; sourceTree = "<group>"; }; + 4A928ED40AAE82DB00732556 /* grabdma.tgz */ = {isa = PBXFileReference; lastKnownFileType = file; path = grabdma.tgz; sourceTree = "<group>"; }; 4A934B5C086A150A00DF2FAC /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; }; 4A934D80086A2DB700DF2FAC /* libARvrml.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libARvrml.a; sourceTree = "<group>"; }; 4A99C6520A59DCC3001B4C35 /* Makefile.in */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = Makefile.in; sourceTree = "<group>"; }; *************** *** 1571,1574 **** --- 1531,1535 ---- 4AC3C0DF07518F650073D2C6 /* simpleTest.dsp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = simpleTest.dsp; sourceTree = "<group>"; }; 4AC3C0E007518F790073D2C6 /* simpleTest2.dsp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = simpleTest2.dsp; sourceTree = "<group>"; }; + 4ADBC7C00B0C0A5E00A1431F /* libboost_thread-1_33_1.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libboost_thread-1_33_1.dylib"; path = "openvrml-0.16.1-bin-macosx/lib/libboost_thread-1_33_1.dylib"; sourceTree = "<group>"; }; 4AE22FFD0659B7A80047D402 /* libARMulti.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libARMulti.a; sourceTree = BUILT_PRODUCTS_DIR; }; 4AE22FFE0659B7A80047D402 /* libARgsubUtil.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libARgsubUtil.a; sourceTree = BUILT_PRODUCTS_DIR; }; *************** *** 1577,1580 **** --- 1538,1542 ---- 4AE230280659B7A80047D402 /* libARgsub_lite.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libARgsub_lite.a; sourceTree = BUILT_PRODUCTS_DIR; }; 4AE230340659B7A80047D402 /* libAR.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libAR.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 4AF15F2D0AB129780015588E /* libstdc++.6.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libstdc++.6.dylib"; path = "/usr/lib/libstdc++.6.dylib"; sourceTree = "<absolute>"; }; 4AFEA7E407DE94E100483D33 /* ARVideoSettingsController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ARVideoSettingsController.h; sourceTree = "<group>"; }; 4AFEA85207DEB00000483D33 /* videoInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = videoInternal.h; sourceTree = "<group>"; }; *************** *** 1906,1919 **** 788C83C0089AB6AE003E3825 /* libARvideo.a in Frameworks */, 788C83DE089AB7E5003E3825 /* libARvrml.a in Frameworks */, - 788C83E2089AB80D003E3825 /* libSystemStubs.a in Frameworks */, 4A304AE30A4B8D98003AD621 /* libjpeg.62.0.0.dylib in Frameworks */, ! 4A304AE40A4B8D98003AD621 /* libmozjs.dylib in Frameworks */, ! 4A304AE50A4B8D98003AD621 /* libnspr4.dylib in Frameworks */, ! 4A304AF50A4B8F67003AD621 /* libopenvrml-gl.5.0.1.dylib in Frameworks */, ! 4A304AF60A4B8F67003AD621 /* libopenvrml.4.0.1.dylib in Frameworks */, ! 4A304AEA0A4B8D98003AD621 /* libplc4.dylib in Frameworks */, ! 4A304AEB0A4B8D98003AD621 /* libplds4.dylib in Frameworks */, ! 4A304AEC0A4B8D98003AD621 /* libpng.3.1.2.7.dylib in Frameworks */, ! 788C83E1089AB808003E3825 /* libstdc++.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; --- 1868,1877 ---- 788C83C0089AB6AE003E3825 /* libARvideo.a in Frameworks */, 788C83DE089AB7E5003E3825 /* libARvrml.a in Frameworks */, 4A304AE30A4B8D98003AD621 /* libjpeg.62.0.0.dylib in Frameworks */, ! 4A304AF50A4B8F67003AD621 /* libopenvrml-gl.6.0.3.dylib in Frameworks */, ! 4A304AF60A4B8F67003AD621 /* libopenvrml.6.1.0.dylib in Frameworks */, ! 4A304AEC0A4B8D98003AD621 /* libpng12.0.12.0.dylib in Frameworks */, ! 4ADBC7C10B0C0A5E00A1431F /* libboost_thread-1_33_1.dylib in Frameworks */, ! 4AF15F2E0AB129780015588E /* libstdc++.6.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; *************** *** 2035,2046 **** isa = PBXGroup; children = ( 4A304AD90A4B8D98003AD621 /* libjpeg.62.0.0.dylib */, ! 4A304ADA0A4B8D98003AD621 /* libmozjs.dylib */, ! 4A304ADB0A4B8D98003AD621 /* libnspr4.dylib */, ! 4A304ADC0A4B8D98003AD621 /* libopenvrml-gl.5.0.1.dylib */, ! 4A304ADE0A4B8D98003AD621 /* libopenvrml.4.0.1.dylib */, ! 4A304AE00A4B8D98003AD621 /* libplc4.dylib */, ! 4A304AE10A4B8D98003AD621 /* libplds4.dylib */, ! 4A304AE20A4B8D98003AD621 /* libpng.3.1.2.7.dylib */, 4A934B5C086A150A00DF2FAC /* Cocoa.framework */, 4A3F167F064A0E270042B0D7 /* Carbon.framework */, --- 1993,2001 ---- isa = PBXGroup; children = ( + 4ADBC7C00B0C0A5E00A1431F /* libboost_thread-1_33_1.dylib */, 4A304AD90A4B8D98003AD621 /* libjpeg.62.0.0.dylib */, ! 4A304ADC0A4B8D98003AD621 /* libopenvrml-gl.6.0.3.dylib */, ! 4A304ADE0A4B8D98003AD621 /* libopenvrml.6.1.0.dylib */, ! 4A304AE20A4B8D98003AD621 /* libpng12.0.12.0.dylib */, 4A934B5C086A150A00DF2FAC /* Cocoa.framework */, 4A3F167F064A0E270042B0D7 /* Carbon.framework */, *************** *** 2048,2053 **** 4A3F14FD064A0C510042B0D7 /* OpenGL.framework */, 4A3F14FE064A0C510042B0D7 /* QuickTime.framework */, ! 4A130A19075C284C00D62ACD /* libstdc++.a */, ! 4A934D7C086A2BB900DF2FAC /* libSystemStubs.a */, ); name = "External Libraries & Frameworks"; --- 2003,2007 ---- 4A3F14FD064A0C510042B0D7 /* OpenGL.framework */, 4A3F14FE064A0C510042B0D7 /* QuickTime.framework */, ! 4AF15F2D0AB129780015588E /* libstdc++.6.dylib */, ); name = "External Libraries & Frameworks"; *************** *** 2413,2416 **** --- 2367,2373 ---- isa = PBXGroup; children = ( + 4A928ED20AAE82DB00732556 /* conversions.c */, + 4A928ED30AAE82DB00732556 /* conversions.h */, + 4A928ED40AAE82DB00732556 /* grabdma.tgz */, 4A427D660484329900B56093 /* Makefile.in */, 4A427D670484329900B56093 /* video.c */, *************** *** 2857,2861 **** ); buildRules = ( - 4A934B4D086A137B00DF2FAC /* PBXBuildRule */, ); dependencies = ( --- 2814,2817 ---- *************** *** 3236,3241 **** ); buildRules = ( - 788C83E4089AB870003E3825 /* PBXBuildRule */, - 788C83E3089AB869003E3825 /* PBXBuildRule */, ); dependencies = ( --- 3192,3195 ---- *************** *** 4977,4981 **** isa = XCBuildConfiguration; buildSettings = { ! ARCHS = ppc; COPY_PHASE_STRIP = NO; DEPLOYMENT_LOCATION = YES; --- 4931,4935 ---- isa = XCBuildConfiguration; buildSettings = { ! ARCHS = "$(NATIVE_ARCH)"; COPY_PHASE_STRIP = NO; DEPLOYMENT_LOCATION = YES; *************** *** 4987,4996 **** GCC_WARN_UNKNOWN_PRAGMAS = NO; HEADER_SEARCH_PATHS = ( - /sw/include, "$(HEADER_SEARCH_PATHS_QUOTED_1)", "$(HEADER_SEARCH_PATHS_QUOTED_2)", ); HEADER_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/include\""; ! HEADER_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/openvrml/include\""; INSTALL_PATH = "$(SRCROOT)/lib"; LIBRARY_STYLE = STATIC; --- 4941,4949 ---- GCC_WARN_UNKNOWN_PRAGMAS = NO; HEADER_SEARCH_PATHS = ( "$(HEADER_SEARCH_PATHS_QUOTED_1)", "$(HEADER_SEARCH_PATHS_QUOTED_2)", ); HEADER_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/include\""; ! HEADER_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/openvrml-0.16.1-bin-macosx/include\""; INSTALL_PATH = "$(SRCROOT)/lib"; LIBRARY_STYLE = STATIC; *************** *** 5004,5008 **** isa = XCBuildConfiguration; buildSettings = { ! ARCHS = ppc; COPY_PHASE_STRIP = YES; DEPLOYMENT_LOCATION = YES; --- 4957,4961 ---- isa = XCBuildConfiguration; buildSettings = { ! ARCHS = "$(NATIVE_ARCH)"; COPY_PHASE_STRIP = YES; DEPLOYMENT_LOCATION = YES; *************** *** 5012,5021 **** GCC_WARN_UNKNOWN_PRAGMAS = NO; HEADER_SEARCH_PATHS = ( - /sw/include, "$(HEADER_SEARCH_PATHS_QUOTED_1)", "$(HEADER_SEARCH_PATHS_QUOTED_2)", ); HEADER_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/include\""; ! HEADER_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/openvrml/include\""; INSTALL_PATH = "$(SRCROOT)/lib"; LIBRARY_STYLE = STATIC; --- 4965,4973 ---- GCC_WARN_UNKNOWN_PRAGMAS = NO; HEADER_SEARCH_PATHS = ( "$(HEADER_SEARCH_PATHS_QUOTED_1)", "$(HEADER_SEARCH_PATHS_QUOTED_2)", ); HEADER_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/include\""; ! HEADER_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/openvrml-0.16.1-bin-macosx/include\""; INSTALL_PATH = "$(SRCROOT)/lib"; LIBRARY_STYLE = STATIC; *************** *** 5076,5079 **** --- 5028,5035 ---- GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; GCC_WARN_UNKNOWN_PRAGMAS = NO; + HEADERMAP_INCLUDES_FLAT_ENTRIES_FOR_TARGET_BEING_BUILT = NO; + HEADERMAP_INCLUDES_FRAMEWORK_ENTRIES_FOR_ALL_PRODUCT_TYPES = NO; + HEADERMAP_INCLUDES_NONPUBLIC_NONPRIVATE_HEADERS = NO; + PREBINDING = NO; SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; WARNING_CFLAGS = "-Wmost"; *************** *** 5090,5093 **** --- 5046,5053 ---- GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; GCC_WARN_UNKNOWN_PRAGMAS = NO; + HEADERMAP_INCLUDES_FLAT_ENTRIES_FOR_TARGET_BEING_BUILT = NO; + HEADERMAP_INCLUDES_FRAMEWORK_ENTRIES_FOR_ALL_PRODUCT_TYPES = NO; + HEADERMAP_INCLUDES_NONPUBLIC_NONPRIVATE_HEADERS = NO; + PREBINDING = NO; SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; WARNING_CFLAGS = "-Wmost"; *************** *** 5710,5725 **** isa = XCBuildConfiguration; buildSettings = { ! ARCHS = ppc; HEADER_SEARCH_PATHS = include; INFOPLIST_FILE = "examples/simpleVRML/simpleVRML-Info.plist"; INSTALL_PATH = "$(SRCROOT)/bin"; LIBRARY_SEARCH_PATHS = ( - /sw/lib, - /usr/lib/gcc/darwin/3.3, "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", "$(LIBRARY_SEARCH_PATHS_QUOTED_2)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/lib\""; LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/openvrml/lib\""; PRODUCT_NAME = simpleVRML; }; --- 5670,5685 ---- isa = XCBuildConfiguration; buildSettings = { ! ARCHS = "$(NATIVE_ARCH)"; HEADER_SEARCH_PATHS = include; INFOPLIST_FILE = "examples/simpleVRML/simpleVRML-Info.plist"; INSTALL_PATH = "$(SRCROOT)/bin"; LIBRARY_SEARCH_PATHS = ( "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", "$(LIBRARY_SEARCH_PATHS_QUOTED_2)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_3)", ); LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/lib\""; LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/openvrml/lib\""; + LIBRARY_SEARCH_PATHS_QUOTED_3 = "\"$(SRCROOT)/openvrml-0.16.1-bin-macosx/lib\""; PRODUCT_NAME = simpleVRML; }; *************** *** 5729,5744 **** isa = XCBuildConfiguration; buildSettings = { ! ARCHS = ppc; HEADER_SEARCH_PATHS = include; INFOPLIST_FILE = "examples/simpleVRML/simpleVRML-Info.plist"; INSTALL_PATH = "$(SRCROOT)/bin"; LIBRARY_SEARCH_PATHS = ( - lib, - /sw/lib, - /usr/lib/gcc/darwin/3.3, - "$(SRCROOT)/lib", "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", ); ! LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/openvrml/lib\""; PRODUCT_NAME = simpleVRML; }; --- 5689,5704 ---- isa = XCBuildConfiguration; buildSettings = { ! ARCHS = "$(NATIVE_ARCH)"; HEADER_SEARCH_PATHS = include; INFOPLIST_FILE = "examples/simpleVRML/simpleVRML-Info.plist"; INSTALL_PATH = "$(SRCROOT)/bin"; LIBRARY_SEARCH_PATHS = ( "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_2)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_3)", ); ! LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/lib\""; ! LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/openvrml/lib\""; ! LIBRARY_SEARCH_PATHS_QUOTED_3 = "\"$(SRCROOT)/openvrml-0.16.1-bin-macosx/lib\""; PRODUCT_NAME = simpleVRML; }; |
|
From: Philip L. <phi...@us...> - 2006-11-17 03:35:38
|
Update of /cvsroot/artoolkit/artoolkit/examples/twoView In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv7525 Modified Files: twoView.c Log Message: arDebug fixes. Index: twoView.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/examples/twoView/twoView.c,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** twoView.c 4 Oct 2006 03:45:01 -0000 1.16 --- twoView.c 17 Nov 2006 03:35:37 -0000 1.17 *************** *** 184,188 **** static int DrawCubeFinal(void) { ! if (!gDrawListBox) { free(gDrawListBox); gDrawListBox = NULL; --- 184,188 ---- static int DrawCubeFinal(void) { ! if (gDrawListBox) { free(gDrawListBox); gDrawListBox = NULL; *************** *** 359,362 **** --- 359,366 ---- gCallCountGetImage = 0; break; + case 'D': + case 'd': + arDebug = !arDebug; + break; case '?': case '/': *************** *** 364,367 **** --- 368,372 ---- printf(" q or [esc] Quit demo.\n"); printf(" c Change arglDrawMode and arglTexmapMode.\n"); + printf(" d Activate / deactivate debug mode.\n"); printf(" ? or / Show this help.\n"); printf("\nAdditionally, the ARVideo library supplied the following help text:\n"); |
|
From: Philip L. <phi...@us...> - 2006-11-17 03:35:02
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/AR In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv7134 Modified Files: arLabeling.c Log Message: arDebug fixes. Index: arLabeling.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/AR/arLabeling.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** arLabeling.c 3 Oct 2006 21:36:05 -0000 1.5 --- arLabeling.c 17 Nov 2006 03:35:00 -0000 1.6 *************** *** 225,248 **** for(i = 1; i < lxsize-1; i++, pnt+=poff, pnt2++) { #if (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ARGB) ! if( *(pnt+1) + *(pnt+2) + *(pnt+3) <= thresht3 ) { #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ABGR) ! if( *(pnt+1) + *(pnt+2) + *(pnt+3) <= thresht3 ) { #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGRA) ! if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresht3 ) { #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGR) ! if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresht3 ) { #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGBA) ! if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresht3 ) { #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGB) ! if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresht3 ) { #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_MONO) ! if( *(pnt) <= thresh ) { #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) ! if( *(pnt+1) <= thresh ) { #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_yuvs) ! if( *(pnt+0) <= thresh ) { #else # error Unknown default pixel format defined in config.h #endif pnt1 = &(pnt2[-lxsize]); if( *pnt1 > 0 ) { --- 225,249 ---- for(i = 1; i < lxsize-1; i++, pnt+=poff, pnt2++) { #if (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ARGB) ! if( *(pnt+1) + *(pnt+2) + *(pnt+3) <= thresht3 ) #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ABGR) ! if( *(pnt+1) + *(pnt+2) + *(pnt+3) <= thresht3 ) #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGRA) ! if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresht3 ) #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGR) ! if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresht3 ) #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGBA) ! if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresht3 ) #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGB) ! if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresht3 ) #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_MONO) ! if( *(pnt) <= thresh ) #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) ! if( *(pnt+1) <= thresh ) #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_yuvs) ! if( *(pnt+0) <= thresh ) #else # error Unknown default pixel format defined in config.h #endif + { pnt1 = &(pnt2[-lxsize]); if( *pnt1 > 0 ) { *************** *** 482,485 **** --- 483,498 ---- double *wpos; int thresht3 = thresh * 3; + static int imageProcModePrev = -1; + static int imXsizePrev = -1; + static int imYsizePrev = -1; + + // Ensure that the debug image is correct size. + // If size has changed, debug image will need to be re-allocated. + if (imageProcModePrev != arImageProcMode || imXsizePrev != arImXsize || imYsizePrev != arImYsize) { + arLabelingCleanup(); + imageProcModePrev = arImageProcMode; + imXsizePrev = arImXsize; + imYsizePrev = arImYsize; + } if( arImageProcMode == AR_IMAGE_PROC_IN_HALF ) { *************** *** 589,596 **** #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) if( *(pnt+1) <= thresh ) { ! *(dpnt+1) = 255; #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_yuvs) if( *(pnt+0) <= thresh ) { ! *(dpnt+0) = 255; #else # error Unknown default pixel format defined in config.h --- 602,609 ---- #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) if( *(pnt+1) <= thresh ) { ! *(dpnt+0) = 128; *(dpnt+1) = 235; // *(dpnt+0) is chroma, set to 128 to maintain black & white debug image. #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_yuvs) if( *(pnt+0) <= thresh ) { ! *(dpnt+0) = 235; *(dpnt+1) = 128; // *(dpnt+1) is chroma, set to 128 to maintain black & white debug image. #else # error Unknown default pixel format defined in config.h *************** *** 696,720 **** *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_MONO) ! *(dpnt) = 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 # error Unknown default pixel format defined in config.h #endif - } } if (arImageProcMode == AR_IMAGE_PROC_IN_HALF) pnt += arImXsize*AR_PIX_SIZE_DEFAULT; --- 709,732 ---- *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_MONO) ! *(dpnt) = 0; } #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) ! *(dpnt+0) = 128; *(dpnt+1) = 16; } // *(dpnt+0) is chroma, set to 128 to maintain black & white debug image. #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_yuvs) ! *(dpnt+0) = 16; *(dpnt+1) = 128; } // *(dpnt+1) is chroma, set to 128 to maintain black & white debug image. #else # error Unknown default pixel format defined in config.h #endif } if (arImageProcMode == AR_IMAGE_PROC_IN_HALF) pnt += arImXsize*AR_PIX_SIZE_DEFAULT; *************** *** 761,762 **** --- 773,787 ---- return( l_image ); } + + void arLabelingCleanup(void) + { + if (arImageL) { + free (arImageL); + arImageL = NULL; + arImage = NULL; + } + if (arImageR) { + free (arImageR); + arImageR = NULL; + } + } |
|
From: Philip L. <phi...@us...> - 2006-11-17 03:34:44
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/Gl In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv7118 Modified Files: gsub_lite.c Log Message: arDebug fixes. Index: gsub_lite.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/Gl/gsub_lite.c,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** gsub_lite.c 4 Oct 2006 05:37:22 -0000 1.21 --- gsub_lite.c 17 Nov 2006 03:34:42 -0000 1.22 *************** *** 847,851 **** // Prepare an orthographic projection, set camera position for 2D drawing, and save GL state. glGetTexEnviv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, &texEnvModeSave); // Save GL texture environment mode. ! glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); lightingSave = glIsEnabled(GL_LIGHTING); // Save enabled state of lighting. if (lightingSave == GL_TRUE) glDisable(GL_LIGHTING); --- 847,851 ---- // Prepare an orthographic projection, set camera position for 2D drawing, and save GL state. glGetTexEnviv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, &texEnvModeSave); // Save GL texture environment mode. ! if (texEnvModeSave != GL_REPLACE) glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); lightingSave = glIsEnabled(GL_LIGHTING); // Save enabled state of lighting. if (lightingSave == GL_TRUE) glDisable(GL_LIGHTING); *************** *** 860,864 **** glLoadIdentity(); ! arglDispImageStateful(image, cparam, zoom, contextSettings); // Restore previous projection, camera position, and GL state. --- 860,877 ---- glLoadIdentity(); ! if (arDebug) { // Globals from ar.h: arDebug, arImage, arImageProcMode. ! if (arImage) { ! if (arImageProcMode == AR_IMAGE_PROC_IN_HALF) { ! ARParam cparamScaled = *cparam; ! cparamScaled.xsize /= 2; ! cparamScaled.ysize /= 2; ! arglDispImageStateful(arImage, &cparamScaled, zoom * 2.0, contextSettings); ! } else { ! arglDispImageStateful(arImage, cparam, zoom, contextSettings); ! } ! } ! } else { ! arglDispImageStateful(image, cparam, zoom, contextSettings); ! } // Restore previous projection, camera position, and GL state. *************** *** 869,873 **** if (depthTestSave == GL_TRUE) glEnable(GL_DEPTH_TEST); // Restore enabled state of depth test. if (lightingSave == GL_TRUE) glEnable(GL_LIGHTING); // Restore enabled state of lighting. ! glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, texEnvModeSave); // Restore GL texture environment mode. #ifdef ARGL_DEBUG --- 882,886 ---- if (depthTestSave == GL_TRUE) glEnable(GL_DEPTH_TEST); // Restore enabled state of depth test. if (lightingSave == GL_TRUE) glEnable(GL_LIGHTING); // Restore enabled state of lighting. ! if (texEnvModeSave != GL_REPLACE) glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, texEnvModeSave); // Restore GL texture environment mode. #ifdef ARGL_DEBUG |
|
From: Philip L. <phi...@us...> - 2006-11-17 03:34:27
|
Update of /cvsroot/artoolkit/artoolkit/examples/simpleLite In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv7103 Modified Files: simpleLite.c Log Message: arDebug fixes. Index: simpleLite.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/examples/simpleLite/simpleLite.c,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** simpleLite.c 4 Oct 2006 03:44:52 -0000 1.19 --- simpleLite.c 17 Nov 2006 03:34:25 -0000 1.20 *************** *** 268,271 **** --- 268,275 ---- debugReportMode(); break; + case 'D': + case 'd': + arDebug = !arDebug; + break; case '?': case '/': *************** *** 273,276 **** --- 277,281 ---- printf(" q or [esc] Quit demo.\n"); printf(" c Change arglDrawMode and arglTexmapMode.\n"); + printf(" d Activate / deactivate debug mode.\n"); printf(" ? or / Show this help.\n"); printf("\nAdditionally, the ARVideo library supplied the following help text:\n"); *************** *** 411,416 **** { char glutGamemode[32]; ! const char *cparam_name = ! "Data/camera_para.dat"; // // Camera configuration. --- 416,420 ---- { char glutGamemode[32]; ! const char *cparam_name = "Data/camera_para.dat"; // // Camera configuration. *************** *** 454,458 **** glutEnterGameMode(); } else { ! glutInitWindowSize(gARTCparam.xsize, gARTCparam.ysize); glutCreateWindow(argv[0]); } --- 458,462 ---- glutEnterGameMode(); } else { ! glutInitWindowSize(prefWidth, prefHeight); glutCreateWindow(argv[0]); } |
|
From: Philip L. <phi...@us...> - 2006-11-17 03:30:02
|
Update of /cvsroot/artoolkit/artoolkit/doc In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv4989 Modified Files: ar_8h.html globals.html globals_func.html Log Message: Update docs. Index: globals.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/globals.html,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** globals.html 28 Sep 2006 03:06:33 -0000 1.3 --- globals.html 17 Nov 2006 03:29:56 -0000 1.4 *************** *** 89,93 **** --- 89,95 ---- : <a class="el" href="gsub_8h.html#fc546eb5e187fe05444fa2cdf2497a1d">gsub.h</a><li>ARGL_CONTEXT_SETTINGS_REF : <a class="el" href="gsub_lite/index.html">gsub_lite.h</a><li>arglCameraFrustum() + : <a class="el" href="gsub_lite/index.html">gsub_lite.h</a><li>arglCameraFrustumRH() : <a class="el" href="gsub_lite/index.html">gsub_lite.h</a><li>arglCameraView() + : <a class="el" href="gsub_lite/index.html">gsub_lite.h</a><li>arglCameraViewRH() : <a class="el" href="gsub_lite/index.html">gsub_lite.h</a><li>arglCleanup() : <a class="el" href="gsub_lite/index.html">gsub_lite.h</a><li>arglDispImage() *************** *** 117,121 **** : <a class="el" href="ar_8h.html#f37d0b07126866ac30bc35b384ea1661">ar.h</a><li>arInitCparam() : <a class="el" href="ar_8h.html#52f12a73083b810427e2a9066e69a0f2">ar.h</a><li>arLabeling() ! : <a class="el" href="ar_8h.html#42ad9c96a619e0d62be0627634332dfe">ar.h</a><li>arLoadPatt() : <a class="el" href="ar_8h.html#c2f0ca15b1247e50412fdfa02a1541e1">ar.h</a><li>arMalloc : <a class="el" href="ar_8h.html#8f604950d2f084c26c5536d3f3c6d2dc">ar.h</a><li>arMatchingPCAMode --- 119,124 ---- : <a class="el" href="ar_8h.html#f37d0b07126866ac30bc35b384ea1661">ar.h</a><li>arInitCparam() : <a class="el" href="ar_8h.html#52f12a73083b810427e2a9066e69a0f2">ar.h</a><li>arLabeling() ! : <a class="el" href="ar_8h.html#42ad9c96a619e0d62be0627634332dfe">ar.h</a><li>arLabelingCleanup() ! : <a class="el" href="ar_8h.html#f4cc9097aa08c705e97b9abf19c5fdfe">ar.h</a><li>arLoadPatt() : <a class="el" href="ar_8h.html#c2f0ca15b1247e50412fdfa02a1541e1">ar.h</a><li>arMalloc : <a class="el" href="ar_8h.html#8f604950d2f084c26c5536d3f3c6d2dc">ar.h</a><li>arMatchingPCAMode Index: globals_func.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/globals_func.html,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** globals_func.html 28 Sep 2006 03:06:34 -0000 1.3 --- globals_func.html 17 Nov 2006 03:29:56 -0000 1.4 *************** *** 81,85 **** --- 81,87 ---- : <a class="el" href="gsub_8h.html#07b1fb9faa954efc65f5d2b8f6f637e6">gsub.h</a><li>argInqSetting() : <a class="el" href="gsub_8h.html#fc546eb5e187fe05444fa2cdf2497a1d">gsub.h</a><li>arglCameraFrustum() + : <a class="el" href="gsub_lite/index.html">gsub_lite.h</a><li>arglCameraFrustumRH() : <a class="el" href="gsub_lite/index.html">gsub_lite.h</a><li>arglCameraView() + : <a class="el" href="gsub_lite/index.html">gsub_lite.h</a><li>arglCameraViewRH() : <a class="el" href="gsub_lite/index.html">gsub_lite.h</a><li>arglCleanup() : <a class="el" href="gsub_lite/index.html">gsub_lite.h</a><li>arglDispImage() *************** *** 104,108 **** : <a class="el" href="gsubUtil_8h.html#ed3f6b47599c694f6eb5886653e5982b">gsubUtil.h</a><li>arInitCparam() : <a class="el" href="ar_8h.html#52f12a73083b810427e2a9066e69a0f2">ar.h</a><li>arLabeling() ! : <a class="el" href="ar_8h.html#42ad9c96a619e0d62be0627634332dfe">ar.h</a><li>arLoadPatt() : <a class="el" href="ar_8h.html#c2f0ca15b1247e50412fdfa02a1541e1">ar.h</a><li>arMatrixAlloc() : <a class="el" href="matrix_8h.html#69c9a974dc5a3963148ebb2c4a80f969">matrix.h</a><li>arMatrixAllocDup() --- 106,111 ---- : <a class="el" href="gsubUtil_8h.html#ed3f6b47599c694f6eb5886653e5982b">gsubUtil.h</a><li>arInitCparam() : <a class="el" href="ar_8h.html#52f12a73083b810427e2a9066e69a0f2">ar.h</a><li>arLabeling() ! : <a class="el" href="ar_8h.html#42ad9c96a619e0d62be0627634332dfe">ar.h</a><li>arLabelingCleanup() ! : <a class="el" href="ar_8h.html#f4cc9097aa08c705e97b9abf19c5fdfe">ar.h</a><li>arLoadPatt() : <a class="el" href="ar_8h.html#c2f0ca15b1247e50412fdfa02a1541e1">ar.h</a><li>arMatrixAlloc() : <a class="el" href="matrix_8h.html#69c9a974dc5a3963148ebb2c4a80f969">matrix.h</a><li>arMatrixAllocDup() Index: ar_8h.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/ar_8h.html,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ar_8h.html 28 Sep 2006 03:06:34 -0000 1.3 --- ar_8h.html 17 Nov 2006 03:29:56 -0000 1.4 *************** *** 133,136 **** --- 133,139 ---- <tr><td class="mdescLeft"> </td><td class="mdescRight">extract connected components from image. <a href="#42ad9c96a619e0d62be0627634332dfe"></a><br></td></tr> + <tr><td class="memItemLeft" nowrap align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="ar_8h.html#f4cc9097aa08c705e97b9abf19c5fdfe">arLabelingCleanup</a> (void)</td></tr> + + <tr><td class="mdescLeft"> </td><td class="mdescRight">clean up static data allocated by arLabeling. <a href="#f4cc9097aa08c705e97b9abf19c5fdfe"></a><br></td></tr> <tr><td class="memItemLeft" nowrap align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="ar_8h.html#4909575c338b25813a1c824d46b2f4fe">arGetImgFeature</a> (int *num, int **area, int **clip, double **pos)</td></tr> *************** *** 337,340 **** --- 340,344 ---- 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.<p> 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.<p> + AR_PIXEL_FORMAT_MONO Each pixel is represented by 8 bits of luminance information.<p> 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 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'.<p> 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 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'. </td> *************** *** 1610,1613 **** --- 1614,1647 ---- </tr> </table> + <a class="anchor" name="f4cc9097aa08c705e97b9abf19c5fdfe"></a><!-- doxytag: member="ar.h::arLabelingCleanup" ref="f4cc9097aa08c705e97b9abf19c5fdfe" args="(void)" --><p> + <table class="mdTable" cellpadding="2" cellspacing="0"> + <tr> + <td class="mdRow"> + <table cellpadding="0" cellspacing="0" border="0"> + <tr> + <td class="md" nowrap valign="top">void arLabelingCleanup </td> + <td class="md" valign="top">( </td> + <td class="md" nowrap valign="top">void </td> + <td class="mdname1" valign="top" nowrap> </td> + <td class="md" valign="top"> ) </td> + <td class="md" nowrap></td> + </tr> + </table> + </td> + </tr> + </table> + <table cellspacing="5" cellpadding="0" border="0"> + <tr> + <td> + + </td> + <td> + + <p> + clean up static data allocated by arLabeling. + <p> + In debug mode, arLabeling may allocate and use static storage. This function deallocates this storage. </td> + </tr> + </table> <a class="anchor" name="c2f0ca15b1247e50412fdfa02a1541e1"></a><!-- doxytag: member="ar.h::arLoadPatt" ref="c2f0ca15b1247e50412fdfa02a1541e1" args="(const char *filename)" --><p> <table class="mdTable" cellpadding="2" cellspacing="0"> |
|
From: Philip L. <phi...@us...> - 2006-11-17 03:22:25
|
Update of /cvsroot/artoolkit/artoolkit/include/AR In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv2344 Modified Files: ar.h gsub_lite.h Log Message: arDebug fixes. Index: ar.h =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/include/AR/ar.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** ar.h 3 Oct 2006 21:35:37 -0000 1.11 --- ar.h 17 Nov 2006 03:22:23 -0000 1.12 *************** *** 580,583 **** --- 580,592 ---- /** + * \brief clean up static data allocated by arLabeling. + * + * In debug mode, arLabeling may allocate and use static storage. + * This function deallocates this storage. + */ + void arLabelingCleanup(void); + + + /** * \brief XXXBK * Index: gsub_lite.h =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/include/AR/gsub_lite.h,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** gsub_lite.h 4 Oct 2006 03:44:41 -0000 1.14 --- gsub_lite.h 17 Nov 2006 03:22:23 -0000 1.15 *************** *** 134,138 **** #endif #include <AR/config.h> ! #include <AR/ar.h> // ARUint8, AR_PIXEL_FORMAT #include <AR/param.h> // ARParam, arParamDecompMat(), arParamObserv2Ideal() --- 134,138 ---- #endif #include <AR/config.h> ! #include <AR/ar.h> // ARUint8, AR_PIXEL_FORMAT, arDebug, arImage. #include <AR/param.h> // ARParam, arParamDecompMat(), arParamObserv2Ideal() |
|
From: Philip L. <phi...@us...> - 2006-11-17 03:21:22
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/ARvrml In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv1943 Modified Files: arViewerCapi.cpp arViewer.cpp arViewer.h Log Message: Update ARvrml for OpenVRML-0.16.1. Index: arViewer.cpp =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/ARvrml/arViewer.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** arViewer.cpp 28 May 2006 09:24:49 -0000 1.2 --- arViewer.cpp 17 Nov 2006 03:21:19 -0000 1.3 *************** *** 1,10 **** /* ! modif: ! version 0.14.3 ! remove vrmlScene since we use reference now. ! remove culling pb */ - /* * --- 1,12 ---- /* ! Original version for VRML97-0.8.7 by Hirokazu Kato. ! ! Updated for OpenVRML-0.14.3 by Raphael Grasset. ! -remove vrmlScene since we use reference now. ! -remove culling pb ! Updated for OpenVRML-0.16.1 by Philip Lamb. 2006-11-15. ! - add arVrmlBrowser class and Boost dependencies. */ /* * *************** *** 44,48 **** using namespace openvrml; ! arVrmlViewer::arVrmlViewer(openvrml::browser& browser) : gl::viewer(browser) { internal_light = true; --- 46,141 ---- using namespace openvrml; ! arVrmlBrowser::arVrmlBrowser(): openvrml::browser(std::cout, std::cerr) ! { ! } ! ! std::auto_ptr<openvrml::resource_istream> ! arVrmlBrowser::do_get_resource(const std::string & uri) ! { ! using std::auto_ptr; ! using std::invalid_argument; ! using std::string; ! using openvrml::resource_istream; ! ! class file_resource_istream : public resource_istream { ! std::string url_; ! std::filebuf buf_; ! ! public: ! explicit file_resource_istream(const std::string & path): resource_istream(&this->buf_) ! { ! if (!this->buf_.open(path.c_str(), ios_base::in)) { ! this->setstate(ios_base::failbit); ! } ! } ! ! void url(const std::string & str) throw (std::bad_alloc) ! { ! this->url_ = str; ! } ! ! private: ! virtual const std::string do_url() const throw () ! { ! return this->url_; ! } ! ! virtual const std::string do_type() const throw () ! { ! // ! // A real application should use OS facilities for this. This ! // is a crude hack. ! // ! using std::find; ! using std::string; ! using boost::algorithm::iequals; ! using boost::next; ! string media_type = "application/octet-stream"; ! const string::const_reverse_iterator dot_pos = ! find(this->url_.rbegin(), this->url_.rend(), '.'); ! if (dot_pos == this->url_.rend() ! || next(dot_pos.base()) == this->url_.end()) { ! return media_type; ! } ! const string::const_iterator hash_pos = ! find(next(dot_pos.base()), this->url_.end(), '#'); ! const string ext(dot_pos.base(), hash_pos); ! if (iequals(ext, "wrl")) { ! media_type = "model/vrml"; ! } else if (iequals(ext, "x3dv")) { ! media_type = "model/x3d+vrml"; ! } else if (iequals(ext, "png")) { ! media_type = "image/png"; ! } else if (iequals(ext, "jpg") || iequals(ext, "jpeg")) { ! media_type = "image/jpeg"; ! } ! return media_type; ! } ! ! virtual bool do_data_available() const throw () ! { ! return !!(*this); ! } ! }; // class file_resource_istream ! ! const string scheme = uri.substr(0, uri.find_first_of(':')); ! if (scheme != "file") { ! throw invalid_argument('\"' + scheme + "\" URI scheme not supported"); ! } ! // ! // file:// ! // ^ ! // 01234567 ! // ! string path = uri.substr(uri.find_first_of('/', 7)); ! ! auto_ptr<resource_istream> in(new file_resource_istream(path)); ! static_cast<file_resource_istream *>(in.get())->url(uri); ! ! return in; ! } ! ! ! arVrmlViewer::arVrmlViewer() : gl::viewer::viewer() { internal_light = true; *************** *** 62,66 **** } ! arVrmlViewer::~arVrmlViewer() { --- 155,159 ---- } ! arVrmlViewer::~arVrmlViewer() throw() { *************** *** 69,73 **** void arVrmlViewer::timerUpdate() { ! this->update(0.0); } --- 162,166 ---- void arVrmlViewer::timerUpdate() { ! this->update(0.0); } *************** *** 81,85 **** void arVrmlViewer::redraw() { ! double start = browser::current_time(); glMatrixMode(GL_MODELVIEW); glPushMatrix(); --- 174,178 ---- void arVrmlViewer::redraw() { ! //double start = browser::current_time(); glMatrixMode(GL_MODELVIEW); glPushMatrix(); *************** *** 123,127 **** sensitive = 0; ! this->browser.render(*this); if (internal_light) { --- 216,220 ---- sensitive = 0; ! browser()->render(); if (internal_light) { Index: arViewerCapi.cpp =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/ARvrml/arViewerCapi.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** arViewerCapi.cpp 1 Dec 2004 22:48:03 -0000 1.2 --- arViewerCapi.cpp 17 Nov 2006 03:21:19 -0000 1.3 *************** *** 50,54 **** FILE *fp; ! openvrml::browser * myBrowser = 0; char buf[256], buf1[256]; char buf2[256]; --- 50,54 ---- FILE *fp; ! openvrml::browser * myBrowser = NULL; char buf[256], buf1[256]; char buf2[256]; *************** *** 66,70 **** id = i; - if( (fp=fopen(file, "r")) == NULL ) return -1; --- 66,69 ---- *************** *** 78,96 **** sprintf(buf, "%s%s", buf2, buf1); ! myBrowser = new openvrml::browser(std::cout, std::cerr); ! if( !myBrowser) {fclose(fp); return -1;} ! ! std::vector<std::string> uri(1, buf); ! std::vector<std::string> parameter; ! myBrowser->load_url(uri, parameter); ! viewer[id] = new arVrmlViewer(*myBrowser); ! if(!viewer[id]) ! { delete myBrowser; fclose(fp); return -1; } ! strcpy( viewer[id]->filename, buf ); get_buff(buf, 256, fp); --- 77,99 ---- sprintf(buf, "%s%s", buf2, buf1); ! myBrowser = new arVrmlBrowser; ! if (!myBrowser) { ! fclose(fp); ! return -1; ! } ! viewer[id] = new arVrmlViewer(); ! if (!viewer[id]) { delete myBrowser; fclose(fp); return -1; } ! strcpy(viewer[id]->filename, buf); // Save filename in viewer. ! myBrowser->viewer(viewer[id]); ! ! std::vector<std::string> uri(1, buf); ! std::vector<std::string> parameter; ! myBrowser->load_url(uri, parameter); ! get_buff(buf, 256, fp); Index: arViewer.h =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/ARvrml/arViewer.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** arViewer.h 19 Nov 2004 03:26:52 -0000 1.1 --- arViewer.h 17 Nov 2006 03:21:19 -0000 1.2 *************** *** 23,35 **** #define AR_VRMLINT_H #include <openvrml/browser.h> #include <openvrml/gl/viewer.h> #include <openvrml/bounding_volume.h> class arVrmlViewer : public openvrml::gl::viewer { public: ! arVrmlViewer(openvrml::browser& browser); ! ~arVrmlViewer(); char filename[512]; --- 23,51 ---- #define AR_VRMLINT_H + #include <iostream> + #include <fstream> + #include <boost/algorithm/string/predicate.hpp> + #include <boost/utility.hpp> #include <openvrml/browser.h> #include <openvrml/gl/viewer.h> #include <openvrml/bounding_volume.h> + #ifdef _WIN32 + # include <windows.h> + #endif + + class arVrmlBrowser : public openvrml::browser { + public: + arVrmlBrowser(); + + private: + virtual std::auto_ptr<openvrml::resource_istream> + do_get_resource(const std::string & uri); + }; class arVrmlViewer : public openvrml::gl::viewer { public: ! arVrmlViewer(); ! ~arVrmlViewer() throw (); char filename[512]; |
|
From: Philip L. <phi...@us...> - 2006-10-04 05:37:50
|
Update of /cvsroot/artoolkit/artoolkit/doc/gsub_lite In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv11233 Modified Files: toc.html CompositePage.html Log Message: Added RH versions of GL projection and modelview fns in gsub_lite, and switch examples to using these. Index: toc.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/gsub_lite/toc.html,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** toc.html 22 May 2006 23:03:19 -0000 1.7 --- toc.html 4 Oct 2006 05:37:47 -0000 1.8 *************** *** 18,22 **** --- 18,24 ---- <nobr> <a href="Functions/Functions.html#//apple_ref/c/func/arglCameraFrustum" target="doc">arglCameraFrustum</a></nobr><br> + <nobr> <a href="Functions/Functions.html#//apple_ref/c/func/arglCameraFrustumRH" target="doc">arglCameraFrustumRH</a></nobr><br> <nobr> <a href="Functions/Functions.html#//apple_ref/c/func/arglCameraView" target="doc">arglCameraView</a></nobr><br> + <nobr> <a href="Functions/Functions.html#//apple_ref/c/func/arglCameraViewRH" target="doc">arglCameraViewRH</a></nobr><br> <nobr> <a href="Functions/Functions.html#//apple_ref/c/func/arglCleanup" target="doc">arglCleanup</a></nobr><br> <nobr> <a href="Functions/Functions.html#//apple_ref/c/func/arglDispImage" target="doc">arglDispImage</a></nobr><br> Index: CompositePage.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/gsub_lite/CompositePage.html,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** CompositePage.html 28 Sep 2006 03:09:39 -0000 1.8 --- CompositePage.html 4 Oct 2006 05:37:47 -0000 1.9 *************** *** 73,79 **** --- 73,85 ---- <dd>Create an OpenGL perspective projection matrix. </dd> + <dt><tt><a href="CompositePage.html#//apple_ref/doc/compositePage/c/func/arglCameraFrustumRH" target="_top">arglCameraFrustumRH</a></tt></dt> + <dd>(description) + </dd> <dt><tt><a href="CompositePage.html#//apple_ref/doc/compositePage/c/func/arglCameraView" target="_top">arglCameraView</a></tt></dt> <dd>Create an OpenGL viewing transformation matrix. </dd> + <dt><tt><a href="CompositePage.html#//apple_ref/doc/compositePage/c/func/arglCameraViewRH" target="_top">arglCameraViewRH</a></tt></dt> + <dd>(description) + </dd> <dt><tt><a href="CompositePage.html#//apple_ref/doc/compositePage/c/func/arglCleanup" target="_top">arglCleanup</a></tt></dt> <dd>Free memory used by gsub_lite associated with the specified context. *************** *** 163,166 **** --- 169,193 ---- </dd> </dl> + <hr><!-- headerDoc=func; uid=//apple_ref/doc/compositePage/c/func/arglCameraFrustumRH; name=arglCameraFrustumRH --> + <a name="//apple_ref/doc/compositePage/c/func/arglCameraFrustumRH"></a> + <table border="0" cellpadding="2" cellspacing="2" width="300"><tr><td valign="top" height="12" colspan="5"><h3><a name="arglCameraFrustumRH">arglCameraFrustumRH</a></h3> + </td></tr></table><hr><dl></dl><p>(description) + </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/arglCameraFrustumRH //apple_ref/c/clm/arglCameraFrustumRH //apple_ref/c/intfcm/arglCameraFrustumRH //apple_ref/c/func/arglCameraFrustumRH //apple_ref/c/ftmplt/arglCameraFrustumRH //apple_ref/c/defn/arglCameraFrustumRH //apple_ref/c/macro/arglCameraFrustumRH" --><font class="function">arglCameraFrustumRH</font><!-- /a -->( + <font class="keyword">const</font> <!-- a logicalPath="//apple_ref/c/cl/ARParam //apple_ref/c/cl/ARParam //apple_ref/c/tdef/ARParam //apple_ref/c/tag/ARParam //apple_ref/c/econst/ARParam //apple_ref/c/struct/ARParam //apple_ref/c/clconst/ARParam" --><font class="type">ARParam</font><!-- /a --> *<font class="param">cparam</font>, + <font class="keyword">const</font> <!-- a logicalPath="//apple_ref/c/cl/double //apple_ref/c/cl/double //apple_ref/c/tdef/double //apple_ref/c/tag/double //apple_ref/c/econst/double //apple_ref/c/struct/double //apple_ref/c/clconst/double" --><font class="type">double</font><!-- /a --> <font class="param">focalmin</font>, + <font class="keyword">const</font> <!-- a logicalPath="//apple_ref/c/cl/double //apple_ref/c/cl/double //apple_ref/c/tdef/double //apple_ref/c/tag/double //apple_ref/c/econst/double //apple_ref/c/struct/double //apple_ref/c/clconst/double" --><font class="type">double</font><!-- /a --> <font class="param">focalmax</font>, + <!-- a logicalPath="//apple_ref/c/cl/GLdouble //apple_ref/c/cl/GLdouble //apple_ref/c/tdef/GLdouble //apple_ref/c/tag/GLdouble //apple_ref/c/econst/GLdouble //apple_ref/c/struct/GLdouble //apple_ref/c/clconst/GLdouble" --><font class="type">GLdouble</font><!-- /a --> <!-- a logicalPath="//apple_ref/c/cl/m_projection //apple_ref/c/cl/m_projection //apple_ref/c/tdef/m_projection //apple_ref/c/tag/m_projection //apple_ref/c/econst/m_projection //apple_ref/c/struct/m_projection //apple_ref/c/clconst/m_projection" --><font class="type">m_projection</font><!-- /a -->[<font class="number">16</font>]); </pre></blockquote> + <h5><font face="Lucida Grande,Helvetica,Arial">Parameter Descriptions</font></h5> + <blockquote> + <dl> + <dt><code><i>(name)</i></code></dt><dd>(description)</dd> + </dl> + </blockquote> + <dl><dt><i>function result</i></dt><dd>(description) + </dd> + <h5><font face="Lucida Grande,Helvetica,Arial">Discussion</font></h5><p>(description) + </p> + </dl> <hr><!-- headerDoc=func; uid=//apple_ref/doc/compositePage/c/func/arglCameraView; name=arglCameraView --> <a name="//apple_ref/doc/compositePage/c/func/arglCameraView"></a> *************** *** 193,196 **** --- 220,243 ---- </dd> </dl> + <hr><!-- headerDoc=func; uid=//apple_ref/doc/compositePage/c/func/arglCameraViewRH; name=arglCameraViewRH --> + <a name="//apple_ref/doc/compositePage/c/func/arglCameraViewRH"></a> + <table border="0" cellpadding="2" cellspacing="2" width="300"><tr><td valign="top" height="12" colspan="5"><h3><a name="arglCameraViewRH">arglCameraViewRH</a></h3> + </td></tr></table><hr><dl></dl><p>(description) + </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/arglCameraViewRH //apple_ref/c/clm/arglCameraViewRH //apple_ref/c/intfcm/arglCameraViewRH //apple_ref/c/func/arglCameraViewRH //apple_ref/c/ftmplt/arglCameraViewRH //apple_ref/c/defn/arglCameraViewRH //apple_ref/c/macro/arglCameraViewRH" --><font class="function">arglCameraViewRH</font><!-- /a -->( + <font class="keyword">const</font> <!-- a logicalPath="//apple_ref/c/cl/double //apple_ref/c/cl/double //apple_ref/c/tdef/double //apple_ref/c/tag/double //apple_ref/c/econst/double //apple_ref/c/struct/double //apple_ref/c/clconst/double" --><font class="type">double</font><!-- /a --> <!-- a logicalPath="//apple_ref/c/cl/para //apple_ref/c/cl/para //apple_ref/c/tdef/para //apple_ref/c/tag/para //apple_ref/c/econst/para //apple_ref/c/struct/para //apple_ref/c/clconst/para" --><font class="type">para</font><!-- /a -->[<font class="number">3</font>][<font class="number">4</font>], + <!-- a logicalPath="//apple_ref/c/cl/GLdouble //apple_ref/c/cl/GLdouble //apple_ref/c/tdef/GLdouble //apple_ref/c/tag/GLdouble //apple_ref/c/econst/GLdouble //apple_ref/c/struct/GLdouble //apple_ref/c/clconst/GLdouble" --><font class="type">GLdouble</font><!-- /a --> <!-- a logicalPath="//apple_ref/c/cl/m_modelview //apple_ref/c/cl/m_modelview //apple_ref/c/tdef/m_modelview //apple_ref/c/tag/m_modelview //apple_ref/c/econst/m_modelview //apple_ref/c/struct/m_modelview //apple_ref/c/clconst/m_modelview" --><font class="type">m_modelview</font><!-- /a -->[<font class="number">16</font>], + <font class="keyword">const</font> <!-- a logicalPath="//apple_ref/c/cl/double //apple_ref/c/cl/double //apple_ref/c/tdef/double //apple_ref/c/tag/double //apple_ref/c/econst/double //apple_ref/c/struct/double //apple_ref/c/clconst/double" --><font class="type">double</font><!-- /a --> <font class="param">scale</font>); </pre></blockquote> + <h5><font face="Lucida Grande,Helvetica,Arial">Parameter Descriptions</font></h5> + <blockquote> + <dl> + <dt><code><i>(name)</i></code></dt><dd>(description)</dd> + </dl> + </blockquote> + <dl><dt><i>function result</i></dt><dd>(description) + </dd> + <h5><font face="Lucida Grande,Helvetica,Arial">Discussion</font></h5><p>(description) + </p> + </dl> <hr><!-- headerDoc=func; uid=//apple_ref/doc/compositePage/c/func/arglCleanup; name=arglCleanup --> <a name="//apple_ref/doc/compositePage/c/func/arglCleanup"></a> |
|
From: Philip L. <phi...@us...> - 2006-10-04 05:37:36
|
Update of /cvsroot/artoolkit/artoolkit/doc/gsub_lite/Functions In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv11214 Modified Files: Functions.html Log Message: Added RH versions of GL projection and modelview fns in gsub_lite, and switch examples to using these. Index: Functions.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/gsub_lite/Functions/Functions.html,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Functions.html 28 Sep 2006 03:09:26 -0000 1.7 --- Functions.html 4 Oct 2006 05:37:33 -0000 1.8 *************** *** 12,18 **** --- 12,24 ---- <dd>Create an OpenGL perspective projection matrix. </dd> + <dt><tt><a href="Functions.html#//apple_ref/c/func/arglCameraFrustumRH" target="doc">arglCameraFrustumRH</a></tt></dt> + <dd>(description) + </dd> <dt><tt><a href="Functions.html#//apple_ref/c/func/arglCameraView" target="doc">arglCameraView</a></tt></dt> <dd>Create an OpenGL viewing transformation matrix. </dd> + <dt><tt><a href="Functions.html#//apple_ref/c/func/arglCameraViewRH" target="doc">arglCameraViewRH</a></tt></dt> + <dd>(description) + </dd> <dt><tt><a href="Functions.html#//apple_ref/c/func/arglCleanup" target="doc">arglCleanup</a></tt></dt> <dd>Free memory used by gsub_lite associated with the specified context. *************** *** 102,105 **** --- 108,132 ---- </dd> </dl> + <hr><!-- headerDoc=func; uid=//apple_ref/c/func/arglCameraFrustumRH; name=arglCameraFrustumRH --> + <a name="//apple_ref/c/func/arglCameraFrustumRH"></a> + <table border="0" cellpadding="2" cellspacing="2" width="300"><tr><td valign="top" height="12" colspan="5"><h3><a name="arglCameraFrustumRH">arglCameraFrustumRH</a></h3> + </td></tr></table><hr><dl></dl><p>(description) + </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/arglCameraFrustumRH //apple_ref/c/clm/arglCameraFrustumRH //apple_ref/c/intfcm/arglCameraFrustumRH //apple_ref/c/func/arglCameraFrustumRH //apple_ref/c/ftmplt/arglCameraFrustumRH //apple_ref/c/defn/arglCameraFrustumRH //apple_ref/c/macro/arglCameraFrustumRH" --><font class="function">arglCameraFrustumRH</font><!-- /a -->( + <font class="keyword">const</font> <!-- a logicalPath="//apple_ref/c/cl/ARParam //apple_ref/c/cl/ARParam //apple_ref/c/tdef/ARParam //apple_ref/c/tag/ARParam //apple_ref/c/econst/ARParam //apple_ref/c/struct/ARParam //apple_ref/c/clconst/ARParam" --><font class="type">ARParam</font><!-- /a --> *<font class="param">cparam</font>, + <font class="keyword">const</font> <!-- a logicalPath="//apple_ref/c/cl/double //apple_ref/c/cl/double //apple_ref/c/tdef/double //apple_ref/c/tag/double //apple_ref/c/econst/double //apple_ref/c/struct/double //apple_ref/c/clconst/double" --><font class="type">double</font><!-- /a --> <font class="param">focalmin</font>, + <font class="keyword">const</font> <!-- a logicalPath="//apple_ref/c/cl/double //apple_ref/c/cl/double //apple_ref/c/tdef/double //apple_ref/c/tag/double //apple_ref/c/econst/double //apple_ref/c/struct/double //apple_ref/c/clconst/double" --><font class="type">double</font><!-- /a --> <font class="param">focalmax</font>, + <!-- a logicalPath="//apple_ref/c/cl/GLdouble //apple_ref/c/cl/GLdouble //apple_ref/c/tdef/GLdouble //apple_ref/c/tag/GLdouble //apple_ref/c/econst/GLdouble //apple_ref/c/struct/GLdouble //apple_ref/c/clconst/GLdouble" --><font class="type">GLdouble</font><!-- /a --> <!-- a logicalPath="//apple_ref/c/cl/m_projection //apple_ref/c/cl/m_projection //apple_ref/c/tdef/m_projection //apple_ref/c/tag/m_projection //apple_ref/c/econst/m_projection //apple_ref/c/struct/m_projection //apple_ref/c/clconst/m_projection" --><font class="type">m_projection</font><!-- /a -->[<font class="number">16</font>]); </pre></blockquote> + <h5><font face="Lucida Grande,Helvetica,Arial">Parameter Descriptions</font></h5> + <blockquote> + <dl> + <dt><code><i>(name)</i></code></dt><dd>(description)</dd> + </dl> + </blockquote> + <dl><dt><i>function result</i></dt><dd>(description) + </dd> + <h5><font face="Lucida Grande,Helvetica,Arial">Discussion</font></h5><p>(description) + </p> + </dl> <hr><!-- headerDoc=func; uid=//apple_ref/c/func/arglCameraView; name=arglCameraView --> <a name="//apple_ref/c/func/arglCameraView"></a> *************** *** 132,135 **** --- 159,182 ---- </dd> </dl> + <hr><!-- headerDoc=func; uid=//apple_ref/c/func/arglCameraViewRH; name=arglCameraViewRH --> + <a name="//apple_ref/c/func/arglCameraViewRH"></a> + <table border="0" cellpadding="2" cellspacing="2" width="300"><tr><td valign="top" height="12" colspan="5"><h3><a name="arglCameraViewRH">arglCameraViewRH</a></h3> + </td></tr></table><hr><dl></dl><p>(description) + </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/arglCameraViewRH //apple_ref/c/clm/arglCameraViewRH //apple_ref/c/intfcm/arglCameraViewRH //apple_ref/c/func/arglCameraViewRH //apple_ref/c/ftmplt/arglCameraViewRH //apple_ref/c/defn/arglCameraViewRH //apple_ref/c/macro/arglCameraViewRH" --><font class="function">arglCameraViewRH</font><!-- /a -->( + <font class="keyword">const</font> <!-- a logicalPath="//apple_ref/c/cl/double //apple_ref/c/cl/double //apple_ref/c/tdef/double //apple_ref/c/tag/double //apple_ref/c/econst/double //apple_ref/c/struct/double //apple_ref/c/clconst/double" --><font class="type">double</font><!-- /a --> <!-- a logicalPath="//apple_ref/c/cl/para //apple_ref/c/cl/para //apple_ref/c/tdef/para //apple_ref/c/tag/para //apple_ref/c/econst/para //apple_ref/c/struct/para //apple_ref/c/clconst/para" --><font class="type">para</font><!-- /a -->[<font class="number">3</font>][<font class="number">4</font>], + <!-- a logicalPath="//apple_ref/c/cl/GLdouble //apple_ref/c/cl/GLdouble //apple_ref/c/tdef/GLdouble //apple_ref/c/tag/GLdouble //apple_ref/c/econst/GLdouble //apple_ref/c/struct/GLdouble //apple_ref/c/clconst/GLdouble" --><font class="type">GLdouble</font><!-- /a --> <!-- a logicalPath="//apple_ref/c/cl/m_modelview //apple_ref/c/cl/m_modelview //apple_ref/c/tdef/m_modelview //apple_ref/c/tag/m_modelview //apple_ref/c/econst/m_modelview //apple_ref/c/struct/m_modelview //apple_ref/c/clconst/m_modelview" --><font class="type">m_modelview</font><!-- /a -->[<font class="number">16</font>], + <font class="keyword">const</font> <!-- a logicalPath="//apple_ref/c/cl/double //apple_ref/c/cl/double //apple_ref/c/tdef/double //apple_ref/c/tag/double //apple_ref/c/econst/double //apple_ref/c/struct/double //apple_ref/c/clconst/double" --><font class="type">double</font><!-- /a --> <font class="param">scale</font>); </pre></blockquote> + <h5><font face="Lucida Grande,Helvetica,Arial">Parameter Descriptions</font></h5> + <blockquote> + <dl> + <dt><code><i>(name)</i></code></dt><dd>(description)</dd> + </dl> + </blockquote> + <dl><dt><i>function result</i></dt><dd>(description) + </dd> + <h5><font face="Lucida Grande,Helvetica,Arial">Discussion</font></h5><p>(description) + </p> + </dl> <hr><!-- headerDoc=func; uid=//apple_ref/c/func/arglCleanup; name=arglCleanup --> <a name="//apple_ref/c/func/arglCleanup"></a> |
|
From: Philip L. <phi...@us...> - 2006-10-04 05:37:25
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/Gl In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv11201 Modified Files: gsub_lite.c Log Message: Added RH versions of GL projection and modelview fns in gsub_lite, and switch examples to using these. Index: gsub_lite.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/Gl/gsub_lite.c,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** gsub_lite.c 3 Oct 2006 21:35:45 -0000 1.20 --- gsub_lite.c 4 Oct 2006 05:37:22 -0000 1.21 *************** *** 709,736 **** q[3][3] = 0.0; ! for (i = 0; i < 4; i++) { ! for (j = 0; j < 3; j++) { ! m_projection[i + j*4] = q[i][0] * trans[0][j] ! + q[i][1] * trans[1][j] ! + q[i][2] * trans[2][j]; } ! m_projection[i + 3*4] = q[i][0] * trans[0][3] ! + q[i][1] * trans[1][3] ! + q[i][2] * trans[2][3] ! + q[i][3]; } } ! void arglCameraView(const double para[3][4], GLdouble m_modelview[16], const double scale) { ! int i, j; ! ! for (j = 0; j < 3; j++) { // Row. ! for(i = 0; i < 4; i++) { // Column. ! m_modelview[j + i*4] = para[j][i]; } } ! m_modelview[3 + 0*4] = m_modelview[3 + 1*4] = m_modelview[3 + 2*4] = 0.0; // row + column x 4. ! m_modelview[3 + 3*4] = 1.0; if (scale != 0.0) { m_modelview[12] *= scale; --- 709,829 ---- q[3][3] = 0.0; ! for (i = 0; i < 4; i++) { // Row. ! // First 3 columns of the current row. ! for (j = 0; j < 3; j++) { // Column. ! m_projection[i + j*4] = q[i][0] * trans[0][j] + ! q[i][1] * trans[1][j] + ! q[i][2] * trans[2][j]; } ! // Fourth column of the current row. ! m_projection[i + 3*4] = q[i][0] * trans[0][3] + ! q[i][1] * trans[1][3] + ! q[i][2] * trans[2][3] + ! q[i][3]; } } ! void arglCameraFrustumRH(const ARParam *cparam, const double focalmin, const double focalmax, GLdouble m_projection[16]) { ! double icpara[3][4]; ! double trans[3][4]; ! double p[3][3], q[4][4]; ! int width, height; ! int i, j; ! ! width = cparam->xsize; ! height = cparam->ysize; ! ! if (arParamDecompMat(cparam->mat, icpara, trans) < 0) { ! printf("arglCameraFrustum(): arParamDecompMat() indicated parameter error.\n"); // Windows bug: when running multi-threaded, can't write to stderr! ! return; ! } ! for (i = 0; i < 4; i++) { ! icpara[1][i] = (height - 1)*(icpara[2][i]) - icpara[1][i]; ! } ! ! for(i = 0; i < 3; i++) { ! for(j = 0; j < 3; j++) { ! p[i][j] = icpara[i][j] / icpara[2][2]; } } ! q[0][0] = (2.0 * p[0][0] / (width - 1)); ! q[0][1] = (2.0 * p[0][1] / (width - 1)); ! q[0][2] = -((2.0 * p[0][2] / (width - 1)) - 1.0); ! q[0][3] = 0.0; ! ! q[1][0] = 0.0; ! q[1][1] = -(2.0 * p[1][1] / (height - 1)); ! q[1][2] = -((2.0 * p[1][2] / (height - 1)) - 1.0); ! q[1][3] = 0.0; ! ! q[2][0] = 0.0; ! q[2][1] = 0.0; ! q[2][2] = (focalmax + focalmin)/(focalmin - focalmax); ! q[2][3] = 2.0 * focalmax * focalmin / (focalmin - focalmax); ! ! q[3][0] = 0.0; ! q[3][1] = 0.0; ! q[3][2] = -1.0; ! q[3][3] = 0.0; ! ! for (i = 0; i < 4; i++) { // Row. ! // First 3 columns of the current row. ! for (j = 0; j < 3; j++) { // Column. ! m_projection[i + j*4] = q[i][0] * trans[0][j] + ! q[i][1] * trans[1][j] + ! q[i][2] * trans[2][j]; ! } ! // Fourth column of the current row. ! m_projection[i + 3*4] = q[i][0] * trans[0][3] + ! q[i][1] * trans[1][3] + ! q[i][2] * trans[2][3] + ! q[i][3]; ! } ! } ! ! void arglCameraView(const double para[3][4], GLdouble m_modelview[16], const double scale) ! { ! m_modelview[0 + 0*4] = para[0][0]; // R1C1 ! m_modelview[0 + 1*4] = para[0][1]; // R1C2 ! m_modelview[0 + 2*4] = para[0][2]; ! m_modelview[0 + 3*4] = para[0][3]; ! m_modelview[1 + 0*4] = para[1][0]; // R2 ! m_modelview[1 + 1*4] = para[1][1]; ! m_modelview[1 + 2*4] = para[1][2]; ! m_modelview[1 + 3*4] = para[1][3]; ! m_modelview[2 + 0*4] = para[2][0]; // R3 ! m_modelview[2 + 1*4] = para[2][1]; ! m_modelview[2 + 2*4] = para[2][2]; ! m_modelview[2 + 3*4] = para[2][3]; ! m_modelview[3 + 0*4] = 0.0; ! m_modelview[3 + 1*4] = 0.0; ! m_modelview[3 + 2*4] = 0.0; ! m_modelview[3 + 3*4] = 1.0; ! if (scale != 0.0) { ! m_modelview[12] *= scale; ! m_modelview[13] *= scale; ! m_modelview[14] *= scale; ! } ! } ! ! void arglCameraViewRH(const double para[3][4], GLdouble m_modelview[16], const double scale) ! { ! m_modelview[0 + 0*4] = para[0][0]; // R1C1 ! m_modelview[0 + 1*4] = para[0][1]; // R1C2 ! m_modelview[0 + 2*4] = para[0][2]; ! m_modelview[0 + 3*4] = para[0][3]; ! m_modelview[1 + 0*4] = -para[1][0]; // R2 ! m_modelview[1 + 1*4] = -para[1][1]; ! m_modelview[1 + 2*4] = -para[1][2]; ! m_modelview[1 + 3*4] = -para[1][3]; ! m_modelview[2 + 0*4] = -para[2][0]; // R3 ! m_modelview[2 + 1*4] = -para[2][1]; ! m_modelview[2 + 2*4] = -para[2][2]; ! m_modelview[2 + 3*4] = -para[2][3]; ! m_modelview[3 + 0*4] = 0.0; ! m_modelview[3 + 1*4] = 0.0; ! m_modelview[3 + 2*4] = 0.0; ! m_modelview[3 + 3*4] = 1.0; if (scale != 0.0) { m_modelview[12] *= scale; *************** *** 797,801 **** if (contextSettings->arglDrawMode == AR_DRAW_BY_GL_DRAW_PIXELS) { glDisable(GL_TEXTURE_2D); ! glGetIntegerv(GL_VIEWPORT, params); glPixelZoom(zoomf * ((float)(params[2]) / (float)(cparam->xsize)), -zoomf * ((float)(params[3]) / (float)(cparam->ysize))); --- 890,894 ---- if (contextSettings->arglDrawMode == AR_DRAW_BY_GL_DRAW_PIXELS) { glDisable(GL_TEXTURE_2D); ! glGetIntegerv(GL_VIEWPORT, (GLint *)params); glPixelZoom(zoomf * ((float)(params[2]) / (float)(cparam->xsize)), -zoomf * ((float)(params[3]) / (float)(cparam->ysize))); |
|
From: Philip L. <phi...@us...> - 2006-10-04 03:45:17
|
Update of /cvsroot/artoolkit/artoolkit In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv1874 Modified Files: ChangeLog.txt Log Message: Added RH versions of GL projection and modelview fns in gsub_lite, and switch examples to using these. Index: ChangeLog.txt =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/ChangeLog.txt,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** ChangeLog.txt 3 Oct 2006 21:36:36 -0000 1.11 --- ChangeLog.txt 4 Oct 2006 03:45:16 -0000 1.12 *************** *** 7,10 **** --- 7,11 ---- - All platforms: ARToolKit now supports querying of SDK and runtime versions. - All platforms: Support for AR_PIXEL_FORMAT_MONO is now included. + - All platforms: There are now right-hand coordinate system versions of the OpenGL projection and modelview matrix functions, named arglCameraFrustumRH and arglCameraViewRH, respectively. These will help when integrating ARToolKit into existing OpenGL drawing. - Mac OS X: Fix for an error in the VRML library inclusion on Mac OS X. - Mac OS X: Now detects if running emulated on Intel Macs, and optimises video for this case. |
|
From: Philip L. <phi...@us...> - 2006-10-04 03:45:03
|
Update of /cvsroot/artoolkit/artoolkit/examples/twoView In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv1508 Modified Files: twoView.c Log Message: Added RH versions of GL projection and modelview fns in gsub_lite, and switch examples to using these. Index: twoView.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/examples/twoView/twoView.c,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** twoView.c 29 May 2006 04:00:20 -0000 1.15 --- twoView.c 4 Oct 2006 03:45:01 -0000 1.16 *************** *** 485,489 **** // Projection transformation. ! arglCameraFrustum(&(gContextsActive[drawContextIndex].ARTCparam), VIEW_DISTANCE_MIN, VIEW_DISTANCE_MAX, p); glMatrixMode(GL_PROJECTION); glLoadMatrixd(p); --- 485,489 ---- // Projection transformation. ! arglCameraFrustumRH(&(gContextsActive[drawContextIndex].ARTCparam), VIEW_DISTANCE_MIN, VIEW_DISTANCE_MAX, p); glMatrixMode(GL_PROJECTION); glLoadMatrixd(p); *************** *** 497,501 **** // ARToolKit supplied distance in millimetres, but I want OpenGL to work in my units. ! arglCameraView(gContextsActive[drawContextIndex].patt_trans, m, VIEW_SCALEFACTOR); glLoadMatrixd(m); --- 497,501 ---- // ARToolKit supplied distance in millimetres, but I want OpenGL to work in my units. ! arglCameraViewRH(gContextsActive[drawContextIndex].patt_trans, m, VIEW_SCALEFACTOR); glLoadMatrixd(m); |
|
From: Philip L. <phi...@us...> - 2006-10-04 03:44:54
|
Update of /cvsroot/artoolkit/artoolkit/examples/simpleLite In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv1478 Modified Files: simpleLite.c Log Message: Added RH versions of GL projection and modelview fns in gsub_lite, and switch examples to using these. Index: simpleLite.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/examples/simpleLite/simpleLite.c,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** simpleLite.c 18 Sep 2006 23:39:03 -0000 1.18 --- simpleLite.c 4 Oct 2006 03:44:52 -0000 1.19 *************** *** 383,387 **** if (gPatt_found) { // Projection transformation. ! arglCameraFrustum(&gARTCparam, VIEW_DISTANCE_MIN, VIEW_DISTANCE_MAX, p); glMatrixMode(GL_PROJECTION); glLoadMatrixd(p); --- 383,387 ---- if (gPatt_found) { // Projection transformation. ! arglCameraFrustumRH(&gARTCparam, VIEW_DISTANCE_MIN, VIEW_DISTANCE_MAX, p); glMatrixMode(GL_PROJECTION); glLoadMatrixd(p); *************** *** 395,401 **** // ARToolKit supplied distance in millimetres, but I want OpenGL to work in my units. ! arglCameraView(gPatt_trans, m, VIEW_SCALEFACTOR); glLoadMatrixd(m); ! // All other lighting and geometry goes here. DrawCube(); --- 395,401 ---- // ARToolKit supplied distance in millimetres, but I want OpenGL to work in my units. ! arglCameraViewRH(gPatt_trans, m, VIEW_SCALEFACTOR); glLoadMatrixd(m); ! // All other lighting and geometry goes here. DrawCube(); |
|
From: Philip L. <phi...@us...> - 2006-10-04 03:44:43
|
Update of /cvsroot/artoolkit/artoolkit/include/AR In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv1457 Modified Files: gsub_lite.h Log Message: Added RH versions of GL projection and modelview fns in gsub_lite, and switch examples to using these. Index: gsub_lite.h =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/include/AR/gsub_lite.h,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** gsub_lite.h 29 Aug 2006 01:35:52 -0000 1.13 --- gsub_lite.h 4 Oct 2006 03:44:41 -0000 1.14 *************** *** 260,263 **** --- 260,272 ---- /*! + @function + @abstract (description) + @discussion (description) + @param (name) (description) + @result (description) + */ + void arglCameraFrustumRH(const ARParam *cparam, const double focalmin, const double focalmax, GLdouble m_projection[16]); + + /*! @function @abstract Create an OpenGL viewing transformation matrix. *************** *** 281,284 **** --- 290,302 ---- /*! + @function + @abstract (description) + @discussion (description) + @param (name) (description) + @result (description) + */ + void arglCameraViewRH(const double para[3][4], GLdouble m_modelview[16], const double scale); + + /*! @function @abstract Display an ARVideo image, by drawing it using OpenGL. |
|
From: Philip L. <phi...@us...> - 2006-10-04 03:44:33
|
Update of /cvsroot/artoolkit/artoolkit/examples/simpleVRML In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv1430 Modified Files: simpleVRML.c Log Message: Added RH versions of GL projection and modelview fns in gsub_lite, and switch examples to using these. Index: simpleVRML.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/examples/simpleVRML/simpleVRML.c,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** simpleVRML.c 18 Sep 2006 23:39:11 -0000 1.15 --- simpleVRML.c 4 Oct 2006 03:44:31 -0000 1.16 *************** *** 360,364 **** if (gPatt_found) { // Projection transformation. ! arglCameraFrustum(&gARTCparam, VIEW_DISTANCE_MIN, VIEW_DISTANCE_MAX, p); glMatrixMode(GL_PROJECTION); glLoadMatrixd(p); --- 360,364 ---- if (gPatt_found) { // Projection transformation. ! arglCameraFrustumRH(&gARTCparam, VIEW_DISTANCE_MIN, VIEW_DISTANCE_MAX, p); glMatrixMode(GL_PROJECTION); glLoadMatrixd(p); *************** *** 376,380 **** if ((gObjectData[i].visible != 0) && (gObjectData[i].vrml_id >= 0)) { //fprintf(stderr, "About to draw object %i\n", i); ! arglCameraView(gObjectData[i].trans, m, VIEW_SCALEFACTOR_4); glLoadMatrixd(m); --- 376,380 ---- if ((gObjectData[i].visible != 0) && (gObjectData[i].vrml_id >= 0)) { //fprintf(stderr, "About to draw object %i\n", i); ! arglCameraViewRH(gObjectData[i].trans, m, VIEW_SCALEFACTOR_4); glLoadMatrixd(m); |
|
From: Philip L. <phi...@us...> - 2006-10-03 21:36:38
|
Update of /cvsroot/artoolkit/artoolkit In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv17549 Modified Files: ChangeLog.txt Log Message: Added support for AR_PIXEL_FORMAT_MONO. Index: ChangeLog.txt =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/ChangeLog.txt,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** ChangeLog.txt 27 Sep 2006 23:31:56 -0000 1.10 --- ChangeLog.txt 3 Oct 2006 21:36:36 -0000 1.11 *************** *** 6,9 **** --- 6,10 ---- ------------------------------------------------------ - All platforms: ARToolKit now supports querying of SDK and runtime versions. + - All platforms: Support for AR_PIXEL_FORMAT_MONO is now included. - Mac OS X: Fix for an error in the VRML library inclusion on Mac OS X. - Mac OS X: Now detects if running emulated on Intel Macs, and optimises video for this case. |
|
From: Philip L. <phi...@us...> - 2006-10-03 21:36:07
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/AR In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv17186 Modified Files: arLabeling.c arGetCode.c Log Message: Added support for AR_PIXEL_FORMAT_MONO. Index: arLabeling.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/AR/arLabeling.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** arLabeling.c 25 May 2006 04:08:11 -0000 1.4 --- arLabeling.c 3 Oct 2006 21:36:05 -0000 1.5 *************** *** 236,239 **** --- 236,241 ---- #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGB) if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresht3 ) { + #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_MONO) + if( *(pnt) <= thresh ) { #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) if( *(pnt+1) <= thresh ) { *************** *** 582,585 **** --- 584,590 ---- if( *(pnt+0) + *(pnt+1) + *(pnt+2) <= thresht3 ) { *(dpnt+0) = *(dpnt+1) = *(dpnt+2) = 255; + #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_MONO) + if( *(pnt) <= thresh ) { + *(dpnt) = 255; #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) if( *(pnt+1) <= thresh ) { *************** *** 702,705 **** --- 707,712 ---- #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGB) *(dpnt+0) = *(dpnt+1) = *(dpnt+2) = 0; + #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_MONO) + *(dpnt) = 0; #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) *(dpnt+1) = 0; Index: arGetCode.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/AR/arGetCode.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** arGetCode.c 8 Jun 2006 21:34:02 -0000 1.4 --- arGetCode.c 3 Oct 2006 21:36:05 -0000 1.5 *************** *** 288,291 **** --- 288,295 ---- 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_MONO) + ext_pat2[ext_pat2_y_index][ext_pat2_x_index][0] += image[image_index]; + ext_pat2[ext_pat2_y_index][ext_pat2_x_index][1] += image[image_index]; + ext_pat2[ext_pat2_y_index][ext_pat2_x_index][2] += image[image_index]; #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) ext_pat2[ext_pat2_y_index][ext_pat2_x_index][0] += image[image_index+1]; *************** *** 431,434 **** --- 435,451 ---- + 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_MONO) + k1 = image[(yc*arImXsize+xc)*AR_PIX_SIZE_DEFAULT]; + k1 = ext_pat[j*AR_PATT_SIZE_Y/AR_PATT_SAMPLE_NUM][i*AR_PATT_SIZE_X/AR_PATT_SAMPLE_NUM][0] + + k1*(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][0] = (k1 > 255)? 255: k1; + k2 = image[(yc*arImXsize+xc)*AR_PIX_SIZE_DEFAULT]; + k2 = ext_pat[j*AR_PATT_SIZE_Y/AR_PATT_SAMPLE_NUM][i*AR_PATT_SIZE_X/AR_PATT_SAMPLE_NUM][1] + + k2*(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][1] = (k2 > 255)? 255: k2; + k3 = image[(yc*arImXsize+xc)*AR_PIX_SIZE_DEFAULT]; + k3 = ext_pat[j*AR_PATT_SIZE_Y/AR_PATT_SAMPLE_NUM][i*AR_PATT_SIZE_X/AR_PATT_SAMPLE_NUM][2] + + 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]; |
|
From: Philip L. <phi...@us...> - 2006-10-03 21:35:57
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/VideoMacOSX In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv17075 Modified Files: video.c Log Message: Added support for AR_PIXEL_FORMAT_MONO. Index: video.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoMacOSX/video.c,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** video.c 19 Sep 2006 03:13:20 -0000 1.22 --- video.c 3 Oct 2006 21:35:52 -0000 1.23 *************** *** 1350,1353 **** --- 1350,1355 ---- #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGRA) pixFormat = k32BGRAPixelFormat; + #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_MONO) + pixFormat = k8IndexedGrayPixelFormat; #else # error Unsupported default pixel format specified in config.h. *************** *** 1370,1373 **** --- 1372,1377 ---- bytesPerPixel = 4l; break; + case k8IndexedGrayPixelFormat: + bytesPerPixel = 1l; default: fprintf(stderr, "ar2VideoOpen(): Unsupported pixel format requested.\n"); |
|
From: Philip L. <phi...@us...> - 2006-10-03 21:35:47
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/Gl In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv17054 Modified Files: gsub.c gsub_lite.c Log Message: Added support for AR_PIXEL_FORMAT_MONO. Index: gsub.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/Gl/gsub.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** gsub.c 27 Apr 2006 18:49:12 -0000 1.6 --- gsub.c 3 Oct 2006 21:35:44 -0000 1.7 *************** *** 435,438 **** --- 435,440 ---- #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_MONO) + glDrawPixels( gImXsize, gImYsize, GL_LUMINANCE, GL_UNSIGNED_BYTE, image ); #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) # ifdef AR_BIG_ENDIAN *************** *** 523,526 **** --- 525,530 ---- #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_MONO) + glTexSubImage2D( AR_TEXTURE_RECTANGLE, 0, 0, 0, gImXsize, gImYsize/size_adjust_factor, GL_LUMINANCE, GL_UNSIGNED_BYTE, image ); #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) # ifdef AR_BIG_ENDIAN *************** *** 542,570 **** #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 ); #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) # 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 --- 546,576 ---- #if (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ARGB) # ifdef AR_BIG_ENDIAN ! glTexImage2D( AR_TEXTURE_RECTANGLE, 0, GL_RGBA, gImXsize, gImYsize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); # else ! glTexImage2D( AR_TEXTURE_RECTANGLE, 0, GL_RGBA, 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, GL_RGBA, 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, GL_RGBA, 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, GL_RGB, 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, GL_RGBA, 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, GL_RGB, gImXsize, gImYsize/size_adjust_factor, 0, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_MONO) ! glTexImage2D( AR_TEXTURE_RECTANGLE, 0, GL_LUMINANCE, gImXsize, gImYsize/size_adjust_factor, 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, image ); #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) # ifdef AR_BIG_ENDIAN ! glTexImage2D( AR_TEXTURE_RECTANGLE, 0, GL_RGB, gImXsize, gImYsize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); # else ! glTexImage2D( AR_TEXTURE_RECTANGLE, 0, GL_RGB, 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, GL_RGB, gImXsize, gImYsize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); # else ! glTexImage2D( AR_TEXTURE_RECTANGLE, 0, GL_RGB, gImXsize, gImYsize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); # endif #else *************** *** 713,716 **** --- 719,724 ---- #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_MONO) + glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_LUMINANCE, GL_UNSIGNED_BYTE, image ); #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) # ifdef AR_BIG_ENDIAN *************** *** 732,760 **** #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 ); #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) # 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 --- 740,770 ---- #if (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ARGB) # ifdef AR_BIG_ENDIAN ! glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); # else ! glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, 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, GL_RGBA, 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, GL_RGBA, 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, GL_RGB, 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, GL_RGBA, 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, GL_RGB, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_MONO) ! glTexImage2D( GL_TEXTURE_2D, 0, GL_LUMINANCE, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, image ); #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) # ifdef AR_BIG_ENDIAN ! glTexImage2D( GL_TEXTURE_2D, 0, GL_RGB, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); # else ! glTexImage2D( GL_TEXTURE_2D, 0, GL_RGB, 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, GL_RGB, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); # else ! glTexImage2D( GL_TEXTURE_2D, 0, GL_RGB, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); # endif #else *************** *** 926,929 **** --- 936,941 ---- #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_MONO) + glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize1, tex1Ysize/size_adjust_factor, GL_LUMINANCE, GL_UNSIGNED_BYTE, image ); #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) # ifdef AR_BIG_ENDIAN *************** *** 945,973 **** #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 ); #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) # 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 --- 957,987 ---- #if (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ARGB) # ifdef AR_BIG_ENDIAN ! glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); # else ! glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, 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, GL_RGBA, 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, GL_RGBA, 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, GL_RGB, 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, GL_RGBA, 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, GL_RGB, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_MONO) ! glTexImage2D( GL_TEXTURE_2D, 0, GL_LUMINANCE, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, image ); #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) # ifdef AR_BIG_ENDIAN ! glTexImage2D( GL_TEXTURE_2D, 0, GL_RGB, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); # else ! glTexImage2D( GL_TEXTURE_2D, 0, GL_RGB, 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, GL_RGB, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); # else ! glTexImage2D( GL_TEXTURE_2D, 0, GL_RGB, tex1Xsize1, tex1Ysize/size_adjust_factor, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); # endif #else *************** *** 1079,1082 **** --- 1093,1098 ---- #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_MONO) + glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex1Xsize2, tex1Ysize/size_adjust_factor, GL_LUMINANCE, GL_UNSIGNED_BYTE, image+tex1Xsize1*AR_PIX_SIZE_DEFAULT ); #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) # ifdef AR_BIG_ENDIAN *************** *** 1098,1126 **** #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 ); #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) # 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 --- 1114,1144 ---- #if (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ARGB) # ifdef AR_BIG_ENDIAN ! glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, 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, GL_RGBA, 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, GL_RGBA, 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, GL_RGBA, 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, GL_RGB, 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, GL_RGBA, 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, GL_RGB, 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_MONO) ! glTexImage2D( GL_TEXTURE_2D, 0, GL_LUMINANCE, tex1Xsize2, tex1Ysize/size_adjust_factor, 0, GL_LUMINANCE, 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, GL_RGB, 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, GL_RGB, 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, GL_RGB, 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, GL_RGB, 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 *************** *** 1275,1278 **** --- 1293,1298 ---- #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_MONO) + glDrawPixels( gImXsize/2, gImYsize/2, GL_LUMINANCE, GL_UNSIGNED_BYTE, image ); #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) # ifdef AR_BIG_ENDIAN *************** *** 1366,1369 **** --- 1386,1391 ---- #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_MONO) + glTexSubImage2D( GL_TEXTURE_2D, 0, 0, 0, tex2Xsize, tex2Ysize, GL_LUMINANCE, GL_UNSIGNED_BYTE, image ); #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) # ifdef AR_BIG_ENDIAN *************** *** 1385,1413 **** #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 ); #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) # 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 --- 1407,1437 ---- #if (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_ARGB) # ifdef AR_BIG_ENDIAN ! glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, tex2Xsize, tex2Ysize, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, image ); # else ! glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, 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, GL_RGBA, tex2Xsize, tex2Ysize, 0, GL_ABGR, GL_UNSIGNED_BYTE, image ); #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGRA) ! glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, tex2Xsize, tex2Ysize, 0, GL_BGRA, GL_UNSIGNED_BYTE, image ); #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_BGR) ! glTexImage2D( GL_TEXTURE_2D, 0, GL_RGB, tex2Xsize, tex2Ysize, 0, GL_BGR, GL_UNSIGNED_BYTE, image ); #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGBA) ! glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, tex2Xsize, tex2Ysize, 0, GL_RGBA, GL_UNSIGNED_BYTE, image ); #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_RGB) ! glTexImage2D( GL_TEXTURE_2D, 0, GL_RGB, tex2Xsize, tex2Ysize, 0, GL_RGB, GL_UNSIGNED_BYTE, image ); ! #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_MONO) ! glTexImage2D( GL_TEXTURE_2D, 0, GL_LUMINANCE, tex2Xsize, tex2Ysize, 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, image ); #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) # ifdef AR_BIG_ENDIAN ! glTexImage2D( GL_TEXTURE_2D, 0, GL_RGB, tex2Xsize, tex2Ysize, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); # else ! glTexImage2D( GL_TEXTURE_2D, 0, GL_RGB, 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, GL_RGB, tex2Xsize, tex2Ysize, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, image ); # else ! glTexImage2D( GL_TEXTURE_2D, 0, GL_RGB, tex2Xsize, tex2Ysize, 0, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, image ); # endif #else Index: gsub_lite.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/Gl/gsub_lite.c,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** gsub_lite.c 29 Aug 2006 01:36:06 -0000 1.19 --- gsub_lite.c 3 Oct 2006 21:35:45 -0000 1.20 *************** *** 897,900 **** --- 897,906 ---- } break; + case AR_PIXEL_FORMAT_MONO: + contextSettings->pixIntFormat = GL_LUMINANCE; + contextSettings->pixFormat = GL_LUMINANCE; + contextSettings->pixType = GL_UNSIGNED_BYTE; + contextSettings->pixSize = 1; + break; case AR_PIXEL_FORMAT_2vuy: if (arglGLCapabilityCheck(0, (unsigned char *)"GL_APPLE_ycbcr_422")) { *************** *** 991,994 **** --- 997,1004 ---- *size = 2; break; + case GL_LUMINANCE: + *format = AR_PIXEL_FORMAT_MONO; + *size = 1; + break; default: return (FALSE); |
|
From: Philip L. <phi...@us...> - 2006-10-03 21:35:39
|
Update of /cvsroot/artoolkit/artoolkit/include/AR In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv17025 Modified Files: ar.h config.h.in Log Message: Added support for AR_PIXEL_FORMAT_MONO. Index: ar.h =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/include/AR/ar.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** ar.h 27 Sep 2006 23:31:35 -0000 1.10 --- ar.h 3 Oct 2006 21:35:37 -0000 1.11 *************** *** 108,111 **** --- 108,114 ---- platform. + AR_PIXEL_FORMAT_MONO + Each pixel is represented by 8 bits of luminance information. + AR_PIXEL_FORMAT_2vuy 8-bit 4:2:2 Component Y'CbCr format. Each 16 bit pixel is represented Index: config.h.in =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/include/AR/config.h.in,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** config.h.in 27 Sep 2006 23:31:35 -0000 1.12 --- config.h.in 3 Oct 2006 21:35:37 -0000 1.13 *************** *** 53,56 **** --- 53,57 ---- #define AR_PIXEL_FORMAT_BGRA 4 #define AR_PIXEL_FORMAT_ABGR 5 + #define AR_PIXEL_FORMAT_MONO 6 #define AR_PIXEL_FORMAT_ARGB 7 #define AR_PIXEL_FORMAT_2vuy 8 *************** *** 216,219 **** --- 217,222 ---- #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_2vuy) || (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_yuvs) # define AR_PIX_SIZE_DEFAULT 2 + #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_MONO) + # define AR_PIX_SIZE_DEFAULT 1 #else # error Unknown default pixel format defined in config.h. |
|
From: Philip L. <phi...@us...> - 2006-10-03 21:35:31
|
Update of /cvsroot/artoolkit/artoolkit/util/calib_camera2 In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv17000 Modified Files: main.c Log Message: Added support for AR_PIXEL_FORMAT_MONO. Index: main.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/calib_camera2/main.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** main.c 15 Sep 2006 03:08:18 -0000 1.13 --- main.c 3 Oct 2006 21:35:27 -0000 1.14 *************** *** 428,431 **** --- 428,433 ---- #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_yuvs) *p1 = ((255 - *(p+0)) < gThresh ? 0 : 255); + #elif (AR_DEFAULT_PIXEL_FORMAT == AR_PIXEL_FORMAT_MONO) + *p1 = ((255 - *(p)) < gThresh ? 0 : 255); #else # error Unknown default pixel format defined in config.h |
