artoolkit-commits — Log of code commits to the ARToolKit repository

[artoolkit-commits] artoolkit README.txt,1.19,1.20 ChangeLog.txt,1.4,1.5

[Philip L. <phi...@us...>]

Update of /cvsroot/artoolkit/artoolkit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3369

Modified Files:
	README.txt ChangeLog.txt 
Log Message:
Update for 2.71.2

Index: ChangeLog.txt
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/ChangeLog.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ChangeLog.txt	23 Sep 2005 00:14:42 -0000	1.4
--- ChangeLog.txt	12 Oct 2005 00:27:43 -0000	1.5
***************
*** 3,6 ****
--- 3,11 ----
  
  
+ Changes in this release (2005-10-11).
+ -------------------------------------
+ - Fixed line endings in MS Visual Studio 6 workspace (.dsw) file.
+ 
+ 
  Changes in version 2.71.1 (2005-09-22).
  ---------------------------------------

Index: README.txt
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/README.txt,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** README.txt	23 Sep 2005 00:14:42 -0000	1.19
--- README.txt	12 Oct 2005 00:27:43 -0000	1.20
***************
*** 1,3 ****
! Read me for ARToolKit-2.71.1.
  =============================
  
--- 1,3 ----
! Read me for ARToolKit-2.71.2.
  =============================
  
***************
*** 15,19 ****
  About this archive.
  -------------------
! This archive contains the ARToolKit libraries, utilities and examples, version 2.71.1.
  
  ARToolKit is released under the GNU General Public License (GPL). Please read the file COPYING.txt.
--- 15,19 ----
  About this archive.
  -------------------
! This archive contains the ARToolKit libraries, utilities and examples, version 2.71.2.
  
  ARToolKit is released under the GNU General Public License (GPL). Please read the file COPYING.txt.
***************
*** 27,31 ****
      HIT Lab NZ
      http://www.hitlabnz.org
!     2005-09-22
  
  
--- 27,31 ----
      HIT Lab NZ
      http://www.hitlabnz.org
!     2005-10-11
  
  
***************
*** 61,65 ****
   
  Unpack the ARToolKit to a convenient location. The root of this location will be referred to below as {ARToolKit}:
!     tar zxvf ARToolKit-2.71.1.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. You will be prompted as to which of the four Linux video drivers you wish to use at the Configure step.
      cd {ARToolKit}
--- 61,65 ----
   
  Unpack the ARToolKit to a convenient location. The root of this location will be referred to below as {ARToolKit}:
!     tar zxvf ARToolKit-2.71.2.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. You will be prompted as to which of the four Linux video drivers you wish to use at the Configure step.
      cd {ARToolKit}
***************
*** 99,103 ****
  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.1.tgz
  Configure and build
  	cd ~/ARToolKit
--- 99,103 ----
  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.2.tgz
  Configure and build
  	cd ~/ARToolKit
***************
*** 119,124 ****
  
  
! Changes in this release.
! ------------------------
  - 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.
--- 119,129 ----
  
  
! Changes in this release (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.

[artoolkit-commits] artoolkit ARToolKit.dsw,1.4,1.5

[Philip L. <phi...@us...>]

Update of /cvsroot/artoolkit/artoolkit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32449

Modified Files:
	ARToolKit.dsw 
Log Message:
Fix line endings in MSVC .dsw file.

Index: ARToolKit.dsw
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/ARToolKit.dsw,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ARToolKit.dsw	22 Sep 2005 20:37:22 -0000	1.4
--- ARToolKit.dsw	12 Oct 2005 00:17:22 -0000	1.5
***************
*** 1,558 ****
! Microsoft Developer Studio Workspace File, Format Version 6.00
! # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
! 
! ###############################################################################
! 
! Project: "calib_camera2"=.\util\calib_camera2\calib_camera2.dsp - Package Owner=<4>
! 
! Package=<5>
! {{{
! }}}
[...1087 lines suppressed...]
!     Begin Project Dependency
!     Project_Dep_Name libARvideo
!     End Project Dependency
! }}}
! 
! ###############################################################################
! 
! 
! Global:
! 
! Package=<5>
! {{{
! }}}
! 
! Package=<3>
! {{{
! }}}
! 
! ###############################################################################
! 

[artoolkit-commits] artoolkit/ARToolKit.xcodeproj project.pbxproj,1.4,1.5

[Philip L. <phi...@us...>]

Update of /cvsroot/artoolkit/artoolkit/ARToolKit.xcodeproj
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32414

Modified Files:
	project.pbxproj 
Log Message:
Fix line endings in MSVC .dsw file.

Index: project.pbxproj
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/ARToolKit.xcodeproj/project.pbxproj,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** project.pbxproj	22 Sep 2005 20:05:57 -0000	1.4
--- project.pbxproj	12 Oct 2005 00:17:18 -0000	1.5
***************
*** 1034,1038 ****
  			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
  			proxyType = 1;
! 			remoteGlobalIDString = 4A3F11430649F7BA0042B0D7 /* AR */;
  			remoteInfo = AR;
  		};
--- 1034,1038 ----
  			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
  			proxyType = 1;
! 			remoteGlobalIDString = 4A3F11430649F7BA0042B0D7;
  			remoteInfo = AR;
  		};
***************
*** 1041,1045 ****
  			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
  			proxyType = 1;
! 			remoteGlobalIDString = 4A3F1305064A02100042B0D7 /* ARvideo */;
  			remoteInfo = ARvideo;
  		};
--- 1041,1045 ----
  			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
  			proxyType = 1;
! 			remoteGlobalIDString = 4A3F1305064A02100042B0D7;
  			remoteInfo = ARvideo;
  		};
***************
*** 1048,1052 ****
  			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
  			proxyType = 1;
! 			remoteGlobalIDString = 4A8EA585065873E100ADDDD1 /* ARgsub_lite */;
  			remoteInfo = ARgsub_lite;
  		};
--- 1048,1052 ----
  			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
  			proxyType = 1;
! 			remoteGlobalIDString = 4A8EA585065873E100ADDDD1;
  			remoteInfo = ARgsub_lite;
  		};
***************
*** 1055,1059 ****
  			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
  			proxyType = 1;
! 			remoteGlobalIDString = 4A3F11430649F7BA0042B0D7 /* AR */;
  			remoteInfo = AR;
  		};
--- 1055,1059 ----
  			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
  			proxyType = 1;
! 			remoteGlobalIDString = 4A3F11430649F7BA0042B0D7;
  			remoteInfo = AR;
  		};
***************
*** 1062,1066 ****
  			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
  			proxyType = 1;
! 			remoteGlobalIDString = 4A3F1305064A02100042B0D7 /* ARvideo */;
  			remoteInfo = ARvideo;
  		};
--- 1062,1066 ----
  			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
  			proxyType = 1;
! 			remoteGlobalIDString = 4A3F1305064A02100042B0D7;
  			remoteInfo = ARvideo;
  		};
***************
*** 1069,1073 ****
  			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
  			proxyType = 1;
! 			remoteGlobalIDString = 4A8EA585065873E100ADDDD1 /* ARgsub_lite */;
  			remoteInfo = ARgsub_lite;
  		};
--- 1069,1073 ----
  			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
  			proxyType = 1;
! 			remoteGlobalIDString = 4A8EA585065873E100ADDDD1;
  			remoteInfo = ARgsub_lite;
  		};
***************
*** 1076,1080 ****
  			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
  			proxyType = 1;
! 			remoteGlobalIDString = 4A3F11430649F7BA0042B0D7 /* AR */;
  			remoteInfo = AR;
  		};
--- 1076,1080 ----
  			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
  			proxyType = 1;
! 			remoteGlobalIDString = 4A3F11430649F7BA0042B0D7;
  			remoteInfo = AR;
  		};
***************
*** 1083,1087 ****
  			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
  			proxyType = 1;
! 			remoteGlobalIDString = 4A3F1305064A02100042B0D7 /* ARvideo */;
  			remoteInfo = ARvideo;
  		};
--- 1083,1087 ----
  			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
  			proxyType = 1;
! 			remoteGlobalIDString = 4A3F1305064A02100042B0D7;
  			remoteInfo = ARvideo;
  		};
***************
*** 1090,1094 ****
  			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
  			proxyType = 1;
! 			remoteGlobalIDString = 4A8EA585065873E100ADDDD1 /* ARgsub_lite */;
  			remoteInfo = ARgsub_lite;
  		};
--- 1090,1094 ----
  			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
  			proxyType = 1;
! 			remoteGlobalIDString = 4A8EA585065873E100ADDDD1;
  			remoteInfo = ARgsub_lite;
  		};
***************
*** 1097,1101 ****
  			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
  			proxyType = 1;
! 			remoteGlobalIDString = 4A3F11430649F7BA0042B0D7 /* AR */;
  			remoteInfo = AR;
  		};
--- 1097,1101 ----
  			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
  			proxyType = 1;
! 			remoteGlobalIDString = 4A3F11430649F7BA0042B0D7;
  			remoteInfo = AR;
  		};
***************
*** 1104,1108 ****
  			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
  			proxyType = 1;
! 			remoteGlobalIDString = 4A3F1305064A02100042B0D7 /* ARvideo */;
  			remoteInfo = ARvideo;
  		};
--- 1104,1108 ----
  			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
  			proxyType = 1;
! 			remoteGlobalIDString = 4A3F1305064A02100042B0D7;
  			remoteInfo = ARvideo;
  		};
***************
*** 1111,1115 ****
  			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
  			proxyType = 1;
! 			remoteGlobalIDString = 4A8EA585065873E100ADDDD1 /* ARgsub_lite */;
  			remoteInfo = ARgsub_lite;
  		};
--- 1111,1115 ----
  			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
  			proxyType = 1;
! 			remoteGlobalIDString = 4A8EA585065873E100ADDDD1;
  			remoteInfo = ARgsub_lite;
  		};
***************
*** 1118,1122 ****
  			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
  			proxyType = 1;
! 			remoteGlobalIDString = 7872EE5B08E3181200DB266E /* calib_camera2 */;
  			remoteInfo = calib_camera2;
  		};
--- 1118,1122 ----
  			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
  			proxyType = 1;
! 			remoteGlobalIDString = 7872EE5B08E3181200DB266E;
  			remoteInfo = calib_camera2;
  		};
***************
*** 1125,1129 ****
  			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
  			proxyType = 1;
! 			remoteGlobalIDString = 7872EF4F08E3187D00DB266E /* calib_cparam */;
  			remoteInfo = calib_cparam;
  		};
--- 1125,1129 ----
  			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
  			proxyType = 1;
