artoolkit-commits Mailing List for ARToolKit (Page 16)
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...> - 2005-09-21 17:50:41
|
Update of /cvsroot/artoolkit/artoolkit/util/calib_camera2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10352 Modified Files: calib_camera2.vcproj Log Message: Reverse slashes in paths. Index: calib_camera2.vcproj =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/calib_camera2/calib_camera2.vcproj,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** calib_camera2.vcproj 14 Sep 2005 19:11:03 -0000 1.3 --- calib_camera2.vcproj 21 Sep 2005 17:50:29 -0000 1.4 *************** *** 1,126 **** ! <?xml version="1.0" encoding="Windows-1252"?> ! <VisualStudioProject ! ProjectType="Visual C++" ! Version="7.10" ! Name="calib_camera2" ! ProjectGUID="{7218026D-600A-2D4D-C387-44E5B226FA6A}"> ! <Platforms> ! <Platform ! Name="Win32"/> ! </Platforms> ! <Configurations> ! <Configuration ! Name="Debug|Win32" ! OutputDirectory="Debug" ! IntermediateDirectory="Debug" ! ConfigurationType="1"> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="0" ! AdditionalIncludeDirectories="$(ProjectDir)../../include" ! PreprocessorDefinitions="WIN32;_DEBUG" ! BasicRuntimeChecks="3" ! RuntimeLibrary="1" ! BrowseInformation="1" ! WarningLevel="3" ! DebugInformationFormat="3"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalOptions="/DEBUG" ! AdditionalDependencies="libARd.lib libARgsub_lited.lib libARvideod.lib" ! OutputFile="$(ProjectDir)../../bin/$(ProjectName)d.exe" ! AdditionalLibraryDirectories=""$(ProjectDir)../../lib"" ! GenerateDebugInformation="TRUE"/> ! <Tool ! Name="VCMIDLTool" ! PreprocessorDefinitions="_DEBUG" ! MkTypLibCompatible="TRUE" ! SuppressStartupBanner="TRUE" ! TargetEnvironment="1"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool"/> ! <Tool ! Name="VCWebServiceProxyGeneratorTool"/> ! <Tool ! Name="VCXMLDataGeneratorTool"/> ! <Tool ! Name="VCWebDeploymentTool"/> ! <Tool ! Name="VCManagedWrapperGeneratorTool"/> ! <Tool ! Name="VCAuxiliaryManagedWrapperGeneratorTool"/> ! </Configuration> ! <Configuration ! Name="Release|Win32" ! OutputDirectory="Release" ! IntermediateDirectory="Release" ! ConfigurationType="1" ! WholeProgramOptimization="TRUE"> ! <Tool ! Name="VCCLCompilerTool" ! GlobalOptimizations="TRUE" ! InlineFunctionExpansion="1" ! FavorSizeOrSpeed="1" ! AdditionalIncludeDirectories="$(ProjectDir)../../include" ! PreprocessorDefinitions="WIN32;NDEBUG" ! RuntimeLibrary="0"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalDependencies="libAR.lib libARvideo.lib libARgsub_lite.lib" ! OutputFile="$(ProjectDir)../../bin/$(ProjectName).exe" ! AdditionalLibraryDirectories=""$(ProjectDir)../../lib""/> ! <Tool ! Name="VCMIDLTool" ! PreprocessorDefinitions="NDEBUG" ! MkTypLibCompatible="TRUE" ! SuppressStartupBanner="TRUE" ! TargetEnvironment="1"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool"/> ! <Tool ! Name="VCWebServiceProxyGeneratorTool"/> ! <Tool ! Name="VCXMLDataGeneratorTool"/> ! <Tool ! Name="VCWebDeploymentTool"/> ! <Tool ! Name="VCManagedWrapperGeneratorTool"/> ! <Tool ! Name="VCAuxiliaryManagedWrapperGeneratorTool"/> ! </Configuration> ! </Configurations> ! <References> ! </References> ! <Files> ! <File ! RelativePath="calib_camera.h"> ! </File> ! <File ! RelativePath="calib_dist.c"> ! </File> ! <File ! RelativePath="calib_inp.c"> ! </File> ! <File ! RelativePath="main.c"> ! </File> ! </Files> ! <Globals> ! </Globals> ! </VisualStudioProject> --- 1,126 ---- ! <?xml version="1.0" encoding="Windows-1252"?> ! <VisualStudioProject ! ProjectType="Visual C++" ! Version="7.10" ! Name="calib_camera2" ! ProjectGUID="{7218026D-600A-2D4D-C387-44E5B226FA6A}"> ! <Platforms> ! <Platform ! Name="Win32"/> ! </Platforms> ! <Configurations> ! <Configuration ! Name="Debug|Win32" ! OutputDirectory="Debug" ! IntermediateDirectory="Debug" ! ConfigurationType="1"> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="0" ! AdditionalIncludeDirectories="$(ProjectDir)..\..\include" ! PreprocessorDefinitions="WIN32;_DEBUG" ! BasicRuntimeChecks="3" ! RuntimeLibrary="1" ! BrowseInformation="1" ! WarningLevel="3" ! DebugInformationFormat="3"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalOptions="/DEBUG" ! AdditionalDependencies="libARd.lib libARgsub_lited.lib libARvideod.lib" ! OutputFile="$(ProjectDir)..\..\bin\$(ProjectName)d.exe" ! AdditionalLibraryDirectories=""$(ProjectDir)..\..\lib"" ! GenerateDebugInformation="TRUE"/> ! <Tool ! Name="VCMIDLTool" ! PreprocessorDefinitions="_DEBUG" ! MkTypLibCompatible="TRUE" ! SuppressStartupBanner="TRUE" ! TargetEnvironment="1"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool"/> ! <Tool ! Name="VCWebServiceProxyGeneratorTool"/> ! <Tool ! Name="VCXMLDataGeneratorTool"/> ! <Tool ! Name="VCWebDeploymentTool"/> ! <Tool ! Name="VCManagedWrapperGeneratorTool"/> ! <Tool ! Name="VCAuxiliaryManagedWrapperGeneratorTool"/> ! </Configuration> ! <Configuration ! Name="Release|Win32" ! OutputDirectory="Release" ! IntermediateDirectory="Release" ! ConfigurationType="1" ! WholeProgramOptimization="TRUE"> ! <Tool ! Name="VCCLCompilerTool" ! GlobalOptimizations="TRUE" ! InlineFunctionExpansion="1" ! FavorSizeOrSpeed="1" ! AdditionalIncludeDirectories="$(ProjectDir)..\..\include" ! PreprocessorDefinitions="WIN32;NDEBUG" ! RuntimeLibrary="0"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalDependencies="libAR.lib libARvideo.lib libARgsub_lite.lib" ! OutputFile="$(ProjectDir)..\..\bin\$(ProjectName).exe" ! AdditionalLibraryDirectories=""$(ProjectDir)..\..\lib""/> ! <Tool ! Name="VCMIDLTool" ! PreprocessorDefinitions="NDEBUG" ! MkTypLibCompatible="TRUE" ! SuppressStartupBanner="TRUE" ! TargetEnvironment="1"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool"/> ! <Tool ! Name="VCWebServiceProxyGeneratorTool"/> ! <Tool ! Name="VCXMLDataGeneratorTool"/> ! <Tool ! Name="VCWebDeploymentTool"/> ! <Tool ! Name="VCManagedWrapperGeneratorTool"/> ! <Tool ! Name="VCAuxiliaryManagedWrapperGeneratorTool"/> ! </Configuration> ! </Configurations> ! <References> ! </References> ! <Files> ! <File ! RelativePath="calib_camera.h"> ! </File> ! <File ! RelativePath="calib_dist.c"> ! </File> ! <File ! RelativePath="calib_inp.c"> ! </File> ! <File ! RelativePath="main.c"> ! </File> ! </Files> ! <Globals> ! </Globals> ! </VisualStudioProject> |
|
From: Philip L. <phi...@us...> - 2005-09-15 00:53:45
|
Update of /cvsroot/artoolkit/artoolkit/ARToolKit.xcodeproj In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18326 Modified Files: project.pbxproj Log Message: calib programs now link against gsub_lite. Index: project.pbxproj =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/ARToolKit.xcodeproj/project.pbxproj,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** project.pbxproj 1 Sep 2005 01:12:34 -0000 1.2 --- project.pbxproj 15 Sep 2005 00:53:35 -0000 1.3 *************** *** 392,396 **** 784DB83B089AB04500389D33 /* paddle.c in Sources */ = {isa = PBXBuildFile; fileRef = 4AC3C0B207518C7E0073D2C6 /* paddle.c */; }; 784DB83C089AB04900389D33 /* paddleInteractionTest.c in Sources */ = {isa = PBXBuildFile; fileRef = 4AC3C0B407518C7E0073D2C6 /* paddleInteractionTest.c */; }; - 784EF19908AD634A0002821E /* Data in Resources */ = {isa = PBXBuildFile; fileRef = 782EA555089995C300A8A712 /* Data */; }; 784EF19E08AD634A0002821E /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A3F167F064A0E270042B0D7 /* Carbon.framework */; }; 784EF19F08AD634A0002821E /* GLUT.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A3F14FC064A0C510042B0D7 /* GLUT.framework */; }; --- 392,395 ---- *************** *** 398,407 **** 784EF1A108AD634A0002821E /* QuickTime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A3F14FE064A0C510042B0D7 /* QuickTime.framework */; }; 784EF1A208AD634A0002821E /* libAR.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A427D120484329800B56093 /* libAR.a */; }; - 784EF1A308AD634A0002821E /* libARgsub.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A427D130484329800B56093 /* libARgsub.a */; }; 784EF1A408AD634A0002821E /* libARvideo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A427D160484329800B56093 /* libARvideo.a */; }; 784EF1A508AD634A0002821E /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A934B5C086A150A00DF2FAC /* Cocoa.framework */; }; 784EF1CD08AD64C10002821E /* calib_cparam.c in Sources */ = {isa = PBXBuildFile; fileRef = 4A427C22048431FA00B56093 /* calib_cparam.c */; }; 784EF1CE08AD64C10002821E /* calib_cparam_sub.c in Sources */ = {isa = PBXBuildFile; fileRef = 4A427C2B048431FA00B56093 /* calib_cparam_sub.c */; }; - 784EF1D708AD64F40002821E /* Data in Resources */ = {isa = PBXBuildFile; fileRef = 782EA555089995C300A8A712 /* Data */; }; 784EF1DC08AD64F40002821E /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A3F167F064A0E270042B0D7 /* Carbon.framework */; }; 784EF1DD08AD64F40002821E /* GLUT.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A3F14FC064A0C510042B0D7 /* GLUT.framework */; }; --- 397,404 ---- *************** *** 498,501 **** --- 495,500 ---- 78D2541F089AA3AD0064B793 /* multiTest.c in Sources */ = {isa = PBXBuildFile; fileRef = 4A427CBD0484329800B56093 /* multiTest.c */; }; 78D25420089AA3C80064B793 /* libARMulti.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A427D150484329800B56093 /* libARMulti.a */; }; + 78DA2EFE08D8EDF900F7A5F2 /* libARgsub_lite.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A66475606598B950061DA76 /* libARgsub_lite.a */; }; + 78DA2EFF08D8EE2000F7A5F2 /* libARgsub_lite.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A66475606598B950061DA76 /* libARgsub_lite.a */; }; 78F11FCA08AD4FBB00FD6442 /* Data in Resources */ = {isa = PBXBuildFile; fileRef = 782EA555089995C300A8A712 /* Data */; }; 78F11FCE08AD4FBB00FD6442 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A3F167F064A0E270042B0D7 /* Carbon.framework */; }; *************** *** 508,512 **** 78F11FD508AD4FBB00FD6442 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A934B5C086A150A00DF2FAC /* Cocoa.framework */; }; 78F1200508AD50DF00FD6442 /* mk_patt.c in Sources */ = {isa = PBXBuildFile; fileRef = 4A427C42048431FA00B56093 /* mk_patt.c */; }; - 78F1201008AD514F00FD6442 /* Data in Resources */ = {isa = PBXBuildFile; fileRef = 782EA555089995C300A8A712 /* Data */; }; 78F1201408AD514F00FD6442 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A3F167F064A0E270042B0D7 /* Carbon.framework */; }; 78F1201508AD514F00FD6442 /* GLUT.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A3F14FC064A0C510042B0D7 /* GLUT.framework */; }; --- 507,510 ---- *************** *** 514,518 **** 78F1201708AD514F00FD6442 /* QuickTime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A3F14FE064A0C510042B0D7 /* QuickTime.framework */; }; 78F1201808AD514F00FD6442 /* libAR.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A427D120484329800B56093 /* libAR.a */; }; - 78F1201908AD514F00FD6442 /* libARgsub.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A427D130484329800B56093 /* libARgsub.a */; }; 78F1201A08AD514F00FD6442 /* libARvideo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A427D160484329800B56093 /* libARvideo.a */; }; 78F1201B08AD514F00FD6442 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A934B5C086A150A00DF2FAC /* Cocoa.framework */; }; --- 512,515 ---- *************** *** 1880,1885 **** 784EF1A108AD634A0002821E /* QuickTime.framework in Frameworks */, 784EF1A208AD634A0002821E /* libAR.a in Frameworks */, - 784EF1A308AD634A0002821E /* libARgsub.a in Frameworks */, 784EF1A408AD634A0002821E /* libARvideo.a in Frameworks */, 784EF1A508AD634A0002821E /* Cocoa.framework in Frameworks */, ); --- 1877,1882 ---- 784EF1A108AD634A0002821E /* QuickTime.framework in Frameworks */, 784EF1A208AD634A0002821E /* libAR.a in Frameworks */, 784EF1A408AD634A0002821E /* libARvideo.a in Frameworks */, + 78DA2EFE08D8EDF900F7A5F2 /* libARgsub_lite.a in Frameworks */, 784EF1A508AD634A0002821E /* Cocoa.framework in Frameworks */, ); *************** *** 2037,2042 **** 78F1201708AD514F00FD6442 /* QuickTime.framework in Frameworks */, 78F1201808AD514F00FD6442 /* libAR.a in Frameworks */, - 78F1201908AD514F00FD6442 /* libARgsub.a in Frameworks */, 78F1201A08AD514F00FD6442 /* libARvideo.a in Frameworks */, 78F1201B08AD514F00FD6442 /* Cocoa.framework in Frameworks */, ); --- 2034,2039 ---- 78F1201708AD514F00FD6442 /* QuickTime.framework in Frameworks */, 78F1201808AD514F00FD6442 /* libAR.a in Frameworks */, 78F1201A08AD514F00FD6442 /* libARvideo.a in Frameworks */, + 78DA2EFF08D8EE2000F7A5F2 /* libARgsub_lite.a in Frameworks */, 78F1201B08AD514F00FD6442 /* Cocoa.framework in Frameworks */, ); *************** *** 3724,3728 **** buildConfigurationList = 784EF1A608AD634A0002821E /* Build configuration list for PBXNativeTarget "calib_cparam" */; buildPhases = ( - 784EF19808AD634A0002821E /* Resources */, 784EF19A08AD634A0002821E /* Sources */, 784EF19D08AD634A0002821E /* Frameworks */, --- 3721,3724 ---- *************** *** 3789,3793 **** buildConfigurationList = 784EF1E408AD64F40002821E /* Build configuration list for PBXNativeTarget "calib_camera2" */; buildPhases = ( - 784EF1D608AD64F40002821E /* Resources */, 784EF1D808AD64F40002821E /* Sources */, 784EF1DB08AD64F40002821E /* Frameworks */, --- 3785,3788 ---- *************** *** 4372,4376 **** buildConfigurationList = 78F1201C08AD514F00FD6442 /* Build configuration list for PBXNativeTarget "calib_dist" */; buildPhases = ( - 78F1200F08AD514F00FD6442 /* Resources */, 78F1201108AD514F00FD6442 /* Sources */, 78F1201308AD514F00FD6442 /* Frameworks */, --- 4367,4370 ---- *************** *** 4579,4598 **** runOnlyForDeploymentPostprocessing = 0; }; - 784EF19808AD634A0002821E /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 784EF19908AD634A0002821E /* Data in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 784EF1D608AD64F40002821E /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 784EF1D708AD64F40002821E /* Data in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 788A85A2089AA558001AB56A /* Resources */ = { isa = PBXResourcesBuildPhase; --- 4573,4576 ---- *************** *** 4660,4671 **** runOnlyForDeploymentPostprocessing = 0; }; - 78F1200F08AD514F00FD6442 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 78F1201008AD514F00FD6442 /* Data in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXResourcesBuildPhase section */ --- 4638,4641 ---- |
|
From: Philip L. <phi...@us...> - 2005-09-15 00:53:12
|
Update of /cvsroot/artoolkit/artoolkit/util/mk_patt In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18250 Modified Files: mk_patt.c Log Message: Step 1 of cleanup. Index: mk_patt.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/mk_patt/mk_patt.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** mk_patt.c 28 Jul 2005 21:58:50 -0000 1.5 --- mk_patt.c 15 Sep 2005 00:53:03 -0000 1.6 *************** *** 1,13 **** #include <stdio.h> #include <stdlib.h> ! #if defined(_WIN32) ! #include <windows.h> ! #endif #ifndef __APPLE__ ! #include <GL/gl.h> ! #include <GL/glut.h> #else ! #include <OpenGL/gl.h> ! #include <GLUT/glut.h> #endif #include <AR/gsub.h> --- 1,41 ---- + /* + * + * This file is part of ARToolKit. + * + * ARToolKit is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * ARToolKit is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with ARToolKit; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + + // ============================================================================ + // Includes + // ============================================================================ + + #ifdef _WIN32 + # include <windows.h> + #endif + #include <math.h> #include <stdio.h> #include <stdlib.h> ! #include <string.h> #ifndef __APPLE__ ! # include <GL/glut.h> ! # ifdef GL_VERSION_1_2 ! # include <GL/glext.h> ! # endif #else ! # include <GLUT/glut.h> ! # include <OpenGL/glext.h> #endif #include <AR/gsub.h> *************** *** 16,19 **** --- 44,51 ---- #include <AR/ar.h> + // ============================================================================ + // Global variables + // ============================================================================ + /* set up the video format globals */ |
|
From: Philip L. <phi...@us...> - 2005-09-15 00:53:06
|
Update of /cvsroot/artoolkit/artoolkit/util/calib_cparam In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18207 Modified Files: calib_cparam.c Log Message: Step 2 of cleanup. Index: calib_cparam.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/calib_cparam/calib_cparam.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** calib_cparam.c 14 Sep 2005 19:10:57 -0000 1.8 --- calib_cparam.c 15 Sep 2005 00:52:48 -0000 1.9 *************** *** 26,32 **** # include <windows.h> #endif #include <stdio.h> #include <stdlib.h> ! #include <math.h> #ifndef __APPLE__ # include <GL/glut.h> --- 26,33 ---- # include <windows.h> #endif [...1233 lines suppressed...] - z = 1.0; - glBegin(GL_QUADS ); - glTexCoord2f( 0.0, 0.0 ); glVertex3f( sx, sy, z ); - glTexCoord2f( tx, 0.0 ); glVertex3f( ex, sy, z ); - glTexCoord2f( tx, ty ); glVertex3f( ex, ey, z ); - glTexCoord2f( 0.0, ty ); glVertex3f( sx, ey, z ); - glEnd(); - - glBindTexture( GL_TEXTURE_2D, 0 ); - glDisable( GL_TEXTURE_2D ); - glPixelStorei( GL_UNPACK_ROW_LENGTH, 0 ); - } --- 680,686 ---- g = a*e - b*d; ! if (g == 0.0) { printf("???\n"); exit(0); } screen_coord[0] = (c * e - b * f) / g; screen_coord[1] = (a * f - c * d) / g; } |
|
From: Philip L. <phi...@us...> - 2005-09-15 00:52:32
|
Update of /cvsroot/artoolkit/artoolkit/util/calib_distortion In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18155 Modified Files: calib_dist.h Log Message: Change threshold to match calib_camera2 value. Index: calib_dist.h =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/calib_distortion/calib_dist.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** calib_dist.h 14 Sep 2005 19:11:16 -0000 1.2 --- calib_dist.h 15 Sep 2005 00:52:25 -0000 1.3 *************** *** 4,8 **** #include <AR/gsub_lite.h> ! #define THRESH 150 #define H_NUM 6 #define V_NUM 4 --- 4,8 ---- #include <AR/gsub_lite.h> ! #define THRESH 100 #define H_NUM 6 #define V_NUM 4 |
|
From: Philip L. <phi...@us...> - 2005-09-15 00:52:11
|
Update of /cvsroot/artoolkit/artoolkit/util/calib_distortion In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18115 Modified Files: calib_dist.c Log Message: Change control flow around grab start/stop. Index: calib_dist.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/calib_distortion/calib_dist.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** calib_dist.c 14 Sep 2005 19:11:16 -0000 1.9 --- calib_dist.c 15 Sep 2005 00:52:03 -0000 1.10 *************** *** 151,155 **** // Start grabbing. ! point_num = 0; gStatus = 0; print_comment(0); --- 151,159 ---- // 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); *************** *** 190,198 **** arMalloc(gClipImage, unsigned char, gXsize * gYsize); - if (arVideoCapStart() != 0) { - fprintf(stderr, "init(): Unable to begin camera data capture.\n"); - return (FALSE); - } - return (TRUE); } --- 194,197 ---- *************** *** 211,215 **** gPatt.loop_num++; if ((gPatt.arglSettings[gPatt.loop_num-1] = arglSetupForCurrentContext()) == NULL) { ! fprintf(stderr, "main(): arglSetupForCurrentContext() returned error.\n"); exit(-1); } --- 210,214 ---- gPatt.loop_num++; if ((gPatt.arglSettings[gPatt.loop_num-1] = arglSetupForCurrentContext()) == NULL) { ! fprintf(stderr, "grabImage(): arglSetupForCurrentContext() returned error.\n"); exit(-1); } *************** *** 218,222 **** 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); } --- 217,220 ---- *************** *** 298,301 **** --- 296,300 ---- grabImage(); gDragStartX = gDragStartY = gDragEndX = gDragEndY = -1; + arVideoCapStop(); gStatus = 1; print_comment(1); |
|
From: Philip L. <phi...@us...> - 2005-09-14 19:11:25
|
Update of /cvsroot/artoolkit/artoolkit/util/calib_distortion In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7141 Modified Files: calib_dist.c calib_dist.h calib_distortion.dsp calib_dist.vcproj Makefile.in Log Message: Step 2 of cleanup. Index: Makefile.in =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/calib_distortion/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:13 -0000 1.1.1.1 --- Makefile.in 14 Sep 2005 19:11:17 -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) Index: calib_dist.vcproj =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/calib_distortion/calib_dist.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** calib_dist.vcproj 23 Jul 2005 00:01:32 -0000 1.2 --- calib_dist.vcproj 14 Sep 2005 19:11:16 -0000 1.3 *************** *** 1,123 **** ! <?xml version="1.0" encoding="Windows-1252"?> ! <VisualStudioProject ! ProjectType="Visual C++" ! Version="7.10" ! Name="calib_dist" ! ProjectGUID="{0304C918-FB5D-5047-11BF-7DCB5020DFF4}"> ! <Platforms> ! <Platform ! Name="Win32"/> ! </Platforms> ! <Configurations> ! <Configuration ! Name="Debug|Win32" ! OutputDirectory="Debug" ! IntermediateDirectory="Debug" ! ConfigurationType="1"> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="0" ! AdditionalIncludeDirectories="$(ProjectDir)../../include" ! PreprocessorDefinitions="WIN32;_DEBUG" ! BasicRuntimeChecks="3" ! RuntimeLibrary="1" ! BrowseInformation="1" ! WarningLevel="3" ! DebugInformationFormat="3"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalOptions="/DEBUG" ! AdditionalDependencies="libARd.lib libARgsubd.lib libARvideod.lib" ! OutputFile="$(ProjectDir)../../bin/$(ProjectName)d.exe" ! AdditionalLibraryDirectories=""$(ProjectDir)../../lib"" ! GenerateDebugInformation="TRUE"/> ! <Tool ! Name="VCMIDLTool" ! PreprocessorDefinitions="_DEBUG" ! MkTypLibCompatible="TRUE" ! SuppressStartupBanner="TRUE" ! TargetEnvironment="1"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool"/> ! <Tool ! Name="VCWebServiceProxyGeneratorTool"/> ! <Tool ! Name="VCXMLDataGeneratorTool"/> ! <Tool ! Name="VCWebDeploymentTool"/> ! <Tool ! Name="VCManagedWrapperGeneratorTool"/> ! <Tool ! Name="VCAuxiliaryManagedWrapperGeneratorTool"/> ! </Configuration> ! <Configuration ! Name="Release|Win32" ! OutputDirectory="Release" ! IntermediateDirectory="Release" ! ConfigurationType="1" ! WholeProgramOptimization="TRUE"> ! <Tool ! Name="VCCLCompilerTool" ! GlobalOptimizations="TRUE" ! InlineFunctionExpansion="1" ! FavorSizeOrSpeed="1" ! AdditionalIncludeDirectories="$(ProjectDir)../../include" ! PreprocessorDefinitions="WIN32;NDEBUG" ! RuntimeLibrary="0"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalDependencies="libAR.lib libARvideo.lib libARgsub.lib" ! OutputFile="$(ProjectDir)../../bin/$(ProjectName).exe" ! AdditionalLibraryDirectories=""$(ProjectDir)../../lib""/> ! <Tool ! Name="VCMIDLTool" ! PreprocessorDefinitions="NDEBUG" ! MkTypLibCompatible="TRUE" ! SuppressStartupBanner="TRUE" ! TargetEnvironment="1"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool"/> ! <Tool ! Name="VCWebServiceProxyGeneratorTool"/> ! <Tool ! Name="VCXMLDataGeneratorTool"/> ! <Tool ! Name="VCWebDeploymentTool"/> ! <Tool ! Name="VCManagedWrapperGeneratorTool"/> ! <Tool ! Name="VCAuxiliaryManagedWrapperGeneratorTool"/> ! </Configuration> ! </Configurations> ! <References> ! </References> ! <Files> ! <File ! RelativePath="calib_dist.c"> ! </File> ! <File ! RelativePath="calib_dist.h"> ! </File> ! <File ! RelativePath="check_dist.c"> ! </File> ! </Files> ! <Globals> ! </Globals> ! </VisualStudioProject> --- 1,123 ---- ! <?xml version="1.0" encoding="Windows-1252"?> ! <VisualStudioProject ! ProjectType="Visual C++" ! Version="7.10" ! Name="calib_dist" ! ProjectGUID="{0304C918-FB5D-5047-11BF-7DCB5020DFF4}"> ! <Platforms> ! <Platform ! Name="Win32"/> ! </Platforms> ! <Configurations> ! <Configuration ! Name="Debug|Win32" ! OutputDirectory="Debug" ! IntermediateDirectory="Debug" ! ConfigurationType="1"> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="0" ! AdditionalIncludeDirectories="$(ProjectDir)../../include" ! PreprocessorDefinitions="WIN32;_DEBUG" ! BasicRuntimeChecks="3" ! RuntimeLibrary="1" ! BrowseInformation="1" ! WarningLevel="3" ! DebugInformationFormat="3"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalOptions="/DEBUG" ! AdditionalDependencies="libARd.lib libARgsub_lited.lib libARvideod.lib" ! OutputFile="$(ProjectDir)../../bin/$(ProjectName)d.exe" ! AdditionalLibraryDirectories=""$(ProjectDir)../../lib"" ! GenerateDebugInformation="TRUE"/> ! <Tool ! Name="VCMIDLTool" ! PreprocessorDefinitions="_DEBUG" ! MkTypLibCompatible="TRUE" ! SuppressStartupBanner="TRUE" ! TargetEnvironment="1"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool"/> ! <Tool ! Name="VCWebServiceProxyGeneratorTool"/> ! <Tool ! Name="VCXMLDataGeneratorTool"/> ! <Tool ! Name="VCWebDeploymentTool"/> ! <Tool ! Name="VCManagedWrapperGeneratorTool"/> ! <Tool ! Name="VCAuxiliaryManagedWrapperGeneratorTool"/> ! </Configuration> ! <Configuration ! Name="Release|Win32" ! OutputDirectory="Release" ! IntermediateDirectory="Release" ! ConfigurationType="1" ! WholeProgramOptimization="TRUE"> ! <Tool ! Name="VCCLCompilerTool" ! GlobalOptimizations="TRUE" ! InlineFunctionExpansion="1" ! FavorSizeOrSpeed="1" ! AdditionalIncludeDirectories="$(ProjectDir)../../include" ! PreprocessorDefinitions="WIN32;NDEBUG" ! RuntimeLibrary="0"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalDependencies="libAR.lib libARvideo.lib libARgsub_lite.lib" ! OutputFile="$(ProjectDir)../../bin/$(ProjectName).exe" ! AdditionalLibraryDirectories=""$(ProjectDir)../../lib""/> ! <Tool ! Name="VCMIDLTool" ! PreprocessorDefinitions="NDEBUG" ! MkTypLibCompatible="TRUE" ! SuppressStartupBanner="TRUE" ! TargetEnvironment="1"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool"/> ! <Tool ! Name="VCWebServiceProxyGeneratorTool"/> ! <Tool ! Name="VCXMLDataGeneratorTool"/> ! <Tool ! Name="VCWebDeploymentTool"/> ! <Tool ! Name="VCManagedWrapperGeneratorTool"/> ! <Tool ! Name="VCAuxiliaryManagedWrapperGeneratorTool"/> ! </Configuration> ! </Configurations> ! <References> ! </References> ! <Files> ! <File ! RelativePath="calib_dist.c"> ! </File> ! <File ! RelativePath="calib_dist.h"> ! </File> ! <File ! RelativePath="check_dist.c"> ! </File> ! </Files> ! <Globals> ! </Globals> ! </VisualStudioProject> Index: calib_dist.h =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/calib_distortion/calib_dist.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** calib_dist.h 4 Nov 2004 08:52:12 -0000 1.1.1.1 --- calib_dist.h 14 Sep 2005 19:11:16 -0000 1.2 *************** *** 2,5 **** --- 2,7 ---- #define CALIB_DIST_H + #include <AR/gsub_lite.h> + #define THRESH 150 #define H_NUM 6 *************** *** 14,21 **** typedef struct patt { unsigned char *savedImage[LOOP_MAX]; CALIB_COORD_T *point[LOOP_MAX]; ! int h_num; ! int v_num; ! int loop_num; } CALIB_PATT_T; --- 16,24 ---- typedef struct patt { unsigned char *savedImage[LOOP_MAX]; + ARGL_CONTEXT_SETTINGS_REF arglSettings[LOOP_MAX]; CALIB_COORD_T *point[LOOP_MAX]; ! int h_num; // Number of dots horizontally in the calibration pattern. ! int v_num; // Number of dots vertically in the calibration pattern. ! int loop_num; // How many images of the complete calibration patterns we have completed. } CALIB_PATT_T; Index: calib_distortion.dsp =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/calib_distortion/calib_distortion.dsp,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** calib_distortion.dsp 4 Nov 2004 08:52:13 -0000 1.1.1.1 --- calib_distortion.dsp 14 Sep 2005 19:11:16 -0000 1.2 *************** *** 1,114 **** ! # Microsoft Developer Studio Project File - Name="calib_distortion" - Package Owner=<4> ! # Microsoft Developer Studio Generated Build File, Format Version 6.00 ! # ** DO NOT EDIT ** ! ! # TARGTYPE "Win32 (x86) Console Application" 0x0103 ! ! CFG=calib_distortion - Win32 Debug ! !MESSAGE This is not a valid makefile. To build this project using NMAKE, ! !MESSAGE use the Export Makefile command and run ! !MESSAGE ! !MESSAGE NMAKE /f "calib_distortion.mak". ! !MESSAGE ! !MESSAGE You can specify a configuration when running NMAKE ! !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE ! !MESSAGE NMAKE /f "calib_distortion.mak" CFG="calib_distortion - Win32 Debug" ! !MESSAGE ! !MESSAGE Possible choices for configuration are: ! !MESSAGE ! !MESSAGE "calib_distortion - Win32 Release" (based on "Win32 (x86) Console Application") ! !MESSAGE "calib_distortion - Win32 Debug" (based on "Win32 (x86) Console Application") ! !MESSAGE ! ! # Begin Project ! # PROP AllowPerConfigDependencies 0 ! # PROP Scc_ProjName "" ! # PROP Scc_LocalPath "" ! CPP=cl.exe ! RSC=rc.exe ! ! !IF "$(CFG)" == "calib_distortion - Win32 Release" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "Release" ! # PROP BASE Intermediate_Dir "Release" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "Release" ! # PROP Intermediate_Dir "Release" ! # PROP Ignore_Export_Lib 0 ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c ! # ADD CPP /nologo /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c ! # SUBTRACT CPP /YX ! # ADD BASE RSC /l 0x1409 /d "NDEBUG" ! # ADD RSC /l 0x1409 /d "NDEBUG" ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! 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_distortion.exe" /libpath:"..\..\lib" ! # SUBTRACT LINK32 /nodefaultlib ! ! !ELSEIF "$(CFG)" == "calib_distortion - Win32 Debug" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "Debug" ! # PROP BASE Intermediate_Dir "Debug" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "Debug" ! # PROP Intermediate_Dir "Debug" ! # PROP Ignore_Export_Lib 0 ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c ! # ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c ! # SUBTRACT CPP /YX ! # ADD BASE RSC /l 0x1409 /d "_DEBUG" ! # ADD RSC /l 0x1409 /d "_DEBUG" ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! 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_distortiond.exe" /pdbtype:sept /libpath:"..\..\lib" ! # SUBTRACT LINK32 /nodefaultlib ! ! !ENDIF ! ! # Begin Target ! ! # Name "calib_distortion - Win32 Release" ! # Name "calib_distortion - Win32 Debug" ! # Begin Group "Source Files" ! ! # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" ! # Begin Source File ! ! SOURCE=.\calib_dist.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\check_dist.c ! # End Source File ! # End Group ! # Begin Group "Header Files" ! ! # PROP Default_Filter "h;hpp;hxx;hm;inl" ! # Begin Source File ! ! SOURCE=.\calib_dist.h ! # End Source File ! # End Group ! # Begin Group "Resource Files" ! ! # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" ! # End Group ! # End Target ! # End Project --- 1,114 ---- ! # Microsoft Developer Studio Project File - Name="calib_distortion" - Package Owner=<4> ! # Microsoft Developer Studio Generated Build File, Format Version 6.00 ! # ** DO NOT EDIT ** ! ! # TARGTYPE "Win32 (x86) Console Application" 0x0103 ! ! CFG=calib_distortion - Win32 Debug ! !MESSAGE This is not a valid makefile. To build this project using NMAKE, ! !MESSAGE use the Export Makefile command and run ! !MESSAGE ! !MESSAGE NMAKE /f "calib_distortion.mak". ! !MESSAGE ! !MESSAGE You can specify a configuration when running NMAKE ! !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE ! !MESSAGE NMAKE /f "calib_distortion.mak" CFG="calib_distortion - Win32 Debug" ! !MESSAGE ! !MESSAGE Possible choices for configuration are: ! !MESSAGE ! !MESSAGE "calib_distortion - Win32 Release" (based on "Win32 (x86) Console Application") ! !MESSAGE "calib_distortion - Win32 Debug" (based on "Win32 (x86) Console Application") ! !MESSAGE ! ! # Begin Project ! # PROP AllowPerConfigDependencies 0 ! # PROP Scc_ProjName "" ! # PROP Scc_LocalPath "" ! CPP=cl.exe ! RSC=rc.exe ! ! !IF "$(CFG)" == "calib_distortion - Win32 Release" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "Release" ! # PROP BASE Intermediate_Dir "Release" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "Release" ! # PROP Intermediate_Dir "Release" ! # PROP Ignore_Export_Lib 0 ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c ! # ADD CPP /nologo /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c ! # SUBTRACT CPP /YX ! # ADD BASE RSC /l 0x1409 /d "NDEBUG" ! # ADD RSC /l 0x1409 /d "NDEBUG" ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! 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_distortion.exe" /libpath:"..\..\lib" ! # SUBTRACT LINK32 /nodefaultlib ! ! !ELSEIF "$(CFG)" == "calib_distortion - Win32 Debug" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "Debug" ! # PROP BASE Intermediate_Dir "Debug" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "Debug" ! # PROP Intermediate_Dir "Debug" ! # PROP Ignore_Export_Lib 0 ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c ! # ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c ! # SUBTRACT CPP /YX ! # ADD BASE RSC /l 0x1409 /d "_DEBUG" ! # ADD RSC /l 0x1409 /d "_DEBUG" ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! 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_distortiond.exe" /pdbtype:sept /libpath:"..\..\lib" ! # SUBTRACT LINK32 /nodefaultlib ! ! !ENDIF ! ! # Begin Target ! ! # Name "calib_distortion - Win32 Release" ! # Name "calib_distortion - Win32 Debug" ! # Begin Group "Source Files" ! ! # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" ! # Begin Source File ! ! SOURCE=.\calib_dist.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\check_dist.c ! # End Source File ! # End Group ! # Begin Group "Header Files" ! ! # PROP Default_Filter "h;hpp;hxx;hm;inl" ! # Begin Source File ! ! SOURCE=.\calib_dist.h ! # End Source File ! # End Group ! # Begin Group "Resource Files" ! ! # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" ! # End Group ! # End Target ! # End Project Index: calib_dist.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/calib_distortion/calib_dist.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** calib_dist.c 31 Aug 2005 00:05:18 -0000 1.8 --- calib_dist.c 14 Sep 2005 19:11:16 -0000 1.9 *************** *** 1,4 **** #ifdef _WIN32 ! #include <windows.h> #endif #include <math.h> --- 1,28 ---- + /* + * + * This file is part of ARToolKit. + * + * ARToolKit is free software; you can redistribute it and/or modify [...1464 lines suppressed...] ! 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; } } |
|
From: Philip L. <phi...@us...> - 2005-09-14 19:11:18
|
Update of /cvsroot/artoolkit/artoolkit In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7048 Modified Files: ARToolKit.sln ARToolKit.dsw Log Message: Step 2 of cleanup. Index: ARToolKit.dsw =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/ARToolKit.dsw,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ARToolKit.dsw 22 Nov 2004 03:41:22 -0000 1.2 --- ARToolKit.dsw 14 Sep 2005 19:11:09 -0000 1.3 *************** *** 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> ! {{{ ! }}} ! ! ############################################################################### ! Index: ARToolKit.sln =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/ARToolKit.sln,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ARToolKit.sln 1 Dec 2004 20:36:56 -0000 1.4 --- ARToolKit.sln 14 Sep 2005 19:11:09 -0000 1.5 *************** *** 1,332 **** ! Microsoft Visual Studio Solution File, Format Version 8.00 ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libAR", "lib\SRC\AR\libAR.vcproj", "{191F78D2-7A53-4EAF-94E9-433DF5496E6E}" ! ProjectSection(ProjectDependencies) = postProject ! EndProjectSection ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libARMulti", "lib\SRC\ARMulti\libARMulti.vcproj", "{6BB655FE-B823-4BE4-BDC9-FD3738FF82BC}" ! ProjectSection(ProjectDependencies) = postProject ! EndProjectSection ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libARgsub", "lib\SRC\Gl\libARgsub.vcproj", "{1CB7F08A-A8E5-457B-A589-9878F126601D}" ! ProjectSection(ProjectDependencies) = postProject ! EndProjectSection ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libARgsubUtil", "lib\SRC\Gl\libARgsubUtil.vcproj", "{81A146C4-A7ED-462D-ADF3-FE93E82F2B9B}" ! ProjectSection(ProjectDependencies) = postProject ! EndProjectSection ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "simpleTest", "examples\simple\simpleTest.vcproj", "{89E3CB14-46DF-46BB-B87F-CC653045B14C}" ! 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 ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "simpleTest2", "examples\simple2\simpleTest2.vcproj", "{591A24EE-AE23-7439-B131-D7A75370BFE8}" ! 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 ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "relationTest", "examples\relation\relationTest.vcproj", "{1E69B126-6965-4DEC-5FED-5A392CCDD2B5}" ! 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 ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "optical", "examples\optical\optical.vcproj", "{E50769E3-0646-8D8C-3318-308E7D1A9149}" ! ProjectSection(ProjectDependencies) = postProject ! {B5E62882-360E-46B2-A97F-50443BB795E3} = {B5E62882-360E-46B2-A97F-50443BB795E3} ! {1CB7F08A-A8E5-457B-A589-9878F126601D} = {1CB7F08A-A8E5-457B-A589-9878F126601D} ! {81A146C4-A7ED-462D-ADF3-FE93E82F2B9B} = {81A146C4-A7ED-462D-ADF3-FE93E82F2B9B} ! {191F78D2-7A53-4EAF-94E9-433DF5496E6E} = {191F78D2-7A53-4EAF-94E9-433DF5496E6E} ! EndProjectSection ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "multiTest", "examples\multi\multiTest.vcproj", "{AAE4C85D-5090-725A-1213-96DA1C47FA86}" ! 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} ! {6BB655FE-B823-4BE4-BDC9-FD3738FF82BC} = {6BB655FE-B823-4BE4-BDC9-FD3738FF82BC} ! EndProjectSection ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "exview", "examples\exview\exview.vcproj", "{470DFC62-B400-2B24-4FF1-B2AAA5936303}" ! 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 ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "calib_camera2", "util\calib_camera2\calib_camera2.vcproj", "{7218026D-600A-2D4D-C387-44E5B226FA6A}" ! 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 ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "calib_cparam", "util\calib_cparam\calib_cparam.vcproj", "{C5DDBA06-F8CF-0191-E0BB-3D92CD5C1538}" ! 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 ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "calib_dist", "util\calib_distortion\calib_dist.vcproj", "{0304C918-FB5D-5047-11BF-7DCB5020DFF4}" ! 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 ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mk_patt", "util\mk_patt\mk_patt.vcproj", "{92E9C84C-BADB-EF76-FA80-740BA0F532DF}" ! 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 ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libARgsub_lite", "lib\SRC\Gl\libARgsub_lite.vcproj", "{8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF}" ! ProjectSection(ProjectDependencies) = postProject ! EndProjectSection ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "simpleLite", "examples\simpleLite\simpleLite.vcproj", "{A1BB0AD4-A5E7-4C0F-9FE8-D584F6B2FBF2}" ! ProjectSection(ProjectDependencies) = postProject ! {8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF} = {8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF} ! {B5E62882-360E-46B2-A97F-50443BB795E3} = {B5E62882-360E-46B2-A97F-50443BB795E3} ! {191F78D2-7A53-4EAF-94E9-433DF5496E6E} = {191F78D2-7A53-4EAF-94E9-433DF5496E6E} ! EndProjectSection ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libARvideo", "lib\SRC\VideoWin32DirectShow\libARvideo.vcproj", "{B5E62882-360E-46B2-A97F-50443BB795E3}" ! ProjectSection(ProjectDependencies) = postProject ! EndProjectSection ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "collideTest", "examples\collide\collideTest.vcproj", "{5FA7A8DD-5430-4644-91A9-51626083BB97}" ! ProjectSection(ProjectDependencies) = postProject ! EndProjectSection ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "loadMultiple", "examples\loadMultiple\loadMultiple.vcproj", "{783FACE5-1839-4EEF-9BA6-363214268B2E}" ! ProjectSection(ProjectDependencies) = postProject ! EndProjectSection ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "modeTest", "examples\modeTest\modeTest.vcproj", "{84700F48-BA9E-4465-AFEE-D31B15157A69}" ! ProjectSection(ProjectDependencies) = postProject ! EndProjectSection ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "paddleTest", "examples\paddle\paddleTest.vcproj", "{FDE263E5-1713-4E16-8199-663CAECA981E}" ! ProjectSection(ProjectDependencies) = postProject ! EndProjectSection ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "paddleDemo", "examples\paddleDemo\paddleDemo.vcproj", "{A363668A-A9B7-4CB4-89C6-67911CE040E0}" ! ProjectSection(ProjectDependencies) = postProject ! EndProjectSection ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "paddleInteractionTest", "examples\paddleInteraction\paddleInteractionTest.vcproj", "{6057A7AF-B6DF-4535-8453-E27EDDDDDD02}" ! ProjectSection(ProjectDependencies) = postProject ! EndProjectSection ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rangeTest", "examples\range\rangeTest.vcproj", "{43965D43-1F96-4C4C-AB04-912B388A779C}" ! 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 ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "twoView", "examples\twoView\twoView.vcproj", "{AE939D29-D571-404E-A9DC-15B532FDA41D}" ! ProjectSection(ProjectDependencies) = postProject ! {8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF} = {8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF} ! {B5E62882-360E-46B2-A97F-50443BB795E3} = {B5E62882-360E-46B2-A97F-50443BB795E3} ! {191F78D2-7A53-4EAF-94E9-433DF5496E6E} = {191F78D2-7A53-4EAF-94E9-433DF5496E6E} ! EndProjectSection ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graphicsTest", "util\graphicsTest\graphicsTest.vcproj", "{8C93A102-ABC7-4848-A183-BD1F3471159C}" ! ProjectSection(ProjectDependencies) = postProject ! EndProjectSection ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "videoTest", "util\videoTest\videoTest.vcproj", "{401D60F6-AF80-481B-A6EB-9FB03130AB1F}" ! 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 ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libARvrml", "lib\SRC\ARvrml\libarvrml.vcproj", "{C90F035F-437C-4285-BBCA-8DDC70582356}" ! ProjectSection(ProjectDependencies) = postProject ! EndProjectSection ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "simpleVRML", "examples\simpleVRML\simpleVRML.vcproj", "{7B5EFC13-7883-82CC-7D72-732240F68F29}" ! ProjectSection(ProjectDependencies) = postProject ! {C90F035F-437C-4285-BBCA-8DDC70582356} = {C90F035F-437C-4285-BBCA-8DDC70582356} ! {8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF} = {8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF} ! {B5E62882-360E-46B2-A97F-50443BB795E3} = {B5E62882-360E-46B2-A97F-50443BB795E3} ! {191F78D2-7A53-4EAF-94E9-433DF5496E6E} = {191F78D2-7A53-4EAF-94E9-433DF5496E6E} ! EndProjectSection ! EndProject ! Global ! GlobalSection(SolutionConfiguration) = preSolution ! Debug = Debug ! Release = Release ! Release (Intel) = Release (Intel) ! EndGlobalSection ! GlobalSection(ProjectConfiguration) = postSolution ! {191F78D2-7A53-4EAF-94E9-433DF5496E6E}.Debug.ActiveCfg = Debug|Win32 ! {191F78D2-7A53-4EAF-94E9-433DF5496E6E}.Debug.Build.0 = Debug|Win32 ! {191F78D2-7A53-4EAF-94E9-433DF5496E6E}.Release.ActiveCfg = Release|Win32 ! {191F78D2-7A53-4EAF-94E9-433DF5496E6E}.Release.Build.0 = Release|Win32 ! {191F78D2-7A53-4EAF-94E9-433DF5496E6E}.Release (Intel).ActiveCfg = Release|Win32 ! {6BB655FE-B823-4BE4-BDC9-FD3738FF82BC}.Debug.ActiveCfg = Debug|Win32 ! {6BB655FE-B823-4BE4-BDC9-FD3738FF82BC}.Debug.Build.0 = Debug|Win32 ! {6BB655FE-B823-4BE4-BDC9-FD3738FF82BC}.Release.ActiveCfg = Release|Win32 ! {6BB655FE-B823-4BE4-BDC9-FD3738FF82BC}.Release.Build.0 = Release|Win32 ! {6BB655FE-B823-4BE4-BDC9-FD3738FF82BC}.Release (Intel).ActiveCfg = Release|Win32 ! {1CB7F08A-A8E5-457B-A589-9878F126601D}.Debug.ActiveCfg = Debug|Win32 ! {1CB7F08A-A8E5-457B-A589-9878F126601D}.Debug.Build.0 = Debug|Win32 ! {1CB7F08A-A8E5-457B-A589-9878F126601D}.Release.ActiveCfg = Release|Win32 ! {1CB7F08A-A8E5-457B-A589-9878F126601D}.Release.Build.0 = Release|Win32 ! {1CB7F08A-A8E5-457B-A589-9878F126601D}.Release (Intel).ActiveCfg = Release|Win32 ! {81A146C4-A7ED-462D-ADF3-FE93E82F2B9B}.Debug.ActiveCfg = Debug|Win32 ! {81A146C4-A7ED-462D-ADF3-FE93E82F2B9B}.Debug.Build.0 = Debug|Win32 ! {81A146C4-A7ED-462D-ADF3-FE93E82F2B9B}.Release.ActiveCfg = Release|Win32 ! {81A146C4-A7ED-462D-ADF3-FE93E82F2B9B}.Release.Build.0 = Release|Win32 ! {81A146C4-A7ED-462D-ADF3-FE93E82F2B9B}.Release (Intel).ActiveCfg = Release|Win32 ! {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Debug.ActiveCfg = Debug|Win32 ! {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Debug.Build.0 = Debug|Win32 ! {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Release.ActiveCfg = Release|Win32 ! {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Release.Build.0 = Release|Win32 ! {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Release (Intel).ActiveCfg = Release|Win32 ! {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Release (Intel).Build.0 = Release|Win32 ! {591A24EE-AE23-7439-B131-D7A75370BFE8}.Debug.ActiveCfg = Debug|Win32 ! {591A24EE-AE23-7439-B131-D7A75370BFE8}.Debug.Build.0 = Debug|Win32 ! {591A24EE-AE23-7439-B131-D7A75370BFE8}.Release.ActiveCfg = Release|Win32 ! {591A24EE-AE23-7439-B131-D7A75370BFE8}.Release.Build.0 = Release|Win32 ! {591A24EE-AE23-7439-B131-D7A75370BFE8}.Release (Intel).ActiveCfg = Release|Win32 ! {1E69B126-6965-4DEC-5FED-5A392CCDD2B5}.Debug.ActiveCfg = Debug|Win32 ! {1E69B126-6965-4DEC-5FED-5A392CCDD2B5}.Debug.Build.0 = Debug|Win32 ! {1E69B126-6965-4DEC-5FED-5A392CCDD2B5}.Release.ActiveCfg = Release|Win32 ! {1E69B126-6965-4DEC-5FED-5A392CCDD2B5}.Release.Build.0 = Release|Win32 ! {1E69B126-6965-4DEC-5FED-5A392CCDD2B5}.Release (Intel).ActiveCfg = Release|Win32 ! {E50769E3-0646-8D8C-3318-308E7D1A9149}.Debug.ActiveCfg = Debug|Win32 ! {E50769E3-0646-8D8C-3318-308E7D1A9149}.Debug.Build.0 = Debug|Win32 ! {E50769E3-0646-8D8C-3318-308E7D1A9149}.Release.ActiveCfg = Release|Win32 ! {E50769E3-0646-8D8C-3318-308E7D1A9149}.Release.Build.0 = Release|Win32 ! {E50769E3-0646-8D8C-3318-308E7D1A9149}.Release (Intel).ActiveCfg = Release|Win32 ! {AAE4C85D-5090-725A-1213-96DA1C47FA86}.Debug.ActiveCfg = Debug|Win32 ! {AAE4C85D-5090-725A-1213-96DA1C47FA86}.Debug.Build.0 = Debug|Win32 ! {AAE4C85D-5090-725A-1213-96DA1C47FA86}.Release.ActiveCfg = Release|Win32 ! {AAE4C85D-5090-725A-1213-96DA1C47FA86}.Release.Build.0 = Release|Win32 ! {AAE4C85D-5090-725A-1213-96DA1C47FA86}.Release (Intel).ActiveCfg = Release|Win32 ! {470DFC62-B400-2B24-4FF1-B2AAA5936303}.Debug.ActiveCfg = Debug|Win32 ! {470DFC62-B400-2B24-4FF1-B2AAA5936303}.Debug.Build.0 = Debug|Win32 ! {470DFC62-B400-2B24-4FF1-B2AAA5936303}.Release.ActiveCfg = Release|Win32 ! {470DFC62-B400-2B24-4FF1-B2AAA5936303}.Release.Build.0 = Release|Win32 ! {470DFC62-B400-2B24-4FF1-B2AAA5936303}.Release (Intel).ActiveCfg = Release|Win32 ! {7218026D-600A-2D4D-C387-44E5B226FA6A}.Debug.ActiveCfg = Debug|Win32 ! {7218026D-600A-2D4D-C387-44E5B226FA6A}.Debug.Build.0 = Debug|Win32 ! {7218026D-600A-2D4D-C387-44E5B226FA6A}.Release.ActiveCfg = Release|Win32 ! {7218026D-600A-2D4D-C387-44E5B226FA6A}.Release.Build.0 = Release|Win32 ! {7218026D-600A-2D4D-C387-44E5B226FA6A}.Release (Intel).ActiveCfg = Release|Win32 ! {C5DDBA06-F8CF-0191-E0BB-3D92CD5C1538}.Debug.ActiveCfg = Debug|Win32 ! {C5DDBA06-F8CF-0191-E0BB-3D92CD5C1538}.Debug.Build.0 = Debug|Win32 ! {C5DDBA06-F8CF-0191-E0BB-3D92CD5C1538}.Release.ActiveCfg = Release|Win32 ! {C5DDBA06-F8CF-0191-E0BB-3D92CD5C1538}.Release.Build.0 = Release|Win32 ! {C5DDBA06-F8CF-0191-E0BB-3D92CD5C1538}.Release (Intel).ActiveCfg = Release|Win32 ! {0304C918-FB5D-5047-11BF-7DCB5020DFF4}.Debug.ActiveCfg = Debug|Win32 ! {0304C918-FB5D-5047-11BF-7DCB5020DFF4}.Debug.Build.0 = Debug|Win32 ! {0304C918-FB5D-5047-11BF-7DCB5020DFF4}.Release.ActiveCfg = Release|Win32 ! {0304C918-FB5D-5047-11BF-7DCB5020DFF4}.Release.Build.0 = Release|Win32 ! {0304C918-FB5D-5047-11BF-7DCB5020DFF4}.Release (Intel).ActiveCfg = Release|Win32 ! {92E9C84C-BADB-EF76-FA80-740BA0F532DF}.Debug.ActiveCfg = Debug|Win32 ! {92E9C84C-BADB-EF76-FA80-740BA0F532DF}.Debug.Build.0 = Debug|Win32 ! {92E9C84C-BADB-EF76-FA80-740BA0F532DF}.Release.ActiveCfg = Release|Win32 ! {92E9C84C-BADB-EF76-FA80-740BA0F532DF}.Release.Build.0 = Release|Win32 ! {92E9C84C-BADB-EF76-FA80-740BA0F532DF}.Release (Intel).ActiveCfg = Release|Win32 ! {8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF}.Debug.ActiveCfg = Debug|Win32 ! {8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF}.Debug.Build.0 = Debug|Win32 ! {8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF}.Release.ActiveCfg = Release|Win32 ! {8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF}.Release.Build.0 = Release|Win32 ! {8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF}.Release (Intel).ActiveCfg = Release|Win32 ! {A1BB0AD4-A5E7-4C0F-9FE8-D584F6B2FBF2}.Debug.ActiveCfg = Debug|Win32 ! {A1BB0AD4-A5E7-4C0F-9FE8-D584F6B2FBF2}.Debug.Build.0 = Debug|Win32 ! {A1BB0AD4-A5E7-4C0F-9FE8-D584F6B2FBF2}.Release.ActiveCfg = Release|Win32 ! {A1BB0AD4-A5E7-4C0F-9FE8-D584F6B2FBF2}.Release.Build.0 = Release|Win32 ! {A1BB0AD4-A5E7-4C0F-9FE8-D584F6B2FBF2}.Release (Intel).ActiveCfg = Release|Win32 ! {B5E62882-360E-46B2-A97F-50443BB795E3}.Debug.ActiveCfg = Debug|Win32 ! {B5E62882-360E-46B2-A97F-50443BB795E3}.Debug.Build.0 = Debug|Win32 ! {B5E62882-360E-46B2-A97F-50443BB795E3}.Release.ActiveCfg = Release|Win32 ! {B5E62882-360E-46B2-A97F-50443BB795E3}.Release.Build.0 = Release|Win32 ! {B5E62882-360E-46B2-A97F-50443BB795E3}.Release (Intel).ActiveCfg = Release|Win32 ! {5FA7A8DD-5430-4644-91A9-51626083BB97}.Debug.ActiveCfg = Debug|Win32 ! {5FA7A8DD-5430-4644-91A9-51626083BB97}.Debug.Build.0 = Debug|Win32 ! {5FA7A8DD-5430-4644-91A9-51626083BB97}.Release.ActiveCfg = Release|Win32 ! {5FA7A8DD-5430-4644-91A9-51626083BB97}.Release.Build.0 = Release|Win32 ! {5FA7A8DD-5430-4644-91A9-51626083BB97}.Release (Intel).ActiveCfg = Release|Win32 ! {5FA7A8DD-5430-4644-91A9-51626083BB97}.Release (Intel).Build.0 = Release|Win32 ! {783FACE5-1839-4EEF-9BA6-363214268B2E}.Debug.ActiveCfg = Debug|Win32 ! {783FACE5-1839-4EEF-9BA6-363214268B2E}.Debug.Build.0 = Debug|Win32 ! {783FACE5-1839-4EEF-9BA6-363214268B2E}.Release.ActiveCfg = Release|Win32 ! {783FACE5-1839-4EEF-9BA6-363214268B2E}.Release.Build.0 = Release|Win32 ! {783FACE5-1839-4EEF-9BA6-363214268B2E}.Release (Intel).ActiveCfg = Release|Win32 ! {783FACE5-1839-4EEF-9BA6-363214268B2E}.Release (Intel).Build.0 = Release|Win32 ! {84700F48-BA9E-4465-AFEE-D31B15157A69}.Debug.ActiveCfg = Debug|Win32 ! {84700F48-BA9E-4465-AFEE-D31B15157A69}.Debug.Build.0 = Debug|Win32 ! {84700F48-BA9E-4465-AFEE-D31B15157A69}.Release.ActiveCfg = Release|Win32 ! {84700F48-BA9E-4465-AFEE-D31B15157A69}.Release.Build.0 = Release|Win32 ! {84700F48-BA9E-4465-AFEE-D31B15157A69}.Release (Intel).ActiveCfg = Release|Win32 ! {84700F48-BA9E-4465-AFEE-D31B15157A69}.Release (Intel).Build.0 = Release|Win32 ! {FDE263E5-1713-4E16-8199-663CAECA981E}.Debug.ActiveCfg = Debug|Win32 ! {FDE263E5-1713-4E16-8199-663CAECA981E}.Debug.Build.0 = Debug|Win32 ! {FDE263E5-1713-4E16-8199-663CAECA981E}.Release.ActiveCfg = Release|Win32 ! {FDE263E5-1713-4E16-8199-663CAECA981E}.Release.Build.0 = Release|Win32 ! {FDE263E5-1713-4E16-8199-663CAECA981E}.Release (Intel).ActiveCfg = Release|Win32 ! {FDE263E5-1713-4E16-8199-663CAECA981E}.Release (Intel).Build.0 = Release|Win32 ! {A363668A-A9B7-4CB4-89C6-67911CE040E0}.Debug.ActiveCfg = Debug|Win32 ! {A363668A-A9B7-4CB4-89C6-67911CE040E0}.Debug.Build.0 = Debug|Win32 ! {A363668A-A9B7-4CB4-89C6-67911CE040E0}.Release.ActiveCfg = Release|Win32 ! {A363668A-A9B7-4CB4-89C6-67911CE040E0}.Release.Build.0 = Release|Win32 ! {A363668A-A9B7-4CB4-89C6-67911CE040E0}.Release (Intel).ActiveCfg = Release|Win32 ! {A363668A-A9B7-4CB4-89C6-67911CE040E0}.Release (Intel).Build.0 = Release|Win32 ! {6057A7AF-B6DF-4535-8453-E27EDDDDDD02}.Debug.ActiveCfg = Debug|Win32 ! {6057A7AF-B6DF-4535-8453-E27EDDDDDD02}.Debug.Build.0 = Debug|Win32 ! {6057A7AF-B6DF-4535-8453-E27EDDDDDD02}.Release.ActiveCfg = Release|Win32 ! {6057A7AF-B6DF-4535-8453-E27EDDDDDD02}.Release.Build.0 = Release|Win32 ! {6057A7AF-B6DF-4535-8453-E27EDDDDDD02}.Release (Intel).ActiveCfg = Release|Win32 ! {6057A7AF-B6DF-4535-8453-E27EDDDDDD02}.Release (Intel).Build.0 = Release|Win32 ! {43965D43-1F96-4C4C-AB04-912B388A779C}.Debug.ActiveCfg = Debug|Win32 ! {43965D43-1F96-4C4C-AB04-912B388A779C}.Debug.Build.0 = Debug|Win32 ! {43965D43-1F96-4C4C-AB04-912B388A779C}.Release.ActiveCfg = Release|Win32 ! {43965D43-1F96-4C4C-AB04-912B388A779C}.Release.Build.0 = Release|Win32 ! {43965D43-1F96-4C4C-AB04-912B388A779C}.Release (Intel).ActiveCfg = Release|Win32 ! {43965D43-1F96-4C4C-AB04-912B388A779C}.Release (Intel).Build.0 = Release|Win32 ! {AE939D29-D571-404E-A9DC-15B532FDA41D}.Debug.ActiveCfg = Debug|Win32 ! {AE939D29-D571-404E-A9DC-15B532FDA41D}.Debug.Build.0 = Debug|Win32 ! {AE939D29-D571-404E-A9DC-15B532FDA41D}.Release.ActiveCfg = Release|Win32 ! {AE939D29-D571-404E-A9DC-15B532FDA41D}.Release.Build.0 = Release|Win32 ! {AE939D29-D571-404E-A9DC-15B532FDA41D}.Release (Intel).ActiveCfg = Release|Win32 ! {AE939D29-D571-404E-A9DC-15B532FDA41D}.Release (Intel).Build.0 = Release|Win32 ! {8C93A102-ABC7-4848-A183-BD1F3471159C}.Debug.ActiveCfg = Debug|Win32 ! {8C93A102-ABC7-4848-A183-BD1F3471159C}.Debug.Build.0 = Debug|Win32 ! {8C93A102-ABC7-4848-A183-BD1F3471159C}.Release.ActiveCfg = Release|Win32 ! {8C93A102-ABC7-4848-A183-BD1F3471159C}.Release.Build.0 = Release|Win32 ! {8C93A102-ABC7-4848-A183-BD1F3471159C}.Release (Intel).ActiveCfg = Release|Win32 ! {8C93A102-ABC7-4848-A183-BD1F3471159C}.Release (Intel).Build.0 = Release|Win32 ! {401D60F6-AF80-481B-A6EB-9FB03130AB1F}.Debug.ActiveCfg = Debug|Win32 ! {401D60F6-AF80-481B-A6EB-9FB03130AB1F}.Debug.Build.0 = Debug|Win32 ! {401D60F6-AF80-481B-A6EB-9FB03130AB1F}.Release.ActiveCfg = Release|Win32 ! {401D60F6-AF80-481B-A6EB-9FB03130AB1F}.Release.Build.0 = Release|Win32 ! {401D60F6-AF80-481B-A6EB-9FB03130AB1F}.Release (Intel).ActiveCfg = Release|Win32 ! {401D60F6-AF80-481B-A6EB-9FB03130AB1F}.Release (Intel).Build.0 = Release|Win32 ! {C90F035F-437C-4285-BBCA-8DDC70582356}.Debug.ActiveCfg = Debug|Win32 ! {C90F035F-437C-4285-BBCA-8DDC70582356}.Release.ActiveCfg = Release|Win32 ! {C90F035F-437C-4285-BBCA-8DDC70582356}.Release (Intel).ActiveCfg = Release|Win32 ! {C90F035F-437C-4285-BBCA-8DDC70582356}.Release (Intel).Build.0 = Release|Win32 ! {7B5EFC13-7883-82CC-7D72-732240F68F29}.Debug.ActiveCfg = Debug|Win32 ! {7B5EFC13-7883-82CC-7D72-732240F68F29}.Release.ActiveCfg = Release|Win32 ! {7B5EFC13-7883-82CC-7D72-732240F68F29}.Release (Intel).ActiveCfg = Release|Win32 ! {7B5EFC13-7883-82CC-7D72-732240F68F29}.Release (Intel).Build.0 = Release|Win32 ! EndGlobalSection ! GlobalSection(ExtensibilityGlobals) = postSolution ! EndGlobalSection ! GlobalSection(ExtensibilityAddIns) = postSolution ! EndGlobalSection ! EndGlobal --- 1,332 ---- ! Microsoft Visual Studio Solution File, Format Version 8.00 ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libAR", "lib\SRC\AR\libAR.vcproj", "{191F78D2-7A53-4EAF-94E9-433DF5496E6E}" ! ProjectSection(ProjectDependencies) = postProject ! EndProjectSection ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libARMulti", "lib\SRC\ARMulti\libARMulti.vcproj", "{6BB655FE-B823-4BE4-BDC9-FD3738FF82BC}" ! ProjectSection(ProjectDependencies) = postProject ! EndProjectSection ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libARgsub", "lib\SRC\Gl\libARgsub.vcproj", "{1CB7F08A-A8E5-457B-A589-9878F126601D}" ! ProjectSection(ProjectDependencies) = postProject ! EndProjectSection ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libARgsubUtil", "lib\SRC\Gl\libARgsubUtil.vcproj", "{81A146C4-A7ED-462D-ADF3-FE93E82F2B9B}" ! ProjectSection(ProjectDependencies) = postProject ! EndProjectSection ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "simpleTest", "examples\simple\simpleTest.vcproj", "{89E3CB14-46DF-46BB-B87F-CC653045B14C}" ! 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 ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "simpleTest2", "examples\simple2\simpleTest2.vcproj", "{591A24EE-AE23-7439-B131-D7A75370BFE8}" ! 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 ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "relationTest", "examples\relation\relationTest.vcproj", "{1E69B126-6965-4DEC-5FED-5A392CCDD2B5}" ! 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 ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "optical", "examples\optical\optical.vcproj", "{E50769E3-0646-8D8C-3318-308E7D1A9149}" ! ProjectSection(ProjectDependencies) = postProject ! {B5E62882-360E-46B2-A97F-50443BB795E3} = {B5E62882-360E-46B2-A97F-50443BB795E3} ! {1CB7F08A-A8E5-457B-A589-9878F126601D} = {1CB7F08A-A8E5-457B-A589-9878F126601D} ! {81A146C4-A7ED-462D-ADF3-FE93E82F2B9B} = {81A146C4-A7ED-462D-ADF3-FE93E82F2B9B} ! {191F78D2-7A53-4EAF-94E9-433DF5496E6E} = {191F78D2-7A53-4EAF-94E9-433DF5496E6E} ! EndProjectSection ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "multiTest", "examples\multi\multiTest.vcproj", "{AAE4C85D-5090-725A-1213-96DA1C47FA86}" ! 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} ! {6BB655FE-B823-4BE4-BDC9-FD3738FF82BC} = {6BB655FE-B823-4BE4-BDC9-FD3738FF82BC} ! EndProjectSection ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "exview", "examples\exview\exview.vcproj", "{470DFC62-B400-2B24-4FF1-B2AAA5936303}" ! 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 ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "calib_camera2", "util\calib_camera2\calib_camera2.vcproj", "{7218026D-600A-2D4D-C387-44E5B226FA6A}" ! ProjectSection(ProjectDependencies) = postProject ! {B5E62882-360E-46B2-A97F-50443BB795E3} = {B5E62882-360E-46B2-A97F-50443BB795E3} ! {8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF} = {8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF} ! {191F78D2-7A53-4EAF-94E9-433DF5496E6E} = {191F78D2-7A53-4EAF-94E9-433DF5496E6E} ! EndProjectSection ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "calib_cparam", "util\calib_cparam\calib_cparam.vcproj", "{C5DDBA06-F8CF-0191-E0BB-3D92CD5C1538}" ! 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 ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "calib_dist", "util\calib_distortion\calib_dist.vcproj", "{0304C918-FB5D-5047-11BF-7DCB5020DFF4}" ! ProjectSection(ProjectDependencies) = postProject ! {B5E62882-360E-46B2-A97F-50443BB795E3} = {B5E62882-360E-46B2-A97F-50443BB795E3} ! {8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF} = {8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF} ! {191F78D2-7A53-4EAF-94E9-433DF5496E6E} = {191F78D2-7A53-4EAF-94E9-433DF5496E6E} ! EndProjectSection ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mk_patt", "util\mk_patt\mk_patt.vcproj", "{92E9C84C-BADB-EF76-FA80-740BA0F532DF}" ! 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 ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libARgsub_lite", "lib\SRC\Gl\libARgsub_lite.vcproj", "{8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF}" ! ProjectSection(ProjectDependencies) = postProject ! EndProjectSection ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "simpleLite", "examples\simpleLite\simpleLite.vcproj", "{A1BB0AD4-A5E7-4C0F-9FE8-D584F6B2FBF2}" ! ProjectSection(ProjectDependencies) = postProject ! {8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF} = {8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF} ! {B5E62882-360E-46B2-A97F-50443BB795E3} = {B5E62882-360E-46B2-A97F-50443BB795E3} ! {191F78D2-7A53-4EAF-94E9-433DF5496E6E} = {191F78D2-7A53-4EAF-94E9-433DF5496E6E} ! EndProjectSection ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libARvideo", "lib\SRC\VideoWin32DirectShow\libARvideo.vcproj", "{B5E62882-360E-46B2-A97F-50443BB795E3}" ! ProjectSection(ProjectDependencies) = postProject ! EndProjectSection ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "collideTest", "examples\collide\collideTest.vcproj", "{5FA7A8DD-5430-4644-91A9-51626083BB97}" ! ProjectSection(ProjectDependencies) = postProject ! EndProjectSection ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "loadMultiple", "examples\loadMultiple\loadMultiple.vcproj", "{783FACE5-1839-4EEF-9BA6-363214268B2E}" ! ProjectSection(ProjectDependencies) = postProject ! EndProjectSection ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "modeTest", "examples\modeTest\modeTest.vcproj", "{84700F48-BA9E-4465-AFEE-D31B15157A69}" ! ProjectSection(ProjectDependencies) = postProject ! EndProjectSection ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "paddleTest", "examples\paddle\paddleTest.vcproj", "{FDE263E5-1713-4E16-8199-663CAECA981E}" ! ProjectSection(ProjectDependencies) = postProject ! EndProjectSection ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "paddleDemo", "examples\paddleDemo\paddleDemo.vcproj", "{A363668A-A9B7-4CB4-89C6-67911CE040E0}" ! ProjectSection(ProjectDependencies) = postProject ! EndProjectSection ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "paddleInteractionTest", "examples\paddleInteraction\paddleInteractionTest.vcproj", "{6057A7AF-B6DF-4535-8453-E27EDDDDDD02}" ! ProjectSection(ProjectDependencies) = postProject ! EndProjectSection ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rangeTest", "examples\range\rangeTest.vcproj", "{43965D43-1F96-4C4C-AB04-912B388A779C}" ! 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 ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "twoView", "examples\twoView\twoView.vcproj", "{AE939D29-D571-404E-A9DC-15B532FDA41D}" ! ProjectSection(ProjectDependencies) = postProject ! {8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF} = {8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF} ! {B5E62882-360E-46B2-A97F-50443BB795E3} = {B5E62882-360E-46B2-A97F-50443BB795E3} ! {191F78D2-7A53-4EAF-94E9-433DF5496E6E} = {191F78D2-7A53-4EAF-94E9-433DF5496E6E} ! EndProjectSection ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graphicsTest", "util\graphicsTest\graphicsTest.vcproj", "{8C93A102-ABC7-4848-A183-BD1F3471159C}" ! ProjectSection(ProjectDependencies) = postProject ! EndProjectSection ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "videoTest", "util\videoTest\videoTest.vcproj", "{401D60F6-AF80-481B-A6EB-9FB03130AB1F}" ! 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 ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libARvrml", "lib\SRC\ARvrml\libarvrml.vcproj", "{C90F035F-437C-4285-BBCA-8DDC70582356}" ! ProjectSection(ProjectDependencies) = postProject ! EndProjectSection ! EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "simpleVRML", "examples\simpleVRML\simpleVRML.vcproj", "{7B5EFC13-7883-82CC-7D72-732240F68F29}" ! ProjectSection(ProjectDependencies) = postProject ! {C90F035F-437C-4285-BBCA-8DDC70582356} = {C90F035F-437C-4285-BBCA-8DDC70582356} ! {8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF} = {8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF} ! {B5E62882-360E-46B2-A97F-50443BB795E3} = {B5E62882-360E-46B2-A97F-50443BB795E3} ! {191F78D2-7A53-4EAF-94E9-433DF5496E6E} = {191F78D2-7A53-4EAF-94E9-433DF5496E6E} ! EndProjectSection ! EndProject ! Global ! GlobalSection(SolutionConfiguration) = preSolution ! Debug = Debug ! Release = Release ! Release (Intel) = Release (Intel) ! EndGlobalSection ! GlobalSection(ProjectConfiguration) = postSolution ! {191F78D2-7A53-4EAF-94E9-433DF5496E6E}.Debug.ActiveCfg = Debug|Win32 ! {191F78D2-7A53-4EAF-94E9-433DF5496E6E}.Debug.Build.0 = Debug|Win32 ! {191F78D2-7A53-4EAF-94E9-433DF5496E6E}.Release.ActiveCfg = Release|Win32 ! {191F78D2-7A53-4EAF-94E9-433DF5496E6E}.Release.Build.0 = Release|Win32 ! {191F78D2-7A53-4EAF-94E9-433DF5496E6E}.Release (Intel).ActiveCfg = Release|Win32 ! {6BB655FE-B823-4BE4-BDC9-FD3738FF82BC}.Debug.ActiveCfg = Debug|Win32 ! {6BB655FE-B823-4BE4-BDC9-FD3738FF82BC}.Debug.Build.0 = Debug|Win32 ! {6BB655FE-B823-4BE4-BDC9-FD3738FF82BC}.Release.ActiveCfg = Release|Win32 ! {6BB655FE-B823-4BE4-BDC9-FD3738FF82BC}.Release.Build.0 = Release|Win32 ! {6BB655FE-B823-4BE4-BDC9-FD3738FF82BC}.Release (Intel).ActiveCfg = Release|Win32 ! {1CB7F08A-A8E5-457B-A589-9878F126601D}.Debug.ActiveCfg = Debug|Win32 ! {1CB7F08A-A8E5-457B-A589-9878F126601D}.Debug.Build.0 = Debug|Win32 ! {1CB7F08A-A8E5-457B-A589-9878F126601D}.Release.ActiveCfg = Release|Win32 ! {1CB7F08A-A8E5-457B-A589-9878F126601D}.Release.Build.0 = Release|Win32 ! {1CB7F08A-A8E5-457B-A589-9878F126601D}.Release (Intel).ActiveCfg = Release|Win32 ! {81A146C4-A7ED-462D-ADF3-FE93E82F2B9B}.Debug.ActiveCfg = Debug|Win32 ! {81A146C4-A7ED-462D-ADF3-FE93E82F2B9B}.Debug.Build.0 = Debug|Win32 ! {81A146C4-A7ED-462D-ADF3-FE93E82F2B9B}.Release.ActiveCfg = Release|Win32 ! {81A146C4-A7ED-462D-ADF3-FE93E82F2B9B}.Release.Build.0 = Release|Win32 ! {81A146C4-A7ED-462D-ADF3-FE93E82F2B9B}.Release (Intel).ActiveCfg = Release|Win32 ! {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Debug.ActiveCfg = Debug|Win32 ! {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Debug.Build.0 = Debug|Win32 ! {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Release.ActiveCfg = Release|Win32 ! {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Release.Build.0 = Release|Win32 ! {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Release (Intel).ActiveCfg = Release|Win32 ! {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Release (Intel).Build.0 = Release|Win32 ! {591A24EE-AE23-7439-B131-D7A75370BFE8}.Debug.ActiveCfg = Debug|Win32 ! {591A24EE-AE23-7439-B131-D7A75370BFE8}.Debug.Build.0 = Debug|Win32 ! {591A24EE-AE23-7439-B131-D7A75370BFE8}.Release.ActiveCfg = Release|Win32 ! {591A24EE-AE23-7439-B131-D7A75370BFE8}.Release.Build.0 = Release|Win32 ! {591A24EE-AE23-7439-B131-D7A75370BFE8}.Release (Intel).ActiveCfg = Release|Win32 ! {1E69B126-6965-4DEC-5FED-5A392CCDD2B5}.Debug.ActiveCfg = Debug|Win32 ! {1E69B126-6965-4DEC-5FED-5A392CCDD2B5}.Debug.Build.0 = Debug|Win32 ! {1E69B126-6965-4DEC-5FED-5A392CCDD2B5}.Release.ActiveCfg = Release|Win32 ! {1E69B126-6965-4DEC-5FED-5A392CCDD2B5}.Release.Build.0 = Release|Win32 ! {1E69B126-6965-4DEC-5FED-5A392CCDD2B5}.Release (Intel).ActiveCfg = Release|Win32 ! {E50769E3-0646-8D8C-3318-308E7D1A9149}.Debug.ActiveCfg = Debug|Win32 ! {E50769E3-0646-8D8C-3318-308E7D1A9149}.Debug.Build.0 = Debug|Win32 ! {E50769E3-0646-8D8C-3318-308E7D1A9149}.Release.ActiveCfg = Release|Win32 ! {E50769E3-0646-8D8C-3318-308E7D1A9149}.Release.Build.0 = Release|Win32 ! {E50769E3-0646-8D8C-3318-308E7D1A9149}.Release (Intel).ActiveCfg = Release|Win32 ! {AAE4C85D-5090-725A-1213-96DA1C47FA86}.Debug.ActiveCfg = Debug|Win32 ! {AAE4C85D-5090-725A-1213-96DA1C47FA86}.Debug.Build.0 = Debug|Win32 ! {AAE4C85D-5090-725A-1213-96DA1C47FA86}.Release.ActiveCfg = Release|Win32 ! {AAE4C85D-5090-725A-1213-96DA1C47FA86}.Release.Build.0 = Release|Win32 ! {AAE4C85D-5090-725A-1213-96DA1C47FA86}.Release (Intel).ActiveCfg = Release|Win32 ! {470DFC62-B400-2B24-4FF1-B2AAA5936303}.Debug.ActiveCfg = Debug|Win32 ! {470DFC62-B400-2B24-4FF1-B2AAA5936303}.Debug.Build.0 = Debug|Win32 ! {470DFC62-B400-2B24-4FF1-B2AAA5936303}.Release.ActiveCfg = Release|Win32 ! {470DFC62-B400-2B24-4FF1-B2AAA5936303}.Release.Build.0 = Release|Win32 ! {470DFC62-B400-2B24-4FF1-B2AAA5936303}.Release (Intel).ActiveCfg = Release|Win32 ! {7218026D-600A-2D4D-C387-44E5B226FA6A}.Debug.ActiveCfg = Debug|Win32 ! {7218026D-600A-2D4D-C387-44E5B226FA6A}.Debug.Build.0 = Debug|Win32 ! {7218026D-600A-2D4D-C387-44E5B226FA6A}.Release.ActiveCfg = Release|Win32 ! {7218026D-600A-2D4D-C387-44E5B226FA6A}.Release.Build.0 = Release|Win32 ! {7218026D-600A-2D4D-C387-44E5B226FA6A}.Release (Intel).ActiveCfg = Release|Win32 ! {C5DDBA06-F8CF-0191-E0BB-3D92CD5C1538}.Debug.ActiveCfg = Debug|Win32 ! {C5DDBA06-F8CF-0191-E0BB-3D92CD5C1538}.Debug.Build.0 = Debug|Win32 ! {C5DDBA06-F8CF-0191-E0BB-3D92CD5C1538}.Release.ActiveCfg = Release|Win32 ! {C5DDBA06-F8CF-0191-E0BB-3D92CD5C1538}.Release.Build.0 = Release|Win32 ! {C5DDBA06-F8CF-0191-E0BB-3D92CD5C1538}.Release (Intel).ActiveCfg = Release|Win32 ! {0304C918-FB5D-5047-11BF-7DCB5020DFF4}.Debug.ActiveCfg = Debug|Win32 ! {0304C918-FB5D-5047-11BF-7DCB5020DFF4}.Debug.Build.0 = Debug|Win32 ! {0304C918-FB5D-5047-11BF-7DCB5020DFF4}.Release.ActiveCfg = Release|Win32 ! {0304C918-FB5D-5047-11BF-7DCB5020DFF4}.Release.Build.0 = Release|Win32 ! {0304C918-FB5D-5047-11BF-7DCB5020DFF4}.Release (Intel).ActiveCfg = Release|Win32 ! {92E9C84C-BADB-EF76-FA80-740BA0F532DF}.Debug.ActiveCfg = Debug|Win32 ! {92E9C84C-BADB-EF76-FA80-740BA0F532DF}.Debug.Build.0 = Debug|Win32 ! {92E9C84C-BADB-EF76-FA80-740BA0F532DF}.Release.ActiveCfg = Release|Win32 ! {92E9C84C-BADB-EF76-FA80-740BA0F532DF}.Release.Build.0 = Release|Win32 ! {92E9C84C-BADB-EF76-FA80-740BA0F532DF}.Release (Intel).ActiveCfg = Release|Win32 ! {8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF}.Debug.ActiveCfg = Debug|Win32 ! {8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF}.Debug.Build.0 = Debug|Win32 ! {8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF}.Release.ActiveCfg = Release|Win32 ! {8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF}.Release.Build.0 = Release|Win32 ! {8AAAFC7D-0CF2-4E59-BEEA-DD4398CA55BF}.Release (Intel).ActiveCfg = Release|Win32 ! {A1BB0AD4-A5E7-4C0F-9FE8-D584F6B2FBF2}.Debug.ActiveCfg = Debug|Win32 ! {A1BB0AD4-A5E7-4C0F-9FE8-D584F6B2FBF2}.Debug.Build.0 = Debug|Win32 ! {A1BB0AD4-A5E7-4C0F-9FE8-D584F6B2FBF2}.Release.ActiveCfg = Release|Win32 ! {A1BB0AD4-A5E7-4C0F-9FE8-D584F6B2FBF2}.Release.Build.0 = Release|Win32 ! {A1BB0AD4-A5E7-4C0F-9FE8-D584F6B2FBF2}.Release (Intel).ActiveCfg = Release|Win32 ! {B5E62882-360E-46B2-A97F-50443BB795E3}.Debug.ActiveCfg = Debug|Win32 ! {B5E62882-360E-46B2-A97F-50443BB795E3}.Debug.Build.0 = Debug|Win32 ! {B5E62882-360E-46B2-A97F-50443BB795E3}.Release.ActiveCfg = Release|Win32 ! {B5E62882-360E-46B2-A97F-50443BB795E3}.Release.Build.0 = Release|Win32 ! {B5E62882-360E-46B2-A97F-50443BB795E3}.Release (Intel).ActiveCfg = Release|Win32 ! {5FA7A8DD-5430-4644-91A9-51626083BB97}.Debug.ActiveCfg = Debug|Win32 ! {5FA7A8DD-5430-4644-91A9-51626083BB97}.Debug.Build.0 = Debug|Win32 ! {5FA7A8DD-5430-4644-91A9-51626083BB97}.Release.ActiveCfg = Release|Win32 ! {5FA7A8DD-5430-4644-91A9-51626083BB97}.Release.Build.0 = Release|Win32 ! {5FA7A8DD-5430-4644-91A9-51626083BB97}.Release (Intel).ActiveCfg = Release|Win32 ! {5FA7A8DD-5430-4644-91A9-51626083BB97}.Release (Intel).Build.0 = Release|Win32 ! {783FACE5-1839-4EEF-9BA6-363214268B2E}.Debug.ActiveCfg = Debug|Win32 ! {783FACE5-1839-4EEF-9BA6-363214268B2E}.Debug.Build.0 = Debug|Win32 ! {783FACE5-1839-4EEF-9BA6-363214268B2E}.Release.ActiveCfg = Release|Win32 ! {783FACE5-1839-4EEF-9BA6-363214268B2E}.Release.Build.0 = Release|Win32 ! {783FACE5-1839-4EEF-9BA6-363214268B2E}.Release (Intel).ActiveCfg = Release|Win32 ! {783FACE5-1839-4EEF-9BA6-363214268B2E}.Release (Intel).Build.0 = Release|Win32 ! {84700F48-BA9E-4465-AFEE-D31B15157A69}.Debug.ActiveCfg = Debug|Win32 ! {84700F48-BA9E-4465-AFEE-D31B15157A69}.Debug.Build.0 = Debug|Win32 ! {84700F48-BA9E-4465-AFEE-D31B15157A69}.Release.ActiveCfg = Release|Win32 ! {84700F48-BA9E-4465-AFEE-D31B15157A69}.Release.Build.0 = Release|Win32 ! {84700F48-BA9E-4465-AFEE-D31B15157A69}.Release (Intel).ActiveCfg = Release|Win32 ! {84700F48-BA9E-4465-AFEE-D31B15157A69}.Release (Intel).Build.0 = Release|Win32 ! {FDE263E5-1713-4E16-8199-663CAECA981E}.Debug.ActiveCfg = Debug|Win32 ! {FDE263E5-1713-4E16-8199-663CAECA981E}.Debug.Build.0 = Debug|Win32 ! {FDE263E5-1713-4E16-8199-663CAECA981E}.Release.ActiveCfg = Release|Win32 ! {FDE263E5-1713-4E16-8199-663CAECA981E}.Release.Build.0 = Release|Win32 ! {FDE263E5-1713-4E16-8199-663CAECA981E}.Release (Intel).ActiveCfg = Release|Win32 ! {FDE263E5-1713-4E16-8199-663CAECA981E}.Release (Intel).Build.0 = Release|Win32 ! {A363668A-A9B7-4CB4-89C6-67911CE040E0}.Debug.ActiveCfg = Debug|Win32 ! {A363668A-A9B7-4CB4-89C6-67911CE040E0}.Debug.Build.0 = Debug|Win32 ! {A363668A-A9B7-4CB4-89C6-67911CE040E0}.Release.ActiveCfg = Release|Win32 ! {A363668A-A9B7-4CB4-89C6-67911CE040E0}.Release.Build.0 = Release|Win32 ! {A363668A-A9B7-4CB4-89C6-67911CE040E0}.Release (Intel).ActiveCfg = Release|Win32 ! {A363668A-A9B7-4CB4-89C6-67911CE040E0}.Release (Intel).Build.0 = Release|Win32 ! {6057A7AF-B6DF-4535-8453-E27EDDDDDD02}.Debug.ActiveCfg = Debug|Win32 ! {6057A7AF-B6DF-4535-8453-E27EDDDDDD02}.Debug.Build.0 = Debug|Win32 ! {6057A7AF-B6DF-4535-8453-E27EDDDDDD02}.Release.ActiveCfg = Release|Win32 ! {6057A7AF-B6DF-4535-8453-E27EDDDDDD02}.Release.Build.0 = Release|Win32 ! {6057A7AF-B6DF-4535-8453-E27EDDDDDD02}.Release (Intel).ActiveCfg = Release|Win32 ! {6057A7AF-B6DF-4535-8453-E27EDDDDDD02}.Release (Intel).Build.0 = Release|Win32 ! {43965D43-1F96-4C4C-AB04-912B388A779C}.Debug.ActiveCfg = Debug|Win32 ! {43965D43-1F96-4C4C-AB04-912B388A779C}.Debug.Build.0 = Debug|Win32 ! {43965D43-1F96-4C4C-AB04-912B388A779C}.Release.ActiveCfg = Release|Win32 ! {43965D43-1F96-4C4C-AB04-912B388A779C}.Release.Build.0 = Release|Win32 ! {43965D43-1F96-4C4C-AB04-912B388A779C}.Release (Intel).ActiveCfg = Release|Win32 ! {43965D43-1F96-4C4C-AB04-912B388A779C}.Release (Intel).Build.0 = Release|Win32 ! {AE939D29-D571-404E-A9DC-15B532FDA41D}.Debug.ActiveCfg = Debug|Win32 ! {AE939D29-D571-404E-A9DC-15B532FDA41D}.Debug.Build.0 = Debug|Win32 ! {AE939D29-D571-404E-A9DC-15B532FDA41D}.Release.ActiveCfg = Release|Win32 ! {AE939D29-D571-404E-A9DC-15B532FDA41D}.Release.Build.0 = Release|Win32 ! {AE939D29-D571-404E-A9DC-15B532FDA41D}.Release (Intel).ActiveCfg = Release|Win32 ! {AE939D29-D571-404E-A9DC-15B532FDA41D}.Release (Intel).Build.0 = Release|Win32 ! {8C93A102-ABC7-4848-A183-BD1F3471159C}.Debug.ActiveCfg = Debug|Win32 ! {8C93A102-ABC7-4848-A183-BD1F3471159C}.Debug.Build.0 = Debug|Win32 ! {8C93A102-ABC7-4848-A183-BD1F3471159C}.Release.ActiveCfg = Release|Win32 ! {8C93A102-ABC7-4848-A183-BD1F3471159C}.Release.Build.0 = Release|Win32 ! {8C93A102-ABC7-4848-A183-BD1F3471159C}.Release (Intel).ActiveCfg = Release|Win32 ! {8C93A102-ABC7-4848-A183-BD1F3471159C}.Release (Intel).Build.0 = Release|Win32 ! {401D60F6-AF80-481B-A6EB-9FB03130AB1F}.Debug.ActiveCfg = Debug|Win32 ! {401D60F6-AF80-481B-A6EB-9FB03130AB1F}.Debug.Build.0 = Debug|Win32 ! {401D60F6-AF80-481B-A6EB-9FB03130AB1F}.Release.ActiveCfg = Release|Win32 ! {401D60F6-AF80-481B-A6EB-9FB03130AB1F}.Release.Build.0 = Release|Win32 ! {401D60F6-AF80-481B-A6EB-9FB03130AB1F}.Release (Intel).ActiveCfg = Release|Win32 ! {401D60F6-AF80-481B-A6EB-9FB03130AB1F}.Release (Intel).Build.0 = Release|Win32 ! {C90F035F-437C-4285-BBCA-8DDC70582356}.Debug.ActiveCfg = Debug|Win32 ! {C90F035F-437C-4285-BBCA-8DDC70582356}.Release.ActiveCfg = Release|Win32 ! {C90F035F-437C-4285-BBCA-8DDC70582356}.Release (Intel).ActiveCfg = Release|Win32 ! {C90F035F-437C-4285-BBCA-8DDC70582356}.Release (Intel).Build.0 = Release|Win32 ! {7B5EFC13-7883-82CC-7D72-732240F68F29}.Debug.ActiveCfg = Debug|Win32 ! {7B5EFC13-7883-82CC-7D72-732240F68F29}.Release.ActiveCfg = Release|Win32 ! {7B5EFC13-7883-82CC-7D72-732240F68F29}.Release (Intel).ActiveCfg = Release|Win32 ! {7B5EFC13-7883-82CC-7D72-732240F68F29}.Release (Intel).Build.0 = Release|Win32 ! EndGlobalSection ! GlobalSection(ExtensibilityGlobals) = postSolution ! EndGlobalSection ! GlobalSection(ExtensibilityAddIns) = postSolution ! EndGlobalSection ! EndGlobal |
|
From: Philip L. <phi...@us...> - 2005-09-14 19:11:14
|
Update of /cvsroot/artoolkit/artoolkit/util/calib_camera2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6988 Modified Files: calib_camera.h Makefile.in main.c calib_camera2.dsp calib_camera2.vcproj Log Message: Step 2 of cleanup. Index: Makefile.in =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/calib_camera2/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:06 -0000 1.1.1.1 --- Makefile.in 14 Sep 2005 19:11:03 -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) Index: calib_camera2.vcproj =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/calib_camera2/calib_camera2.vcproj,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** calib_camera2.vcproj 23 Jul 2005 00:02:32 -0000 1.2 --- calib_camera2.vcproj 14 Sep 2005 19:11:03 -0000 1.3 *************** *** 1,126 **** ! <?xml version="1.0" encoding="Windows-1252"?> ! <VisualStudioProject ! ProjectType="Visual C++" ! Version="7.10" ! Name="calib_camera2" ! ProjectGUID="{7218026D-600A-2D4D-C387-44E5B226FA6A}"> ! <Platforms> ! <Platform ! Name="Win32"/> ! </Platforms> ! <Configurations> ! <Configuration ! Name="Debug|Win32" ! OutputDirectory="Debug" ! IntermediateDirectory="Debug" ! ConfigurationType="1"> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="0" ! AdditionalIncludeDirectories="$(ProjectDir)../../include" ! PreprocessorDefinitions="WIN32;_DEBUG" ! BasicRuntimeChecks="3" ! RuntimeLibrary="1" ! BrowseInformation="1" ! WarningLevel="3" ! DebugInformationFormat="3"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalOptions="/DEBUG" ! AdditionalDependencies="libARd.lib libARgsubd.lib libARvideod.lib" ! OutputFile="$(ProjectDir)../../bin/$(ProjectName)d.exe" ! AdditionalLibraryDirectories=""$(ProjectDir)../../lib"" ! GenerateDebugInformation="TRUE"/> ! <Tool ! Name="VCMIDLTool" ! PreprocessorDefinitions="_DEBUG" ! MkTypLibCompatible="TRUE" ! SuppressStartupBanner="TRUE" ! TargetEnvironment="1"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool"/> ! <Tool ! Name="VCWebServiceProxyGeneratorTool"/> ! <Tool ! Name="VCXMLDataGeneratorTool"/> ! <Tool ! Name="VCWebDeploymentTool"/> ! <Tool ! Name="VCManagedWrapperGeneratorTool"/> ! <Tool ! Name="VCAuxiliaryManagedWrapperGeneratorTool"/> ! </Configuration> ! <Configuration ! Name="Release|Win32" ! OutputDirectory="Release" ! IntermediateDirectory="Release" ! ConfigurationType="1" ! WholeProgramOptimization="TRUE"> ! <Tool ! Name="VCCLCompilerTool" ! GlobalOptimizations="TRUE" ! InlineFunctionExpansion="1" ! FavorSizeOrSpeed="1" ! AdditionalIncludeDirectories="$(ProjectDir)../../include" ! PreprocessorDefinitions="WIN32;NDEBUG" ! RuntimeLibrary="0"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalDependencies="libAR.lib libARvideo.lib libARgsub.lib" ! OutputFile="$(ProjectDir)../../bin/$(ProjectName).exe" ! AdditionalLibraryDirectories=""$(ProjectDir)../../lib""/> ! <Tool ! Name="VCMIDLTool" ! PreprocessorDefinitions="NDEBUG" ! MkTypLibCompatible="TRUE" ! SuppressStartupBanner="TRUE" ! TargetEnvironment="1"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool"/> ! <Tool ! Name="VCWebServiceProxyGeneratorTool"/> ! <Tool ! Name="VCXMLDataGeneratorTool"/> ! <Tool ! Name="VCWebDeploymentTool"/> ! <Tool ! Name="VCManagedWrapperGeneratorTool"/> ! <Tool ! Name="VCAuxiliaryManagedWrapperGeneratorTool"/> ! </Configuration> ! </Configurations> ! <References> ! </References> ! <Files> ! <File ! RelativePath="calib_camera.h"> ! </File> ! <File ! RelativePath="calib_dist.c"> ! </File> ! <File ! RelativePath="calib_inp.c"> ! </File> ! <File ! RelativePath="main.c"> ! </File> ! </Files> ! <Globals> ! </Globals> ! </VisualStudioProject> --- 1,126 ---- ! <?xml version="1.0" encoding="Windows-1252"?> ! <VisualStudioProject ! ProjectType="Visual C++" ! Version="7.10" ! Name="calib_camera2" ! ProjectGUID="{7218026D-600A-2D4D-C387-44E5B226FA6A}"> ! <Platforms> ! <Platform ! Name="Win32"/> ! </Platforms> ! <Configurations> ! <Configuration ! Name="Debug|Win32" ! OutputDirectory="Debug" ! IntermediateDirectory="Debug" ! ConfigurationType="1"> ! <Tool ! Name="VCCLCompilerTool" ! Optimization="0" ! AdditionalIncludeDirectories="$(ProjectDir)../../include" ! PreprocessorDefinitions="WIN32;_DEBUG" ! BasicRuntimeChecks="3" ! RuntimeLibrary="1" ! BrowseInformation="1" ! WarningLevel="3" ! DebugInformationFormat="3"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalOptions="/DEBUG" ! AdditionalDependencies="libARd.lib libARgsub_lited.lib libARvideod.lib" ! OutputFile="$(ProjectDir)../../bin/$(ProjectName)d.exe" ! AdditionalLibraryDirectories=""$(ProjectDir)../../lib"" ! GenerateDebugInformation="TRUE"/> ! <Tool ! Name="VCMIDLTool" ! PreprocessorDefinitions="_DEBUG" ! MkTypLibCompatible="TRUE" ! SuppressStartupBanner="TRUE" ! TargetEnvironment="1"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool"/> ! <Tool ! Name="VCWebServiceProxyGeneratorTool"/> ! <Tool ! Name="VCXMLDataGeneratorTool"/> ! <Tool ! Name="VCWebDeploymentTool"/> ! <Tool ! Name="VCManagedWrapperGeneratorTool"/> ! <Tool ! Name="VCAuxiliaryManagedWrapperGeneratorTool"/> ! </Configuration> ! <Configuration ! Name="Release|Win32" ! OutputDirectory="Release" ! IntermediateDirectory="Release" ! ConfigurationType="1" ! WholeProgramOptimization="TRUE"> ! <Tool ! Name="VCCLCompilerTool" ! GlobalOptimizations="TRUE" ! InlineFunctionExpansion="1" ! FavorSizeOrSpeed="1" ! AdditionalIncludeDirectories="$(ProjectDir)../../include" ! PreprocessorDefinitions="WIN32;NDEBUG" ! RuntimeLibrary="0"/> ! <Tool ! Name="VCCustomBuildTool"/> ! <Tool ! Name="VCLinkerTool" ! AdditionalDependencies="libAR.lib libARvideo.lib libARgsub_lite.lib" ! OutputFile="$(ProjectDir)../../bin/$(ProjectName).exe" ! AdditionalLibraryDirectories=""$(ProjectDir)../../lib""/> ! <Tool ! Name="VCMIDLTool" ! PreprocessorDefinitions="NDEBUG" ! MkTypLibCompatible="TRUE" ! SuppressStartupBanner="TRUE" ! TargetEnvironment="1"/> ! <Tool ! Name="VCPostBuildEventTool"/> ! <Tool ! Name="VCPreBuildEventTool"/> ! <Tool ! Name="VCPreLinkEventTool"/> ! <Tool ! Name="VCResourceCompilerTool"/> ! <Tool ! Name="VCWebServiceProxyGeneratorTool"/> ! <Tool ! Name="VCXMLDataGeneratorTool"/> ! <Tool ! Name="VCWebDeploymentTool"/> ! <Tool ! Name="VCManagedWrapperGeneratorTool"/> ! <Tool ! Name="VCAuxiliaryManagedWrapperGeneratorTool"/> ! </Configuration> ! </Configurations> ! <References> ! </References> ! <Files> ! <File ! RelativePath="calib_camera.h"> ! </File> ! <File ! RelativePath="calib_dist.c"> ! </File> ! <File ! RelativePath="calib_inp.c"> ! </File> ! <File ! RelativePath="main.c"> ! </File> ! </Files> ! <Globals> ! </Globals> ! </VisualStudioProject> Index: calib_camera2.dsp =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/calib_camera2/calib_camera2.dsp,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** calib_camera2.dsp 4 Nov 2004 08:52:01 -0000 1.1.1.1 --- calib_camera2.dsp 14 Sep 2005 19:11:03 -0000 1.2 *************** *** 1,118 **** ! # Microsoft Developer Studio Project File - Name="calib_camera2" - Package Owner=<4> ! # Microsoft Developer Studio Generated Build File, Format Version 6.00 ! # ** DO NOT EDIT ** ! ! # TARGTYPE "Win32 (x86) Console Application" 0x0103 ! ! CFG=calib_camera2 - Win32 Debug ! !MESSAGE This is not a valid makefile. To build this project using NMAKE, ! !MESSAGE use the Export Makefile command and run ! !MESSAGE ! !MESSAGE NMAKE /f "calib_camera2.mak". ! !MESSAGE ! !MESSAGE You can specify a configuration when running NMAKE ! !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE ! !MESSAGE NMAKE /f "calib_camera2.mak" CFG="calib_camera2 - Win32 Debug" ! !MESSAGE ! !MESSAGE Possible choices for configuration are: ! !MESSAGE ! !MESSAGE "calib_camera2 - Win32 Release" (based on "Win32 (x86) Console Application") ! !MESSAGE "calib_camera2 - Win32 Debug" (based on "Win32 (x86) Console Application") ! !MESSAGE ! ! # Begin Project ! # PROP AllowPerConfigDependencies 0 ! # PROP Scc_ProjName "" ! # PROP Scc_LocalPath "" ! CPP=cl.exe ! RSC=rc.exe ! ! !IF "$(CFG)" == "calib_camera2 - Win32 Release" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "Release" ! # PROP BASE Intermediate_Dir "Release" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "Release" ! # PROP Intermediate_Dir "Release" ! # PROP Ignore_Export_Lib 0 ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c ! # ADD CPP /nologo /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c ! # SUBTRACT CPP /YX ! # ADD BASE RSC /l 0x1409 /d "NDEBUG" ! # ADD RSC /l 0x1409 /d "NDEBUG" ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! 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 /nologo /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"../../bin/calib_camera2.exe" /libpath:"..\..\lib" ! # SUBTRACT LINK32 /nodefaultlib ! ! !ELSEIF "$(CFG)" == "calib_camera2 - Win32 Debug" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "Debug" ! # PROP BASE Intermediate_Dir "Debug" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "Debug" ! # PROP Intermediate_Dir "Debug" ! # PROP Ignore_Export_Lib 0 ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c ! # ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c ! # SUBTRACT CPP /YX ! # ADD BASE RSC /l 0x1409 /d "_DEBUG" ! # ADD RSC /l 0x1409 /d "_DEBUG" ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! 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 /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd.lib" /out:"../../bin/calib_camera2d.exe" /pdbtype:sept /libpath:"..\..\lib" ! # SUBTRACT LINK32 /pdb:none ! ! !ENDIF ! ! # Begin Target ! ! # Name "calib_camera2 - Win32 Release" ! # Name "calib_camera2 - Win32 Debug" ! # Begin Group "Source Files" ! ! # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" ! # Begin Source File ! ! SOURCE=.\calib_dist.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\calib_inp.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\main.c ! # End Source File ! # End Group ! # Begin Group "Header Files" ! ! # PROP Default_Filter "h;hpp;hxx;hm;inl" ! # Begin Source File ! ! SOURCE=.\calib_camera.h ! # End Source File ! # End Group ! # Begin Group "Resource Files" ! ! # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" ! # End Group ! # End Target ! # End Project --- 1,118 ---- ! # Microsoft Developer Studio Project File - Name="calib_camera2" - Package Owner=<4> ! # Microsoft Developer Studio Generated Build File, Format Version 6.00 ! # ** DO NOT EDIT ** ! ! # TARGTYPE "Win32 (x86) Console Application" 0x0103 ! ! CFG=calib_camera2 - Win32 Debug ! !MESSAGE This is not a valid makefile. To build this project using NMAKE, ! !MESSAGE use the Export Makefile command and run ! !MESSAGE ! !MESSAGE NMAKE /f "calib_camera2.mak". ! !MESSAGE ! !MESSAGE You can specify a configuration when running NMAKE ! !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE ! !MESSAGE NMAKE /f "calib_camera2.mak" CFG="calib_camera2 - Win32 Debug" ! !MESSAGE ! !MESSAGE Possible choices for configuration are: ! !MESSAGE ! !MESSAGE "calib_camera2 - Win32 Release" (based on "Win32 (x86) Console Application") ! !MESSAGE "calib_camera2 - Win32 Debug" (based on "Win32 (x86) Console Application") ! !MESSAGE ! ! # Begin Project ! # PROP AllowPerConfigDependencies 0 ! # PROP Scc_ProjName "" ! # PROP Scc_LocalPath "" ! CPP=cl.exe ! RSC=rc.exe ! ! !IF "$(CFG)" == "calib_camera2 - Win32 Release" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 0 ! # PROP BASE Output_Dir "Release" ! # PROP BASE Intermediate_Dir "Release" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 0 ! # PROP Output_Dir "Release" ! # PROP Intermediate_Dir "Release" ! # PROP Ignore_Export_Lib 0 ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c ! # ADD CPP /nologo /W3 /GX /O2 /I "..\..\include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c ! # SUBTRACT CPP /YX ! # ADD BASE RSC /l 0x1409 /d "NDEBUG" ! # ADD RSC /l 0x1409 /d "NDEBUG" ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! 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 /nologo /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"../../bin/calib_camera2.exe" /libpath:"..\..\lib" ! # SUBTRACT LINK32 /nodefaultlib ! ! !ELSEIF "$(CFG)" == "calib_camera2 - Win32 Debug" ! ! # PROP BASE Use_MFC 0 ! # PROP BASE Use_Debug_Libraries 1 ! # PROP BASE Output_Dir "Debug" ! # PROP BASE Intermediate_Dir "Debug" ! # PROP BASE Target_Dir "" ! # PROP Use_MFC 0 ! # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "Debug" ! # PROP Intermediate_Dir "Debug" ! # PROP Ignore_Export_Lib 0 ! # PROP Target_Dir "" ! # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c ! # ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "..\..\include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c ! # SUBTRACT CPP /YX ! # ADD BASE RSC /l 0x1409 /d "_DEBUG" ! # ADD RSC /l 0x1409 /d "_DEBUG" ! BSC32=bscmake.exe ! # ADD BASE BSC32 /nologo ! # ADD BSC32 /nologo ! 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 /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd.lib" /out:"../../bin/calib_camera2d.exe" /pdbtype:sept /libpath:"..\..\lib" ! # SUBTRACT LINK32 /pdb:none ! ! !ENDIF ! ! # Begin Target ! ! # Name "calib_camera2 - Win32 Release" ! # Name "calib_camera2 - Win32 Debug" ! # Begin Group "Source Files" ! ! # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" ! # Begin Source File ! ! SOURCE=.\calib_dist.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\calib_inp.c ! # End Source File ! # Begin Source File ! ! SOURCE=.\main.c ! # End Source File ! # End Group ! # Begin Group "Header Files" ! ! # PROP Default_Filter "h;hpp;hxx;hm;inl" ! # Begin Source File ! ! SOURCE=.\calib_camera.h ! # End Source File ! # End Group ! # Begin Group "Resource Files" ! ! # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" ! # End Group ! # End Target ! # End Project Index: main.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/calib_camera2/main.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** main.c 1 Sep 2005 01:07:58 -0000 1.6 --- main.c 14 Sep 2005 19:11:03 -0000 1.7 *************** *** 50,54 **** // ============================================================================ ! #define CALIB_CAMERA2_DEBUG 1 // ============================================================================ --- 50,54 ---- // ============================================================================ ! #define CALIB_CAMERA2_DEBUG 0 // ============================================================================ *************** *** 91,95 **** static unsigned char *gClipImage = NULL; ! static CALIB_PATT_T gPatt = {0}; static double dist_factor[4]; static double mat[3][4]; --- 91,95 ---- static unsigned char *gClipImage = NULL; ! static CALIB_PATT_T gPatt; static double dist_factor[4]; static double mat[3][4]; *************** *** 640,681 **** i = check_num; ! for( j = 0; j < gPatt.v_num; j++ ) { ! for( k = 0; k < gPatt.h_num; k++ ) { x[k] = gPatt.point[i][j*gPatt.h_num+k].x_coord; y[k] = gPatt.point[i][j*gPatt.h_num+k].y_coord; } ! draw_line2( x, y, gPatt.h_num ); } ! for( j = 0; j < gPatt.h_num; j++ ) { ! for( k = 0; k < gPatt.v_num; k++ ) { x[k] = gPatt.point[i][k*gPatt.h_num+j].x_coord; y[k] = gPatt.point[i][k*gPatt.h_num+j].y_coord; } ! draw_line2( x, y, gPatt.v_num ); } ! for( j = 3 - gPatt.v_num; j < gPatt.h_num - 2; j++ ) { p = 0; ! for( k = 0; k < gPatt.v_num; k++ ) { l = j+k; ! if( l < 0 || l >= gPatt.h_num ) continue; x[p] = gPatt.point[i][k*gPatt.h_num+l].x_coord; y[p] = gPatt.point[i][k*gPatt.h_num+l].y_coord; p++; } ! draw_line2( x, y, p ); } ! for( j = 2; j < gPatt.h_num + gPatt.v_num - 3; j++ ) { p = 0; ! for( k = 0; k < gPatt.v_num; k++ ) { l = j-k; ! if( l < 0 || l >= gPatt.h_num ) continue; x[p] = gPatt.point[i][k*gPatt.h_num+l].x_coord; y[p] = gPatt.point[i][k*gPatt.h_num+l].y_coord; p++; } ! draw_line2( x, y, p ); } --- 640,681 ---- i = check_num; ! for (j = 0; j < gPatt.v_num; j++) { ! for (k = 0; k < gPatt.h_num; k++) { x[k] = gPatt.point[i][j*gPatt.h_num+k].x_coord; y[k] = gPatt.point[i][j*gPatt.h_num+k].y_coord; } ! draw_line2(x, y, gPatt.h_num); } ! for (j = 0; j < gPatt.h_num; j++) { ! for (k = 0; k < gPatt.v_num; k++) { x[k] = gPatt.point[i][k*gPatt.h_num+j].x_coord; y[k] = gPatt.point[i][k*gPatt.h_num+j].y_coord; } ! draw_line2(x, y, gPatt.v_num); } ! for (j = 3 - gPatt.v_num; j < gPatt.h_num - 2; j++) { p = 0; ! for (k = 0; k < gPatt.v_num; k++) { l = j+k; ! if (l < 0 || l >= gPatt.h_num) continue; x[p] = gPatt.point[i][k*gPatt.h_num+l].x_coord; y[p] = gPatt.point[i][k*gPatt.h_num+l].y_coord; p++; } ! draw_line2(x, y, p); } ! for (j = 2; j < gPatt.h_num + gPatt.v_num - 3; j++) { p = 0; ! for (k = 0; k < gPatt.v_num; k++) { l = j-k; ! if (l < 0 || l >= gPatt.h_num) continue; x[p] = gPatt.point[i][k*gPatt.h_num+l].x_coord; y[p] = gPatt.point[i][k*gPatt.h_num+l].y_coord; p++; } ! draw_line2(x, y, p); } Index: calib_camera.h =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/calib_camera2/calib_camera.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** calib_camera.h 1 Sep 2005 01:07:58 -0000 1.3 --- calib_camera.h 14 Sep 2005 19:11:03 -0000 1.4 *************** *** 1,4 **** ! #ifndef CALIB_DIST_H ! #define CALIB_DIST_H #include <AR/gsub_lite.h> --- 1,4 ---- ! #ifndef CALIB_CAMERA_H ! #define CALIB_CAMERA_H #include <AR/gsub_lite.h> *************** *** 27,29 **** int calc_inp( CALIB_PATT_T *patt, double dist_factor[4], int xsize, int ysize, double mat[3][4] ); ! #endif // CALIB_DIST_H --- 27,29 ---- int calc_inp( CALIB_PATT_T *patt, double dist_factor[4], int xsize, int ysize, double mat[3][4] ); ! #endif // CALIB_CAMERA_H |
|
From: Philip L. <phi...@us...> - 2005-09-14 19:11:05
|
Update of /cvsroot/artoolkit/artoolkit/util/calib_cparam In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6962 Modified Files: calib_cparam.c Log Message: Step 2 of cleanup. Index: calib_cparam.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/calib_cparam/calib_cparam.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** calib_cparam.c 30 Aug 2005 18:36:10 -0000 1.7 --- calib_cparam.c 14 Sep 2005 19:10:57 -0000 1.8 *************** *** 1,4 **** #ifdef _WIN32 ! #include <windows.h> #endif #include <stdio.h> --- 1,28 ---- + /* + * + * This file is part of ARToolKit. + * + * ARToolKit is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * ARToolKit is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with ARToolKit; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + + // ============================================================================ + // Includes + // ============================================================================ + #ifdef _WIN32 ! # include <windows.h> #endif #include <stdio.h> *************** *** 18,21 **** --- 42,46 ---- #include <AR/video.h> #include <AR/param.h> + #include <AR/gsub_lite.h> #include "calib_cparam.h" *************** *** 310,317 **** int k = 1; ! if( mode == 0 ) return; ! if( line_mode[line_no] == L_HORIZONTAL ) { ! switch( key ) { case GLUT_KEY_UP: radius -= 1.0; --- 335,342 ---- int k = 1; ! if (mode == 0) return; ! if (line_mode[line_no] == L_HORIZONTAL) { ! switch (key) { case GLUT_KEY_UP: radius -= 1.0; *************** *** 338,344 **** break; } ! } ! else { ! switch( key ) { case GLUT_KEY_UP: mx = (sx + ex)/ 2.0; --- 363,368 ---- break; } ! } else { ! switch (key) { case GLUT_KEY_UP: mx = (sx + ex)/ 2.0; *************** *** 367,371 **** } ! if( k ) refresh = 1; } --- 391,395 ---- } ! if (k) refresh = 1; } |
|
From: Philip L. <phi...@us...> - 2005-09-13 21:45:59
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/Gl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13649 Modified Files: gsub_lite.c Log Message: Actually call our version. Index: gsub_lite.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/Gl/gsub_lite.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** gsub_lite.c 13 Sep 2005 21:44:31 -0000 1.8 --- gsub_lite.c 13 Sep 2005 21:45:48 -0000 1.9 *************** *** 288,292 **** if (0 < minVersion && version >= minVersion) return (TRUE); ! if (extension && gluCheckExtension(extension, strExtensions)) return (TRUE); return (FALSE); } --- 288,292 ---- if (0 < minVersion && version >= minVersion) return (TRUE); ! if (extension && arglGluCheckExtension(extension, strExtensions)) return (TRUE); return (FALSE); } |
|
From: Philip L. <phi...@us...> - 2005-09-13 21:44:44
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/Gl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13483 Modified Files: gsub_lite.c Log Message: Fix pointer type warnings. Index: gsub_lite.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/Gl/gsub_lite.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** gsub_lite.c 13 Sep 2005 21:40:51 -0000 1.7 --- gsub_lite.c 13 Sep 2005 21:44:31 -0000 1.8 *************** *** 233,249 **** GLubyte *where, *terminator; ! /* Extension names should not have spaces. */ ! where = (GLubyte *) strchr(extName, ' '); if (where || *extName == '\0') return GL_FALSE; ! /* It takes a bit of care to be fool-proof about parsing the ! OpenGL extensions string. Don't be fooled by sub-strings, ! etc. */ start = extString; for (;;) { ! where = (GLubyte *) strstr((const char *) start, extName); if (!where) break; ! terminator = where + strlen(extName); if (where == start || *(where - 1) == ' ') if (*terminator == ' ' || *terminator == '\0') --- 233,248 ---- GLubyte *where, *terminator; ! // Extension names should not have spaces. ! where = (GLubyte *)strchr((const char *)extName, ' '); if (where || *extName == '\0') return GL_FALSE; ! // It takes a bit of care to be fool-proof about parsing the ! // OpenGL extensions string. Don't be fooled by sub-strings, etc. start = extString; for (;;) { ! where = (GLubyte *) strstr((const char *)start, (const char *)extName); if (!where) break; ! terminator = where + strlen((const char *)extName); if (where == start || *(where - 1) == ' ') if (*terminator == ' ' || *terminator == '\0') |
|
From: Philip L. <phi...@us...> - 2005-09-13 21:41:03
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/Gl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12797 Modified Files: gsub_lite.c Log Message: Make a gluCheckExtension part of library. Index: gsub_lite.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/Gl/gsub_lite.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** gsub_lite.c 16 Aug 2005 00:50:24 -0000 1.6 --- gsub_lite.c 13 Sep 2005 21:40:51 -0000 1.7 *************** *** 46,49 **** --- 46,50 ---- #include <stdio.h> // fprintf(), stderr + #include <string.h> // strchr(), strstr(), strlen() #ifndef __APPLE__ # include <GL/glu.h> *************** *** 224,233 **** } - #ifndef GLU_VERSION_1_3 - # include <string.h> // strchr(), strstr(), strlen() // ! // Provide a gluCheckExtension() function for platforms that don't have GLU version 1.3 or later. // ! GLboolean gluCheckExtension(const GLubyte* extName, const GLubyte *extString) { const GLubyte *start; --- 225,232 ---- } // ! // Provide a gluCheckExtension() function, since some platforms don't have GLU version 1.3 or later. // ! GLboolean arglGluCheckExtension(const GLubyte* extName, const GLubyte *extString) { const GLubyte *start; *************** *** 254,258 **** return GL_FALSE; } - #endif // GLU_VERSION_1_3 // --- 253,256 ---- |
|
From: Philip L. <phi...@us...> - 2005-09-01 01:12:42
|
Update of /cvsroot/artoolkit/artoolkit/ARToolKit.xcodeproj In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15002 Modified Files: project.pbxproj Log Message: Now builds bundled applications. Index: project.pbxproj =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/ARToolKit.xcodeproj/project.pbxproj,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** project.pbxproj 23 Jun 2005 07:26:19 -0000 1.1 --- project.pbxproj 1 Sep 2005 01:12:34 -0000 1.2 *************** *** 12,15 **** --- 12,16 ---- buildConfigurationList = 4A7E90C9085904A2001E80E8 /* Build configuration list for PBXAggregateTarget "ARToolKit libraries" */; buildPhases = ( + 78A12B7708B679AC00572F0B /* ShellScript */, ); buildSettings = { *************** *** 54,72 **** }; dependencies = ( [...10827 lines suppressed...] }; ! 78F11FD608AD4FBB00FD6442 /* Build configuration list for PBXNativeTarget "mk_patt" */ = { 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 */ |
|
From: Philip L. <phi...@us...> - 2005-09-01 01:08:07
|
Update of /cvsroot/artoolkit/artoolkit/util/calib_camera2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11107 Modified Files: main.c calib_camera.h Log Message: Step 2 of cleanup. Index: main.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/calib_camera2/main.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** main.c 10 Aug 2005 18:16:51 -0000 1.5 --- main.c 1 Sep 2005 01:07:58 -0000 1.6 *************** *** 1,8 **** #ifdef _WIN32 ! #include <windows.h> #endif #include <math.h> #include <stdio.h> #include <stdlib.h> #ifndef __APPLE__ # include <GL/glut.h> --- 1,33 ---- + /* [...1584 lines suppressed...] ! ARParam param; ! int i, j; ! ! param.xsize = gXsize; ! param.ysize = gYsize; ! for (i = 0; i < 4; i++) param.dist_factor[i] = dist_factor[i]; ! for (j = 0; j < 3; j++) { ! for (i = 0; i < 4; i++) { ! param.mat[j][i] = mat[j][i]; ! } ! } ! arParamDisp( ¶m ); ! ! printf("Filename: "); ! scanf( "%s", name ); ! arParamSave( name, 1, ¶m ); ! ! return; } + Index: calib_camera.h =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/calib_camera2/calib_camera.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** calib_camera.h 10 Aug 2005 18:18:21 -0000 1.2 --- calib_camera.h 1 Sep 2005 01:07:58 -0000 1.3 *************** *** 2,9 **** #define CALIB_DIST_H #define H_NUM 6 #define V_NUM 4 #define LOOP_MAX 20 ! #define THRESH 200 typedef struct { --- 2,11 ---- #define CALIB_DIST_H + #include <AR/gsub_lite.h> + #define H_NUM 6 #define V_NUM 4 #define LOOP_MAX 20 ! #define THRESH 100 typedef struct { *************** *** 14,17 **** --- 16,20 ---- typedef struct patt { unsigned char *savedImage[LOOP_MAX]; + ARGL_CONTEXT_SETTINGS_REF arglSettings[LOOP_MAX]; CALIB_COORD_T *world_coord; CALIB_COORD_T *point[LOOP_MAX]; |
|
From: Philip L. <phi...@us...> - 2005-08-31 00:05:26
|
Update of /cvsroot/artoolkit/artoolkit/util/calib_distortion In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28792 Modified Files: calib_dist.c Log Message: Step 1 of cleanup. Index: calib_dist.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/calib_distortion/calib_dist.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** calib_dist.c 30 Aug 2005 18:37:18 -0000 1.7 --- calib_dist.c 31 Aug 2005 00:05:18 -0000 1.8 *************** *** 5,8 **** --- 5,9 ---- #include <stdio.h> #include <stdlib.h> + #include <string.h> #ifndef __APPLE__ # include <GL/glut.h> |
|
From: Philip L. <phi...@us...> - 2005-08-30 20:46:53
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/VideoMacOSX In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20054 Modified Files: video.c Log Message: Fix long-standing bug when CapStart is called after CapStop. Index: video.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/lib/SRC/VideoMacOSX/video.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** video.c 18 Aug 2005 18:23:00 -0000 1.11 --- video.c 30 Aug 2005 20:46:42 -0000 1.12 *************** *** 1621,1630 **** vid->status = 0; ! if (err = vdgStartGrabbing(vid->pVdg, vid->scaleMatrixPtr)) { ! fprintf(stderr, "vdgStartGrabbing err=%ld\n", err); ! err_i = (int)err; } ! #ifdef AR_VIDEO_SUPPORT_OLD_QUICKTIME // Release our hold on the QuickTime toolbox. --- 1621,1638 ---- vid->status = 0; + if (!vid->pVdg->isPreflighted) { + if (err = vdgPreflightGrabbing(vid->pVdg)) { + fprintf(stderr, "ar2VideoCapStart(): vdgPreflightGrabbing err=%ld\n", err); + err_i = (int)err; + } + } ! if (err_i == 0) { ! if (err = vdgStartGrabbing(vid->pVdg, vid->scaleMatrixPtr)) { ! fprintf(stderr, "ar2VideoCapStart(): vdgStartGrabbing err=%ld\n", err); ! err_i = (int)err; ! } } ! #ifdef AR_VIDEO_SUPPORT_OLD_QUICKTIME // Release our hold on the QuickTime toolbox. *************** *** 1676,1679 **** --- 1684,1688 ---- } vid->threadRunning = 0; + vid->thread = NULL; // Exit status is ((exit_status_p == AR_PTHREAD_CANCELLED) ? 0 : *(ERROR_t *)(exit_status_p)) *************** *** 1697,1700 **** --- 1706,1711 ---- err_i = (int)err; } + vid->status = 0; + vid->pVdg->isPreflighted = 0; #ifdef AR_VIDEO_SUPPORT_OLD_QUICKTIME |
|
From: Philip L. <phi...@us...> - 2005-08-30 19:13:00
|
Update of /cvsroot/artoolkit/artoolkit/doc/video In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30433 Modified Files: index.html Log Message: Add Win32 vconf doc for pre-2.71 Index: index.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/video/index.html,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** index.html 24 Aug 2005 01:09:03 -0000 1.1 --- index.html 30 Aug 2005 19:12:52 -0000 1.2 *************** *** 1 **** ! <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> <title>ARToolKit Video Library Configuration documentation</title> </head> <body> <h1>ARToolKit video configuration </h1> <p>When using ARToolKit to open a video stream, one of the following functions / code snippets is called:</p> <blockquote> <p><code>arVideoOpen(char *vconf);</code></p> </blockquote> <p>or</p> <blockquote> <p><code>AR2VideoParamT vid;<br> vid = ar2VideoOpen(char *vconf);</code></p> </blockquote> <p>These functions take a single parameter, vconf, which is a character string.</p> <p>This character string encapsulates operating-system dependent directions as to how to find, open and configure the video stream. In order to assist you in determining a set of parameters, the functions <code>arVideoDispOption();</code> or <code>ar2VideoDispOption();</code> are designed to output some help text. The text is reproduced here for your convenience.</p> <p>Select an operating system / driver for which you wish to view the help text</p> <ul> <li><a href="#VideoLinux1394Cam">VideoLinux1394Cam</a></li> <li><a href="#VideoLinuxDVCam">VideoLinuxDVCam</a></li> <li><a href="#VideoLinuxV4L">VideoLinuxV4L</a></li> <li><a href="#VideoMacOSX">VideoMacOSX</a></li> <li><a href="#VideoSGI">VideoSGI</a></li> <li><a href="#VideoWin32DirectShow">VideoWin32DirectShow</a></li> </ul> <p> </p> <a class="anchor" name="VideoLinux1394Cam"> <h2>VideoLinux1394Cam</h2> <pre> ARVideo may be configured using one or more of the following options, separated by a space: -node=N specifies detected node ID of a FireWire camera (-1: Any). -card=N specifies the FireWire adaptor id number (-1: Any). -mode=[320x240_YUV422|640x480_RGB|640x480_YUV411] specifies input image format. -rate=N specifies desired framerate of a FireWire camera. (1.875, 3.75, 7.5, 15, 30, 60) -[name]=N where name is brightness, iris, shutter, gain, saturation, gamma, sharpness (value must be a legal value for this parameter - use coriander to find what they are </pre> <a class="anchor" name="VideoLinuxDV"> <h2>VideoLinuxDV </h2> <pre> ARVideo may be configured using one or more of the following options, separated by a space: -mode=[PAL|NTSC] specifies TV signal mode. </pre> <a class="anchor" name="VideoLinuxV4L"> <h2>VideoLinuxV4L </h2> <pre> ARVideo may be configured using one or more of the following options, separated by a space: DEVICE CONTROLS: -dev=filepath specifies device file. -channel=N specifies source channel. -noadjust prevent adjusting the width/height/channel if not suitable. -width=N specifies expected width of image. -height=N specifies expected height of image. -palette=[RGB|YUV420P] specifies the camera palette (WARNING:all are not supported on each camera !!). IMAGE CONTROLS (WARNING: every options are not supported by all camera !!): -brightness=N specifies brightness. (0.0 <-> 1.0) -contrast=N specifies contrast. (0.0 <-> 1.0) -saturation=N specifies saturation (color). (0.0 <-> 1.0) (for color camera only) -hue=N specifies hue. (0.0 <-> 1.0) (for color camera only) -whiteness=N specifies whiteness. (0.0 <-> 1.0) (REMARK: gamma for some drivers, otherwise for greyscale camera only) -color=N specifies saturation (color). (0.0 <-> 1.0) (REMARK: obsolete !! use saturation control) OPTION CONTROLS: -mode=[PAL|NTSC|SECAM] specifies TV signal mode (for tv/capture card). </pre> <a class="anchor" name="VideoMacOSX"> <h2>VideoMacOSX </h2> <pre> ARVideo may be configured using one or more of the following options, separated by a space: -nodialog Don't display video settings dialog. -width=w Scale camera native image to width w. -height=h Scale camera native image to height h. -fps Overlay camera frame counter on image. -grabber=n With multiple QuickTime video grabber components installed, use component n (default n=1). N.B. It is NOT necessary to use this option if you have installed more than one video input device (e.g. two cameras) as the default QuickTime grabber can manage multiple video channels. -pixelformat=cccc Return images with pixels in format cccc, where cccc is either a numeric pixel format number or a valid 4-character-code for a pixel format. The following values are supported: 32, BGRA, RGBA, ABGR, 24, 24BG, 2vuy, yuvs. (See http://developer.apple.com/quicktime/icefloe/dispatch020.html.) </pre> <a class="anchor" name="VideoSGI"> <h2>VideoSGI </h2> <pre> ARVideo may be configured using one or more of the following options, separated by a space: -size=[FULL/HALF] specifies size of image. -device=N specifies device number. -bufsize=N specifies video buffer size. </pre> <a class="anchor" name="VideoWin32DirectShow"> <h2>VideoWin32DirectShow </h2> <pre> parameter is a file name (e.g. 'config.XML') conforming to the DSVideoLib XML Schema (DsVideoLib.xsd). </pre> <p>(You will need to use an <a href="http://www.w3.org/XML/Schema">XML Schema viewer</a> to view the file "DsVideoLib.xsd" inside the DSVL-0.0.8b package.)</p> </body> </html> \ No newline at end of file --- 1 ---- ! <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> <title>ARToolKit Video Library Configuration documentation</title> </head> <body> <h1>ARToolKit video configuration </h1> <p>When using ARToolKit to open a video stream, one of the following functions / code snippets is called:</p> <blockquote> <p><code>arVideoOpen(char *vconf);</code></p> </blockquote> <p>or</p> <blockquote> <p><code>AR2VideoParamT vid;<br> vid = ar2VideoOpen(char *vconf);</code></p> </blockquote> <p>These functions take a single parameter, vconf, which is a character string.</p> <p>This character string encapsulates operating-system dependent directions as to how to find, open and configure the video stream. In order to assist you in determining a set of parameters, the functions <code>arVideoDispOption();</code> or <code>ar2VideoDispOption();</code> are designed to output some help text. The text is reproduced here for your convenience.</p> <p>Select an operating system / driver for which you wish to view the help text</p> <ul> <li><a href="#VideoLinux1394Cam">VideoLinux1394Cam</a></li> <li><a href="#VideoLinuxDVCam">VideoLinuxDVCam</a></li> <li><a href="#VideoLinuxV4L">VideoLinuxV4L</a></li> <li><a href="#VideoMacOSX">VideoMacOSX</a></li> <li><a href="#VideoSGI">VideoSGI</a></li> <li><a href="#VideoWin32DirectShow">VideoWin32DirectShow</a> <ul> <li><a href="#VideoWin32DirectShow271">ARToolKit versions 2.71 and later</a></li> <li><a href="#VideoWin32DirectShow265">ARToolKit versions 2.65 to 2.70.1</a></li> </ul> </li> </ul> <p> </p> <a class="anchor" name="VideoLinux1394Cam"> <h2>VideoLinux1394Cam</h2> <pre> ARVideo may be configured using one or more of the following options, separated by a space: -node=N specifies detected node ID of a FireWire camera (-1: Any). -card=N specifies the FireWire adaptor id number (-1: Any). -mode=[320x240_YUV422|640x480_RGB|640x480_YUV411] specifies input image format. -rate=N specifies desired framerate of a FireWire camera. (1.875, 3.75, 7.5, 15, 30, 60) -[name]=N where name is brightness, iris, shutter, gain, saturation, gamma, sharpness (value must be a legal value for this parameter - use coriander to find what they are </pre> <a class="anchor" name="VideoLinuxDV"> <h2>VideoLinuxDV </h2> <pre> ARVideo may be configured using one or more of the following options, separated by a space: -mode=[PAL|NTSC] specifies TV signal mode. </pre> <a class="anchor" name="VideoLinuxV4L"> <h2>VideoLinuxV4L </h2> <pre> ARVideo may be configured using one or more of the following options, separated by a space: DEVICE CONTROLS: -dev=filepath specifies device file. -channel=N specifies source channel. -noadjust prevent adjusting the width/height/channel if not suitable. -width=N specifies expected width of image. -height=N specifies expected height of image. -palette=[RGB|YUV420P] specifies the camera palette (WARNING:all are not supported on each camera !!). IMAGE CONTROLS (WARNING: every options are not supported by all camera !!): -brightness=N specifies brightness. (0.0 <-> 1.0) -contrast=N specifies contrast. (0.0 <-> 1.0) -saturation=N specifies saturation (color). (0.0 <-> 1.0) (for color camera only) -hue=N specifies hue. (0.0 <-> 1.0) (for color camera only) -whiteness=N specifies whiteness. (0.0 <-> 1.0) (REMARK: gamma for some drivers, otherwise for greyscale camera only) -color=N specifies saturation (color). (0.0 <-> 1.0) (REMARK: obsolete !! use saturation control) OPTION CONTROLS: -mode=[PAL|NTSC|SECAM] specifies TV signal mode (for tv/capture card). </pre> <a class="anchor" name="VideoMacOSX"> <h2>VideoMacOSX </h2> <pre> ARVideo may be configured using one or more of the following options, separated by a space: -nodialog Don't display video settings dialog. -width=w Scale camera native image to width w. -height=h Scale camera native image to height h. -fps Overlay camera frame counter on image. -grabber=n With multiple QuickTime video grabber components installed, use component n (default n=1). N.B. It is NOT necessary to use this option if you have installed more than one video input device (e.g. two cameras) as the default QuickTime grabber can manage multiple video channels. -pixelformat=cccc Return images with pixels in format cccc, where cccc is either a numeric pixel format number or a valid 4-character-code for a pixel format. The following values are supported: 32, BGRA, RGBA, ABGR, 24, 24BG, 2vuy, yuvs. (See http://developer.apple.com/quicktime/icefloe/dispatch020.html.) </pre> <a class="anchor" name="VideoSGI"> <h2>VideoSGI </h2> <pre> ARVideo may be configured using one or more of the following options, separated by a space: -size=[FULL/HALF] specifies size of image. -device=N specifies device number. -bufsize=N specifies video buffer size. </pre> <a class="anchor" name="VideoWin32DirectShow"> <h2>VideoWin32DirectShow</h2> <a class="anchor" name="VideoWin32DirectShow271"> <h3>ARToolKit versions 2.71 and later </h3> <p>In ARToolKit 2.71 and later, the video configuration is specified in an XML file, conforming to the DSVideoLib XML Schema. This schema is documented in the file "DsVideoLib.xsd" inside the DSVL-0.0.8b package. You can use an <a href="http://www.w3.org/XML/Schema">XML Schema viewer</a> to view the schema file, and a text editor or XML editor to edit your own configuration file.</p> <p>The pathname of the configuration file is then specified in the video configuration string. </p> <blockquote><pre> parameter is a file name (e.g. 'config.XML') conforming to the DSVideoLib XML Schema (DsVideoLib.xsd). </pre></blockquote> <a class="anchor" name="VideoWin32DirectShow265"> <h3>ARToolKit versions 2.65 to 2.70.1</h3> <blockquote> <pre> parameter format is either NULL or a list of tokens, separated by commas "," BINARY TOKENS: -------------- flipH : flip image horizontally (WARNING: non-optimal performance) flipV : flip image vertically (WARNING: non-optimal performance) showDlg : displays either WDM capture filter's property page or MSDV decoder format dialog (depending on source media type). only applies to WDM_CAP, will be ignored for AVI_FILE loopAVI : continuously loops through an AVI file (applies only to AVI_FILE) noClock : does not use a Reference Clock to synchronize samples; use this flag for offline post-processing (applies only to AVI_FILE) renderSec : render secondary streams (applies only to AVI_FILE) An AVI file can contain an arbitrary number of multiplexed A/V substreams, usually there are at most 2 substreams (1st: video, 2nd: audio). the AVI_FILE input module will only try to render stream 0x00 (assuming that it's video) and ignore the remaning substreams. Use this flag to force IGraphBuilder->Render(IPin*) calls on substreams 1..n DO NOT SET this flag if your AVI file contains more than one video stream PARAMETRIZED TOKENS: -------------------- inputDevice=? : supported parameters: "WDM_CAP" (WDM_VIDEO_CAPTURE_FILTER) use the DirectShow WDM wrapper to obtain live video input from a streaming capture device such as a IEEE 1394 DV camera or USB webcam. OPTIONAL: set deviceName=? and/or ieee1394id=? for better control over the choice of suitable WDM drivers "AVI_FILE" (ASYNC_FILE_INPUT_FILTER) use an Asynchronous File Input Filter to read & decode AVI video data NOTE: be sure to specify the input file name by pointing fileName=? to a valid AVI file. EXAMPLE: "inputDevive=WDM_CAP", or "inputDevice=AVI_FILE" DEFAULT: "WDM_CAP" will be selected if you omit this token videoWidth=? : preferred video width, EXAMPLE: "videoWidth=720" only applies to WDM_CAP, will be ignored for AVI_FILE videoHeight=? : preferred video height, EXAMPLE: "videoHeight=576" only applies to WDM_CAP, will be ignored for AVI_FILE pixelFormat=? : internal pixel format (see PixelFormat.h for supported types) PERFORMANCE WARNING: Be sure to match your IDirect3DTexture/OpenGL texture formats to whatever you specify here, i.e. use PXtoOpenGL(format), PXtoD3D(format) for creating your textures! (see PixelFormat.h for details) EXAMPLE: "pixelFormat=PIXELFORMAT_RGB32" NOTE: if you omit the pixelFormat=? token, the global constant (default_PIXELFORMAT, usually PIXELFORMAT_RGB32) will be selected. friendlyName=? : only applies to WDM_CAP, will be IGNORED if "inputDevice=WDM_CAP" is not set. Used to select a preferred WDM device. WILL BE IGNORED IF deviceName=? IS SET."); (WARNING: WDM "friendly names" are locale-dependent), i.e. try to match substring <?> with the "friendly names" of enumerated DirectShow WDM wrappers (ksproxy.ax). EXAMPLE: "friendlyName=Microsoft DV Camera" for IEEE1394 DV devices "friendlyName=QuickCam" for Logitech QuickCam deviceName=? : only applies to WDM_CAP, will be IGNORED if "inputDevice=WDM_CAP" is not set. Used to select a preferred WDM device. WILL ALWAYS WILL OVERRIDE friendlyName=? i.e. try to match substring <?> with the "device names" of enumerated DirectShow WDM wrappers (ksproxy.ax). Device names look like: "@device:*:{860BB310-5D01-11d0-BD3B-00A0C911CE86} Use GraphEdit (part of the DirectX SDK, under \DXSDK\bin\DxUtils\graphedt.exe) to figure out your camera's device name. EXAMPLE: "deviceName=1394#unibrain&fire-i_1.2#4510000061431408 fileName=? : only applies to AVI_FILE, will be IGNORED if "inputDevice=AVI_FILE" is not set. input file name, if just use a file's name (without its full path), the WIN32 API fuction SearchPath() (Winbase.h) will be used to locate the file. EXAMPLE: "fileName=C:\Some Directory\Another Directory\Video.AVI" "fileName=video.AVI" (will succeed if C:\Some Directory\Another Directory\ is: * the application's startup directory * the current directory * listed in the PATH environment variable) ieee1394id=? : only applies to WDM_CAP, will be IGNORED if "inputDevice=WDM_CAP" is not set. Unique 64-bit device identifier, as defined by IEEE 1394. Hexadecimal value expected, i.e. "ieee1394id=437d3b0201460008" Use /bin/IEEE394_id.exe to determine your camera's ID. deinterlaceState=? : supported parameters (see VFX_STATE_names[]) "off" : disable deinterlacing (DEFAULT) "on" : force deinterlacing (even for progressive frames) "auto" : enable deinterlacing only if (VIDEOINFOHEADER.dwInterlaceFlags & AMINTERLACE_IsInterlaced) WARNING: EXPERIMENTAL FEATURE! deinterlaceMethod=? : deinterlacing method (see VFxDeinterlaceParam.h for supported modes) supported parameters (see DEINTERLACE_METHOD_names[]): "blend" : blend fields (best quality) "duplicate1" : duplicate first field "duplicate2" : duplicate second field NOTE: omitting this token results in default mode (DEINTERLACE_BLEND) being used. WARNING: EXPERIMENTAL FEATURE! EXAMPLES: arVideoOpen(NULL); arVideoOpen("inputDevice=WDM_CAP,showDlg"); arVideoOpen("inputDevice=WDM_CAP,flipH,flipV,showDlg"); arVideoOpen("inputDevice=WDM_CAP,pixelFormat=PIXELFORMAT_RGB24,showDlg"); arVideoOpen("inputDevice=WDM_CAP,showDlg,deinterlaceState=on,deinterlaceMethod=duplicate1"); arVideoOpen("inputDevice=WDM_CAP,videoWidth=640,flipH,videoHeight=480,showDlg,deinterlaceState=auto"); arVideoOpen("inputDevice=WDM_CAP,friendlyName=Microsoft DV Camera,videoWidth=720,videoHeight=480"); arVideoOpen("inputDevice=WDM_CAP,friendlyName=Logitech,videoWidth=320,videoHeight=240,flipV"); arVideoOpen("inputDevice=WDM_CAP,friendlyName=Microsoft DV Camera,ieee1394id=437d3b0201460008"); arVideoOpen("inputDevice=AVI_FILE,fileName=C:\Some Directory\Another Directory\Video.AVI"); arVideoOpen("inputDevice=AVI_FILE,fileName=Video.AVI,pixelFormat=PIXELFORMAT_RGB24"); </pre> </blockquote> </body> </html> \ No newline at end of file |
|
From: Philip L. <phi...@us...> - 2005-08-30 18:37:25
|
Update of /cvsroot/artoolkit/artoolkit/util/calib_distortion In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20175 Modified Files: calib_dist.c Log Message: Step 1 of cleanup. Index: calib_dist.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/calib_distortion/calib_dist.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** calib_dist.c 12 Aug 2005 21:41:10 -0000 1.6 --- calib_dist.c 30 Aug 2005 18:37:18 -0000 1.7 *************** *** 145,149 **** glutInitWindowSize(xsize, ysize); glutInitWindowPosition(100,100); ! win = glutCreateWindow("Calib distotion param"); glMatrixMode(GL_MODELVIEW); --- 145,149 ---- glutInitWindowSize(xsize, ysize); glutInitWindowPosition(100,100); ! win = glutCreateWindow("Calib distortion param"); glMatrixMode(GL_MODELVIEW); *************** *** 773,787 **** printf("Mouse Button\n"); printf(" Left : Rubber-bounding of feature. (%d x %d)\n", patt.h_num, patt.v_num); ! printf(" Right : Cansel rubber-bounding & Retry grabbing.\n"); break; case 2: printf("Mouse Button\n"); printf(" Left : Save feature position.\n"); ! printf(" Right : Discard & Retry grabbing.\n"); break; case 4: printf("Mouse Button\n"); printf(" Left : Grab next image.\n"); ! printf(" Right : Calc parameter.\n"); break; case 5: --- 773,787 ---- printf("Mouse Button\n"); printf(" Left : Rubber-bounding of feature. (%d x %d)\n", patt.h_num, patt.v_num); ! printf(" Right : Cancel rubber-bounding & retry grabbing.\n"); break; case 2: printf("Mouse Button\n"); printf(" Left : Save feature position.\n"); ! printf(" Right : Discard & retry grabbing.\n"); break; case 4: printf("Mouse Button\n"); printf(" Left : Grab next image.\n"); ! printf(" Right : Calculate parameter.\n"); break; case 5: *************** *** 794,798 **** printf("Mouse Button\n"); printf(" Left :\n"); ! printf(" Right : Calc parameter.\n"); printf(" %d/%d.\n", check_num+1, patt.loop_num); break; --- 794,798 ---- printf("Mouse Button\n"); printf(" Left :\n"); ! printf(" Right : Calculate parameter.\n"); printf(" %d/%d.\n", check_num+1, patt.loop_num); break; |
|
From: Philip L. <phi...@us...> - 2005-08-30 18:36:19
|
Update of /cvsroot/artoolkit/artoolkit/util/calib_cparam In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19940 Modified Files: calib_cparam.c Log Message: Step 2 of cleanup. Index: calib_cparam.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/calib_cparam/calib_cparam.c,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** calib_cparam.c 12 Aug 2005 21:41:03 -0000 1.6 --- calib_cparam.c 30 Aug 2005 18:36:10 -0000 1.7 *************** *** 64,70 **** #endif ! int xsize; ! int ysize; ! unsigned char *image; int refresh; --- 64,70 ---- #endif ! int gXsize; ! int gYsize; ! unsigned char *gImage; int refresh; *************** *** 136,143 **** scanf("%lf", &dist_factor[1]); while( getchar()!='\n' ); ! printf("Input distotion retio: F = "); scanf("%lf", &dist_factor[2]); while( getchar()!='\n' ); ! printf("Input Size Adjustment factor: S = "); scanf("%lf", &dist_factor[3]); while( getchar()!='\n' ); --- 136,143 ---- scanf("%lf", &dist_factor[1]); while( getchar()!='\n' ); ! printf("Input distortion ratio: F = "); scanf("%lf", &dist_factor[2]); while( getchar()!='\n' ); ! printf("Input size adjustment factor: S = "); scanf("%lf", &dist_factor[3]); while( getchar()!='\n' ); *************** *** 146,154 **** if( arVideoOpen( vconf ) < 0 ) exit(0); ! if( arVideoInqSize(&xsize, &ysize) < 0 ) exit(0); ! printf("Image size (x,y) = (%d,%d)\n", xsize, ysize); glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE); ! glutInitWindowSize(xsize, ysize); glutInitWindowPosition(100,100); win = glutCreateWindow("Camera calibration"); --- 146,154 ---- if( arVideoOpen( vconf ) < 0 ) exit(0); ! if( arVideoInqSize(&gXsize, &gYsize) < 0 ) exit(0); ! printf("Image size (x,y) = (%d,%d)\n", gXsize, gYsize); glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE); ! glutInitWindowSize(gXsize, gYsize); glutInitWindowPosition(100,100); win = glutCreateWindow("Camera calibration"); *************** *** 158,163 **** glMatrixMode(GL_PROJECTION); glLoadIdentity(); ! glOrtho(0, xsize, 0, ysize, -1.0, 1.0); ! glViewport(0, 0, xsize, ysize); glPixelZoom( (GLfloat)1.0, (GLfloat)-1.0); --- 158,163 ---- glMatrixMode(GL_PROJECTION); glLoadIdentity(); ! glOrtho(0, gXsize, 0, gYsize, -1.0, 1.0); ! glViewport(0, 0, gXsize, gYsize); glPixelZoom( (GLfloat)1.0, (GLfloat)-1.0); *************** *** 167,172 **** glClear(GL_COLOR_BUFFER_BIT); ! param.xsize = xsize; ! param.ysize = ysize; param.dist_factor[0] = dist_factor[0]; param.dist_factor[1] = dist_factor[1]; --- 167,172 ---- glClear(GL_COLOR_BUFFER_BIT); ! param.xsize = gXsize; ! param.ysize = gYsize; param.dist_factor[0] = dist_factor[0]; param.dist_factor[1] = dist_factor[1]; *************** *** 189,209 **** glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST ); glTexEnvf( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL ); ! if( xsize > 512 ) { tex1Xsize1 = 512; tex1Xsize2 = 1; ! while( tex1Xsize2 < xsize - tex1Xsize1 ) tex1Xsize2 *= 2; } else { tex1Xsize1 = 1; ! while( tex1Xsize1 < xsize ) tex1Xsize1 *= 2; } tex1Ysize = 1; ! while( tex1Ysize < ysize ) tex1Ysize *= 2; ! image = (unsigned char *)malloc( xsize*tex1Ysize*AR_PIX_SIZE ); ! if( image == NULL ) {printf("malloc error!!\n"); exit(0);} /* ! image = (unsigned char *)malloc( xsize*ysize*AR_PIX_SIZE ); ! if( image == NULL ) {printf("malloc error!!\n"); exit(0);} */ } --- 189,209 ---- glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST ); glTexEnvf( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL ); ! if( gXsize > 512 ) { tex1Xsize1 = 512; tex1Xsize2 = 1; ! while( tex1Xsize2 < gXsize - tex1Xsize1 ) tex1Xsize2 *= 2; } else { tex1Xsize1 = 1; ! while( tex1Xsize1 < gXsize ) tex1Xsize1 *= 2; } tex1Ysize = 1; ! while( tex1Ysize < gYsize ) tex1Ysize *= 2; ! gImage = (unsigned char *)malloc( gXsize*tex1Ysize*AR_PIX_SIZE ); ! if( gImage == NULL ) {printf("malloc error!!\n"); exit(0);} /* ! gImage = (unsigned char *)malloc( gXsize*gYsize*AR_PIX_SIZE ); ! if( gImage == NULL ) {printf("malloc error!!\n"); exit(0);} */ } *************** *** 225,233 **** if( line_mode[line_no] == L_HORIZONTAL ) { theta = 90; ! radius = ysize/2; } else { theta = 0; ! radius = xsize/2; } } --- 225,233 ---- if( line_mode[line_no] == L_HORIZONTAL ) { theta = 90; ! radius = gYsize/2; } else { theta = 0; ! radius = gXsize/2; } } *************** *** 263,267 **** else { theta = 90; ! radius = ysize/2; } } --- 263,267 ---- else { theta = 90; ! radius = gYsize/2; } } *************** *** 272,276 **** else { theta = 0; ! radius = xsize/2; } } --- 272,276 ---- else { theta = 0; ! radius = gXsize/2; } } *************** *** 382,392 **** } p1 = dataPtr; ! p2 = image; ! for( i = 0; i < xsize*ysize*AR_PIX_SIZE; i++ ) *(p2++) = *(p1++); arVideoCapNext(); glClearColor( 0.0, 0.0, 0.0, 0.0 ); glClear(GL_COLOR_BUFFER_BIT); ! dispImage2( image ); glutSwapBuffers(); } --- 382,392 ---- } p1 = dataPtr; ! p2 = gImage; ! for( i = 0; i < gXsize*gYsize*AR_PIX_SIZE; i++ ) *(p2++) = *(p1++); arVideoCapNext(); glClearColor( 0.0, 0.0, 0.0, 0.0 ); glClear(GL_COLOR_BUFFER_BIT); ! dispImage2( gImage ); glutSwapBuffers(); } *************** *** 400,404 **** glClearColor( 0.0, 0.0, 0.0, 0.0 ); glClear(GL_COLOR_BUFFER_BIT); ! dispImage2( image ); drawPrevLine(); drawNextLine(); --- 400,404 ---- glClearColor( 0.0, 0.0, 0.0, 0.0 ); glClear(GL_COLOR_BUFFER_BIT); ! dispImage2( gImage ); drawPrevLine(); drawNextLine(); *************** *** 430,434 **** if( cos_theta != 0 ) { x1 = radius / cos_theta; ! x2 = (radius - (ysize-1)*sin_theta) / cos_theta; } else { --- 430,434 ---- if( cos_theta != 0 ) { x1 = radius / cos_theta; ! x2 = (radius - (gYsize-1)*sin_theta) / cos_theta; } else { *************** *** 438,442 **** if( sin_theta != 0 ) { y1 = radius / sin_theta; ! y2 = (radius - (xsize-1)*cos_theta) / sin_theta; } else { --- 438,442 ---- if( sin_theta != 0 ) { y1 = radius / sin_theta; ! y2 = (radius - (gXsize-1)*cos_theta) / sin_theta; } else { *************** *** 445,483 **** ey = -1; ! if( x1 >= 0 && x1 <= xsize-1 ) { sx = x1; sy = 0; ! if( x2 >= 0 && x2 <= xsize-1 ) { ex = x2; ! ey = ysize-1; } ! else if( y1 >= 0 && y1 <= ysize-1 ) { ex = 0; ey = y1; } ! else if( y2 >= 0 && y2 <= ysize-1 ) { ! ex = xsize-1; ey = y2; } else printf("???\n"); } ! else if( y1 >= 0 && y1 <= ysize-1 ) { sx = 0; sy = y1; ! if( x2 >= 0 && x2 <= xsize-1 ) { ex = x2; ! ey = ysize-1; } ! else if( y2 >= 0 && y2 <= ysize-1 ) { ! ex = xsize-1; ey = y2; } else printf("???\n"); } ! else if( x2 >= 0 && x2 <= xsize-1 ) { sx = x2; ! sy = ysize-1; ! if( y2 >= 0 && y2 <= ysize-1 ) { ! ex = xsize-1; ey = y2; } --- 445,483 ---- ey = -1; ! if( x1 >= 0 && x1 <= gXsize-1 ) { sx = x1; sy = 0; ! if( x2 >= 0 && x2 <= gXsize-1 ) { ex = x2; ! ey = gYsize-1; } ! else if( y1 >= 0 && y1 <= gYsize-1 ) { ex = 0; ey = y1; } ! else if( y2 >= 0 && y2 <= gYsize-1 ) { ! ex = gXsize-1; ey = y2; } else printf("???\n"); } ! else if( y1 >= 0 && y1 <= gYsize-1 ) { sx = 0; sy = y1; ! if( x2 >= 0 && x2 <= gXsize-1 ) { ex = x2; ! ey = gYsize-1; } ! else if( y2 >= 0 && y2 <= gYsize-1 ) { ! ex = gXsize-1; ey = y2; } else printf("???\n"); } ! else if( x2 >= 0 && x2 <= gXsize-1 ) { sx = x2; ! sy = gYsize-1; ! if( y2 >= 0 && y2 <= gYsize-1 ) { ! ex = gXsize-1; ey = y2; } *************** *** 505,523 **** glBegin(GL_LINE_STRIP); if( a*a >= b*b ) { ! for( i = -20; i <= ysize+20; i+=10 ) { x = -(b*i + c)/a; y = i; arParamIdeal2Observ( dist_factor, x, y, &x1, &y1 ); ! glVertex2f( x1, ysize-1-y1 ); } } else { ! for( i = -20; i <= xsize+20; i+=10 ) { x = i; y = -(a*i + c)/b; arParamIdeal2Observ( dist_factor, x, y, &x1, &y1 ); ! glVertex2f( x1, ysize-1-y1 ); } } --- 505,523 ---- glBegin(GL_LINE_STRIP); if( a*a >= b*b ) { ! for( i = -20; i <= gYsize+20; i+=10 ) { x = -(b*i + c)/a; y = i; arParamIdeal2Observ( dist_factor, x, y, &x1, &y1 ); ! glVertex2f( x1, gYsize-1-y1 ); } } else { ! for( i = -20; i <= gXsize+20; i+=10 ) { x = i; y = -(a*i + c)/b; arParamIdeal2Observ( dist_factor, x, y, &x1, &y1 ); ! glVertex2f( x1, gYsize-1-y1 ); } } *************** *** 599,622 **** sx = 0; ! sy = ysize - 0.5; glPixelZoom( 1.0, -1.0); glRasterPos3i( sx, sy, 0 ); #if defined(AR_PIX_FORMAT_ARGB) ! glDrawPixels( xsize, ysize, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, pimage ); #elif defined(AR_PIX_FORMAT_ABGR) ! glDrawPixels( xsize, ysize, GL_ABGR, GL_UNSIGNED_BYTE, pimage ); #elif defined(AR_PIX_FORMAT_BGRA) ! glDrawPixels( xsize, ysize, GL_BGRA, GL_UNSIGNED_BYTE, pimage ); #elif defined(AR_PIX_FORMAT_BGR) ! glDrawPixels( xsize, ysize, GL_BGR, GL_UNSIGNED_BYTE, pimage ); #elif defined(AR_PIX_FORMAT_RGB) ! glDrawPixels( xsize, ysize, GL_RGB, GL_UNSIGNED_BYTE, pimage ); #elif defined(AR_PIX_FORMAT_RGBA) ! glDrawPixels( xsize, ysize, GL_RGBA, GL_UNSIGNED_BYTE, pimage ); #elif defined(AR_PIX_FORMAT_2vuy) ! glDrawPixels( xsize, ysize, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, pimage ); #elif defined(AR_PIX_FORMAT_yuvs) ! glDrawPixels( xsize, ysize, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, pimage ); #else # error Unknown pixel format defined in config.h --- 599,622 ---- sx = 0; ! sy = gYsize - 0.5; glPixelZoom( 1.0, -1.0); glRasterPos3i( sx, sy, 0 ); #if defined(AR_PIX_FORMAT_ARGB) ! glDrawPixels( gXsize, gYsize, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, pimage ); #elif defined(AR_PIX_FORMAT_ABGR) ! glDrawPixels( gXsize, gYsize, GL_ABGR, GL_UNSIGNED_BYTE, pimage ); #elif defined(AR_PIX_FORMAT_BGRA) ! glDrawPixels( gXsize, gYsize, GL_BGRA, GL_UNSIGNED_BYTE, pimage ); #elif defined(AR_PIX_FORMAT_BGR) ! glDrawPixels( gXsize, gYsize, GL_BGR, GL_UNSIGNED_BYTE, pimage ); #elif defined(AR_PIX_FORMAT_RGB) ! glDrawPixels( gXsize, gYsize, GL_RGB, GL_UNSIGNED_BYTE, pimage ); #elif defined(AR_PIX_FORMAT_RGBA) ! glDrawPixels( gXsize, gYsize, GL_RGBA, GL_UNSIGNED_BYTE, pimage ); #elif defined(AR_PIX_FORMAT_2vuy) ! glDrawPixels( gXsize, gYsize, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_REV_APPLE, pimage ); #elif defined(AR_PIX_FORMAT_yuvs) ! glDrawPixels( gXsize, gYsize, GL_YCBCR_422_APPLE, GL_UNSIGNED_SHORT_8_8_APPLE, pimage ); #else # error Unknown pixel format defined in config.h *************** *** 625,629 **** else { glDisable( GL_DEPTH_TEST ); ! if( xsize > tex1Xsize1 ) dispImageTex1( pimage ); else dispImageTex2( pimage ); } --- 625,629 ---- else { glDisable( GL_DEPTH_TEST ); ! if( gXsize > tex1Xsize1 ) dispImageTex1( pimage ); else dispImageTex2( pimage ); } *************** *** 640,644 **** glMatrixMode(GL_MODELVIEW); ! glPixelStorei( GL_UNPACK_ROW_LENGTH, xsize ); glBindTexture( GL_TEXTURE_2D, glid[0] ); --- 640,644 ---- glMatrixMode(GL_MODELVIEW); ! glPixelStorei( GL_UNPACK_ROW_LENGTH, gXsize ); glBindTexture( GL_TEXTURE_2D, glid[0] ); *************** *** 663,671 **** #endif tx = 1.0; ! ty = (double)ysize / (double)tex1Ysize; sx = 0; ! sy = ysize; ex = sx + tex1Xsize1; ! ey = sy - ysize; z = 1.0; glBegin(GL_QUADS ); --- 663,671 ---- #endif tx = 1.0; ! ty = (double)gYsize / (double)tex1Ysize; sx = 0; ! sy = gYsize; ex = sx + tex1Xsize1; ! ey = sy - gYsize; z = 1.0; glBegin(GL_QUADS ); *************** *** 696,705 **** # error Unknown pixel format defined in config.h #endif ! tx = (double)(xsize-tex1Xsize1) / (double)tex1Xsize2; ! ty = (double)ysize / (double)tex1Ysize; sx = tex1Xsize1; ! sy = ysize; ex = sx + tex1Xsize2; ! ey = sy - ysize; z = 1.0; glBegin(GL_QUADS ); --- 696,705 ---- # error Unknown pixel format defined in config.h #endif ! tx = (double)(gXsize-tex1Xsize1) / (double)tex1Xsize2; ! ty = (double)gYsize / (double)tex1Ysize; sx = tex1Xsize1; ! sy = gYsize; ex = sx + tex1Xsize2; ! ey = sy - gYsize; z = 1.0; glBegin(GL_QUADS ); *************** *** 725,729 **** glMatrixMode(GL_MODELVIEW); ! glPixelStorei( GL_UNPACK_ROW_LENGTH, xsize ); glBindTexture( GL_TEXTURE_2D, glid[0] ); --- 725,729 ---- glMatrixMode(GL_MODELVIEW); ! glPixelStorei( GL_UNPACK_ROW_LENGTH, gXsize ); glBindTexture( GL_TEXTURE_2D, glid[0] ); *************** *** 747,756 **** # error Unknown pixel format defined in config.h #endif ! tx = (double)xsize / (double)tex1Xsize1; ! ty = (double)ysize / (double)tex1Ysize; sx = 0; ! sy = ysize; ! ex = sx + xsize; ! ey = sy - ysize; z = 1.0; glBegin(GL_QUADS ); --- 747,756 ---- # error Unknown pixel format defined in config.h #endif ! tx = (double)gXsize / (double)tex1Xsize1; ! ty = (double)gYsize / (double)tex1Ysize; sx = 0; ! sy = gYsize; ! ex = sx + gXsize; ! ey = sy - gYsize; z = 1.0; glBegin(GL_QUADS ); |
|
From: Philip L. <phi...@us...> - 2005-08-24 20:33:02
|
Update of /cvsroot/artoolkit/artoolkit In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26203 Modified Files: README.txt Log Message: Update build instructions. Index: README.txt =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/README.txt,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** README.txt 16 Aug 2005 00:50:52 -0000 1.16 --- README.txt 24 Aug 2005 20:32:48 -0000 1.17 *************** *** 34,38 **** Prerequisites: ! * Microsoft Visual Studio .NET 2003 or Visual Studio 6. * DSVideoLib-0.0.8b-win32. Download from http://sf.net/projects/artoolkit. * GLUT. Download from http://www.opengl.org/resources/libraries/glut.html. --- 34,38 ---- Prerequisites: ! * 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. *************** *** 85,94 **** * 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 and Fink. Download X11 from http://www.apple.com/downloads/macosx/apple/x11formacosx.html. Download Fink (and optionally, FinkCommander) from http://fink.sf.net. Building using the XCode IDE: (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 into ARToolKit/bin. This must also be the working directory when the executables are run, but by default XCode runs executables with the working directory set to Build/. In order for the binaries to be able to be run from within XCode you will need to edit the "Working directory path" of each executable's XCode settings to the full path to ARToolKit/bin on your system. The VRML renderering library and example (libARvrml & simpleVRML) are optional builds: --- 85,94 ---- * 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 and Fink. Install X11 off the Mac OS X install CD 3 or download an install disk image from http://www.apple.com/downloads/macosx/apple/x11formacosx.html. Download Fink (and optionally, FinkCommander) from http://fink.sourceforge.net/download/. Building using the XCode IDE: (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: *************** *** 124,129 **** - 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. - gsub_lite: Added complete support for runtime selection of pixel format and rectangle/power-of-2 textures. Changes in earlier releases. --- 124,130 ---- - 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. |
|
From: Philip L. <phi...@us...> - 2005-08-24 01:33:46
|
Update of /cvsroot/artoolkit/artoolkit/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24854/doc Modified Files: video_8h.html Log Message: Add video config doc. Index: video_8h.html =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/video_8h.html,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** video_8h.html 23 Aug 2005 19:17:00 -0000 1.1 --- video_8h.html 24 Aug 2005 01:33:38 -0000 1.2 *************** *** 642,648 **** open a video source. <p> ! This function opens a video input path with the driver (and device) present on your platform. According to your operating system and the hardware the initialization will be different : a generic string structure is used for this issue. This function prepares the video stream for capture, but capture will not actually begin until arVideoCapStart is called. More information on establishing video streams is available in the ARToolKit manual. <dl compact><dt><b>Parameters:</b></dt><dd> <table border="0" cellspacing="2" cellpadding="0"> ! <tr><td valign="top"></td><td valign="top"><em>config</em> </td><td>string of the selected video configuration. </td></tr> </table> </dl> --- 642,648 ---- open a video source. <p> ! This function opens a video input path with the driver (and device) present on your platform. According to your operating system and the hardware the initialization will be different : a generic string structure is used for this issue. This function prepares the video stream for capture, but capture will not actually begin until arVideoCapStart is called. <dl compact><dt><b>Parameters:</b></dt><dd> <table border="0" cellspacing="2" cellpadding="0"> ! <tr><td valign="top"></td><td valign="top"><em>config</em> </td><td>string of the selected video configuration. See the <a href="video/">video configuration documentation</a> for more information on this parameter. </td></tr> </table> </dl> |
|
From: Philip L. <phi...@us...> - 2005-08-24 01:33:20
|
Update of /cvsroot/artoolkit/artoolkit/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24808/doc Modified Files: doxygen_config.dox Log Message: Fix to use relative paths. Index: doxygen_config.dox =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/doc/doxygen_config.dox,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** doxygen_config.dox 23 Aug 2005 19:17:00 -0000 1.1 --- doxygen_config.dox 24 Aug 2005 01:33:11 -0000 1.2 *************** *** 6,10 **** PROJECT_NAME = ARToolKit PROJECT_NUMBER = ! OUTPUT_DIRECTORY = /home/plamb/Documents/Development/Projects/ARToolKit/artoolkit/doc CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English --- 6,10 ---- PROJECT_NAME = ARToolKit PROJECT_NUMBER = ! OUTPUT_DIRECTORY = CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English *************** *** 72,76 **** # configuration options related to the input files #--------------------------------------------------------------------------- ! INPUT = /home/plamb/Documents/Development/Projects/ARToolKit/artoolkit/include/AR FILE_PATTERNS = *.h RECURSIVE = NO --- 72,76 ---- # configuration options related to the input files #--------------------------------------------------------------------------- ! INPUT = ../include/AR FILE_PATTERNS = *.h RECURSIVE = NO *************** *** 78,82 **** EXCLUDE_SYMLINKS = NO EXCLUDE_PATTERNS = ! EXAMPLE_PATH = /home/plamb/Documents/Development/Projects/ARToolKit/artoolkit/doc EXAMPLE_PATTERNS = EXAMPLE_RECURSIVE = YES --- 78,82 ---- EXCLUDE_SYMLINKS = NO EXCLUDE_PATTERNS = ! EXAMPLE_PATH = EXAMPLE_PATTERNS = EXAMPLE_RECURSIVE = YES *************** *** 107,112 **** HTML_OUTPUT = . HTML_FILE_EXTENSION = .html ! HTML_HEADER = /home/plamb/Desktop/Ressources/header.html ! HTML_FOOTER = /home/plamb/Desktop/Ressources/footer.html HTML_STYLESHEET = HTML_ALIGN_MEMBERS = YES --- 107,112 ---- HTML_OUTPUT = . HTML_FILE_EXTENSION = .html ! HTML_HEADER = header.html ! HTML_FOOTER = footer.html HTML_STYLESHEET = HTML_ALIGN_MEMBERS = YES |
|
From: Philip L. <phi...@us...> - 2005-08-24 01:33:04
|
Update of /cvsroot/artoolkit/artoolkit/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24770/doc Added Files: header.html Log Message: New documentation. --- NEW FILE: header.html --- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> <meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"> <title>ARToolKit API Documentation</title> <link href="doxygen.css" rel="stylesheet" type="text/css"> </head> <body> |
|
From: Philip L. <phi...@us...> - 2005-08-24 01:32:46
|
Update of /cvsroot/artoolkit/artoolkit/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24736/doc Added Files: footer.html Log Message: New documentation. --- NEW FILE: footer.html --- (This appears to be a binary file; contents omitted.) |