! 			remoteGlobalIDString = 7872EF4F08E3187D00DB266E;
  			remoteInfo = calib_cparam;
  		};
***************
*** 1132,1136 ****
  			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
  			proxyType = 1;
! 			remoteGlobalIDString = 7872EF6908E318DA00DB266E /* calib_dist */;
  			remoteInfo = calib_dist;
  		};
--- 1132,1136 ----
  			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
  			proxyType = 1;
! 			remoteGlobalIDString = 7872EF6908E318DA00DB266E;
  			remoteInfo = calib_dist;
  		};
***************
*** 1139,1143 ****
  			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
  			proxyType = 1;
! 			remoteGlobalIDString = 7872EF8308E3192C00DB266E /* mk_patt */;
  			remoteInfo = mk_patt;
  		};
--- 1139,1143 ----
  			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
  			proxyType = 1;
! 			remoteGlobalIDString = 7872EF8308E3192C00DB266E;
  			remoteInfo = mk_patt;
  		};
***************
*** 1541,1545 ****
  		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>"; };
! 		4AAB8C740728934300708844 /* ARToolKit.dsw */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = ARToolKit.dsw; sourceTree = "<group>"; };
  		4AAB8C750728934300708844 /* ARToolKit.sln */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = ARToolKit.sln; sourceTree = "<group>"; };
  		4AAB8C760728937100708844 /* libARvideo.dsp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = libARvideo.dsp; sourceTree = "<group>"; };
--- 1541,1545 ----
  		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>"; };
! 		4AAB8C740728934300708844 /* ARToolKit.dsw */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; lineEnding = 2; path = ARToolKit.dsw; sourceTree = "<group>"; };
  		4AAB8C750728934300708844 /* ARToolKit.sln */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = ARToolKit.sln; sourceTree = "<group>"; };
  		4AAB8C760728937100708844 /* libARvideo.dsp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = libARvideo.dsp; sourceTree = "<group>"; };

[artoolkit-commits] artoolkit ChangeLog.txt,1.3,1.4 README.txt,1.18,1.19

[Philip L. <phi...@us...>]

Update of /cvsroot/artoolkit/artoolkit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14734

Modified Files:
	ChangeLog.txt README.txt 
Log Message:
Update for 2.71.1 release.

Index: ChangeLog.txt
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/ChangeLog.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ChangeLog.txt	16 Mar 2005 04:42:15 -0000	1.3
--- ChangeLog.txt	23 Sep 2005 00:14:42 -0000	1.4
***************
*** 3,6 ****
--- 3,25 ----
  
  
+ 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.
+ 
+ 
  Changes in version 2.70.1 (2005-03-14).
  ---------------------------------------

Index: README.txt
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/README.txt,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** README.txt	22 Sep 2005 00:51:08 -0000	1.18
--- README.txt	23 Sep 2005 00:14:42 -0000	1.19
***************
*** 1,3 ****
! Read me for ARToolKit-2.71.
  =============================
  
--- 1,3 ----
! Read me for ARToolKit-2.71.1.
  =============================
  
***************
*** 15,19 ****
  About this archive.
  -------------------
! This archive contains the ARToolKit libraries, utilities and examples, version 2.71.
  
  ARToolKit is released under the GNU General Public License (GPL). Please read the file COPYING.txt.
--- 15,19 ----
  About this archive.
  -------------------
! This archive contains the ARToolKit libraries, utilities and examples, version 2.71.1.
  
  ARToolKit is released under the GNU General Public License (GPL). Please read the file COPYING.txt.
***************
*** 27,31 ****
      HIT Lab NZ
      http://www.hitlabnz.org
!     2005-09-21
  
  
--- 27,31 ----
      HIT Lab NZ
      http://www.hitlabnz.org
!     2005-09-22
  
  
***************
*** 61,65 ****
   
  Unpack the ARToolKit to a convenient location. The root of this location will be referred to below as {ARToolKit}:
!     tar zxvf ARToolKit-2.71.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. You will be prompted as to which of the four Linux video drivers you wish to use at the Configure step.
      cd {ARToolKit}
--- 61,65 ----
   
  Unpack the ARToolKit to a convenient location. The root of this location will be referred to below as {ARToolKit}:
!     tar zxvf ARToolKit-2.71.1.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. You will be prompted as to which of the four Linux video drivers you wish to use at the Configure step.
      cd {ARToolKit}
***************
*** 99,103 ****
  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.tgz
  Configure and build
  	cd ~/ARToolKit
--- 99,103 ----
  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.1.tgz
  Configure and build
  	cd ~/ARToolKit
***************
*** 121,124 ****
--- 121,132 ----
  Changes in this release.
  ------------------------
+ - 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.
***************
*** 129,132 ****
--- 137,141 ----
  - The calibration utilties have been rewritten to use gsub_lite. They should now run much more reliably across different platforms.
  
+ 
  Changes in earlier releases.
  ----------------------------

[artoolkit-commits] artoolkit/util/calib_cparam calib_cparam.dsp,1.2,1.3 calib_cparam.vcproj,1.3,1.4

[Philip L. <phi...@us...>]

Update of /cvsroot/artoolkit/artoolkit/util/calib_cparam
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28896/util/calib_cparam

Modified Files:
	calib_cparam.dsp calib_cparam.vcproj 
Log Message:
Link against libARgsub_lite.

Index: calib_cparam.vcproj
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/util/calib_cparam/calib_cparam.vcproj,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** calib_cparam.vcproj	21 Sep 2005 17:50:35 -0000	1.3
--- calib_cparam.vcproj	22 Sep 2005 20:42:34 -0000	1.4
***************
*** 30,34 ****
  				Name="VCLinkerTool"
  				AdditionalOptions="/DEBUG"
! 				AdditionalDependencies="libARd.lib libARgsubd.lib libARvideod.lib"
  				OutputFile="$(ProjectDir)..\..\bin\$(ProjectName)d.exe"
  				AdditionalLibraryDirectories=""$(ProjectDir)..\..\lib""
--- 30,34 ----
  				Name="VCLinkerTool"
  				AdditionalOptions="/DEBUG"
! 				AdditionalDependencies="libARd.lib libARgsub_lited.lib libARvideod.lib"
  				OutputFile="$(ProjectDir)..\..\bin\$(ProjectName)d.exe"
  				AdditionalLibraryDirectories=""$(ProjectDir)..\..\lib""
***************
*** 77,81 ****
  			<Tool
  				Name="VCLinkerTool"
! 				AdditionalDependencies="libAR.lib libARvideo.lib libARgsub.lib"
  				OutputFile="$(ProjectDir)..\..\bin\$(ProjectName).exe"
  				AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\lib&quot;"/>
--- 77,81 ----
  			<Tool
  				Name="VCLinkerTool"
! 				AdditionalDependencies="libAR.lib libARvideo.lib libARgsub_lite.lib"
  				OutputFile="$(ProjectDir)..\..\bin\$(ProjectName).exe"
  				AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\lib&quot;"/>

Index: calib_cparam.dsp
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/util/calib_cparam/calib_cparam.dsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** calib_cparam.dsp	21 Sep 2005 17:56:54 -0000	1.2
--- calib_cparam.dsp	22 Sep 2005 20:42:34 -0000	1.3
***************
*** 52,56 ****
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
! # ADD LINK32 libAR.lib libARvideo.lib libARgsub.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"..\..\bin\calib_cparam.exe" /libpath:"..\..\lib"
  # SUBTRACT LINK32 /nodefaultlib
  
--- 52,56 ----
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
! # ADD LINK32 libAR.lib libARvideo.lib libARgsub_lite.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"..\..\bin\calib_cparam.exe" /libpath:"..\..\lib"
  # SUBTRACT LINK32 /nodefaultlib
  
***************
*** 78,82 ****
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 libARd.lib libARvideod.lib libARgsubd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd.lib" /out:"..\..\bin\calib_cparamd.exe" /pdbtype:sept /libpath:"..\..\lib"
  
  !ENDIF 
--- 78,82 ----
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 libARd.lib libARvideod.lib libARgsub_lited.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd.lib" /out:"..\..\bin\calib_cparamd.exe" /pdbtype:sept /libpath:"..\..\lib"
  
  !ENDIF 

[artoolkit-commits] artoolkit ARToolKit.dsw,1.3,1.4 ARToolKit.sln,1.5,1.6

[Philip L. <phi...@us...>]

Update of /cvsroot/artoolkit/artoolkit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26943

Modified Files:
	ARToolKit.dsw ARToolKit.sln 
Log Message:
Link against libARgsub_lite.

Index: ARToolKit.dsw
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/ARToolKit.dsw,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ARToolKit.dsw	14 Sep 2005 19:11:09 -0000	1.3
--- ARToolKit.dsw	22 Sep 2005 20:37:22 -0000	1.4
***************
*** 37,41 ****
      End Project Dependency
      Begin Project Dependency
!     Project_Dep_Name libARgsub
      End Project Dependency
      Begin Project Dependency
--- 37,41 ----
      End Project Dependency
      Begin Project Dependency
!     Project_Dep_Name libARgsub_lite
      End Project Dependency
      Begin Project Dependency

Index: ARToolKit.sln
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/ARToolKit.sln,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ARToolKit.sln	14 Sep 2005 19:11:09 -0000	1.5
--- ARToolKit.sln	22 Sep 2005 20:37:22 -0000	1.6
***************
*** 70,74 ****
  	ProjectSection(ProjectDependencies) = postProject
  		{B5E62882-360E-46B2-A97F-50443BB795E3} = {B5E62882-360E-46B2-A97F-50443BB795E3}
! 		{1CB7F08A-A8E5-457B-A589-9878F126601D} = {1CB7F08A-A8E5-457B-A589-9878F126601D}
  		{191F78D2-7A53-4EAF-94E9-433DF5496E6E} = {191F78D2-7A53-4EAF-94E9-433DF5496E6E}
  	EndProjectSection
--- 70,74 ----
  	ProjectSection(ProjectDependencies) = postProject
  		{B5E62882-360E-46B2-A97F-50443BB795E3} = {B5E62882-360E-46B2-A97F-50443BB795E3}
! 		{1CB7F08A-A8E5-457B-A589-9878F126601D} = {8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF}
  		{191F78D2-7A53-4EAF-94E9-433DF5496E6E} = {191F78D2-7A53-4EAF-94E9-433DF5496E6E}
  	EndProjectSection

[artoolkit-commits] artoolkit/ARToolKit.xcode .cvsignore,1.1.1.1,NONE project.pbxproj,1.11,NONE

[Philip L. <phi...@us...>]

Update of /cvsroot/artoolkit/artoolkit/ARToolKit.xcode
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22115/ARToolKit.xcode

Removed Files:
	.cvsignore project.pbxproj 
Log Message:
XCode 2.1 is required; these are obsolete.

--- .cvsignore DELETED ---

--- project.pbxproj DELETED ---

[artoolkit-commits] artoolkit/util/calib_cparam Makefile.in,1.1.1.1,1.2

[Philip L. <phi...@us...>]

Update of /cvsroot/artoolkit/artoolkit/util/calib_cparam
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21501/util/calib_cparam

Modified Files:
	Makefile.in 
Log Message:
Link against libARgsub_lite.

Index: Makefile.in
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/util/calib_cparam/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Makefile.in	4 Nov 2004 08:52:10 -0000	1.1.1.1
--- Makefile.in	22 Sep 2005 20:07:13 -0000	1.2
***************
*** 4,8 ****
  
  LDFLAG=@LDFLAG@ -L$(LIB_DIR)
! LIBS= -lARgsub -lARvideo -lAR @LIBS@
  CFLAG= @CFLAG@ -I$(INC_DIR)
  
--- 4,8 ----
  
  LDFLAG=@LDFLAG@ -L$(LIB_DIR)
! LIBS= -lARgsub_lite -lARvideo -lAR @LIBS@
  CFLAG= @CFLAG@ -I$(INC_DIR)
  

[artoolkit-commits] artoolkit/ARToolKit.xcodeproj project.pbxproj,1.3,1.4

[Philip L. <phi...@us...>]

Update of /cvsroot/artoolkit/artoolkit/ARToolKit.xcodeproj
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19128/ARToolKit.xcodeproj

Modified Files:
	project.pbxproj 
Log Message:
Change some utils back to command-line versions.

Index: project.pbxproj
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/ARToolKit.xcodeproj/project.pbxproj,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** project.pbxproj	15 Sep 2005 00:53:35 -0000	1.3
--- project.pbxproj	22 Sep 2005 20:05:57 -0000	1.4
***************
*** 165,172 ****
  				78424398089ABFC400142306 /* PBXTargetDependency */,
  				784EF21B08AD66040002821E /* PBXTargetDependency */,
! 				784EF21D08AD66090002821E /* PBXTargetDependency */,
! 				784EF21F08AD66090002821E /* PBXTargetDependency */,
! 				784EF22108AD66090002821E /* PBXTargetDependency */,
! 				784EF22308AD66090002821E /* PBXTargetDependency */,
  			);
  			name = "ARToolKit utilities";
--- 165,172 ----
  				78424398089ABFC400142306 /* PBXTargetDependency */,
[...1609 lines suppressed...]
- 			isa = XCConfigurationList;
- 			buildConfigurations = (
- 				78F11FD708AD4FBB00FD6442 /* Development */,
- 				78F11FD808AD4FBB00FD6442 /* Deployment */,
- 			);
- 			defaultConfigurationIsVisible = 0;
- 			defaultConfigurationName = Development;
- 		};
- 		78F1201C08AD514F00FD6442 /* Build configuration list for PBXNativeTarget "calib_dist" */ = {
- 			isa = XCConfigurationList;
- 			buildConfigurations = (
- 				78F1201D08AD514F00FD6442 /* Development */,
- 				78F1201E08AD514F00FD6442 /* Deployment */,
- 			);
- 			defaultConfigurationIsVisible = 0;
- 			defaultConfigurationName = Development;
- 		};
  /* End XCConfigurationList section */
  	};
--- 6978,6981 ----

[artoolkit-commits] artoolkit/lib/SRC/Gl gsub_lite.c,1.10,1.11

[Philip L. <phi...@us...>]

Update of /cvsroot/artoolkit/artoolkit/lib/SRC/Gl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18252/lib/SRC/Gl

Modified Files:
	gsub_lite.c 
Log Message:
Fix bug where re-enable of lighting and depth testing were swapped.

Index: gsub_lite.c
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/Gl/gsub_lite.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** gsub_lite.c	22 Sep 2005 00:48:47 -0000	1.10
--- gsub_lite.c	22 Sep 2005 19:44:36 -0000	1.11
***************
*** 758,765 ****
  	// 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.
- 	glGetBooleanv(GL_LIGHTING, &lightingSave);			// Save enabled state of lighting.
- 	glGetBooleanv(GL_DEPTH_TEST, &depthTestSave);		// Save enabled state of depth test.
  	glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
  	if (lightingSave == GL_TRUE) glDisable(GL_LIGHTING);
  	if (depthTestSave == GL_TRUE) glDisable(GL_DEPTH_TEST);
  	glMatrixMode(GL_PROJECTION);
--- 758,765 ----
  	// 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);
+ 	depthTestSave = glIsEnabled(GL_DEPTH_TEST);		// Save enabled state of depth test.
  	if (depthTestSave == GL_TRUE) glDisable(GL_DEPTH_TEST);
  	glMatrixMode(GL_PROJECTION);
***************
*** 778,783 ****
  	glMatrixMode(GL_MODELVIEW);
  	glPopMatrix();
! 	if (lightingSave == GL_TRUE) glEnable(GL_DEPTH_TEST);			// Restore enabled state of depth test.
! 	if (depthTestSave == GL_TRUE) glEnable(GL_LIGHTING);			// Restore enabled state of lighting.
  	glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, texEnvModeSave); // Restore GL texture environment mode.
  	
--- 778,783 ----
  	glMatrixMode(GL_MODELVIEW);
  	glPopMatrix();
! 	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.
  	

[artoolkit-commits] artoolkit/examples/twoView twoView.c,1.10,1.11

[Philip L. <phi...@us...>]

Update of /cvsroot/artoolkit/artoolkit/examples/twoView
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16193/examples/twoView

Modified Files:
	twoView.c 
Log Message:
After fix in gsub_lite, need to explicitly enable depth testing.

Index: twoView.c
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/examples/twoView/twoView.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** twoView.c	22 Sep 2005 00:46:43 -0000	1.10
--- twoView.c	22 Sep 2005 19:35:40 -0000	1.11
***************
*** 481,484 ****
--- 481,485 ----
  	// Select correct buffer for this context.
  	glDrawBuffer(GL_BACK);
+ 	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);	// Clear the buffers for new frame.
  	
  	arglDispImage(gContextsActive[drawContextIndex].ARTImage,
***************
*** 490,494 ****
  	
  	if (gContextsActive[drawContextIndex].patt_found) {
- 		glClear(GL_DEPTH_BUFFER_BIT);	// Clear the buffers for new frame.
  		
  		// Projection transformation.
--- 491,494 ----
***************
*** 626,629 ****
--- 626,630 ----
  			exit(-1);
  		}
+ 		glEnable(GL_DEPTH_TEST);
  	}
  	arUtilTimerReset();

[artoolkit-commits] artoolkit/examples/simpleLite simpleLite.c,1.9,1.10

[Philip L. <phi...@us...>]

Update of /cvsroot/artoolkit/artoolkit/examples/simpleLite
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15116/examples/simpleLite

Modified Files:
	simpleLite.c 
Log Message:
After fix in gsub_lite, need to explicitly enable depth testing.

Index: simpleLite.c
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/examples/simpleLite/simpleLite.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** simpleLite.c	22 Sep 2005 00:46:53 -0000	1.9
--- simpleLite.c	22 Sep 2005 19:15:24 -0000	1.10
***************
*** 119,123 ****
  				glVertex3f(cube_vertices[cube_faces[f][i]][0] * fSize, cube_vertices[cube_faces[f][i]][1] * fSize, cube_vertices[cube_faces[f][i]][2] * fSize);
  			}
! 				glEnd ();
  		glColor3f (0.0, 0.0, 0.0);
  		for (f = 0; f < cube_num_faces; f++) {
--- 119,123 ----
  				glVertex3f(cube_vertices[cube_faces[f][i]][0] * fSize, cube_vertices[cube_faces[f][i]][1] * fSize, cube_vertices[cube_faces[f][i]][2] * fSize);
  			}
! 		glEnd ();
  		glColor3f (0.0, 0.0, 0.0);
  		for (f = 0; f < cube_num_faces; f++) {
***************
*** 380,384 ****
  	// Select correct buffer for this context.
  	glDrawBuffer(GL_BACK);
! 
  	arglDispImage(gARTImage, &gARTCparam, 1.0, gArglSettings);	// zoom = 1.0.
  	arVideoCapNext();
--- 380,385 ----
  	// Select correct buffer for this context.
  	glDrawBuffer(GL_BACK);
! 	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); // Clear the buffers for new frame.
! 	
  	arglDispImage(gARTImage, &gARTCparam, 1.0, gArglSettings);	// zoom = 1.0.
  	arVideoCapNext();
***************
*** 386,391 ****
  				
  	if (gPatt_found) {
- 		glClear(GL_DEPTH_BUFFER_BIT);	// Clear the buffers for new frame.
- 		
  		// Projection transformation.
  		arglCameraFrustum(&gARTCparam, VIEW_DISTANCE_MIN, VIEW_DISTANCE_MAX, p);
--- 387,390 ----
***************
*** 470,473 ****
--- 469,473 ----
  		exit(-1);
  	}
+ 	glEnable(GL_DEPTH_TEST);
  	arUtilTimerReset();
  		

[artoolkit-commits] artoolkit/doc/gsub_lite/Enums Enums.html,1.1,NONE

[Philip L. <phi...@us...>]

Update of /cvsroot/artoolkit/artoolkit/doc/gsub_lite/Enums
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12307/doc/gsub_lite/Enums

Removed Files:
	Enums.html 
Log Message:
Enums became typedefs.

--- Enums.html DELETED ---

[artoolkit-commits] artoolkit/lib/SRC/VideoWin32DirectShow videoWin32DirectShow.cpp,1.3,1.4

[Philip L. <phi...@us...>]

Update of /cvsroot/artoolkit/artoolkit/lib/SRC/VideoWin32DirectShow
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18215

Modified Files:
	videoWin32DirectShow.cpp 
Log Message:
Change frame timeout to 0.

Index: videoWin32DirectShow.cpp
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoWin32DirectShow/videoWin32DirectShow.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** videoWin32DirectShow.cpp	22 Sep 2005 00:47:36 -0000	1.3
--- videoWin32DirectShow.cpp	22 Sep 2005 02:10:24 -0000	1.4
***************
*** 65,69 ****
  static const bool		FLIPPED_defined =  false;		// deprecated
  #endif
! const long				frame_timeout_ms = INFINITE;	// set to INFINITE if arVideoGetImage()
  														// is called from a separate worker thread
  
--- 65,69 ----
  static const bool		FLIPPED_defined =  false;		// deprecated
  #endif
! const long				frame_timeout_ms = 0L;	// set to INFINITE if arVideoGetImage()
  														// is called from a separate worker thread
  

[artoolkit-commits] artoolkit README.txt,1.17,1.18

[Philip L. <phi...@us...>]

Update of /cvsroot/artoolkit/artoolkit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4478

Modified Files:
	README.txt 
Log Message:
Update 2 for 2.71 release.

Index: README.txt
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/README.txt,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** README.txt	24 Aug 2005 20:32:48 -0000	1.17
--- README.txt	22 Sep 2005 00:51:08 -0000	1.18
***************
*** 21,25 ****
  The latest version of ARToolKit is available from http://sf.net/projects/artoolkit.
  
! ARToolKit is designed to build on Windows, Linux, SGI Irix, and Macintosh OS X platforms.
  
  This archive was assembled by:
--- 21,25 ----
  The latest version of ARToolKit is available from http://sf.net/projects/artoolkit.
  
! ARToolKit is designed to build on Linux, Windows, Macintosh OS X, and SGI Irix platforms.
  
  This archive was assembled by:
***************
*** 27,31 ****
      HIT Lab NZ
      http://www.hitlabnz.org
!     2005-07-27
  
  
--- 27,31 ----
      HIT Lab NZ
      http://www.hitlabnz.org
!     2005-09-21
  
  
***************
*** 36,40 ****
   *  Microsoft Visual Studio .NET 2003 or Visual Studio 6, or a free development environment such as Cygwin.
   *  DSVideoLib-0.0.8b-win32. Download from http://sf.net/projects/artoolkit.
!  *  GLUT. Download from http://www.opengl.org/resources/libraries/glut.html.
   *  (Optional, for VRML renderer only) OpenVRML-0.14.3-win32. Download from http://sf.net/projects/artoolkit.
   
--- 36,40 ----
   *  Microsoft Visual Studio .NET 2003 or Visual Studio 6, or a free development environment such as Cygwin.
   *  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.
   
***************
*** 43,48 ****
  (2) Unpack the DSVideoLib zip into {ARToolKit}. Make sure that the directory is named "DSVL".
  (3) Copy the files DSVL.dll and DSVLd.dll from {ARToolKit}\DSVL\bin into {ARToolKit}\bin.
! (4) Install the GLUT DLL into the Windows System32 folder, and the library and headers into the VS platform SDK folders.
! (5) Run the script {ARToolKit}\Configure.win32.bat to create include/AR/config.h.
  (6) Open the ARToolKit.sln file (VS.NET) or ARToolkit.dsw file (VS6).
  (7) Build the toolkit.
--- 43,48 ----
  (2) Unpack the DSVideoLib zip into {ARToolKit}. Make sure that the directory is named "DSVL".
  (3) Copy the files DSVL.dll and DSVLd.dll from {ARToolKit}\DSVL\bin into {ARToolKit}\bin.
! (4) Install GLUT, following the instructions in the README.win file inside the GLUT zip. See http://www.hitlabnz.org/forum/showpost.php?p=332&postcount=12 for more detail on how to install GLUT on Windows.
! (5) Run the script {ARToolKit}\Configure.win32.bat to create include\AR\config.h.
  (6) Open the ARToolKit.sln file (VS.NET) or ARToolkit.dsw file (VS6).
  (7) Build the toolkit.
***************
*** 90,94 ****
  (1) Unpack the archive to a convenient location using StuffIt Expander, and open the ARToolKit.xproj.
  (2) Builds include a script target "Configure" which enables accelerated and rectangular texturing by default. If you wish to change these defaults, manually run the ./Configure script from Terminal as for a command-line build.
! (3) Executables are built as bundled applications into ARToolKit/bin, with the Data/ directory copied into the application bundle so that they may be moved from this location to other locations.
  
  The VRML renderering library and example (libARvrml & simpleVRML) are optional builds:
--- 90,94 ----
  (1) Unpack the archive to a convenient location using StuffIt Expander, and open the ARToolKit.xproj.
  (2) Builds include a script target "Configure" which enables accelerated and rectangular texturing by default. If you wish to change these defaults, manually run the ./Configure script from Terminal as for a command-line build.
! (3) 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 VRML renderering library and example (libARvrml & simpleVRML) are optional builds:
***************
*** 121,130 ****
  Changes in this release.
  ------------------------
! - Mac OS X video driver: QuickTime 6.4 is now required by default. (Support for earlier versions can be enabled at compile-time). 
  - 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. Install of DirectX SDK, registering of filter no longer required. Many bug fixes.
! - gsub_lite: Added complete support for runtime selection of pixel format and rectangle/power-of-2 textures.
! - Mac OS X XCode builds are now bundled applications.
  
  Changes in earlier releases.
--- 121,131 ----
  Changes in this release.
  ------------------------
! - 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.
  
  Changes in earlier releases.

[artoolkit-commits] artoolkit/lib/SRC/Gl gsub_lite.c,1.9,1.10

[Philip L. <phi...@us...>]

Update of /cvsroot/artoolkit/artoolkit/lib/SRC/Gl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4019

Modified Files:
	gsub_lite.c 
Log Message:
Fix for GL state bugs on Win32.

Index: gsub_lite.c
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/Gl/gsub_lite.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** gsub_lite.c	13 Sep 2005 21:45:48 -0000	1.9
--- gsub_lite.c	22 Sep 2005 00:48:47 -0000	1.10
***************
*** 382,387 ****
  		// Specify the texture to OpenGL.
  		if (texmapScaleFactor == 2) {
! 			// If arglTexmapMode is non-zero, pretend lines in the source image are
! 			// twice as long as they are, so that glTexImage2D will read only the first
  			// half of each line, effectively discarding every second line in the source image.
  			glPixelStorei(GL_UNPACK_ROW_LENGTH, cparam->xsize*texmapScaleFactor);
--- 382,387 ----
  		// Specify the texture to OpenGL.
  		if (texmapScaleFactor == 2) {
! 			// If texmapScaleFactor is 2, pretend lines in the source image are
! 			// twice as long as they are; glTexImage2D will read only the first
  			// half of each line, effectively discarding every second line in the source image.
  			glPixelStorei(GL_UNPACK_ROW_LENGTH, cparam->xsize*texmapScaleFactor);
***************
*** 660,665 ****
  #endif // APPLE_TEXTURE_FAST_TRANSFER
  	if (texmapScaleFactor == 2) {
! 		// If arglTexmapMode is non-zero, pretend lines in the source image are
! 		// twice as long as they are, so that glTexImage2D will read only the first
  		// half of each line, effectively discarding every second line in the source image.
  		glPixelStorei(GL_UNPACK_ROW_LENGTH, cparam->xsize*texmapScaleFactor);
--- 660,665 ----
  #endif // APPLE_TEXTURE_FAST_TRANSFER
  	if (texmapScaleFactor == 2) {
! 		// If texmapScaleFactor is 2, pretend lines in the source image are
! 		// twice as long as they are; glTexImage2D will read only the first
  		// half of each line, effectively discarding every second line in the source image.
  		glPixelStorei(GL_UNPACK_ROW_LENGTH, cparam->xsize*texmapScaleFactor);
***************
*** 758,766 ****
  	// 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);
  	glGetBooleanv(GL_LIGHTING, &lightingSave);			// Save enabled state of lighting.
- 	if (lightingSave) glDisable(GL_LIGHTING);
  	glGetBooleanv(GL_DEPTH_TEST, &depthTestSave);		// Save enabled state of depth test.
! 	if (depthTestSave) glDisable(GL_DEPTH_TEST);
  	glMatrixMode(GL_PROJECTION);
  	glPushMatrix();
--- 758,766 ----
  	// 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.
  	glGetBooleanv(GL_LIGHTING, &lightingSave);			// Save enabled state of lighting.
  	glGetBooleanv(GL_DEPTH_TEST, &depthTestSave);		// Save enabled state of depth test.
! 	glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
! 	if (lightingSave == GL_TRUE) glDisable(GL_LIGHTING);
! 	if (depthTestSave == GL_TRUE) glDisable(GL_DEPTH_TEST);
  	glMatrixMode(GL_PROJECTION);
  	glPushMatrix();
***************
*** 778,784 ****
  	glMatrixMode(GL_MODELVIEW);
  	glPopMatrix();
! 	glEnable(GL_DEPTH_TEST);
! 	if (depthTestSave) glEnable(GL_DEPTH_TEST);			// Restore enabled state of depth test.
! 	if (lightingSave) glEnable(GL_LIGHTING);			// Restore enabled state of lighting.
  	glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, texEnvModeSave); // Restore GL texture environment mode.
  	
--- 778,783 ----
  	glMatrixMode(GL_MODELVIEW);
  	glPopMatrix();
! 	if (lightingSave == GL_TRUE) glEnable(GL_DEPTH_TEST);			// Restore enabled state of depth test.
! 	if (depthTestSave == GL_TRUE) glEnable(GL_LIGHTING);			// Restore enabled state of lighting.
  	glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, texEnvModeSave); // Restore GL texture environment mode.
  	
***************
*** 804,807 ****
--- 803,807 ----
  		glPixelZoom(zoomf, -zoomf);
  		glRasterPos2f(0.0f, cparam->ysize * zoomf);
+ 		glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
  		glDrawPixels(cparam->xsize, cparam->ysize, contextSettings->pixFormat, contextSettings->pixType, image);
  	} else {

[artoolkit-commits] artoolkit/lib/SRC/VideoWin32DirectShow videoWin32DirectShow.cpp,1.2,1.3

[Philip L. <phi...@us...>]

Update of /cvsroot/artoolkit/artoolkit/lib/SRC/VideoWin32DirectShow
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3781

Modified Files:
	videoWin32DirectShow.cpp 
Log Message:
Workaround for side-effect of stopping media on glut's periodic tasks.

Index: videoWin32DirectShow.cpp
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoWin32DirectShow/videoWin32DirectShow.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** videoWin32DirectShow.cpp	23 Jul 2005 00:01:38 -0000	1.2
--- videoWin32DirectShow.cpp	22 Sep 2005 00:47:36 -0000	1.3
***************
*** 206,210 ****
  	vid->graphManager->CheckinMemoryBuffer(vid->g_Handle, true);
  
! 	if(FAILED(vid->graphManager->Stop())) return (-1);
  
  	return (0);
--- 206,213 ----
  	vid->graphManager->CheckinMemoryBuffer(vid->g_Handle, true);
  
! 	// PRL 2005-09-21: Commented out due to issue where stopping the
! 	// media stream cuts off glut's periodic tasks, including functions
! 	// registered with glutIdleFunc() and glutDisplayFunc();
! 	//if(FAILED(vid->graphManager->Stop())) return (-1);
  
  	return (0);

[artoolkit-commits] artoolkit/examples/simpleLite simpleLite.c,1.8,1.9

[Philip L. <phi...@us...>]

Update of /cvsroot/artoolkit/artoolkit/examples/simpleLite
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3677

Modified Files:
	simpleLite.c 
Log Message:
Correctness fix in handling grabbed pixels.

Index: simpleLite.c
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/examples/simpleLite/simpleLite.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** simpleLite.c	19 Aug 2005 20:49:37 -0000	1.8
--- simpleLite.c	22 Sep 2005 00:46:53 -0000	1.9
***************
*** 383,386 ****
--- 383,387 ----
  	arglDispImage(gARTImage, &gARTCparam, 1.0, gArglSettings);	// zoom = 1.0.
  	arVideoCapNext();
+ 	gARTImage = NULL; // Image data is no longer valid after calling arVideoCapNext().
  				
  	if (gPatt_found) {

[artoolkit-commits] artoolkit/examples/simpleVRML simpleVRML.c,1.6,1.7

[Philip L. <phi...@us...>]

Update of /cvsroot/artoolkit/artoolkit/examples/simpleVRML
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3661

Modified Files:
	simpleVRML.c 
Log Message:
Correctness fix in handling grabbed pixels.

Index: simpleVRML.c
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/examples/simpleVRML/simpleVRML.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** simpleVRML.c	29 Jul 2005 23:23:03 -0000	1.6
--- simpleVRML.c	22 Sep 2005 00:46:49 -0000	1.7
***************
*** 358,361 ****
--- 358,362 ----
  	arglDispImage(gARTImage, &gARTCparam, 1.0, gArglSettings);	// zoom = 1.0.
  	arVideoCapNext();
+ 	gARTImage = NULL; // Image data is no longer valid after calling arVideoCapNext().
  				
  	if (gPatt_found) {

[artoolkit-commits] artoolkit/examples/twoView twoView.c,1.9,1.10

[Philip L. <phi...@us...>]

Update of /cvsroot/artoolkit/artoolkit/examples/twoView
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3640

Modified Files:
	twoView.c 
Log Message:
Correctness fix in handling grabbed pixels.

Index: twoView.c
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/examples/twoView/twoView.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** twoView.c	29 Jul 2005 23:22:59 -0000	1.9
--- twoView.c	22 Sep 2005 00:46:43 -0000	1.10
***************
*** 487,490 ****
--- 487,491 ----
  				  gContextsActive[drawContextIndex].arglSettings);	// zoom = 1.0.
  	ar2VideoCapNext(gContextsActive[drawContextIndex].ARTVideo);
+ 	gContextsActive[drawContextIndex].ARTImage = NULL; // Image data is no longer valid after calling ar2VideoCapNext().
  	
  	if (gContextsActive[drawContextIndex].patt_found) {

[artoolkit-commits] artoolkit/util/calib_distortion calib_dist.c,1.10,1.11

[Philip L. <phi...@us...>]

Update of /cvsroot/artoolkit/artoolkit/util/calib_distortion
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3278

Modified Files:
	calib_dist.c 
Log Message:
Step 3 of cleanup.

Index: calib_dist.c
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/util/calib_distortion/calib_dist.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** calib_dist.c	15 Sep 2005 00:52:03 -0000	1.10
--- calib_dist.c	22 Sep 2005 00:44:45 -0000	1.11
***************
*** 113,121 ****
  static void     Reshape(int w, int h);
  static void     Display(void);
! static void     draw_warp_line( double a, double b , double c );
  static void     draw_line(void);
! static void     draw_line2( double *x, double *y, int num );
! static void     draw_warp_line( double a, double b , double c );
! static void     print_comment( int status );
  
  int main(int argc, char *argv[])
--- 113,121 ----
  static void     Reshape(int w, int h);
  static void     Display(void);
! static void     draw_warp_line(double a, double b , double c);
  static void     draw_line(void);
! static void     draw_line2(double *x, double *y, int num);
! static void     draw_warp_line(double a, double b , double c);
! static void     print_comment(int status);
  
  int main(int argc, char *argv[])
***************
*** 193,211 ****
  	// Allocate space for a clipping image (luminance only).
  	arMalloc(gClipImage, unsigned char, gXsize * gYsize);
- 	
- 	return (TRUE);
- }
  
- static int videoCleanup(void)
- {
- 	arVideoCapStop();
- 	arVideoClose();
  	return (TRUE);
  }
  
  static void grabImage(void) {
  	// Processing a new image.
! 	// Copy the current image to saved image buffer.
! 	if (!gARTImage) return;
  	gPatt.loop_num++;
  	if ((gPatt.arglSettings[gPatt.loop_num-1] = arglSetupForCurrentContext()) == NULL) {
--- 193,208 ----
  	// Allocate space for a clipping image (luminance only).
  	arMalloc(gClipImage, unsigned char, gXsize * gYsize);
  
  	return (TRUE);
  }
  
  static void grabImage(void) {
+ 	ARUint8 *image;
+ 	
  	// Processing a new image.
! 	// Copy an image to saved image buffer.
! 	do {
! 		image = arVideoGetImage();
! 	} while (image == NULL);
  	gPatt.loop_num++;
  	if ((gPatt.arglSettings[gPatt.loop_num-1] = arglSetupForCurrentContext()) == NULL) {
***************
*** 215,219 ****
  	arglDistortionCompensationSet(gPatt.arglSettings[gPatt.loop_num-1], FALSE);
  	arMalloc((gPatt.savedImage)[gPatt.loop_num-1], unsigned char, gXsize*gYsize*AR_PIX_SIZE);
! 	memcpy((gPatt.savedImage)[gPatt.loop_num-1], gARTImage, gXsize*gYsize*AR_PIX_SIZE);
  	printf("Grabbed image %d.\n", gPatt.loop_num);
  	arMalloc(gPatt.point[gPatt.loop_num-1], CALIB_COORD_T, gPatt.h_num*gPatt.v_num);
--- 212,216 ----
  	arglDistortionCompensationSet(gPatt.arglSettings[gPatt.loop_num-1], FALSE);
  	arMalloc((gPatt.savedImage)[gPatt.loop_num-1], unsigned char, gXsize*gYsize*AR_PIX_SIZE);
! 	memcpy((gPatt.savedImage)[gPatt.loop_num-1], image, gXsize*gYsize*AR_PIX_SIZE);
  	printf("Grabbed image %d.\n", gPatt.loop_num);
  	arMalloc(gPatt.point[gPatt.loop_num-1], CALIB_COORD_T, gPatt.h_num*gPatt.v_num);
***************
*** 249,254 ****
  	if (gStatus == 0) {
  		// Cancelled grabbing.
! 		// Live video will not be needed from here on, so cleanup.
! 		videoCleanup();
  		if (gPatt.loop_num == 0) {
  			// No images with all features identified, so quit.
--- 246,251 ----
  	if (gStatus == 0) {
  		// Cancelled grabbing.
! 		// Live video will not be needed from here on.
! 		arVideoCapStop();
  		if (gPatt.loop_num == 0) {
  			// No images with all features identified, so quit.
***************
*** 286,291 ****
      int             ssx, ssy, eex, eey;
      int             i, j, k;
! 	
! 	if (button == GLUT_RIGHT_BUTTON) {
  		eventCancel();
  	} else if (button == GLUT_LEFT_BUTTON) {
--- 283,288 ----
      int             ssx, ssy, eex, eey;
      int             i, j, k;
! 
! 	if (button == GLUT_RIGHT_BUTTON && state == GLUT_DOWN) {
  		eventCancel();
  	} else if (button == GLUT_LEFT_BUTTON) {
***************
*** 327,331 ****
  			}
  		} else if (state == GLUT_UP) {
! 			if (gStatus == 1 && point_num < gPatt.h_num*gPatt.v_num) {
  				// Drag for rubber-bounding of a feature has finished. Begin identification
  				// of center of white region in gClipImage.
--- 324,331 ----
  			}
  		} else if (state == GLUT_UP) {
! 			if (gStatus == 1
! 				&& gDragStartX != -1 && gDragStartY != -1
! 				&& gDragEndX != -1 && gDragEndY != -1
! 				&& point_num < gPatt.h_num*gPatt.v_num) {
  				// Drag for rubber-bounding of a feature has finished. Begin identification
  				// of center of white region in gClipImage.
***************
*** 339,344 ****
  				p = gClipImage;
  				k = 0;
! 				for( j = 0; j < (eey-ssy+1); j++ ) {
! 					for( i = 0; i < (eex-ssx+1); i++ ) {
  						gPatt.point[gPatt.loop_num-1][point_num].x_coord += i * *p;
  						gPatt.point[gPatt.loop_num-1][point_num].y_coord += j * *p;
--- 339,344 ----
  				p = gClipImage;
  				k = 0;
! 				for (j = 0; j < (eey-ssy+1); j++) {
! 					for (i = 0; i < (eex-ssx+1); i++) {
  						gPatt.point[gPatt.loop_num-1][point_num].x_coord += i * *p;
  						gPatt.point[gPatt.loop_num-1][point_num].y_coord += j * *p;
***************
*** 347,351 ****
  					}
  				}
! 				if( k != 0 ) {
  					gPatt.point[gPatt.loop_num-1][point_num].x_coord /= k;
  					gPatt.point[gPatt.loop_num-1][point_num].y_coord /= k;
--- 347,351 ----
  					}
  				}
! 				if (k != 0) {
  					gPatt.point[gPatt.loop_num-1][point_num].x_coord /= k;
  					gPatt.point[gPatt.loop_num-1][point_num].y_coord /= k;
***************
*** 442,447 ****
--- 442,452 ----
  static void Quit(void)
  {
+ 	if (gClipImage) {
+ 		free(gClipImage);
+ 		gClipImage = NULL;
+ 	}
  	if (gArglSettings) arglCleanup(gArglSettings);
  	if (gWin) glutDestroyWindow(gWin);
+ 	arVideoClose();
  	exit(0);
  }
***************
*** 511,518 ****
  
  static void endOrtho2D(void) {
- 	glPopMatrix();
  	glMatrixMode(GL_PROJECTION);
  	glPopMatrix();
  	glMatrixMode(GL_MODELVIEW);
  }
  
--- 516,523 ----
  
  static void endOrtho2D(void) {
  	glMatrixMode(GL_PROJECTION);
  	glPopMatrix();
  	glMatrixMode(GL_MODELVIEW);
+ 	glPopMatrix();
  }
  
***************
*** 527,530 ****
--- 532,537 ----
  	glClear(GL_COLOR_BUFFER_BIT);
      glDisable(GL_DEPTH_TEST);
+ 	glDisable(GL_LIGHTING);
+ 	glDisable(GL_TEXTURE_2D);
  	beginOrtho2D();
  	
***************
*** 533,536 ****
--- 540,544 ----
  		arglDispImage(gARTImage, &gARTCparam, 1.0, gArglSettings);	// zoom = 1.0.
  		arVideoCapNext();
+ 		gARTImage = NULL;
  		
      } else if (gStatus == 1) {
***************
*** 541,555 ****
              x = gPatt.point[gPatt.loop_num-1][i].x_coord;
              y = gPatt.point[gPatt.loop_num-1][i].y_coord;
!             glColor3f( 1.0, 0.0, 0.0 );
              glBegin(GL_LINES);
! 			glVertex2f( x-10, (gYsize-1)-y );
! 			glVertex2f( x+10, (gYsize-1)-y );
! 			glVertex2f( x, (gYsize-1)-(y-10) );
! 			glVertex2f( x, (gYsize-1)-(y+10) );
              glEnd();
          }
  		
  		// Draw the current mouse drag clipping area.
!         if (gDragStartX != -1 && gDragStartY != -1) {
  			if (gDragStartX < gDragEndX) { ssx = gDragStartX; eex = gDragEndX; }
  			else         { ssx = gDragEndX; eex = gDragStartX; }
--- 549,564 ----
              x = gPatt.point[gPatt.loop_num-1][i].x_coord;
              y = gPatt.point[gPatt.loop_num-1][i].y_coord;
!             glColor3f(1.0f, 0.0f, 0.0f);
              glBegin(GL_LINES);
! 			glVertex2d(x-10.0, (GLdouble)(gYsize-1)-y);
! 			glVertex2d(x+10.0, (GLdouble)(gYsize-1)-y);
! 			glVertex2d(x, (GLdouble)(gYsize-1)-(y-10.0));
! 			glVertex2d(x, (GLdouble)(gYsize-1)-(y+10.0));
              glEnd();
          }
  		
  		// Draw the current mouse drag clipping area.
!         if (gDragStartX != -1 && gDragStartY != -1
! 			&& gDragEndX != -1 && gDragEndY != -1) {
  			if (gDragStartX < gDragEndX) { ssx = gDragStartX; eex = gDragEndX; }
  			else         { ssx = gDragEndX; eex = gDragStartX; }
***************
*** 559,563 ****
  			if (gClipImage) {
  				glPixelZoom(1.0f, -1.0f);	// ARToolKit bitmap 0.0 is at upper-left, OpenGL bitmap 0.0 is at lower-left.
! 				glRasterPos2f((GLfloat)ssx, (GLfloat)gYsize-1-ssy);
  				glDrawPixels(eex-ssx+1, eey-ssy+1, GL_LUMINANCE, GL_UNSIGNED_BYTE, gClipImage);
  			}
--- 568,573 ----
  			if (gClipImage) {
  				glPixelZoom(1.0f, -1.0f);	// ARToolKit bitmap 0.0 is at upper-left, OpenGL bitmap 0.0 is at lower-left.
! 				glRasterPos2f((GLfloat)(ssx), (GLfloat)(gYsize-1-ssy));
! 				glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
  				glDrawPixels(eex-ssx+1, eey-ssy+1, GL_LUMINANCE, GL_UNSIGNED_BYTE, gClipImage);
  			}
***************
*** 565,572 ****
              glColor3f(0.0f, 0.0f, 1.0f);
              glBegin(GL_LINE_LOOP);
! 			glVertex2f(gDragStartX, (gYsize-1)-gDragStartY);
! 			glVertex2f(gDragEndX, (gYsize-1)-gDragStartY);
! 			glVertex2f(gDragEndX, (gYsize-1)-gDragEndY);
! 			glVertex2f(gDragStartX, (gYsize-1)-gDragEndY);
              glEnd();
  #endif
--- 575,582 ----
              glColor3f(0.0f, 0.0f, 1.0f);
              glBegin(GL_LINE_LOOP);
! 			glVertex2i(gDragStartX, (gYsize-1)-gDragStartY);
! 			glVertex2i(gDragEndX, (gYsize-1)-gDragStartY);
! 			glVertex2i(gDragEndX, (gYsize-1)-gDragEndY);
! 			glVertex2i(gDragStartX, (gYsize-1)-gDragEndY);
              glEnd();
  #endif
***************
*** 579,588 ****
              x = gPatt.point[check_num][i].x_coord;
              y = gPatt.point[check_num][i].y_coord;
!             glColor3f( 1.0, 0.0, 0.0 );
              glBegin(GL_LINES);
! 			glVertex2f( x-10, (gYsize-1)-y );
! 			glVertex2f( x+10, (gYsize-1)-y );
! 			glVertex2f( x, (gYsize-1)-(y-10) );
! 			glVertex2f( x, (gYsize-1)-(y+10) );
              glEnd();
          }
--- 589,598 ----
              x = gPatt.point[check_num][i].x_coord;
              y = gPatt.point[check_num][i].y_coord;
!             glColor3f(1.0f, 0.0f, 0.0f);
              glBegin(GL_LINES);
! 			glVertex2d(x-10.0, (GLdouble)(gYsize-1)-y);
! 			glVertex2d(x+10.0, (GLdouble)(gYsize-1)-y);
! 			glVertex2d(x, (GLdouble)(gYsize-1)-(y-10.0));
! 			glVertex2d(x, (GLdouble)(gYsize-1)-(y+10.0));
              glEnd();
          }
***************
*** 716,735 ****
          case 0:
  			printf("Press mouse button to grab first image,\n");
! 			printf("or press [esc] to quit.\n");
  			break;
          case 1:
  			printf("Press mouse button and drag mouse to rubber-bound features (%d x %d),\n", gPatt.h_num, gPatt.v_num);
! 			printf("or press [esc] to cancel rubber-bounding & retry grabbing.\n");
  			break;
          case 2:
  			printf("Press mouse button to save feature positions,\n");
! 			printf("or press [esc] to discard feature positions & retry grabbing.\n");
  			break;
          case 4:
  			printf("Press mouse button to grab next image,\n");
! 			printf("or press [esc] to calculate distortion parameter.\n");
  			break;
          case 5:
! 			printf("Press [esc] to calculate distortion parameter.\n");
  			break;
      }
--- 726,745 ----
          case 0:
  			printf("Press mouse button to grab first image,\n");
! 			printf("or press right mouse button or [esc] to quit.\n");
  			break;
          case 1:
  			printf("Press mouse button and drag mouse to rubber-bound features (%d x %d),\n", gPatt.h_num, gPatt.v_num);
! 			printf("or press right mouse button or [esc] to cancel rubber-bounding & retry grabbing.\n");
  			break;
          case 2:
  			printf("Press mouse button to save feature positions,\n");
! 			printf("or press right mouse button or [esc] to discard feature positions & retry grabbing.\n");
  			break;
          case 4:
  			printf("Press mouse button to grab next image,\n");
! 			printf("or press right mouse button or [esc] to calculate distortion parameter.\n");
  			break;
          case 5:
! 			printf("Press right mouse button or [esc] to calculate distortion parameter.\n");
  			break;
      }

[artoolkit-commits] artoolkit/util/calib_cparam calib_cparam.c,1.9,1.10

[Philip L. <phi...@us...>]

Update of /cvsroot/artoolkit/artoolkit/util/calib_cparam
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3240

Modified Files:
	calib_cparam.c 
Log Message:
Step 3 of cleanup.

Index: calib_cparam.c
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/util/calib_cparam/calib_cparam.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** calib_cparam.c	15 Sep 2005 00:52:48 -0000	1.9
--- calib_cparam.c	22 Sep 2005 00:44:41 -0000	1.10
***************
*** 81,85 ****
  
  static ARUint8		*gARTImage = NULL;
! static ARParam		gARTCparam;
  static ARGL_CONTEXT_SETTINGS_REF gArglSettings = NULL;
  
--- 81,85 ----
  
  static ARUint8		*gARTImage = NULL;
! static ARParam		gARTCparam; // Dummy parameter, to supply to gsub_lite.
  static ARGL_CONTEXT_SETTINGS_REF gArglSettings = NULL;
  
***************
*** 252,256 ****
  		// Cancel from mode 0 should quit program.
  		arVideoCapStop();
- 		arVideoClose();
  		Quit();
  	} else if (mode == 1) {
--- 252,255 ----
***************
*** 270,273 ****
--- 269,274 ----
  static void Mouse(int button, int state, int x, int y)
  {
+ 	ARUint8 *image;
+ 	
  	if (state == GLUT_DOWN) {
  		if (button == GLUT_RIGHT_BUTTON) {
***************
*** 275,281 ****
  		} else if (button == GLUT_LEFT_BUTTON && mode == 0) {
  			// Processing a new image.
! 			// Copy the current image to saved image buffer.
! 			if (!gARTImage) return;
! 			memcpy(gSaveARTImage, gARTImage, gXsize*gYsize*AR_PIX_SIZE);
  			printf("Grabbed image.\n");
  			arVideoCapStop();
--- 276,284 ----
  		} else if (button == GLUT_LEFT_BUTTON && mode == 0) {
  			// Processing a new image.
! 			// Copy an image to saved image buffer.
! 			do {
! 				image = arVideoGetImage();
! 			} while (image == NULL);
! 			memcpy(gSaveARTImage, image, gXsize*gYsize*AR_PIX_SIZE);
  			printf("Grabbed image.\n");
  			arVideoCapStop();
***************
*** 409,412 ****
--- 412,416 ----
  	if (gArglSettings) arglCleanup(gArglSettings);
  	if (gWin) glutDestroyWindow(gWin);
+ 	arVideoClose();
  	exit(0);
  }
***************
*** 476,483 ****
  
  static void endOrtho2D(void) {
- 	glPopMatrix();
  	glMatrixMode(GL_PROJECTION);
  	glPopMatrix();
  	glMatrixMode(GL_MODELVIEW);
  }
  
--- 480,487 ----
  
  static void endOrtho2D(void) {
  	glMatrixMode(GL_PROJECTION);
  	glPopMatrix();
  	glMatrixMode(GL_MODELVIEW);
+ 	glPopMatrix();
  }
  
***************
*** 488,491 ****
--- 492,497 ----
  	glClear(GL_COLOR_BUFFER_BIT);
      glDisable(GL_DEPTH_TEST);
+ 	glDisable(GL_LIGHTING);
+ 	glDisable(GL_TEXTURE_2D);
  	beginOrtho2D();
  	
***************
*** 494,497 ****
--- 500,504 ----
  		arglDispImage(gARTImage, &gARTCparam, 1.0, gArglSettings);	// zoom = 1.0.
  		arVideoCapNext();
+ 		gARTImage = NULL;
  		
      } else if (mode == 1) {

[artoolkit-commits] artoolkit/util/calib_camera2 main.c,1.7,1.8

[Philip L. <phi...@us...>]

Update of /cvsroot/artoolkit/artoolkit/util/calib_camera2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3222

Modified Files:
	main.c 
Log Message:
Step 3 of cleanup.

Index: main.c
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/util/calib_camera2/main.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** main.c	14 Sep 2005 19:11:03 -0000	1.7
--- main.c	22 Sep 2005 00:44:37 -0000	1.8
***************
*** 154,158 ****
  	
  	// Start grabbing.
!     point_num = 0;
      gStatus = 0;
      print_comment(0);
--- 154,162 ----
  	
  	// Start grabbing.
! 	if (arVideoCapStart() != 0) {
!     	fprintf(stderr, "init(): Unable to begin camera data capture.\n");
! 		return (FALSE);		
! 	}
! 	point_num = 0;
      gStatus = 0;
      print_comment(0);
***************
*** 174,184 ****
      if (gPatt.h_num < 3 || gPatt.v_num < 3) exit(0);
  
- #if CALIB_CAMERA2_DEBUG
- 	length = 40.0;
- #else
      printf("Input the distance between each marker dot, in millimeters: ");
      scanf("%lf", &length);
  	while (getchar() != '\n');
! #endif
      gPatt.world_coord = (CALIB_COORD_T *)malloc(sizeof(CALIB_COORD_T) * gPatt.h_num * gPatt.v_num);
      for (j = 0; j < gPatt.v_num; j++) {
--- 178,185 ----
      if (gPatt.h_num < 3 || gPatt.v_num < 3) exit(0);
  
      printf("Input the distance between each marker dot, in millimeters: ");
      scanf("%lf", &length);
  	while (getchar() != '\n');
! 
      gPatt.world_coord = (CALIB_COORD_T *)malloc(sizeof(CALIB_COORD_T) * gPatt.h_num * gPatt.v_num);
      for (j = 0; j < gPatt.v_num; j++) {
***************
*** 209,241 ****
  	arMalloc(gClipImage, unsigned char, gXsize * gYsize);
  
- 	if (arVideoCapStart() != 0) {
-     	fprintf(stderr, "init(): Unable to begin camera data capture.\n");
- 		return (FALSE);		
- 	}
- 	
- 	return (TRUE);
- }
- 
- static int videoCleanup(void)
- {
- 	arVideoCapStop();
- 	arVideoClose();
  	return (TRUE);
  }
  
  static void grabImage(void) {
  	// Processing a new image.
! 	// Copy the current image to saved image buffer.
! 	if (!gARTImage) return;
  	gPatt.loop_num++;
  	if ((gPatt.arglSettings[gPatt.loop_num-1] = arglSetupForCurrentContext()) == NULL) {
! 		fprintf(stderr, "main(): arglSetupForCurrentContext() returned error.\n");
  		exit(-1);
  	}
  	arglDistortionCompensationSet(gPatt.arglSettings[gPatt.loop_num-1], FALSE);
  	arMalloc((gPatt.savedImage)[gPatt.loop_num-1], unsigned char, gXsize*gYsize*AR_PIX_SIZE);
! 	memcpy((gPatt.savedImage)[gPatt.loop_num-1], gARTImage, gXsize*gYsize*AR_PIX_SIZE);
  	printf("Grabbed image %d.\n", gPatt.loop_num);
- 	arVideoCapStop();
  	arMalloc(gPatt.point[gPatt.loop_num-1], CALIB_COORD_T, gPatt.h_num*gPatt.v_num);
  }
--- 210,233 ----
  	arMalloc(gClipImage, unsigned char, gXsize * gYsize);
  
  	return (TRUE);
  }
  
  static void grabImage(void) {
+ 	ARUint8 *image;
+ 	
  	// Processing a new image.
! 	// Copy an image to saved image buffer.
! 	do {
! 		image = arVideoGetImage();
! 	} while (image == NULL);
  	gPatt.loop_num++;
  	if ((gPatt.arglSettings[gPatt.loop_num-1] = arglSetupForCurrentContext()) == NULL) {
! 		fprintf(stderr, "grabImage(): arglSetupForCurrentContext() returned error.\n");
  		exit(-1);
  	}
  	arglDistortionCompensationSet(gPatt.arglSettings[gPatt.loop_num-1], FALSE);
  	arMalloc((gPatt.savedImage)[gPatt.loop_num-1], unsigned char, gXsize*gYsize*AR_PIX_SIZE);
! 	memcpy((gPatt.savedImage)[gPatt.loop_num-1], image, gXsize*gYsize*AR_PIX_SIZE);
  	printf("Grabbed image %d.\n", gPatt.loop_num);
  	arMalloc(gPatt.point[gPatt.loop_num-1], CALIB_COORD_T, gPatt.h_num*gPatt.v_num);
  }
***************
*** 281,286 ****
  	if (gStatus == 0) {
  		// Cancelled grabbing.
! 		// Live video will not be needed from here on, so cleanup.
! 		videoCleanup();
  		if (gPatt.loop_num == 0) {
  			// No images with all features identified, so quit.
--- 273,278 ----
  	if (gStatus == 0) {
  		// Cancelled grabbing.
! 		// Live video will not be needed from here on.
! 		arVideoCapStop();
  		if (gPatt.loop_num == 0) {
  			// No images with all features identified, so quit.
***************
*** 319,323 ****
      int             i, j, k;
  
! 	if (button == GLUT_RIGHT_BUTTON) {
  		eventCancel();
  	} else if (button == GLUT_LEFT_BUTTON) {
--- 311,315 ----
      int             i, j, k;
  
! 	if (button == GLUT_RIGHT_BUTTON && state == GLUT_DOWN) {
  		eventCancel();
  	} else if (button == GLUT_LEFT_BUTTON) {
***************
*** 328,331 ****
--- 320,324 ----
  				grabImage();
  				gDragStartX = gDragStartY = gDragEndX = gDragEndY = -1;
+ 				arVideoCapStop();
  				gStatus = 1;
  				print_comment(1);				
***************
*** 358,362 ****
  			}
  		} else if (state == GLUT_UP) {
! 			if (gStatus == 1 && point_num < gPatt.h_num*gPatt.v_num) {
  				// Drag for rubber-bounding of a feature has finished. Begin identification
  				// of center of white region in gClipImage.
--- 351,358 ----
  			}
  		} else if (state == GLUT_UP) {
! 			if (gStatus == 1
! 				 && gDragStartX != -1 && gDragStartY != -1
! 				 && gDragEndX != -1 && gDragEndY != -1
! 				 && point_num < gPatt.h_num*gPatt.v_num) {
  				// Drag for rubber-bounding of a feature has finished. Begin identification
  				// of center of white region in gClipImage.
***************
*** 370,375 ****
  				p = gClipImage;
  				k = 0;
! 				for( j = 0; j < (eey-ssy+1); j++ ) {
! 					for( i = 0; i < (eex-ssx+1); i++ ) {
  						gPatt.point[gPatt.loop_num-1][point_num].x_coord += i * *p;
  						gPatt.point[gPatt.loop_num-1][point_num].y_coord += j * *p;
--- 366,371 ----
  				p = gClipImage;
  				k = 0;
! 				for (j = 0; j < (eey-ssy+1); j++) {
! 					for (i = 0; i < (eex-ssx+1); i++) {
  						gPatt.point[gPatt.loop_num-1][point_num].x_coord += i * *p;
  						gPatt.point[gPatt.loop_num-1][point_num].y_coord += j * *p;
***************
*** 378,382 ****
  					}
  				}
! 				if( k != 0 ) {
  					gPatt.point[gPatt.loop_num-1][point_num].x_coord /= k;
  					gPatt.point[gPatt.loop_num-1][point_num].y_coord /= k;
--- 374,378 ----
  					}
  				}
! 				if (k != 0) {
  					gPatt.point[gPatt.loop_num-1][point_num].x_coord /= k;
  					gPatt.point[gPatt.loop_num-1][point_num].y_coord /= k;
***************
*** 473,478 ****
--- 469,479 ----
  static void Quit(void)
  {
+ 	if (gClipImage) {
+ 		free(gClipImage);
+ 		gClipImage = NULL;
+ 	}
  	if (gArglSettings) arglCleanup(gArglSettings);
  	if (gWin) glutDestroyWindow(gWin);
+ 	arVideoClose();
  	exit(0);
  }
***************
*** 542,549 ****
  
  static void endOrtho2D(void) {
- 	glPopMatrix();
  	glMatrixMode(GL_PROJECTION);
  	glPopMatrix();
  	glMatrixMode(GL_MODELVIEW);
  }
  
--- 543,550 ----
  
  static void endOrtho2D(void) {
  	glMatrixMode(GL_PROJECTION);
  	glPopMatrix();
  	glMatrixMode(GL_MODELVIEW);
+ 	glPopMatrix();
  }
  
***************
*** 558,561 ****
--- 559,564 ----
  	glClear(GL_COLOR_BUFFER_BIT);
      glDisable(GL_DEPTH_TEST);
+ 	glDisable(GL_LIGHTING);
+ 	glDisable(GL_TEXTURE_2D);
  	beginOrtho2D();
  
***************
*** 564,567 ****
--- 567,571 ----
  		arglDispImage(gARTImage, &gARTCparam, 1.0, gArglSettings);	// zoom = 1.0.
  		arVideoCapNext();
+ 		gARTImage = NULL;
  		
      } else if (gStatus == 1) {
***************
*** 572,586 ****
              x = gPatt.point[gPatt.loop_num-1][i].x_coord;
              y = gPatt.point[gPatt.loop_num-1][i].y_coord;
!             glColor3f( 1.0, 0.0, 0.0 );
              glBegin(GL_LINES);
!               glVertex2f( x-10, (gYsize-1)-y );
!               glVertex2f( x+10, (gYsize-1)-y );
!               glVertex2f( x, (gYsize-1)-(y-10) );
!               glVertex2f( x, (gYsize-1)-(y+10) );
              glEnd();
          }
  		
  		// Draw the current mouse drag clipping area.
!         if (gDragStartX != -1 && gDragStartY != -1) {
  			if (gDragStartX < gDragEndX) { ssx = gDragStartX; eex = gDragEndX; }
  			else         { ssx = gDragEndX; eex = gDragStartX; }
--- 576,591 ----
              x = gPatt.point[gPatt.loop_num-1][i].x_coord;
              y = gPatt.point[gPatt.loop_num-1][i].y_coord;
!             glColor3f(1.0f, 0.0f, 0.0f);
              glBegin(GL_LINES);
!               glVertex2d(x-10.0, (GLdouble)(gYsize-1)-y);
!               glVertex2d(x+10.0, (GLdouble)(gYsize-1)-y);
!               glVertex2d(x, (GLdouble)(gYsize-1)-(y-10.0));
!               glVertex2d(x, (GLdouble)(gYsize-1)-(y+10.0));
              glEnd();
          }
  		
  		// Draw the current mouse drag clipping area.
!         if (gDragStartX != -1 && gDragStartY != -1
! 			&& gDragEndX != -1 && gDragEndY != -1) {
  			if (gDragStartX < gDragEndX) { ssx = gDragStartX; eex = gDragEndX; }
  			else         { ssx = gDragEndX; eex = gDragStartX; }
***************
*** 590,594 ****
  			if (gClipImage) {
  				glPixelZoom(1.0f, -1.0f);	// ARToolKit bitmap 0.0 is at upper-left, OpenGL bitmap 0.0 is at lower-left.
! 				glRasterPos2f((GLfloat)ssx, (GLfloat)gYsize-1-ssy);
  				glDrawPixels(eex-ssx+1, eey-ssy+1, GL_LUMINANCE, GL_UNSIGNED_BYTE, gClipImage);
  			}
--- 595,600 ----
  			if (gClipImage) {
  				glPixelZoom(1.0f, -1.0f);	// ARToolKit bitmap 0.0 is at upper-left, OpenGL bitmap 0.0 is at lower-left.
! 				glRasterPos2f((GLfloat)(ssx), (GLfloat)(gYsize-1-ssy));
! 				glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
  				glDrawPixels(eex-ssx+1, eey-ssy+1, GL_LUMINANCE, GL_UNSIGNED_BYTE, gClipImage);
  			}
***************
*** 596,603 ****
              glColor3f(0.0f, 0.0f, 1.0f);
              glBegin(GL_LINE_LOOP);
!               glVertex2f(gDragStartX, (gYsize-1)-gDragStartY);
!               glVertex2f(gDragEndX, (gYsize-1)-gDragStartY);
!               glVertex2f(gDragEndX, (gYsize-1)-gDragEndY);
!               glVertex2f(gDragStartX, (gYsize-1)-gDragEndY);
              glEnd();
  #endif
--- 602,609 ----
              glColor3f(0.0f, 0.0f, 1.0f);
              glBegin(GL_LINE_LOOP);
!               glVertex2i(gDragStartX, (gYsize-1)-gDragStartY);
!               glVertex2i(gDragEndX, (gYsize-1)-gDragStartY);
!               glVertex2i(gDragEndX, (gYsize-1)-gDragEndY);
!               glVertex2i(gDragStartX, (gYsize-1)-gDragEndY);
              glEnd();
  #endif
***************
*** 610,619 ****
              x = gPatt.point[check_num][i].x_coord;
              y = gPatt.point[check_num][i].y_coord;
!             glColor3f( 1.0, 0.0, 0.0 );
              glBegin(GL_LINES);
!               glVertex2f( x-10, (gYsize-1)-y );
!               glVertex2f( x+10, (gYsize-1)-y );
!               glVertex2f( x, (gYsize-1)-(y-10) );
!               glVertex2f( x, (gYsize-1)-(y+10) );
              glEnd();
          }
--- 616,625 ----
              x = gPatt.point[check_num][i].x_coord;
              y = gPatt.point[check_num][i].y_coord;
!             glColor3f(1.0f, 0.0f, 0.0f);
              glBegin(GL_LINES);
! 			glVertex2d(x-10.0, (GLdouble)(gYsize-1)-y);
! 			glVertex2d(x+10.0, (GLdouble)(gYsize-1)-y);
! 			glVertex2d(x, (GLdouble)(gYsize-1)-(y-10.0));
! 			glVertex2d(x, (GLdouble)(gYsize-1)-(y+10.0));
              glEnd();
          }
***************
*** 747,766 ****
          case 0:
  			printf("Press mouse button to grab first image,\n");
! 			printf("or press [esc] to quit.\n");
  			break;
          case 1:
  			printf("Press mouse button and drag mouse to rubber-bound features (%d x %d),\n", gPatt.h_num, gPatt.v_num);
! 			printf("or press [esc] to cancel rubber-bounding & retry grabbing.\n");
  			break;
          case 2:
  			printf("Press mouse button to save feature positions,\n");
! 			printf("or press [esc] to discard feature positions & retry grabbing.\n");
  			break;
          case 4:
  			printf("Press mouse button to grab next image,\n");
! 			printf("or press [esc] to calculate distortion parameter.\n");
  			break;
          case 5:
! 			printf("Press [esc] to calculate distortion parameter.\n");
  			break;
      }
--- 753,772 ----
          case 0:
  			printf("Press mouse button to grab first image,\n");
! 			printf("or press right mouse button or [esc] to quit.\n");
  			break;
          case 1:
  			printf("Press mouse button and drag mouse to rubber-bound features (%d x %d),\n", gPatt.h_num, gPatt.v_num);
! 			printf("or press right mouse button or [esc] to cancel rubber-bounding & retry grabbing.\n");
  			break;
          case 2:
  			printf("Press mouse button to save feature positions,\n");
! 			printf("or press right mouse button or [esc] to discard feature positions & retry grabbing.\n");
  			break;
          case 4:
  			printf("Press mouse button to grab next image,\n");
! 			printf("or press right mouse button or [esc] to calculate distortion parameter.\n");
  			break;
          case 5:
! 			printf("Press right mouse button or [esc] to calculate distortion parameter.\n");
  			break;
      }

[artoolkit-commits] artoolkit/doc/gsub_lite/Vars Vars.html,1.4,1.5

[Philip L. <phi...@us...>]

Update of /cvsroot/artoolkit/artoolkit/doc/gsub_lite/Vars
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27910/doc/gsub_lite/Vars

Modified Files:
	Vars.html 
Log Message:
Correct description of effects of arglTexmapMode.

Index: Vars.html
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/doc/gsub_lite/Vars/Vars.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Vars.html	16 Aug 2005 00:49:45 -0000	1.4
--- Vars.html	22 Sep 2005 00:08:40 -0000	1.5
***************
*** 25,29 ****
  accelerated drawing on some implementations.
  <br><br>
! The initial value is defined to the value of the symbolic constan DEFAULT_DRAW_MODE
  (defined in &lt;AR/config.h&gt;).
  </p>
--- 25,29 ----
  accelerated drawing on some implementations.
  <br><br>
! The initial value is defined to the value of the symbolic constant DEFAULT_DRAW_MODE
  (defined in &lt;AR/config.h&gt;).
  </p>
***************
*** 40,48 ****
  determines whether full or half-resolution data is transferred to the
  texture. A value of AR_DRAW_TEXTURE_FULL_IMAGE uses all available pixels in the
! source image data. A value of AR_DRAW_TEXTURE_HALF_IMAGE discards every second pixel
! in the source image data, defining a half-width texture which is then drawn stretched
! horizontally to double its width. The latter method offers some advantages to
! certain implentations where texture transfer is slow or costly, at the expense of
! image detail.
  </p>
  <dt><i>Availability</i></dt><dd>First appeared in ARToolKit 2.68.
--- 40,49 ----
  determines whether full or half-resolution data is transferred to the
  texture. A value of AR_DRAW_TEXTURE_FULL_IMAGE uses all available pixels in the
! source image data. A value of AR_DRAW_TEXTURE_HALF_IMAGE discards every second row
! in the source image data, defining a half-height texture which is then drawn stretched
! vertically to double its height.
! <br><br>
! The latter method is well-suited to drawing interlaced images, as would be obtained 
! from DV camera sources in interlaced mode or composite video sources.
  </p>
  <dt><i>Availability</i></dt><dd>First appeared in ARToolKit 2.68.

[artoolkit-commits] artoolkit/doc/gsub_lite CompositePage.html,1.4,1.5

[Philip L. <phi...@us...>]

Update of /cvsroot/artoolkit/artoolkit/doc/gsub_lite
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27783/doc/gsub_lite

Modified Files:
	CompositePage.html 
Log Message:
Correct description of effects of arglTexmapMode.

Index: CompositePage.html
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/doc/gsub_lite/CompositePage.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CompositePage.html	16 Aug 2005 00:49:34 -0000	1.4
--- CompositePage.html	22 Sep 2005 00:08:15 -0000	1.5
***************
*** 538,542 ****
  accelerated drawing on some implementations.
  <br><br>
! The initial value is defined to the value of the symbolic constan DEFAULT_DRAW_MODE
  (defined in &lt;AR/config.h&gt;).
  </p>
--- 538,542 ----
  accelerated drawing on some implementations.
  <br><br>
! The initial value is defined to the value of the symbolic constant DEFAULT_DRAW_MODE
  (defined in &lt;AR/config.h&gt;).
  </p>
***************
*** 553,561 ****
  determines whether full or half-resolution data is transferred to the
  texture. A value of AR_DRAW_TEXTURE_FULL_IMAGE uses all available pixels in the
! source image data. A value of AR_DRAW_TEXTURE_HALF_IMAGE discards every second pixel
! in the source image data, defining a half-width texture which is then drawn stretched
! horizontally to double its width. The latter method offers some advantages to
! certain implentations where texture transfer is slow or costly, at the expense of
! image detail.
  </p>
  <dt><i>Availability</i></dt><dd>First appeared in ARToolKit 2.68.
--- 553,562 ----
  determines whether full or half-resolution data is transferred to the
  texture. A value of AR_DRAW_TEXTURE_FULL_IMAGE uses all available pixels in the
! source image data. A value of AR_DRAW_TEXTURE_HALF_IMAGE discards every second row
! in the source image data, defining a half-height texture which is then drawn stretched
! vertically to double its height.
! <br><br>
! The latter method is well-suited to drawing interlaced images, as would be obtained 
! from DV camera sources in interlaced mode or composite video sources.
  </p>
  <dt><i>Availability</i></dt><dd>First appeared in ARToolKit 2.68.