artoolkit-commits Mailing List for ARToolKit (Page 26)
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...> - 2004-11-30 03:55:02
|
Update of /cvsroot/artoolkit/artoolkit/bin/Data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24658 Added Files: object_data_vrml Log Message: Add data for simpleVRML. --- NEW FILE: object_data_vrml --- #the number of patterns to be recognized 2 #pattern 1 VRML Wrl/bud_B.dat Data/patt.hiro 80.0 0.0 0.0 #pattern 2 VRML Wrl/snoman.dat Data/patt.kanji 80.0 0.0 0.0 |
|
From: Philip L. <phi...@us...> - 2004-11-30 03:54:29
|
Update of /cvsroot/artoolkit/artoolkit/bin/Wrl/textures In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24548 Added Files: bud_B_Ramp_6.gif bud_B_Ramp_2.gif bud_B_Fractal_2.gif bud_B_Ramp_4.gif bud_B_Ramp_5.gif Log Message: Add data for simpleVRML. --- NEW FILE: bud_B_Fractal_2.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: bud_B_Ramp_6.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: bud_B_Ramp_4.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: bud_B_Ramp_5.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: bud_B_Ramp_2.gif --- (This appears to be a binary file; contents omitted.) |
|
From: Philip L. <phi...@us...> - 2004-11-30 03:54:24
|
Update of /cvsroot/artoolkit/artoolkit/bin/Wrl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24507 Added Files: bud_B.dat bud_B.wrl snoman.wrl snoman.dat Log Message: Add data for simpleVRML. --- NEW FILE: bud_B.wrl --- #VRML V2.0 utf8 CosmoWorlds V1.0 WorldInfo { title "bud_B" info "VRML2.0 output created by Alias|Wavefront PowerAnimator 8.5" } NavigationInfo { type "EXAMINE" headlight TRUE speed 1.000000 } DEF GlobalTransform Transform { translation 0 0 0 scale 5 5 5 children [ Switch { [...6429 lines suppressed...] ROUTE TimeSource.fraction_changed TO cone_2RotAnim.set_fraction ROUTE cone_2RotAnim.value_changed TO cone_2.set_rotation ROUTE TimeSource.fraction_changed TO cone_2SclAnim.set_fraction ROUTE cone_2SclAnim.value_changed TO cone_2.set_scale ROUTE TimeSource.fraction_changed TO capA_23VtxAnim.set_fraction ROUTE capA_23VtxAnim.value_changed TO capA_23GeoPoints.set_point ROUTE TimeSource.fraction_changed TO capA_24VtxAnim.set_fraction ROUTE capA_24VtxAnim.value_changed TO capA_24GeoPoints.set_point ROUTE TimeSource.fraction_changed TO capA_25VtxAnim.set_fraction ROUTE capA_25VtxAnim.value_changed TO capA_25GeoPoints.set_point ROUTE TimeSource.fraction_changed TO capA_26VtxAnim.set_fraction ROUTE capA_26VtxAnim.value_changed TO capA_26GeoPoints.set_point ROUTE TimeSource.fraction_changed TO capA_27VtxAnim.set_fraction ROUTE capA_27VtxAnim.value_changed TO capA_27GeoPoints.set_point ROUTE TimeSource.fraction_changed TO capA_28VtxAnim.set_fraction ROUTE capA_28VtxAnim.value_changed TO capA_28GeoPoints.set_point ROUTE TimeSource.fraction_changed TO capA_29VtxAnim.set_fraction ROUTE capA_29VtxAnim.value_changed TO capA_29GeoPoints.set_point ROUTE TimeSource.fraction_changed TO capA_30VtxAnim.set_fraction ROUTE capA_30VtxAnim.value_changed TO capA_30GeoPoints.set_point --- NEW FILE: bud_B.dat --- bud_B.wrl 0.0 0.0 0.0 # Translation 0.0 0.0 0.0 0.0 # Rotation 10.0 10.0 10.0 # Scale --- NEW FILE: snoman.dat --- snoman.wrl 0.0 0.0 50.0 # Translation 90.0 1.0 0.0 0.0 # Rotation 25 25 25 # Scale --- NEW FILE: snoman.wrl --- #VRML V2.0 utf8 Background { #remove these lines skyColor .7 .7 1 # } # when placing this Viewpoint { # position 0 0 7 # object in a VRML world } # NavigationInfo { # or apartment. type "EXAMINE" # } # WorldInfo { title "Animated Snowman" info [ "Copyright 1988 modeled by Kiwano [Andrew Reitemeyer] ki...@t-... " "This model is linkware. Non commercial users are required to link to" " http://home.t-online.de/home/kiwano4 " "Commercial users must pay a small fee, details and more models from the above url" "This node must remain unaltered in this code" ] } Transform { # main grouping node translation 0 0 0 # controls position scale 1 1 1 # controls size rotation 0 0 0 0 # controls orientation children [ DEF Bottom Transform { translation 0 -1 0 scale 1.2 1 1.2 children [ DEF Ball Shape { appearance Appearance { material Material { diffuseColor 1 1 1 specularColor .9 .9 1 shininess 1 ambientIntensity .2 # transparency .2 } } geometry Sphere { radius 1 } } DEF See VisibilitySensor {} ] } DEF Middle Transform { translation 0 0 0 scale .9 .9 .9 children [ USE Ball ] } DEF head Transform { translation 0 .9 0 scale .6 .6 .6 children [ USE Ball ] } DEF Eye1 Transform { translation .35 1.1 .4 children [ DEF Eye Shape { appearance Appearance { material Material { diffuseColor 0 0 0 specularColor 1 1 1 shininess 1 ambientIntensity 1 } } geometry Sphere { radius .1 } } ] } DEF Eye2 Transform { translation -.35 1.1 .4 children [ USE Eye ] } DEF Nose Transform { translation 0 .9 .8 rotation 1 0 0 1.57 children [ Shape { appearance Appearance { material Material { diffuseColor .8 .5 0 specularColor .9 .6 0 shininess .3 ambientIntensity .2 } } geometry Cone { bottomRadius .1 height .5 } } ] } DEF Hat Transform { translation 0 0 0 children [ Transform { translation 0 1.3 0 rotation 0 1 1 -.1 children [ Shape { appearance DEF Felt Appearance { material Material { diffuseColor 0 0 0 specularColor 1 1 1 shininess 1 ambientIntensity 1 } } geometry Cylinder { radius .7 height .05 } } ] } Transform { translation 0 1.6 0 rotation 0 1 1 -.1 children [ Shape { appearance USE Felt geometry Cylinder { radius .5 height .6 } } ] } ] }# end Hat DEF Arm1 Transform { children [ DEF Arm Shape { appearance DEF Stick Appearance { material Material { diffuseColor .7 .6 .4 specularColor 1 1 0 shininess .2 ambientIntensity .1 } } geometry Extrusion { creaseAngle 1.4 crossSection [ .1 0, .071 -.07, 0 -.1 -.07 -.071, -.1 0, -.071 .07, 0 .1 #18 .07 .071, .1 0, ] spine [.6 .35 0, 1.5 .2 0, 2 0 .5 ] scale [ 1 1, .7 .7, .5 .5] } } ] } DEF Arm2 Transform { children [ Shape { appearance USE Stick geometry DEF Tipper Extrusion { creaseAngle 1.4 crossSection [ .1 0, .071 -.07, 0 -.1 -.07 -.071, -.1 0, -.071 .07, 0 .1 #18 .07 .071, .1 0, ] spine [-.6 .35 0, -1.5 .2 0, -2 0 .5] # spine [-.6 .35 0, -1.5 .8 0, -.65 1.4 0 ] scale [ 1 1, .7 .7, .5 .5] } } ] } ] } DEF Tick TimeSensor { cycleInterval 15 loop TRUE enabled FALSE } DEF Lift CoordinateInterpolator { key [0, .35, .45, .5, .65, .75, 1] keyValue [-.6 .35 0, -1.5 .2 0, -2 0 .5, -.6 .35 0, -1.5 .2 0, -2 0 .5, -.6 .35 0, -1.5 .8 0, -.65 1.4 0 -.6 .35 0, -1.5 1 0, -1.4 1.9 0 -.6 .35 0, -1.5 .8 0, -.65 1.4 0 -.6 .35 0, -1.5 .2 0, -2 0 .5, -.6 .35 0, -1.5 .2 0, -2 0 .5, ] } DEF Doff PositionInterpolator { key [0, .45, .5, .65, 1] keyValue [ 0 0 0, 0 0 0, -.6 .5 0, 0 0 0, 0 0 0 ] } ROUTE See.isActive TO Tick.set_enabled ROUTE Tick.fraction_changed TO Lift.set_fraction ROUTE Lift.value_changed TO Tipper.set_spine ROUTE Tick.fraction_changed TO Doff.set_fraction ROUTE Doff.value_changed TO Hat.set_translation WorldInfo { title "Arcadia" info [ "(C)1997 modeled by Kiwano (Andrew Reitemeyer) ki...@t-..."] } |
|
From: Philip L. <phi...@us...> - 2004-11-30 03:52:39
|
Update of /cvsroot/artoolkit/artoolkit/bin/Wrl/textures In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24176/textures Log Message: Directory /cvsroot/artoolkit/artoolkit/bin/Wrl/textures added to the repository |
|
From: Philip L. <phi...@us...> - 2004-11-30 03:52:12
|
Update of /cvsroot/artoolkit/artoolkit/bin/Wrl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24115/Wrl Log Message: Directory /cvsroot/artoolkit/artoolkit/bin/Wrl added to the repository |
|
From: Philip L. <phi...@us...> - 2004-11-26 01:19:53
|
Update of /cvsroot/artoolkit/artoolkit/ARToolKit.xcode In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13398 Modified Files: project.pbxproj Log Message: Add twoView example. Index: project.pbxproj =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/ARToolKit.xcode/project.pbxproj,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** project.pbxproj 25 Nov 2004 22:45:03 -0000 1.6 --- project.pbxproj 26 Nov 2004 01:19:36 -0000 1.7 *************** *** 68,71 **** --- 68,72 ---- 4A5F9C84064B538700525EC0, 4A5F9D3F064B54D800525EC0, + 4A94DD350756B1EB00D79CD1, 4AB9FF750651CDE3003B9097, 4A1F9DE00756897100DEC369, *************** *** 476,481 **** DEPLOYMENT_LOCATION = YES; DSTROOT = /; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h"; GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; GCC_WARN_UNKNOWN_PRAGMAS = NO; --- 477,480 ---- *************** *** 3502,3507 **** DEPLOYMENT_LOCATION = YES; DSTROOT = /; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h"; GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; GCC_WARN_UNKNOWN_PRAGMAS = NO; --- 3501,3504 ---- *************** *** 3644,3649 **** DEPLOYMENT_LOCATION = YES; DSTROOT = /; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h"; GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; GCC_WARN_UNKNOWN_PRAGMAS = NO; --- 3641,3644 ---- *************** *** 3785,3790 **** DEPLOYMENT_LOCATION = YES; DSTROOT = /; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h"; GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; GCC_WARN_UNKNOWN_PRAGMAS = NO; --- 3780,3783 ---- *************** *** 3924,3929 **** DEPLOYMENT_LOCATION = YES; DSTROOT = /; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h"; GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; GCC_WARN_UNKNOWN_PRAGMAS = NO; --- 3917,3920 ---- *************** *** 4070,4075 **** DEPLOYMENT_LOCATION = YES; DSTROOT = /; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h"; GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; GCC_WARN_UNKNOWN_PRAGMAS = NO; --- 4061,4064 ---- *************** *** 4232,4237 **** DEPLOYMENT_LOCATION = YES; DSTROOT = /; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h"; GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; GCC_WARN_UNKNOWN_PRAGMAS = NO; --- 4221,4224 ---- *************** *** 4394,4397 **** --- 4381,4385 ---- 4A5F9D96064B557700525EC0, 4A488ACD0751CC8E003D46BE, + 4A94DD4C0756B27700D79CD1, ); isa = PBXAggregateTarget; *************** *** 4944,4947 **** --- 4932,5113 ---- }; }; + 4A94DD350756B1EB00D79CD1 = { + buildPhases = ( + 4A94DD390756B1EB00D79CD1, + 4A94DD3D0756B1EB00D79CD1, + 4A94DD3F0756B1EB00D79CD1, + 4A94DD400756B1EB00D79CD1, + ); + buildRules = ( + ); + buildSettings = { + DEPLOYMENT_LOCATION = YES; + DSTROOT = /; + GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; + GCC_WARN_UNKNOWN_PRAGMAS = NO; + HEADER_SEARCH_PATHS = include; + INSTALL_PATH = "$(SRCROOT)/bin"; + LIBRARY_SEARCH_PATHS = lib; + PRODUCT_NAME = twoView; + WARNING_CFLAGS = "-Wmost"; + }; + dependencies = ( + 4A94DD360756B1EB00D79CD1, + 4A94DD370756B1EB00D79CD1, + 4A94DD380756B1EB00D79CD1, + ); + isa = PBXNativeTarget; + name = twoView; + productName = simpleTest; + productReference = 4A94DD490756B1EB00D79CD1; + productType = "com.apple.product-type.tool"; + }; + 4A94DD360756B1EB00D79CD1 = { + isa = PBXTargetDependency; + target = 4A3F11430649F7BA0042B0D7; + targetProxy = 4A5F9A4C064B4F0600525EC0; + }; + 4A94DD370756B1EB00D79CD1 = { + isa = PBXTargetDependency; + target = 4A3F1305064A02100042B0D7; + targetProxy = 4A5F9A4E064B4F0600525EC0; + }; + 4A94DD380756B1EB00D79CD1 = { + isa = PBXTargetDependency; + target = 4A8EA585065873E100ADDDD1; + targetProxy = 4A2244FE0659A32C0014DA8E; + }; + 4A94DD390756B1EB00D79CD1 = { + buildActionMask = 2147483647; + files = ( + 4A94DD3A0756B1EB00D79CD1, + 4A94DD3B0756B1EB00D79CD1, + 4A94DD3C0756B1EB00D79CD1, + ); + isa = PBXHeadersBuildPhase; + runOnlyForDeploymentPostprocessing = 0; + }; + 4A94DD3A0756B1EB00D79CD1 = { + fileRef = 4A427D000484329800B56093; + isa = PBXBuildFile; + settings = { + }; + }; + 4A94DD3B0756B1EB00D79CD1 = { + fileRef = 4A427D070484329800B56093; + isa = PBXBuildFile; + settings = { + }; + }; + 4A94DD3C0756B1EB00D79CD1 = { + fileRef = 4A427D0F0484329800B56093; + isa = PBXBuildFile; + settings = { + }; + }; + 4A94DD3D0756B1EB00D79CD1 = { + buildActionMask = 2147483647; + files = ( + 4A94DD4D0756B29700D79CD1, + ); + isa = PBXSourcesBuildPhase; + runOnlyForDeploymentPostprocessing = 0; + }; + 4A94DD3F0756B1EB00D79CD1 = { + buildActionMask = 2147483647; + files = ( + ); + isa = PBXRezBuildPhase; + runOnlyForDeploymentPostprocessing = 0; + }; + 4A94DD400756B1EB00D79CD1 = { + buildActionMask = 2147483647; + files = ( + 4A94DD410756B1EB00D79CD1, + 4A94DD420756B1EB00D79CD1, + 4A94DD430756B1EB00D79CD1, + 4A94DD440756B1EB00D79CD1, + 4A94DD450756B1EB00D79CD1, + 4A94DD460756B1EB00D79CD1, + 4A94DD470756B1EB00D79CD1, + 4A94DD480756B1EB00D79CD1, + ); + isa = PBXFrameworksBuildPhase; + runOnlyForDeploymentPostprocessing = 0; + }; + 4A94DD410756B1EB00D79CD1 = { + fileRef = 4A3F1601064A0CE40042B0D7; + isa = PBXBuildFile; + settings = { + }; + }; + 4A94DD420756B1EB00D79CD1 = { + fileRef = 4A3F167F064A0E270042B0D7; + isa = PBXBuildFile; + settings = { + }; + }; + 4A94DD430756B1EB00D79CD1 = { + fileRef = 4A3F14FC064A0C510042B0D7; + isa = PBXBuildFile; + settings = { + }; + }; + 4A94DD440756B1EB00D79CD1 = { + fileRef = 4A3F14FD064A0C510042B0D7; + isa = PBXBuildFile; + settings = { + }; + }; + 4A94DD450756B1EB00D79CD1 = { + fileRef = 4A3F14FE064A0C510042B0D7; + isa = PBXBuildFile; + settings = { + }; + }; + 4A94DD460756B1EB00D79CD1 = { + fileRef = 4A427D120484329800B56093; + isa = PBXBuildFile; + settings = { + }; + }; + 4A94DD470756B1EB00D79CD1 = { + fileRef = 4A427D160484329800B56093; + isa = PBXBuildFile; + settings = { + }; + }; + 4A94DD480756B1EB00D79CD1 = { + fileRef = 4A66475606598B950061DA76; + isa = PBXBuildFile; + settings = { + }; + }; + 4A94DD490756B1EB00D79CD1 = { + explicitFileType = "compiled.mach-o.executable"; + includeInIndex = 0; + isa = PBXFileReference; + path = twoView; + refType = 3; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4A94DD4B0756B27700D79CD1 = { + containerPortal = 08FB7793FE84155DC02AAC07; + isa = PBXContainerItemProxy; + proxyType = 1; + remoteGlobalIDString = 4A94DD350756B1EB00D79CD1; + remoteInfo = twoView; + }; + 4A94DD4C0756B27700D79CD1 = { + isa = PBXTargetDependency; + target = 4A94DD350756B1EB00D79CD1; + targetProxy = 4A94DD4B0756B27700D79CD1; + }; + 4A94DD4D0756B29700D79CD1 = { + fileRef = 4AC3C0BE07518C7E0073D2C6; + isa = PBXBuildFile; + settings = { + }; + }; 4AAB8C740728934300708844 = { fileEncoding = 30; *************** *** 5244,5249 **** DEPLOYMENT_LOCATION = YES; DSTROOT = /; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h"; GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; GCC_WARN_UNKNOWN_PRAGMAS = NO; --- 5410,5413 ---- *************** *** 5404,5409 **** DEPLOYMENT_LOCATION = YES; DSTROOT = /; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h"; GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; GCC_WARN_UNKNOWN_PRAGMAS = NO; --- 5568,5571 ---- *************** *** 5557,5562 **** DEPLOYMENT_LOCATION = YES; DSTROOT = /; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h"; GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; GCC_WARN_UNKNOWN_PRAGMAS = NO; --- 5719,5722 ---- *************** *** 5710,5715 **** DEPLOYMENT_LOCATION = YES; DSTROOT = /; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h"; GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; GCC_WARN_UNKNOWN_PRAGMAS = NO; --- 5870,5873 ---- *************** *** 6734,6737 **** --- 6892,6896 ---- 4AE2305E0659B7D10047D402 = { children = ( + 4A94DD490756B1EB00D79CD1, 4A1F9E1B07568A0100DEC369, 4A1F9DF40756897100DEC369, |
|
From: raph_hitlab <rgr...@us...> - 2004-11-25 23:24:43
|
Update of /cvsroot/artoolkit/artoolkit/include/AR In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23455 Modified Files: ar.h matrix.h param.h Log Message: added documentation Index: param.h =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/include/AR/param.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** param.h 22 Nov 2004 08:17:34 -0000 1.3 --- param.h 25 Nov 2004 23:24:20 -0000 1.4 *************** *** 116,121 **** * * XXXBK ! * \param source XXXBK ! * \param cpara XXXBK * \param trans XXXBK * \return XXXBK --- 116,121 ---- * * XXXBK ! * \param source input camera matrix ! * \param cpara camera parameter to be set * \param trans XXXBK * \return XXXBK *************** *** 126,138 **** double *ox, double *oy ) ! * \brief XXXBK * ! * XXXBK ! * \param dist_factor XXXBK ! * \param ix XXXBK ! * \param iy XXXBK ! * \param ox XXXBK ! * \param oy XXXBK ! * \return XXXBK */ int arParamIdeal2Observ( const double dist_factor[4], const double ix, const double iy, --- 126,139 ---- double *ox, double *oy ) ! * \brief Convert ideal screen coordinates of a vertex to observed ones. * ! * Ideal coordinates mean that the distortion of the camera is compensated (so a straight line looks straight). ! * In observed coordinates the camera-distortion is not compensated and thus a straight line is not shown really straight. ! * \param dist_factor distorsion factors of used camera ! * \param ix x in ideal screen coordinates ! * \param iy y in ideal screen coordinates ! * \param ox resulted x in observed screen coordinates ! * \param oy resulted y in observed screen coordinates ! * \return 0 if success, -1 otherwise */ int arParamIdeal2Observ( const double dist_factor[4], const double ix, const double iy, *************** *** 142,154 **** double *ix, double *iy ) ! * \brief XXXBK ! * ! * XXXBK ! * \param dist_factor XXXBK ! * \param ox XXXBK ! * \param oy XXXBK ! * \param ix XXXBK ! * \param iy XXXBK ! * \return XXXBK */ int arParamObserv2Ideal( const double dist_factor[4], const double ox, const double oy, --- 143,156 ---- double *ix, double *iy ) ! * \brief Convert observed screen coordinates of a vertex to ideal ones. ! ! * Ideal coordinates mean that the distortion of the camera is compensated (so a straight line looks straight). ! * In observed coordinates the camera-distortion is not compensated and thus a straight line is not shown really straight. ! * \param dist_factor distorsion factors of used camera ! * \param ox x in observed screen coordinates ! * \param oy y in observed screen coordinates ! * \param ix resulted x in ideal screen coordinates ! * \param iy resulted y in ideal screen coordinates ! * \return 0 if success, -1 otherwise */ int arParamObserv2Ideal( const double dist_factor[4], const double ox, const double oy, *************** *** 172,176 **** * Save manipulated camera intrinsic parameters in a file. * \param filename name of the parameters file. ! * \param num XXXBK * \param param parameters to save * \return 0 if success, -1 if Error (file not found, file structure problem) --- 174,178 ---- * Save manipulated camera intrinsic parameters in a file. * \param filename name of the parameters file. ! * \param num number of variable arguments * \param param parameters to save * \return 0 if success, -1 if Error (file not found, file structure problem) *************** *** 184,188 **** * a file (itselft, a resulted output of calibration step). * \param filename name of the parameters file. ! * \param num XXXBK * \param param result of the loaded parameters * \return 0 if success, -1 if Error (file not found, file structure problem) --- 186,190 ---- * a file (itselft, a resulted output of calibration step). * \param filename name of the parameters file. ! * \param num number of variable arguments * \param param result of the loaded parameters * \return 0 if success, -1 if Error (file not found, file structure problem) Index: ar.h =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/include/AR/ar.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ar.h 22 Nov 2004 02:11:05 -0000 1.2 --- ar.h 25 Nov 2004 23:24:20 -0000 1.3 *************** *** 75,86 **** * \brief main structure for detected marker. * * \remark lines are represented by 3 values a,b,c for ax+by+c=0 ! * \param area XXXBK ! * \param id marker identity number ! * \param dir XXXBK ! * \param cf confidence value * \param pos center of marker (in ideal screen coordinates) * \param line line equations for four side of the marker (in ideal screen coordinates) ! * \param vertex marker coordinates (in ideal screen coordinates) */ typedef struct { --- 75,87 ---- * \brief main structure for detected marker. * + * Store information after contour detection (in idea screen coordinate, after distorsion compensated). * \remark lines are represented by 3 values a,b,c for ax+by+c=0 ! * \param area number of pixels in the labeled region ! * \param id marker identitied number ! * \param dir Direction that tells about the rotation about the marker (possible values are 0, 1, 2 or 3). This parameter makes it possible to tell about the line order of the detected marker (so which line is the first one) and so find the first vertex. This is important to compute the transformation matrix in arGetTransMat(). ! * \param cf confidence value (probability to be a marker) * \param pos center of marker (in ideal screen coordinates) * \param line line equations for four side of the marker (in ideal screen coordinates) ! * \param vertex edge points of the marker (in ideal screen coordinates) */ typedef struct { *************** *** 97,107 **** * \brief internal structure use for marker detection. * ! * Store information after contour detection. ! * \param area XXXBK ! * \param pos center of marker (in ideal screen coordinates) * \param coord_num numer of pixels in the contour. ! * \param x_coord x coordinate of pixels of contour. ! * \param y_coord y coordinate of pixels of contour. ! * \param vertex marker coordinates (in ideal screen coordinates) * */ --- 98,109 ---- * \brief internal structure use for marker detection. * ! * Store information after contour detection (in observed screen coordinate, before distorsion correction). ! * \param area number of pixels in the labeled region ! * \param pos position of the center of the marker (in observed screen coordinates) * \param coord_num numer of pixels in the contour. ! * \param x_coord x coordinate of the pixels of contours (size limited by AR_CHAIN_MAX). ! * \param y_coord y coordinate of the pixels of contours (size limited by AR_CHAIN_MAX). ! * \param vertex position of the vertices of the marker. (in observed screen coordinates) ! rem:the first vertex is stored again as the 5th entry in the array for convenience of drawing a line-strip easier. * */ *************** *** 247,251 **** * The pixel format depend of your architecture. Generally ABGR, but the images * are treated as a gray scale, so the order of BGR components does not matter. ! * However the ordering of the alpha component, A, is important. * \param thresh specifies the threshold value (between 0-255) to be used to convert * the input image into a binary image. --- 249,253 ---- * The pixel format depend of your architecture. Generally ABGR, but the images * are treated as a gray scale, so the order of BGR components does not matter. ! * However the ordering of the alpha comp, A, is important. * \param thresh specifies the threshold value (between 0-255) to be used to convert * the input image into a binary image. Index: matrix.h =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/include/AR/matrix.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** matrix.h 22 Nov 2004 02:11:05 -0000 1.2 --- matrix.h 25 Nov 2004 23:24:20 -0000 1.3 *************** *** 140,144 **** * * copy one matrix to another. The two ARMat must ! * be allocate * \param dest the destination matrix of the copy * \param source the original matrix source --- 140,144 ---- * * copy one matrix to another. The two ARMat must ! * be allocated. * \param dest the destination matrix of the copy * \param source the original matrix source *************** *** 171,175 **** * * Allocates and initializes a matrix to a ! * a unit matrix. * \param dim dimensions of the unit matrix (square) * \return the matrix allocated if success, NULL if error --- 171,175 ---- * * Allocates and initializes a matrix to a ! * an identity matrix. * \param dim dimensions of the unit matrix (square) * \return the matrix allocated if success, NULL if error *************** *** 187,191 **** * \param a first matrix * \param b second matrix ! * \return 0 if success, -1 if error */ int arMatrixMul(ARMat *dest, ARMat *a, ARMat *b); --- 187,191 ---- * \param a first matrix * \param b second matrix ! * \return 0 if success, -1 if error (multiplication impossible, or destination matrix have not comptabile size) */ int arMatrixMul(ARMat *dest, ARMat *a, ARMat *b); *************** *** 211,215 **** * \param dest the destination matrix of the copy * \param source the source matrix ! * \return 0 if success, -1 if error */ int arMatrixTrans(ARMat *dest, ARMat *source); --- 211,215 ---- * \param dest the destination matrix of the copy * \param source the source matrix ! * \return 0 if success, -1 if error (source and destination matrix have different size) */ int arMatrixTrans(ARMat *dest, ARMat *source); *************** *** 221,225 **** * allocate matrix (the source matrix is unmodified). * \param source the matrix to transpose ! * \return the allocated matrix if success, NULL if error */ ARMat *arMatrixAllocTrans(ARMat *source); --- 221,225 ---- * allocate matrix (the source matrix is unmodified). * \param source the matrix to transpose ! * \return the allocated matrix if success, NULL if error (creation or transposition impossible) */ ARMat *arMatrixAllocTrans(ARMat *source); *************** *** 234,238 **** * \param dest result matrix of the inverse operation * \param source source matrix ! * \return 0 if success, -1 if error */ int arMatrixInv(ARMat *dest, ARMat *source); --- 234,238 ---- * \param dest result matrix of the inverse operation * \param source source matrix ! * \return 0 if success, -1 if error (not square matrix) */ int arMatrixInv(ARMat *dest, ARMat *source); *************** *** 270,279 **** * \brief compute the PCA of a matrix. * ! * XXXBK ! * \param input XXXBK ! * \param evec XXXBK ! * \param ev XXXBK ! * \param mean XXXBK ! * \return XXXBK */ int arMatrixPCA( ARMat *input, ARMat *evec, ARVec *ev, ARVec *mean ); --- 270,279 ---- * \brief compute the PCA of a matrix. * ! * Compute the Principal Component Analysis (PCA) of a matrix. ! * \param input source matrix ! * \param evec eigen vector computed ! * \param ev eigen value computed ! * \param mean mean computed ! * \return 0 if success to compute, -1 otherwise */ int arMatrixPCA( ARMat *input, ARMat *evec, ARVec *ev, ARVec *mean ); *************** *** 282,290 **** * \brief compute the PCA of a matrix. * ! * XXXBK ! * \param input XXXBK ! * \param evec XXXBK ! * \param ev XXXBK ! * \return XXXBK */ int arMatrixPCA2( ARMat *input, ARMat *evec, ARVec *ev ); --- 282,290 ---- * \brief compute the PCA of a matrix. * ! * Compute the Principal Component Analysis (PCA) of a matrix. ! * \param input source matrix ! * \param evec result matrix ! * \param ev egein value computed ! * \return 0 if success to compute, -1 otherwise */ int arMatrixPCA2( ARMat *input, ARMat *evec, ARVec *ev ); *************** *** 305,309 **** * Allocates and initializes new vector structure. * \param clm dimension of vector ! * \return the allocated vector, NULL if error */ ARVec *arVecAlloc( int clm ); --- 305,309 ---- * Allocates and initializes new vector structure. * \param clm dimension of vector ! * \return the allocated vector, NULL if error (impossible allocation) */ ARVec *arVecAlloc( int clm ); *************** *** 313,317 **** * * Delete a vector structure (deallocate used memory). ! * \param v vector to delete * \return 0 */ --- 313,317 ---- * * Delete a vector structure (deallocate used memory). ! * \param v the vector to delete * \return 0 */ |
|
From: Philip L. <phi...@us...> - 2004-11-25 22:45:34
|
Update of /cvsroot/artoolkit/artoolkit/util/graphicsTest In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16156 Modified Files: graphicsTest.c Log Message: Add graphicsTest & videoTest to OSX project. Index: graphicsTest.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/graphicsTest/graphicsTest.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** graphicsTest.c 22 Nov 2004 02:42:48 -0000 1.1 --- graphicsTest.c 25 Nov 2004 22:45:10 -0000 1.2 *************** *** 1,133 **** ! #ifdef _WIN32 ! #include <windows.h> ! #endif ! #include <stdio.h> ! #include <stdlib.h> ! #ifndef __APPLE__ ! #include <GL/gl.h> ! #include <GL/glut.h> ! #else ! #include <OpenGL/gl.h> ! #include <GLUT/glut.h> ! #endif ! #include <AR/gsub.h> ! #include <AR/video.h> ! #include <AR/param.h> ! #include <AR/ar.h> ! ! ! int count = 0; ! char *cparam_name = "Data/camera_para.dat"; ! ARParam cparam; ! ! int xsize = 320; ! int ysize = 240; ! ! float rotate_angle=0.; ! ! static void init(void); ! static void cleanup(void); ! static void keyEvent( unsigned char key, int x, int y); ! static void mainLoop(void); ! static void draw( void ); ! ! int main(int argc, char **argv) ! { ! init(); ! ! argMainLoop( NULL, keyEvent, mainLoop ); ! return (0); ! } ! ! static void keyEvent( unsigned char key, int x, int y) ! { ! /* quit if the ESC key is pressed */ ! if( key == 0x1b ) { ! printf("*** %f (frame/sec)\n", (double)count/arUtilTimer()); ! cleanup(); ! exit(0); ! } ! } ! ! /* main loop */ ! static void mainLoop(void) ! { ! ! if( count == 100 ) { ! printf("*** %f (frame/sec)\n", (double)count/arUtilTimer()); ! count = 0; ! } ! if( count == 0 ) arUtilTimerReset(); ! count++; ! ! rotate_angle+=1.; ! if (rotate_angle>360) ! { ! rotate_angle=0.; ! } ! draw(); ! ! argSwapBuffers(); ! } ! ! static void init( void ) ! { ! ARParam wparam; ! ! /* set the initial camera parameters */ ! if( arParamLoad(cparam_name, 1, &wparam) < 0 ) { ! printf("Camera parameter load error !!\n"); ! exit(0); ! } ! arParamChangeSize( &wparam, xsize, ysize, &cparam ); ! ! arInitCparam( &cparam ); ! printf("*** Camera Parameter ***\n"); ! arParamDisp( &cparam ); ! ! /* open the graphics window */ ! argInit( &cparam, 1.0, 0, 0, 0, 0 ); ! } ! ! /* cleanup function called when program exits */ ! static void cleanup(void) ! { ! argCleanup(); ! } ! ! static void draw( void ) ! { ! ! GLfloat mat_ambient[] = {0.0, 0.0, 1.0, 1.0}; ! GLfloat mat_flash[] = {0.0, 0.0, 1.0, 1.0}; ! GLfloat mat_flash_shiny[] = {50.0}; ! GLfloat light_position[] = {100.0,-200.0,200.0,0.0}; ! GLfloat ambi[] = {0.1, 0.1, 0.1, 0.1}; ! GLfloat lightZeroColor[] = {0.9, 0.9, 0.9, 0.1}; ! ! argDrawMode3D(); ! argDraw3dCamera( 0, 0 ); ! glClear(GL_DEPTH_BUFFER_BIT|GL_COLOR_BUFFER_BIT); ! glEnable(GL_DEPTH_TEST); ! glDepthFunc(GL_LEQUAL); ! ! glEnable(GL_LIGHTING); ! glEnable(GL_LIGHT0); ! glLightfv(GL_LIGHT0, GL_POSITION, light_position); ! glLightfv(GL_LIGHT0, GL_AMBIENT, ambi); ! glLightfv(GL_LIGHT0, GL_DIFFUSE, lightZeroColor); ! glMaterialfv(GL_FRONT, GL_SPECULAR, mat_flash); ! glMaterialfv(GL_FRONT, GL_SHININESS, mat_flash_shiny); ! glMaterialfv(GL_FRONT, GL_AMBIENT, mat_ambient); ! ! glMatrixMode(GL_MODELVIEW); ! glLoadIdentity(); ! glTranslatef( 0.0, 0.0, 500.0 ); ! glRotatef(rotate_angle,0.,1.,0.); ! glRotatef(180.,1.,0.,0.); ! glutSolidTeapot(100.0); ! ! glDisable( GL_LIGHTING ); ! ! glDisable( GL_DEPTH_TEST ); ! } --- 1,133 ---- ! #ifdef _WIN32 ! # include <windows.h> ! #endif ! #include <stdio.h> ! #include <stdlib.h> ! #ifndef __APPLE__ ! # include <GL/gl.h> ! # include <GL/glut.h> ! #else ! # include <OpenGL/gl.h> ! # include <GLUT/glut.h> ! #endif ! #include <AR/gsub.h> ! #include <AR/video.h> ! #include <AR/param.h> ! #include <AR/ar.h> ! ! ! int count = 0; ! char *cparam_name = "Data/camera_para.dat"; ! ARParam cparam; ! ! int xsize = 320; ! int ysize = 240; ! ! float rotate_angle=0.; ! ! static void init(void); ! static void cleanup(void); ! static void keyEvent( unsigned char key, int x, int y); ! static void mainLoop(void); ! static void draw( void ); ! ! int main(int argc, char **argv) ! { ! init(); ! ! argMainLoop( NULL, keyEvent, mainLoop ); ! return (0); ! } ! ! static void keyEvent( unsigned char key, int x, int y) ! { ! /* quit if the ESC key is pressed */ ! if( key == 0x1b ) { ! printf("*** %f (frame/sec)\n", (double)count/arUtilTimer()); ! cleanup(); ! exit(0); ! } ! } ! ! /* main loop */ ! static void mainLoop(void) ! { ! ! if( count == 100 ) { ! printf("*** %f (frame/sec)\n", (double)count/arUtilTimer()); ! count = 0; ! } ! if( count == 0 ) arUtilTimerReset(); ! count++; ! ! rotate_angle+=1.; ! if (rotate_angle>360) ! { ! rotate_angle=0.; ! } ! draw(); ! ! argSwapBuffers(); ! } ! ! static void init( void ) ! { ! ARParam wparam; ! ! /* set the initial camera parameters */ ! if( arParamLoad(cparam_name, 1, &wparam) < 0 ) { ! printf("Camera parameter load error !!\n"); ! exit(0); ! } ! arParamChangeSize( &wparam, xsize, ysize, &cparam ); ! ! arInitCparam( &cparam ); ! printf("*** Camera Parameter ***\n"); ! arParamDisp( &cparam ); ! ! /* open the graphics window */ ! argInit( &cparam, 1.0, 0, 0, 0, 0 ); ! } ! ! /* cleanup function called when program exits */ ! static void cleanup(void) ! { ! argCleanup(); ! } ! ! static void draw( void ) ! { ! ! GLfloat mat_ambient[] = {0.0, 0.0, 1.0, 1.0}; ! GLfloat mat_flash[] = {0.0, 0.0, 1.0, 1.0}; ! GLfloat mat_flash_shiny[] = {50.0}; ! GLfloat light_position[] = {100.0,-200.0,200.0,0.0}; ! GLfloat ambi[] = {0.1, 0.1, 0.1, 0.1}; ! GLfloat lightZeroColor[] = {0.9, 0.9, 0.9, 0.1}; ! ! argDrawMode3D(); ! argDraw3dCamera( 0, 0 ); ! glClear(GL_DEPTH_BUFFER_BIT|GL_COLOR_BUFFER_BIT); ! glEnable(GL_DEPTH_TEST); ! glDepthFunc(GL_LEQUAL); ! ! glEnable(GL_LIGHTING); ! glEnable(GL_LIGHT0); ! glLightfv(GL_LIGHT0, GL_POSITION, light_position); ! glLightfv(GL_LIGHT0, GL_AMBIENT, ambi); ! glLightfv(GL_LIGHT0, GL_DIFFUSE, lightZeroColor); ! glMaterialfv(GL_FRONT, GL_SPECULAR, mat_flash); ! glMaterialfv(GL_FRONT, GL_SHININESS, mat_flash_shiny); ! glMaterialfv(GL_FRONT, GL_AMBIENT, mat_ambient); ! ! glMatrixMode(GL_MODELVIEW); ! glLoadIdentity(); ! glTranslatef( 0.0, 0.0, 500.0 ); ! glRotatef(rotate_angle,0.,1.,0.); ! glRotatef(180.,1.,0.,0.); ! glutSolidTeapot(100.0); ! ! glDisable( GL_LIGHTING ); ! ! glDisable( GL_DEPTH_TEST ); ! } |
|
From: Philip L. <phi...@us...> - 2004-11-25 22:45:22
|
Update of /cvsroot/artoolkit/artoolkit/ARToolKit.xcode In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16117 Modified Files: project.pbxproj Log Message: Add graphicsTest & videoTest to OSX project. Index: project.pbxproj =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/ARToolKit.xcode/project.pbxproj,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** project.pbxproj 22 Nov 2004 20:01:59 -0000 1.5 --- project.pbxproj 25 Nov 2004 22:45:03 -0000 1.6 *************** *** 69,72 **** --- 69,74 ---- 4A5F9D3F064B54D800525EC0, 4AB9FF750651CDE3003B9097, + 4A1F9DE00756897100DEC369, + 4A1F9E0A07568A0100DEC369, 4AB9FDF30651CB83003B9097, 4AB9FE590651CC50003B9097, *************** *** 120,123 **** --- 122,439 ---- sourceTree = "<group>"; }; + 4A1F9DE00756897100DEC369 = { + buildPhases = ( + 4A1F9DE40756897100DEC369, + 4A1F9DE60756897100DEC369, + 4A1F9DEA0756897100DEC369, + 4A1F9DEB0756897100DEC369, + ); + buildRules = ( + ); + buildSettings = { + DEPLOYMENT_LOCATION = YES; + DSTROOT = /; + GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; + GCC_WARN_UNKNOWN_PRAGMAS = NO; + HEADER_SEARCH_PATHS = include; + INSTALL_PATH = "$(SRCROOT)/bin"; + LIBRARY_SEARCH_PATHS = lib; + PRODUCT_NAME = videoTest; + WARNING_CFLAGS = "-Wmost"; + }; + dependencies = ( + 4A1F9DE10756897100DEC369, + 4A1F9DE20756897100DEC369, + 4A1F9DE30756897100DEC369, + ); + isa = PBXNativeTarget; + name = videoTest; + productName = simpleTest; + productReference = 4A1F9DF40756897100DEC369; + productType = "com.apple.product-type.tool"; + }; + 4A1F9DE10756897100DEC369 = { + isa = PBXTargetDependency; + target = 4A3F11430649F7BA0042B0D7; + targetProxy = 4A5F9A4C064B4F0600525EC0; + }; + 4A1F9DE20756897100DEC369 = { + isa = PBXTargetDependency; + target = 4A3F1305064A02100042B0D7; + targetProxy = 4A5F9A4E064B4F0600525EC0; + }; + 4A1F9DE30756897100DEC369 = { + isa = PBXTargetDependency; + target = 4A3F13F4064A091B0042B0D7; + targetProxy = 4A5F9A50064B4F0600525EC0; + }; + 4A1F9DE40756897100DEC369 = { + buildActionMask = 2147483647; + files = ( + ); + isa = PBXHeadersBuildPhase; + runOnlyForDeploymentPostprocessing = 0; + }; + 4A1F9DE60756897100DEC369 = { + buildActionMask = 2147483647; + files = ( + 4A1F9E07075689CE00DEC369, + ); + isa = PBXSourcesBuildPhase; + runOnlyForDeploymentPostprocessing = 0; + }; + 4A1F9DEA0756897100DEC369 = { + buildActionMask = 2147483647; + files = ( + ); + isa = PBXRezBuildPhase; + runOnlyForDeploymentPostprocessing = 0; + }; + 4A1F9DEB0756897100DEC369 = { + buildActionMask = 2147483647; + files = ( + 4A1F9DEC0756897100DEC369, + 4A1F9DED0756897100DEC369, + 4A1F9DEE0756897100DEC369, + 4A1F9DEF0756897100DEC369, + 4A1F9DF00756897100DEC369, + 4A1F9DF10756897100DEC369, + 4A1F9DF20756897100DEC369, + 4A1F9DF30756897100DEC369, + ); + isa = PBXFrameworksBuildPhase; + runOnlyForDeploymentPostprocessing = 0; + }; + 4A1F9DEC0756897100DEC369 = { + fileRef = 4A3F1601064A0CE40042B0D7; + isa = PBXBuildFile; + settings = { + }; + }; + 4A1F9DED0756897100DEC369 = { + fileRef = 4A3F167F064A0E270042B0D7; + isa = PBXBuildFile; + settings = { + }; + }; + 4A1F9DEE0756897100DEC369 = { + fileRef = 4A3F14FC064A0C510042B0D7; + isa = PBXBuildFile; + settings = { + }; + }; + 4A1F9DEF0756897100DEC369 = { + fileRef = 4A3F14FD064A0C510042B0D7; + isa = PBXBuildFile; + settings = { + }; + }; + 4A1F9DF00756897100DEC369 = { + fileRef = 4A3F14FE064A0C510042B0D7; + isa = PBXBuildFile; + settings = { + }; + }; + 4A1F9DF10756897100DEC369 = { + fileRef = 4A427D120484329800B56093; + isa = PBXBuildFile; + settings = { + }; + }; + 4A1F9DF20756897100DEC369 = { + fileRef = 4A427D130484329800B56093; + isa = PBXBuildFile; + settings = { + }; + }; + 4A1F9DF30756897100DEC369 = { + fileRef = 4A427D160484329800B56093; + isa = PBXBuildFile; + settings = { + }; + }; + 4A1F9DF40756897100DEC369 = { + explicitFileType = "compiled.mach-o.executable"; + includeInIndex = 0; + isa = PBXFileReference; + path = videoTest; + refType = 3; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4A1F9E07075689CE00DEC369 = { + fileRef = 4AC3C07D075188AB0073D2C6; + isa = PBXBuildFile; + settings = { + }; + }; + 4A1F9E08075689F900DEC369 = { + containerPortal = 08FB7793FE84155DC02AAC07; + isa = PBXContainerItemProxy; + proxyType = 1; + remoteGlobalIDString = 4A1F9DE00756897100DEC369; + remoteInfo = videoTest; + }; + 4A1F9E09075689F900DEC369 = { + isa = PBXTargetDependency; + target = 4A1F9DE00756897100DEC369; + targetProxy = 4A1F9E08075689F900DEC369; + }; + 4A1F9E0A07568A0100DEC369 = { + buildPhases = ( + 4A1F9E0E07568A0100DEC369, + 4A1F9E0F07568A0100DEC369, + 4A1F9E1107568A0100DEC369, + 4A1F9E1207568A0100DEC369, + ); + buildRules = ( + ); + buildSettings = { + DEPLOYMENT_LOCATION = YES; + DSTROOT = /; + GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; + GCC_WARN_UNKNOWN_PRAGMAS = NO; + HEADER_SEARCH_PATHS = include; + INSTALL_PATH = "$(SRCROOT)/bin"; + LIBRARY_SEARCH_PATHS = lib; + PRODUCT_NAME = graphicsTest; + WARNING_CFLAGS = "-Wmost"; + }; + dependencies = ( + 4A1F9E0B07568A0100DEC369, + 4A1F9E0C07568A0100DEC369, + 4A1F9E0D07568A0100DEC369, + ); + isa = PBXNativeTarget; + name = graphicsTest; + productName = simpleTest; + productReference = 4A1F9E1B07568A0100DEC369; + productType = "com.apple.product-type.tool"; + }; + 4A1F9E0B07568A0100DEC369 = { + isa = PBXTargetDependency; + target = 4A3F11430649F7BA0042B0D7; + targetProxy = 4A5F9A4C064B4F0600525EC0; + }; + 4A1F9E0C07568A0100DEC369 = { + isa = PBXTargetDependency; + target = 4A3F1305064A02100042B0D7; + targetProxy = 4A5F9A4E064B4F0600525EC0; + }; + 4A1F9E0D07568A0100DEC369 = { + isa = PBXTargetDependency; + target = 4A3F13F4064A091B0042B0D7; + targetProxy = 4A5F9A50064B4F0600525EC0; + }; + 4A1F9E0E07568A0100DEC369 = { + buildActionMask = 2147483647; + files = ( + ); + isa = PBXHeadersBuildPhase; + runOnlyForDeploymentPostprocessing = 0; + }; + 4A1F9E0F07568A0100DEC369 = { + buildActionMask = 2147483647; + files = ( + 4A1F9E2007568A7A00DEC369, + ); + isa = PBXSourcesBuildPhase; + runOnlyForDeploymentPostprocessing = 0; + }; + 4A1F9E1107568A0100DEC369 = { + buildActionMask = 2147483647; + files = ( + ); + isa = PBXRezBuildPhase; + runOnlyForDeploymentPostprocessing = 0; + }; + 4A1F9E1207568A0100DEC369 = { + buildActionMask = 2147483647; + files = ( + 4A1F9E1307568A0100DEC369, + 4A1F9E1407568A0100DEC369, + 4A1F9E1507568A0100DEC369, + 4A1F9E1607568A0100DEC369, + 4A1F9E1707568A0100DEC369, + 4A1F9E1807568A0100DEC369, + 4A1F9E1907568A0100DEC369, + 4A1F9E1A07568A0100DEC369, + ); + isa = PBXFrameworksBuildPhase; + runOnlyForDeploymentPostprocessing = 0; + }; + 4A1F9E1307568A0100DEC369 = { + fileRef = 4A3F1601064A0CE40042B0D7; + isa = PBXBuildFile; + settings = { + }; + }; + 4A1F9E1407568A0100DEC369 = { + fileRef = 4A3F167F064A0E270042B0D7; + isa = PBXBuildFile; + settings = { + }; + }; + 4A1F9E1507568A0100DEC369 = { + fileRef = 4A3F14FC064A0C510042B0D7; + isa = PBXBuildFile; + settings = { + }; + }; + 4A1F9E1607568A0100DEC369 = { + fileRef = 4A3F14FD064A0C510042B0D7; + isa = PBXBuildFile; + settings = { + }; + }; + 4A1F9E1707568A0100DEC369 = { + fileRef = 4A3F14FE064A0C510042B0D7; + isa = PBXBuildFile; + settings = { + }; + }; + 4A1F9E1807568A0100DEC369 = { + fileRef = 4A427D120484329800B56093; + isa = PBXBuildFile; + settings = { + }; + }; + 4A1F9E1907568A0100DEC369 = { + fileRef = 4A427D130484329800B56093; + isa = PBXBuildFile; + settings = { + }; + }; + 4A1F9E1A07568A0100DEC369 = { + fileRef = 4A427D160484329800B56093; + isa = PBXBuildFile; + settings = { + }; + }; + 4A1F9E1B07568A0100DEC369 = { + explicitFileType = "compiled.mach-o.executable"; + includeInIndex = 0; + isa = PBXFileReference; + path = graphicsTest; + refType = 3; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4A1F9E1D07568A2C00DEC369 = { + containerPortal = 08FB7793FE84155DC02AAC07; + isa = PBXContainerItemProxy; + proxyType = 1; + remoteGlobalIDString = 4A1F9E0A07568A0100DEC369; + remoteInfo = graphicsTest; + }; + 4A1F9E1E07568A2C00DEC369 = { + isa = PBXTargetDependency; + target = 4A1F9E0A07568A0100DEC369; + targetProxy = 4A1F9E1D07568A2C00DEC369; + }; + 4A1F9E2007568A7A00DEC369 = { + fileRef = 4AC3C077075188AB0073D2C6; + isa = PBXBuildFile; + settings = { + }; + }; 4A2244930659A20D0014DA8E = { children = ( *************** *** 5537,5540 **** --- 5853,5858 ---- 4AB9FF7D0651CDE8003B9097, 4AB9FF7F0651CDE8003B9097, + 4A1F9E09075689F900DEC369, + 4A1F9E1E07568A2C00DEC369, ); isa = PBXAggregateTarget; *************** *** 6416,6419 **** --- 6734,6739 ---- 4AE2305E0659B7D10047D402 = { children = ( + 4A1F9E1B07568A0100DEC369, + 4A1F9DF40756897100DEC369, 4A488ACA0751CC26003D46BE, 4AE22FFD0659B7A80047D402, |
|
From: Philip L. <phi...@us...> - 2004-11-25 22:45:17
|
Update of /cvsroot/artoolkit/artoolkit/util/videoTest In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16048 Modified Files: videoTest.c Log Message: Add graphicsTest & videoTest to OSX project. Index: videoTest.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/videoTest/videoTest.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** videoTest.c 22 Nov 2004 02:42:41 -0000 1.1 --- videoTest.c 25 Nov 2004 22:44:54 -0000 1.2 *************** *** 1,13 **** #ifdef _WIN32 ! #include <windows.h> #endif #include <stdio.h> #include <stdlib.h> #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,13 ---- #ifdef _WIN32 ! # include <windows.h> #endif #include <stdio.h> #include <stdlib.h> #ifndef __APPLE__ ! # include <GL/gl.h> ! # include <GL/glut.h> #else ! # include <OpenGL/gl.h> ! # include <GLUT/glut.h> #endif #include <AR/gsub.h> |
|
From: Philip L. <phi...@us...> - 2004-11-25 21:42:42
|
Update of /cvsroot/artoolkit/artoolkit/examples/twoView In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2655 Modified Files: twoView.vcproj twoView.dsp Makefile.in twoView.c Log Message: Rewrite of twoView example. Index: Makefile.in =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/examples/twoView/Makefile.in,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.in 22 Nov 2004 03:37:58 -0000 1.1 --- Makefile.in 25 Nov 2004 21:42:30 -0000 1.2 *************** *** 1,27 **** ! INC_DIR= ../../include ! LIB_DIR= ../../lib ! BIN_DIR= ../../bin ! ! LDFLAG=@LDFLAG@ -L$(LIB_DIR) ! LIBS= -lARgsub -lARvideo -lAR @LIBS@ ! CFLAG= @CFLAG@ -I$(INC_DIR) ! ! OBJS = ! HEADDERS = ! ! all: $(BIN_DIR)/twoView ! ! $(BIN_DIR)/twoView: twoView.o $(OBJS) ! cc -o $(BIN_DIR)/twoView twoView.o $(OBJS) $(LDFLAG) $(LIBS) ! ! twoView.o: twoView.c $(HEADDERS) ! cc -c $(CFLAG) twoView.c ! ! clean: ! rm -f *.o ! rm -f $(BIN_DIR)/twoView ! ! allclean: ! rm -f *.o ! rm -f $(BIN_DIR)/twoView ! rm -f Makefile --- 1,27 ---- ! INC_DIR= ../../include ! LIB_DIR= ../../lib ! BIN_DIR= ../../bin ! ! LDFLAG=@LDFLAG@ -L$(LIB_DIR) ! LIBS= -lARgsub_lite -lARvideo -lAR @LIBS@ ! CFLAG= @CFLAG@ -I$(INC_DIR) ! ! OBJS = ! HEADDERS = ! ! all: $(BIN_DIR)/twoView ! ! $(BIN_DIR)/twoView: twoView.o $(OBJS) ! cc -o $(BIN_DIR)/twoView twoView.o $(OBJS) $(LDFLAG) $(LIBS) ! ! twoView.o: twoView.c $(HEADDERS) ! cc -c $(CFLAG) twoView.c ! ! clean: ! rm -f *.o ! rm -f $(BIN_DIR)/twoView ! ! allclean: ! rm -f *.o ! rm -f $(BIN_DIR)/twoView ! rm -f Makefile Index: twoView.vcproj =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/examples/twoView/twoView.vcproj,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** twoView.vcproj 22 Nov 2004 03:37:58 -0000 1.1 --- twoView.vcproj 25 Nov 2004 21:42:29 -0000 1.2 *************** *** 30,34 **** Name="VCLinkerTool" AdditionalOptions="/DEBUG" ! AdditionalDependencies="libARd.lib libARgsubd.lib libARvideod.lib" OutputFile="$(ProjectDir)/../../bin/$(ProjectName)d.exe" AdditionalLibraryDirectories=""$(ProjectDir)/../../lib"" --- 30,34 ---- Name="VCLinkerTool" AdditionalOptions="/DEBUG" ! AdditionalDependencies="libARd.lib libARgsub_lited.lib libARvideod.lib" OutputFile="$(ProjectDir)/../../bin/$(ProjectName)d.exe" AdditionalLibraryDirectories=""$(ProjectDir)/../../lib"" *************** *** 77,81 **** <Tool Name="VCLinkerTool" ! AdditionalDependencies="libAR.lib libARgsub.lib libARvideo.lib" OutputFile="$(ProjectDir)/../../bin/$(ProjectName).exe" AdditionalLibraryDirectories=""$(ProjectDir)/../../lib""/> --- 77,81 ---- <Tool Name="VCLinkerTool" ! AdditionalDependencies="libAR.lib libARgsub_lite.lib libARvideo.lib" OutputFile="$(ProjectDir)/../../bin/$(ProjectName).exe" AdditionalLibraryDirectories=""$(ProjectDir)/../../lib""/> Index: twoView.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/examples/twoView/twoView.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** twoView.c 22 Nov 2004 03:37:58 -0000 1.1 --- twoView.c 25 Nov 2004 21:42:30 -0000 1.2 *************** *** 1,233 **** ! #ifdef _WIN32 ! #include <windows.h> ! #endif ! #include <stdio.h> ! #include <stdlib.h> ! #ifndef __APPLE__ ! #include <GL/gl.h> ! #include <GL/glut.h> ! #else ! #include <OpenGL/gl.h> ! #include <GLUT/glut.h> ! #endif ! #include <AR/gsub.h> ! #include <AR/video.h> ! #include <AR/param.h> ! #include <AR/ar.h> ! ! /*****************************************************************************/ ! // modified by Thomas Pintaric, Vienna University of Technology ! ! #ifdef _WIN32 ! char *vconf1 = "flipV,showDlg"; // see video.h for a list of supported parameters ! char *vconf2 = "flipV,showDlg"; // see video.h for a list of supported parameters ! #else ! char *vconf1 = "-dev=/dev/video0 -channel=0 -palette=YUV420P -width=320 -height=240"; ! char *vconf2 = "-dev=/dev/video3 -channel=0 -palette=YUV420P -width=320 -height=240"; ! #endif ! /*****************************************************************************/ ! ! int xsize, ysize; ! int thresh = 100; ! int count = 0; ! ! char *cparam_name = "Data/camera_para.dat"; ! ARParam cparam; ! ! char *patt_name = "Data/patt.hiro"; ! int patt_id; ! double patt_width = 80.0; ! double patt_center[2] = {0.0, 0.0}; ! double patt_trans[3][4]; ! ! AR2VideoParamT* video1; ! AR2VideoParamT* video2; ! ! static void init(void); ! static void cleanup(void); ! static void keyEvent( unsigned char key, int x, int y); ! static void mainLoop(void); ! static void draw(int ); ! ! int main(int argc, char **argv) ! { ! init(); ! ! ar2VideoCapStart(video1); ! ar2VideoCapStart(video2); ! argMainLoop( NULL, keyEvent, mainLoop ); ! return (0); ! } ! ! static void keyEvent( unsigned char key, int x, int y) ! { ! /* quit if the ESC key is pressed */ ! if( key == 0x1b ) { ! printf("*** %f (frame/sec)\n", (double)count/arUtilTimer()); ! cleanup(); ! exit(0); ! } ! } ! ! /* main loop */ ! static void mainLoop(void) ! { ! ARUint8 *dataPtr; ! ARMarkerInfo *marker_info; ! int marker_num; ! int j, k; ! ! /* grab a vide frame */ ! if( (dataPtr = (ARUint8 *)ar2VideoGetImage(video1)) == NULL ) { ! arUtilSleep(2); ! return; ! } ! if( count == 0 ) arUtilTimerReset(); ! count++; ! ! argDrawMode2D(); ! argDispImage( dataPtr, 0,0 ); ! ! /* detect the markers in the video frame */ ! if( arDetectMarker(dataPtr, thresh, &marker_info, &marker_num) < 0 ) { ! cleanup(); ! exit(0); ! } ! ! ar2VideoCapNext(video1); ! ! /* check for object visibility */ ! k = -1; ! for( j = 0; j < marker_num; j++ ) { ! if( patt_id == marker_info[j].id ) { ! if( k == -1 ) k = j; ! else if( marker_info[k].cf < marker_info[j].cf ) k = j; ! } ! } ! ! /* get the transformation between the marker and the real camera */ ! arGetTransMat(&marker_info[k], patt_center, patt_width, patt_trans); ! ! draw(1); ! ! /* grab a vide frame */ ! if( (dataPtr = (ARUint8 *)ar2VideoGetImage(video2)) == NULL ) { ! arUtilSleep(2); ! return; ! } ! if( count == 0 ) arUtilTimerReset(); ! count++; ! ! argDrawMode2D(); ! glViewport(0,0,xsize,ysize); ! argDispImage( dataPtr, 0,0 ); ! ! /* detect the markers in the video frame */ ! if( arDetectMarker(dataPtr, thresh, &marker_info, &marker_num) < 0 ) { ! cleanup(); ! exit(0); ! } ! ! ar2VideoCapNext(video2); ! ! /* check for object visibility */ ! k = -1; ! for( j = 0; j < marker_num; j++ ) { ! if( patt_id == marker_info[j].id ) { ! if( k == -1 ) k = j; ! else if( marker_info[k].cf < marker_info[j].cf ) k = j; ! } ! } ! ! /* get the transformation between the marker and the real camera */ ! arGetTransMat(&marker_info[k], patt_center, patt_width, patt_trans); ! ! draw(2); ! ! argSwapBuffers(); ! } ! ! static void init( void ) ! { ! ARParam wparam; ! ! /* open the video path */ ! video1=ar2VideoOpen( vconf1 ); ! /* find the size of the window */ ! ar2VideoInqSize(video1,&xsize, &ysize); ! printf("Image size (x,y) = (%d,%d)\n", xsize, ysize); ! ! /* open the video path */ ! video2=ar2VideoOpen( vconf2 ); ! /* find the size of the window */ ! ar2VideoInqSize(video2,&xsize, &ysize); ! printf("Image size (x,y) = (%d,%d)\n", xsize, ysize); ! ! /* set the initial camera parameters */ ! if( arParamLoad(cparam_name, 1, &wparam) < 0 ) { ! printf("Camera parameter load error !!\n"); ! exit(0); ! } ! arParamChangeSize( &wparam, xsize, ysize, &cparam ); ! arInitCparam( &cparam ); ! printf("*** Camera Parameter ***\n"); ! arParamDisp( &cparam ); ! ! if( (patt_id=arLoadPatt(patt_name)) < 0 ) { ! printf("pattern load error !!\n"); ! exit(0); ! } ! argDrawMode = AR_DRAW_BY_GL_DRAW_PIXELS; ! /* open the graphics window */ ! argInit( &cparam, 1.0, 0, 0, 2, 0 ); ! } ! ! /* cleanup function called when program exits */ ! static void cleanup(void) ! { ! ar2VideoCapStop(video1); ! ar2VideoCapStop(video2); ! ar2VideoClose(video1); ! ar2VideoClose(video2); ! argCleanup(); ! } ! ! static void draw(int view) ! { ! double gl_para[16]; ! GLfloat mat_ambient[] = {0.0, 0.0, 1.0, 1.0}; ! GLfloat mat_flash[] = {0.0, 0.0, 1.0, 1.0}; ! GLfloat mat_flash_shiny[] = {50.0}; ! GLfloat light_position[] = {100.0,-200.0,200.0,0.0}; ! GLfloat ambi[] = {0.1, 0.1, 0.1, 0.1}; ! GLfloat lightZeroColor[] = {0.9, 0.9, 0.9, 0.1}; ! ! argDrawMode3D(); ! argDraw3dCamera( 0, 0 ); ! if (view==2) ! glViewport(0,0,xsize,ysize); ! glClearDepth( 1.0 ); ! glClear(GL_DEPTH_BUFFER_BIT); ! glEnable(GL_DEPTH_TEST); ! glDepthFunc(GL_LEQUAL); ! ! /* load the camera transformation matrix */ ! argConvGlpara(patt_trans, gl_para); ! glMatrixMode(GL_MODELVIEW); ! glLoadMatrixd( gl_para ); ! ! glEnable(GL_LIGHTING); ! glEnable(GL_LIGHT0); ! glLightfv(GL_LIGHT0, GL_POSITION, light_position); ! glLightfv(GL_LIGHT0, GL_AMBIENT, ambi); ! glLightfv(GL_LIGHT0, GL_DIFFUSE, lightZeroColor); ! glMaterialfv(GL_FRONT, GL_SPECULAR, mat_flash); ! glMaterialfv(GL_FRONT, GL_SHININESS, mat_flash_shiny); ! glMaterialfv(GL_FRONT, GL_AMBIENT, mat_ambient); ! glMatrixMode(GL_MODELVIEW); ! glTranslatef( 0.0, 0.0, 25.0 ); ! glutSolidCube(50.0); ! glDisable( GL_LIGHTING ); ! ! glDisable( GL_DEPTH_TEST ); ! } --- 1,682 ---- ! /* ! * twoView.c ! * ! * Some code to demonstrate grabbing from two video sources. ! * Press '?' while running for help. ! * ! * Copyright (c) 2004-2004 Philip Lamb (PRL) ph...@ed.... All rights reserved. ! * ! * Rev Date Who Changes ! * 1.0.0 2004-10-27 PRL Initial version. ! * ! */ ! ! // ============================================================================ ! // Includes ! // ============================================================================ ! ! #include <stdio.h> // fprintf(), stderr ! #include <stdlib.h> // malloc(), free(), atexit() ! #ifdef __APPLE__ ! # include <GLUT/glut.h> ! # include <OpenGL/glext.h> ! #else ! # include <GL/glut.h> ! # include <GL/glext.h> ! #endif ! #include <AR/config.h> ! #include <AR/video.h> ! #include <AR/param.h> // arParamDisp() ! #include <AR/ar.h> ! #include <AR/gsub_lite.h> ! ! // ============================================================================ ! // Constants and types. ! // ============================================================================ ! ! #define VIEW_SCALEFACTOR 0.025 // 1.0 ARToolKit unit becomes 0.025 of my OpenGL units. ! #define VIEW_DISTANCE_MIN 0.1 // Objects closer to the camera than this will not be displayed. ! #define VIEW_DISTANCE_MAX 100.0 // Objects further away from the camera than this will not be displayed. ! ! // For cases in which we have multiple OpenGL contexts, never more than this many. ! #define CONTEXTSACTIVECOUNT 2 ! #define CONTEXTSACTIVECOUNTMAX CONTEXTSACTIVECOUNT ! ! // Structure to keep track of per-camera variables. ! typedef struct { ! int apiContextIndex; // API-specific index into an array of display contexts. ! ARParam ARTCparam; // Camera parameter. ! AR2VideoParamT *ARTVideo; // Video parameters ! ARUint8 *ARTImage; // Most recent image. ! long callCountMarkerDetect; // Frames received. ! double patt_trans[3][4]; // Marker transformation. ! BOOL patt_found; // Whether marker transformation is valid. ! ARGL_CONTEXT_SETTINGS_REF arglSettings; // Settings from ARGL. ! } CONTEXT_INFO; ! ! // ============================================================================ ! // Global variables. ! // ============================================================================ ! ! static GLuint *gDrawListBox = NULL; ! ! CONTEXT_INFO gContextsActive[CONTEXTSACTIVECOUNTMAX]; ! int gContextsActiveCount = 0; ! ! static BOOL gAlwaysVisible = FALSE; // Setting this to true will make the program ignore ! // events that tell it it is not visible. ! ! // ARToolKit globals. ! static long gCallCountGetImage = 0; ! static int gARTThreshhold = 100; ! static int gPatt_id; ! static double gPatt_width = 80.0; ! static double gPatt_centre[2] = {0.0, 0.0}; ! ! // Other globals. ! static BOOL gDrawRotate = FALSE; ! static float gDrawRotateAngle; // For use in drawing. ! ! // ============================================================================ ! // Functions ! // ============================================================================ ! ! BOOL DrawCubeInit(int contextsActiveCountMax) ! { ! // Allocate room for display lists for all contexts. ! if (gDrawListBox) return (FALSE); // Sanity check. ! if ((gDrawListBox = (GLuint *)calloc(contextsActiveCountMax, sizeof(GLuint))) == NULL) { ! return (FALSE); ! } ! return (TRUE); ! ! } ! ! BOOL DrawCubeSetup(int contextIndex) ! { ! // Colour cube data. ! float fSize = 0.5f; ! long f, i; ! const GLfloat cube_vertices [8][3] = { ! {1.0, 1.0, 1.0}, {1.0, -1.0, 1.0}, {-1.0, -1.0, 1.0}, {-1.0, 1.0, 1.0}, ! {1.0, 1.0, -1.0}, {1.0, -1.0, -1.0}, {-1.0, -1.0, -1.0}, {-1.0, 1.0, -1.0} }; ! const GLfloat cube_vertex_colors [8][3] = { ! {1.0, 1.0, 1.0}, {1.0, 1.0, 0.0}, {0.0, 1.0, 0.0}, {0.0, 1.0, 1.0}, ! {1.0, 0.0, 1.0}, {1.0, 0.0, 0.0}, {0.0, 0.0, 0.0}, {0.0, 0.0, 1.0} }; ! GLint cube_num_faces = 6; ! const short cube_faces [6][4] = { {3, 2, 1, 0}, {2, 3, 7, 6}, {0, 1, 5, 4}, {3, 0, 4, 7}, {1, 2, 6, 5}, {4, 5, 6, 7} }; ! ! if (!gDrawListBox[contextIndex]) { ! gDrawListBox[contextIndex] = glGenLists (1); ! glNewList(gDrawListBox[contextIndex], GL_COMPILE); ! glBegin (GL_QUADS); ! for (f = 0; f < cube_num_faces; f++) ! for (i = 0; i < 4; i++) { ! glColor3f (cube_vertex_colors[cube_faces[f][i]][0], cube_vertex_colors[cube_faces[f][i]][1], cube_vertex_colors[cube_faces[f][i]][2]); ! glVertex3f(cube_vertices[cube_faces[f][i]][0] * fSize, cube_vertices[cube_faces[f][i]][1] * fSize, cube_vertices[cube_faces[f][i]][2] * fSize); ! } ! glEnd (); ! glColor3f (0.0, 0.0, 0.0); ! for (f = 0; f < cube_num_faces; f++) { ! glBegin (GL_LINE_LOOP); ! for (i = 0; i < 4; i++) ! glVertex3f(cube_vertices[cube_faces[f][i]][0] * fSize, cube_vertices[cube_faces[f][i]][1] * fSize, cube_vertices[cube_faces[f][i]][2] * fSize); ! glEnd (); ! } ! glEndList (); ! } ! ! return (TRUE); ! } ! ! // Something to look at, draw a rotating colour cube. ! void DrawCube(int contextIndex) ! { ! // Draw the colour cube. ! glPushMatrix(); // Save world coordinate system. ! glTranslatef(0.0, 0.0, 0.5); // Place base of cube on marker surface. ! glRotatef(gDrawRotateAngle, 0.0, 0.0, 1.0); // Rotate about z axis. ! glDisable(GL_LIGHTING); // Just use colours. ! glCallList(gDrawListBox[contextIndex]); // Draw the cube. ! glPopMatrix(); // Restore world coordinate system. ! } ! ! void DrawCubeUpdate(float timeDelta) ! { ! if (gDrawRotate) { ! gDrawRotateAngle += timeDelta * 45.0f; // Rotate cube at 45 degrees per second. ! if (gDrawRotateAngle > 360.0f) gDrawRotateAngle -= 360.0f; ! } ! } ! ! BOOL DrawCubeCleanup(int contextIndex) ! { ! if (contextIndex >= gContextsActiveCount) return (FALSE); // Sanity check. ! ! // Destroy display lists... ! if (gDrawListBox[contextIndex]) { ! glDeleteLists(gDrawListBox[contextIndex], 1); ! gDrawListBox[contextIndex] = 0; ! } ! ! return (TRUE); ! } ! ! BOOL DrawCubeFinal(void) ! { ! if (!gDrawListBox) { ! free(gDrawListBox); ! gDrawListBox = NULL; ! } ! return (TRUE); ! } ! ! // Function to clean up and then exit. ! static void Quit(void) ! { ! int i; ! ! fprintf(stderr, "Quitting...\n"); ! ! // OpenGL per-context cleanup. ! for (i = 0; i < gContextsActiveCount; i++) { ! if (gContextsActive[i].apiContextIndex) { ! glutSetWindow(gContextsActive[i].apiContextIndex); ! arglCleanup(gContextsActive[i].arglSettings); ! DrawCubeCleanup(i); ! glutDestroyWindow(gContextsActive[i].apiContextIndex); ! gContextsActive[i].apiContextIndex = 0; ! } ! ar2VideoCapStop(gContextsActive[i].ARTVideo); ! ar2VideoClose(gContextsActive[i].ARTVideo); ! } ! gContextsActiveCount = 0; ! ! // Library finals (in reverse order to inits.) ! DrawCubeFinal(); ! ! // Unless we don't have an atexit() function, terminate by falling off end ! // (since Quit is called by exit()'s exitfunc.) ! #ifdef NOATEXIT ! exit(0); ! #endif ! } ! ! // Sets up fields ARTVideo, ARTCparam of gContextsActive[0] through gContextsActive[cameraCount - 1]. ! BOOL demoARSetupCameras(const int cameraCount, const unsigned char *cparam_names[], char *vconfs[]) ! { ! int i; ! ARParam wparam; ! int xsize, ysize; ! ! for (i = 0; i < cameraCount; i++) { ! ! // Open the video path. ! if ((gContextsActive[i].ARTVideo = ar2VideoOpen(vconfs[i])) == NULL) { ! fprintf(stderr, "demoARSetupCamera(): Unable to open connection to camera %d.\n", i + 1); ! return (FALSE); ! } ! ! // Find the size of the window. ! if (ar2VideoInqSize(gContextsActive[i].ARTVideo, &xsize, &ysize) < 0) return (FALSE); ! fprintf(stderr, "demoARSetupCamera(): Camera %d image size (x,y) = (%d,%d)\n", i + 1, xsize, ysize); ! ! // Load the camera parameters, resize for the window and init. ! if (arParamLoad(cparam_names[i], 1, &wparam) < 0) { ! fprintf(stderr, "demoARSetupCamera(): Error loading parameter file %s for camera %d.\n", cparam_names[i], i + 1); ! return (FALSE); ! } ! arParamChangeSize(&wparam, xsize, ysize, &(gContextsActive[i].ARTCparam)); ! arInitCparam(&(gContextsActive[i].ARTCparam)); ! fprintf(stderr, "*** Camera %d parameter ***\n", i + 1); ! arParamDisp(&(gContextsActive[i].ARTCparam)); ! ! // Start the video capture for this camera. ! if (ar2VideoCapStart(gContextsActive[i].ARTVideo) != 0) { ! fprintf(stderr, "demoARSetupCamera(): Unable to begin camera data capture for camera %d.\n", i + 1); ! return (FALSE); ! } ! ! } ! return (TRUE); ! } ! ! BOOL demoARSetupMarker(const unsigned char *patt_name, int *patt_id) ! { ! ! if((*patt_id = arLoadPatt(patt_name)) < 0) { ! fprintf(stderr, "demoARSetupMarker(): pattern load error !!\n"); ! return (FALSE); ! } ! ! return (TRUE); ! } ! ! // Report state of ARToolKit global variables arFittingMode, ! // arImageProcMode, arglDrawMode, arTemplateMatchingMode, arMatchingPCAMode. ! void demoARDebugReportMode(void) ! { ! if(arFittingMode == AR_FITTING_TO_INPUT ) { ! fprintf(stderr, "FittingMode (Z): INPUT IMAGE\n"); ! } else { ! fprintf(stderr, "FittingMode (Z): COMPENSATED IMAGE\n"); ! } ! ! if( arImageProcMode == AR_IMAGE_PROC_IN_FULL ) { ! fprintf(stderr, "ProcMode (X) : FULL IMAGE\n"); ! } else { ! fprintf(stderr, "ProcMode (X) : HALF IMAGE\n"); ! } ! ! if( arglDrawMode == AR_DRAW_BY_GL_DRAW_PIXELS ) { ! fprintf(stderr, "DrawMode (C) : GL_DRAW_PIXELS\n"); ! } else if( arglTexmapMode == AR_DRAW_TEXTURE_FULL_IMAGE ) { ! fprintf(stderr, "DrawMode (C) : TEXTURE MAPPING (FULL RESOLUTION)\n"); ! } else { ! fprintf(stderr, "DrawMode (C) : TEXTURE MAPPING (HALF RESOLUTION)\n"); ! } ! ! if( arTemplateMatchingMode == AR_TEMPLATE_MATCHING_COLOR ) { ! fprintf(stderr, "TemplateMatchingMode (M) : Color Template\n"); ! } else { ! fprintf(stderr, "TemplateMatchingMode (M) : BW Template\n"); ! } ! ! if( arMatchingPCAMode == AR_MATCHING_WITHOUT_PCA ) { ! fprintf(stderr, "MatchingPCAMode (P) : Without PCA\n"); ! } else { ! fprintf(stderr, "MatchingPCAMode (P) : With PCA\n"); ! } ! #ifdef APPLE_TEXTURE_FAST_TRANSFER ! # ifdef GL_APPLE_client_storage ! fprintf(stderr, "arglAppleClientStorage is %d.\n", arglAppleClientStorage); ! # endif // GL_APPLE_client_storage ! # ifdef GL_APPLE_texture_range ! fprintf(stderr, "arglAppleTextureRange is %d.\n", arglAppleTextureRange); ! fprintf(stderr, "arglAppleTextureRangeStorageHint is "); ! switch (arglAppleTextureRangeStorageHint) { ! case GL_STORAGE_SHARED_APPLE: ! fprintf(stderr, "GL_STORAGE_SHARED_APPLE.\n"); ! break; ! case GL_STORAGE_CACHED_APPLE: ! fprintf(stderr, "GL_STORAGE_CACHED_APPLE.\n"); ! break; ! default: ! case GL_STORAGE_PRIVATE_APPLE: ! fprintf(stderr, "GL_STORAGE_PRIVATE_APPLE.\n"); ! break; ! } ! # endif // GL_APPLE_texture_range ! #endif // APPLE_TEXTURE_FAST_TRANSFER ! } ! ! void Keyboard(unsigned char key, int x, int y) ! { ! int modifiers, shift, i; ! ! modifiers = glutGetModifiers(); ! shift = (modifiers & GLUT_ACTIVE_SHIFT); // Get status of shift key. ! ! switch (key) { ! case 0x1b: // Quit. ! case 'Q': ! case 'q': ! #ifdef NOATEXIT ! Quit(); ! #else ! exit(0); ! #endif // NOATEXIT ! break; ! case ' ': ! gDrawRotate = !gDrawRotate; ! break; ! case 'C': ! case 'c': ! if( arglDrawMode == AR_DRAW_BY_GL_DRAW_PIXELS ) { ! arglDrawMode = AR_DRAW_BY_TEXTURE_MAPPING; ! arglTexmapMode = AR_DRAW_TEXTURE_FULL_IMAGE; ! } else if( arglTexmapMode == AR_DRAW_TEXTURE_FULL_IMAGE ) { ! arglTexmapMode = AR_DRAW_TEXTURE_HALF_IMAGE; ! } else { ! arglDrawMode = AR_DRAW_BY_GL_DRAW_PIXELS; ! } ! for (i = 0; i < gContextsActiveCount; i++) { ! fprintf(stderr, "*** Camera %2d - %f (frame/sec)\n", i + 1, (double)(gContextsActive[i].callCountMarkerDetect)/arUtilTimer()); ! gContextsActive[i].callCountMarkerDetect = 0; ! } ! demoARDebugReportMode(); ! break; ! case 'R': ! case 'r': ! #ifdef AR_OPENGL_TEXTURE_RECTANGLE ! arglTexRectangle = !arglTexRectangle; ! fprintf(stderr, "Toggled arglTexRectangle to %d.\n", arglTexRectangle); ! #endif // AR_OPENGL_TEXTURE_RECTANGLE ! break; ! case 'T': ! case 't': ! #ifdef APPLE_TEXTURE_FAST_TRANSFER ! # ifdef GL_APPLE_client_storage ! arglAppleClientStorage = !arglAppleClientStorage; ! fprintf(stderr, "Toggled arglAppleClientStorage to %d.\n", arglAppleClientStorage); ! # endif ! #endif ! break; ! case 'Y': ! case 'y': ! #ifdef APPLE_TEXTURE_FAST_TRANSFER ! # ifdef GL_APPLE_texture_range ! arglAppleTextureRange = !arglAppleTextureRange; ! fprintf(stderr, "Toggled arglAppleTextureRange to %d.\n", arglAppleTextureRange); ! # endif ! #endif ! break; ! case 'U': ! case 'u': ! #ifdef APPLE_TEXTURE_FAST_TRANSFER ! # ifdef GL_APPLE_texture_range ! fprintf(stderr, "Toggled arglAppleTextureRangeStorageHint to "); ! switch (arglAppleTextureRangeStorageHint) { ! case GL_STORAGE_PRIVATE_APPLE: ! arglAppleTextureRangeStorageHint = GL_STORAGE_SHARED_APPLE; ! fprintf(stderr, "GL_STORAGE_SHARED_APPLE.\n"); ! break; ! case GL_STORAGE_SHARED_APPLE: ! arglAppleTextureRangeStorageHint = GL_STORAGE_CACHED_APPLE; ! fprintf(stderr, "GL_STORAGE_CACHED_APPLE.\n"); ! break; ! case GL_STORAGE_CACHED_APPLE: ! default: ! arglAppleTextureRangeStorageHint = GL_STORAGE_PRIVATE_APPLE; ! fprintf(stderr, "GL_STORAGE_PRIVATE_APPLE.\n"); ! break; ! } ! # endif ! #endif ! break; ! case '?': ! case '/': ! fprintf(stderr,"Keys:\n"); ! fprintf(stderr," q or [esc] Quit demo.\n"); ! fprintf(stderr," c Change arglDrawMode and arglTexmapMode.\n"); ! fprintf(stderr," r Toggle arglTexRectangle.\n"); ! fprintf(stderr," ? or / Show this help.\n"); ! #ifdef APPLE_TEXTURE_FAST_TRANSFER ! # ifdef GL_APPLE_client_storage ! fprintf(stderr," t Toggle arglAppleClientStorage.\n"); ! # endif // GL_APPLE_client_storage ! # ifdef GL_APPLE_texture_range ! fprintf(stderr," y Toggle arglAppleTextureRange.\n"); ! fprintf(stderr," u Toggle arglAppleTextureRangeStorageHint.\n"); ! # endif // GL_APPLE_texture_range ! #endif APPLE_TEXTURE_FAST_TRANSFER ! default: ! break; ! } ! } ! ! void Mouse(int button, int state, int x, int y) ! { ! // Nothing here yet. ! } ! ! void Idle(void) ! { ! int i; ! static double timeRecentPast; ! double timeNow; ! float timeDelta; ! ARUint8 *image; ! ! ARMarkerInfo *marker_info; // Pointer to array holding the details of detected markers. ! int marker_num; // Count of number of markers detected. ! int j, k; ! ! // Find out how long since Idle() last ran. ! timeNow = (double)glutGet(GLUT_ELAPSED_TIME) / 1000.0; // Get the current time. ! timeDelta = (float)(timeNow - timeRecentPast); // Work out how long in seconds since the last epoch. ! if (timeDelta < 0.01f) return; // Don't update more often than 100 Hz. ! timeRecentPast = timeNow; ! ! // Update drawing. ! DrawCubeUpdate(timeDelta); ! ! if (!gCallCountGetImage) arUtilTimerReset(); ! gCallCountGetImage++; // Increment ARToolKit FPS counter. ! ! for (i = 0; i < gContextsActiveCount; i++) { ! ! // Grab a video frame. ! if ((image = ar2VideoGetImage(gContextsActive[i].ARTVideo)) != NULL) { ! gContextsActive[i].ARTImage = image; ! ! gContextsActive[i].callCountMarkerDetect++; // Increment ARToolKit FPS counter. ! //fprintf(stderr, "Idle(): Got image #%ld from cam %d on attempt #%ld.\n", gContextsActive[i].callCountMarkerDetect, i + 1, gCallCountGetImage); ! ! // Detect the markers in the video frame. ! if (arDetectMarkerLite(gContextsActive[i].ARTImage, gARTThreshhold, &marker_info, &marker_num) < 0) { ! exit(-1); ! } ! ! // Check through the marker_info array for highest confidence ! // visible marker matching our preferred pattern. ! k = -1; ! for (j = 0; j < marker_num; j++) { ! if (marker_info[j].id == gPatt_id) { ! if (k == -1) k = j; // First marker detected. ! else if(marker_info[j].cf > marker_info[k].cf) k = j; // Higher confidence marker detected. ! } ! } ! ! if(k != -1) { ! // Get the transformation between the marker and the real camera into gPatt_trans1. ! arGetTransMat(&(marker_info[k]), gPatt_centre, gPatt_width, gContextsActive[i].patt_trans); ! gContextsActive[i].patt_found = TRUE; ! } ! ! glutPostWindowRedisplay(gContextsActive[i].apiContextIndex); ! } ! ! } ! } ! ! // ! // The function is called on events when the visibility of a ! // GLUT window changes (including when it first becomes visible). ! // ! static void Visibility(int visible) ! { ! if (gAlwaysVisible || (visible == GLUT_VISIBLE)) { ! glutIdleFunc(Idle); ! } else { ! glutIdleFunc(NULL); ! } ! } ! ! // ! // The function is called when a ! // GLUT window is resized. ! // ! void Reshape(int w, int h) ! { ! glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); ! glViewport(0, 0, (GLsizei) w, (GLsizei) h); ! ! glMatrixMode(GL_PROJECTION); ! glLoadIdentity(); ! glMatrixMode(GL_MODELVIEW); ! glLoadIdentity(); ! ! // Call through to anyone else who needs to know about window sizing here. ! } ! ! static void Draw(const int drawContextIndex) ! { ! int i; ! GLdouble p[16]; ! GLdouble m[16]; ! ! // Select correct buffer for this context. ! glDrawBuffer(GL_BACK); ! ! arglDispImage(gContextsActive[drawContextIndex].ARTImage, ! &(gContextsActive[drawContextIndex].ARTCparam), ! 1.0, ! gContextsActive[drawContextIndex].arglSettings); // zoom = 1.0, contextIndex = 0. ! ar2VideoCapNext(gContextsActive[drawContextIndex].ARTVideo); ! ! if (gContextsActive[drawContextIndex].patt_found) { ! glClear(GL_DEPTH_BUFFER_BIT); // Clear the buffers for new frame. ! ! // Projection transformation. ! glMatrixMode(GL_PROJECTION); ! arglCameraFrustum(&(gContextsActive[drawContextIndex].ARTCparam), VIEW_DISTANCE_MIN, VIEW_DISTANCE_MAX, p); ! glLoadMatrixd(p); ! glMatrixMode(GL_MODELVIEW); ! ! // Viewing transformation. ! glLoadIdentity(); ! // Lighting and geometry that moves with the camera should go here. ! // (I.e. must be specified before viewing transformations.) ! //none ! ! arglCameraView(gContextsActive[drawContextIndex].patt_trans, m, VIEW_SCALEFACTOR); ! glLoadMatrixd(m); ! ! // All other lighting and geometry goes here. ! DrawCube(drawContextIndex); ! ! gContextsActive[drawContextIndex].patt_found = FALSE; ! } // gPatt_found ! ! // Any 2D overlays go here. ! //none ! ! // Drawing for this context complete. ! } ! ! // Linear search through all active contexts to find context index for the current glut window. ! int getContextIndexForCurrentGLUTWindow(void) ! { ! int i, window; ! ! if ((window = glutGetWindow()) != 0) { ! for (i = 0; i < gContextsActiveCount; i++) { ! if (gContextsActive[i].apiContextIndex == window) return (i); ! } ! } ! return (-1); ! } ! ! static void Display(void) ! { ! int contextIndex; ! ! if ((contextIndex = getContextIndexForCurrentGLUTWindow()) != -1) { ! Draw(contextIndex); ! glutSwapBuffers(); ! } ! } ! ! int main(int argc, char** argv) ! { ! int i; ! char windowTitle[32] = {0}; ! const unsigned char *cparam_names[] = { // Camera parameter names. ! "Data/camera_para.dat", ! "Data/camera_para.dat", ! }; ! char *vconfs[] = { // Camera configuration. ! #if defined(_WIN32) ! "showDlg,flipV", ! "showDlg,flipV", ! #elif defined(__APPLE__) ! "", ! "", ! #else ! "-dev=/dev/video0 -channel=0 -palette=YUV420P -width=320 -height=240", ! "-dev=/dev/video3 -channel=0 -palette=YUV420P -width=320 -height=240", ! #endif ! }; ! const unsigned char *patt_name = "Data/patt.hiro"; ! ! ! // ---------------------------------------------------------------------------- ! // Library inits. ! // ! ! glutInit(&argc, argv); ! ! // Register a cleanup function to be called upon exit(). ! #ifndef NOATEXIT ! if (atexit(Quit) < 0) { ! fprintf(stderr, "main(): Unable to register exit function.\n"); ! exit (-1); // Bail out if we can't even register our exit function. ! } ! #endif // NOATEXIT ! ! // Initialise drawing libraries. ! if (!DrawCubeInit(CONTEXTSACTIVECOUNTMAX)) { ! fprintf(stderr, "main(): DrawCubeInit returned error.\n"); ! exit(-1); ! } ! ! ! // ---------------------------------------------------------------------------- ! // Hardware setup. ! // ! ! ! if (!demoARSetupCameras(CONTEXTSACTIVECOUNT, cparam_names, vconfs)) { ! fprintf(stderr, "main(): Unable to set up %d AR cameras.\n", CONTEXTSACTIVECOUNT); ! exit(-1); ! } ! gContextsActiveCount = CONTEXTSACTIVECOUNT; ! demoARDebugReportMode(); ! if (!demoARSetupMarker(patt_name, &gPatt_id)) { ! fprintf(stderr, "main(): Unable to set up AR marker.\n"); ! exit(-1); ! } ! ! // ---------------------------------------------------------------------------- ! // Library setup. ! // ! ! // Per- GL context setup. ! for (i = 0; i < gContextsActiveCount; i++ ) { ! ! // Set up GL context(s) for OpenGL to draw into. ! glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGBA | GLUT_DEPTH); ! glutInitWindowSize(gContextsActive[i].ARTCparam.xsize, gContextsActive[i].ARTCparam.ysize); ! glutInitWindowPosition(10 + 10*i, 20 + 10*i); // First window at 20,10, subsequent windows staggered. ! sprintf(windowTitle, "Video source %i", i); ! if ((gContextsActive[i].apiContextIndex = glutCreateWindow(windowTitle)) < 1) { ! fprintf(stderr, "main(): Unable to create window.\n"); ! exit(-1); ! } ! glutDisplayFunc(Display); ! glutReshapeFunc(Reshape); ! glutVisibilityFunc(Visibility); ! glutMouseFunc(Mouse); ! glutKeyboardFunc(Keyboard); ! ! DrawCubeSetup(i); ! ! if ((gContextsActive[i].arglSettings = arglSetupForCurrentContext()) == NULL) { ! fprintf(stderr, "main(): arglSetupForCurrentContext() returned error.\n"); ! exit(-1); ! } ! } ! ! // Register GLUT event-handling callbacks. ! // NB: MainRunLoop() is registered by Visibility. ! glutMainLoop(); ! ! // All done. Exit the program now. ! #ifdef NOATEXIT ! Quit(); ! #else ! return (0); ! #endif // NOATEXIT ! ! } Index: twoView.dsp =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/examples/twoView/twoView.dsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** twoView.dsp 22 Nov 2004 03:37:58 -0000 1.1 --- twoView.dsp 25 Nov 2004 21:42:29 -0000 1.2 *************** *** 52,56 **** LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 ! # ADD LINK32 libAR.lib libARvideo.lib libARgsub.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"../../bin/twoView.exe" /libpath:"..\..\lib" # SUBTRACT LINK32 /nodefaultlib --- 52,56 ---- LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 ! # ADD LINK32 libAR.lib libARvideo.lib libARgsub_lite.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"../../bin/twoView.exe" /libpath:"..\..\lib" # SUBTRACT LINK32 /nodefaultlib *************** *** 78,82 **** LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept ! # ADD LINK32 libARd.lib libARvideod.lib libARgsubd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd.lib" /out:"../../bin/twoViewd.exe" /pdbtype:sept /libpath:"..\..\lib" # SUBTRACT LINK32 /nodefaultlib --- 78,82 ---- LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept ! # ADD LINK32 libARd.lib libARvideod.lib 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/twoViewd.exe" /pdbtype:sept /libpath:"..\..\lib" # SUBTRACT LINK32 /nodefaultlib |
|
From: Philip L. <phi...@us...> - 2004-11-25 21:42:05
|
Update of /cvsroot/artoolkit/artoolkit In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2508 Modified Files: ARToolKit.sln Log Message: Fix dependencies for new projects. Index: ARToolKit.sln =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/ARToolKit.sln,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ARToolKit.sln 22 Nov 2004 03:41:22 -0000 1.2 --- ARToolKit.sln 25 Nov 2004 21:41:49 -0000 1.3 *************** *** 103,136 **** EndProjectSection EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "collideTest", "examples\collide\collideTest.vcproj", "{89E3CB14-46DF-46BB-B87F-CC653045B14C}" ProjectSection(ProjectDependencies) = postProject EndProjectSection EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "loadMultiple", "examples\loadMultiple\loadMultiple.vcproj", "{89E3CB14-46DF-46BB-B87F-CC653045B14C}" ProjectSection(ProjectDependencies) = postProject EndProjectSection EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "modeTest", "examples\modeTest\modeTest.vcproj", "{89E3CB14-46DF-46BB-B87F-CC653045B14C}" ProjectSection(ProjectDependencies) = postProject EndProjectSection EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "paddleTest", "examples\paddle\paddleTest.vcproj", "{89E3CB14-46DF-46BB-B87F-CC653045B14C}" ProjectSection(ProjectDependencies) = postProject EndProjectSection EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "paddleDemo", "examples\paddleDemo\paddleDemo.vcproj", "{89E3CB14-46DF-46BB-B87F-CC653045B14C}" ProjectSection(ProjectDependencies) = postProject EndProjectSection EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "paddleInteractionTest", "examples\paddleInteraction\paddleInteractionTest.vcproj", "{89E3CB14-46DF-46BB-B87F-CC653045B14C}" ProjectSection(ProjectDependencies) = postProject EndProjectSection EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rangeTest", "examples\range\rangeTest.vcproj", "{89E3CB14-46DF-46BB-B87F-CC653045B14C}" ProjectSection(ProjectDependencies) = postProject EndProjectSection EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "twoView", "examples\twoView\twoView.vcproj", "{89E3CB14-46DF-46BB-B87F-CC653045B14C}" ProjectSection(ProjectDependencies) = postProject EndProjectSection EndProject --- 103,142 ---- 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 *************** *** 141,144 **** --- 147,153 ---- 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 *************** *** 236,287 **** {B5E62882-360E-46B2-A97F-50443BB795E3}.Release.Build.0 = Release|Win32 {B5E62882-360E-46B2-A97F-50443BB795E3}.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 ! {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 ! {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 ! {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 ! {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 ! {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 ! {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 ! {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 {8C93A102-ABC7-4848-A183-BD1F3471159C}.Debug.ActiveCfg = Debug|Win32 {8C93A102-ABC7-4848-A183-BD1F3471159C}.Debug.Build.0 = Debug|Win32 --- 245,296 ---- {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 |
|
From: Philip L. <phi...@us...> - 2004-11-22 20:02:11
|
Update of /cvsroot/artoolkit/artoolkit/ARToolKit.xcode In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6991 Modified Files: project.pbxproj Log Message: Splitoff ChangeLog.Fix headerDoc script. Index: project.pbxproj =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/ARToolKit.xcode/project.pbxproj,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** project.pbxproj 22 Nov 2004 03:41:15 -0000 1.4 --- project.pbxproj 22 Nov 2004 20:01:59 -0000 1.5 *************** *** 62,65 **** --- 62,66 ---- 4A5F9A47064B4EF400525EC0, 4A5F9B6F064B501700525EC0, + 4A488AC90751CC26003D46BE, 4A2244E30659A2F40014DA8E, 4A5F9BDD064B51FB00525EC0, *************** *** 79,82 **** --- 80,84 ---- children = ( 4AB5532806A4BA0C00FAEE19, + 4A0D818507526B1B00CB0B40, 4AB5532706A4BA0C00FAEE19, 4AAB8CEC0728BCF500708844, *************** *** 110,113 **** --- 112,123 ---- //4A3 //4A4 + 4A0D818507526B1B00CB0B40 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = text; + path = ChangeLog.txt; + refType = 4; + sourceTree = "<group>"; + }; 4A2244930659A20D0014DA8E = { children = ( *************** *** 1123,1128 **** DEPLOYMENT_LOCATION = YES; DSTROOT = /; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Headers/Carbon.h"; GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; GCC_WARN_UNKNOWN_PRAGMAS = NO; --- 1133,1136 ---- *************** *** 2967,2970 **** --- 2975,3140 ---- sourceTree = "<group>"; }; + 4A488AC70751CC26003D46BE = { + buildActionMask = 2147483647; + files = ( + 4A488ACE0751CCB3003D46BE, + ); + isa = PBXSourcesBuildPhase; + runOnlyForDeploymentPostprocessing = 0; + }; + 4A488AC80751CC26003D46BE = { + buildActionMask = 2147483647; + files = ( + 4A488BA50751CD0E003D46BE, + 4A488BA60751CD0E003D46BE, + 4A488BA70751CD0E003D46BE, + 4A488BA80751CD0E003D46BE, + 4A488ACF0751CCDA003D46BE, + 4A488AD00751CCDB003D46BE, + 4A488AD10751CCDB003D46BE, + 4A488BA40751CCFB003D46BE, + ); + isa = PBXFrameworksBuildPhase; + runOnlyForDeploymentPostprocessing = 0; + }; + 4A488AC90751CC26003D46BE = { + buildPhases = ( + 4A488AC70751CC26003D46BE, + 4A488AC80751CC26003D46BE, + ); + buildRules = ( + ); + buildSettings = { + DEPLOYMENT_LOCATION = YES; + DSTROOT = /; + GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; + GCC_WARN_UNKNOWN_PRAGMAS = NO; + HEADER_SEARCH_PATHS = include; + INSTALL_PATH = "$(SRCROOT)/bin"; + LIBRARY_SEARCH_PATHS = "lib /Users/phil/Documents/Development/Projects/ARToolKit/artoolkit/lib"; + PRODUCT_NAME = rangeTest; + WARNING_CFLAGS = "-Wmost"; + }; + dependencies = ( + 4A488BAA0751CD59003D46BE, + 4A488BAC0751CD59003D46BE, + 4A488BAE0751CD59003D46BE, + ); + isa = PBXNativeTarget; + name = rangeTest; + productName = rangeTest; + productReference = 4A488ACA0751CC26003D46BE; + productType = "com.apple.product-type.tool"; + }; + 4A488ACA0751CC26003D46BE = { + explicitFileType = "compiled.mach-o.executable"; + includeInIndex = 0; + isa = PBXFileReference; + path = rangeTest; + refType = 3; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4A488ACC0751CC8E003D46BE = { + containerPortal = 08FB7793FE84155DC02AAC07; + isa = PBXContainerItemProxy; + proxyType = 1; + remoteGlobalIDString = 4A488AC90751CC26003D46BE; + remoteInfo = rangeTest; + }; + 4A488ACD0751CC8E003D46BE = { + isa = PBXTargetDependency; + target = 4A488AC90751CC26003D46BE; + targetProxy = 4A488ACC0751CC8E003D46BE; + }; + 4A488ACE0751CCB3003D46BE = { + fileRef = 4AC3C0B907518C7E0073D2C6; + isa = PBXBuildFile; + settings = { + }; + }; + 4A488ACF0751CCDA003D46BE = { + fileRef = 4A427D120484329800B56093; + isa = PBXBuildFile; + settings = { + }; + }; + 4A488AD00751CCDB003D46BE = { + fileRef = 4A427D130484329800B56093; + isa = PBXBuildFile; + settings = { + }; + }; + 4A488AD10751CCDB003D46BE = { + fileRef = 4A427D160484329800B56093; + isa = PBXBuildFile; + settings = { + }; + }; + 4A488BA40751CCFB003D46BE = { + fileRef = 4A3F1601064A0CE40042B0D7; + isa = PBXBuildFile; + settings = { + }; + }; + 4A488BA50751CD0E003D46BE = { + fileRef = 4A3F167F064A0E270042B0D7; + isa = PBXBuildFile; + settings = { + }; + }; + 4A488BA60751CD0E003D46BE = { + fileRef = 4A3F14FC064A0C510042B0D7; + isa = PBXBuildFile; + settings = { + }; + }; + 4A488BA70751CD0E003D46BE = { + fileRef = 4A3F14FD064A0C510042B0D7; + isa = PBXBuildFile; + settings = { + }; + }; + 4A488BA80751CD0E003D46BE = { + fileRef = 4A3F14FE064A0C510042B0D7; + isa = PBXBuildFile; + settings = { + }; + }; + 4A488BA90751CD59003D46BE = { + containerPortal = 08FB7793FE84155DC02AAC07; + isa = PBXContainerItemProxy; + proxyType = 1; + remoteGlobalIDString = 4A3F11430649F7BA0042B0D7; + remoteInfo = AR; + }; + 4A488BAA0751CD59003D46BE = { + isa = PBXTargetDependency; + target = 4A3F11430649F7BA0042B0D7; + targetProxy = 4A488BA90751CD59003D46BE; + }; + 4A488BAB0751CD59003D46BE = { + containerPortal = 08FB7793FE84155DC02AAC07; + isa = PBXContainerItemProxy; + proxyType = 1; + remoteGlobalIDString = 4A3F1305064A02100042B0D7; + remoteInfo = ARvideo; + }; + 4A488BAC0751CD59003D46BE = { + isa = PBXTargetDependency; + target = 4A3F1305064A02100042B0D7; + targetProxy = 4A488BAB0751CD59003D46BE; + }; + 4A488BAD0751CD59003D46BE = { + containerPortal = 08FB7793FE84155DC02AAC07; + isa = PBXContainerItemProxy; + proxyType = 1; + remoteGlobalIDString = 4A3F13F4064A091B0042B0D7; + remoteInfo = ARgsub; + }; + 4A488BAE0751CD59003D46BE = { + isa = PBXTargetDependency; + target = 4A3F13F4064A091B0042B0D7; + targetProxy = 4A488BAD0751CD59003D46BE; + }; 4A5F9A43064B4EF400525EC0 = { buildActionMask = 2147483647; *************** *** 3907,3910 **** --- 4077,4081 ---- 4A5F9D92064B557700525EC0, 4A5F9D96064B557700525EC0, + 4A488ACD0751CC8E003D46BE, ); isa = PBXAggregateTarget; *************** *** 4423,4431 **** isa = PBXShellScriptBuildPhase; outputPaths = ( ! doc/gsub_lite/gsub_lite.html, ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/tcsh; ! shellScript = "rm -rf doc/gsub_lite\nif ($ACTION != clean) then\n\t/usr/bin/headerdoc2html -o doc/ \\\n\t\tinclude/AR/gsub_lite.h\nendif"; }; 4A8EA5A30658752200ADDDD1 = { --- 4594,4602 ---- isa = PBXShellScriptBuildPhase; outputPaths = ( ! doc/gsub_lite/CompositePage.html, ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/tcsh; ! shellScript = "rm -f doc/gsub_lite/CompositePage.html\nrm -f doc/gsub_lite/DataTypes/DataTypes.html\nrm -f doc/gsub_lite/Functions/Functions.html\nrm -f doc/gsub_lite/Vars/Vars.html\nrm -f doc/gsub_lite/gsub_lite.html\nrm -f doc/gsub_lite/index.html\nrm -f doc/gsub_lite/toc.html\nif ($ACTION != clean) then\n\t/usr/bin/headerdoc2html -o doc/ \\\n\t\tinclude/AR/gsub_lite.h\nendif"; }; 4A8EA5A30658752200ADDDD1 = { *************** *** 6245,6248 **** --- 6416,6420 ---- 4AE2305E0659B7D10047D402 = { children = ( + 4A488ACA0751CC26003D46BE, 4AE22FFD0659B7A80047D402, 4AE22FFE0659B7A80047D402, |
|
From: Philip L. <phi...@us...> - 2004-11-22 18:48:21
|
Update of /cvsroot/artoolkit/artoolkit In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22583 Modified Files: README.txt Added Files: ChangeLog.txt Log Message: Splitoff ChangeLog. --- NEW FILE: ChangeLog.txt --- ARToolKit ChangeLog. ==================== Changes in version 2.69 (2004-11-04). ------------------------------------- - Windows builds still depend on DSVideoLib, but DSVideoLib is no longer included in source-only ARToolKit releases and must be downloaded separately. - Fixed bugs identified by Raphael Grasset: typo 'DEFALUT' in config.h.in and arUtil.c, return values in arMultiActivate.c, implementation of arUtilSleep for Win32. - Fixed help text in arVideoDispOption for VideoWin32DirectShow. - Fixed bug in ar2VideoClose() identified by Joerg Hedrich (http://www.hitl.washington.edu/artoolkit/mail-archive/message-thread-00690-possible-bug-in-libARvid.html). - For builds under Visual Studio 6, all projects are now in one workspace (.dsw) file, and builds now go into lib/ and bin/ rather than lib.vc60/ and bin.vc60/. - For debug builds under Visual Studio, libraries and binaries now have the character 'd' appended to the name. - For builds under Visual Studio 6, all libraries now use multithreaded code generation model. - For builds under Apple XCode, creation of config.h is now performed by a script run by the aggregate target 'Configure'. - Changed the '_' character in releases to a '-' character to be more compatible with Unix packaging system conventions. - Fix bug identified by Alexandre Gillet: arLabelling.c allocates buffer for arImage with maximum dimension 512 pixels. Changes in version 2.68.2. -------------------------- - VideoWin32DirectShow uses DSVideoLib 0.0.4 (was 0.0.3). The samples now correct the vertical orientation of video from DSVideoLib by specifying the "flipV" parameter by default. An alternative is to use the WDM capture settings dialog 'Mirror horizontally' parameter and rotate the camera 180 degrees. - Rewrite of Windows AR/video.h interface to follow same scheme for multiple cameras as used on other platforms (i.e. using the ar2Video*() set of functions). - All platforms now support the arVideoDispOptions() call, which prints acceptable options for arVideoOpen()'s configuration string to the standard output. New applications using ARToolKit should provide a way for a user to specify a preferred configuration string at runtime (rather than compile time), and to see the output of arVideoDispOptions() so that he or she can learn possible configuration strings. - Optimisations in arLabelling.c and arGetCode.c by Thomas Pintaric. - gsub libraries compile correctly on platforms with older OpenGL headers. Removed extraneous glPixelStorei(GL_UNPACK_IMAGE_HEIGHT,...) calls. - New function arglDispImageStateful() in gsub_lite for special effects. - Removed the obsolete graphicsTest example. Changes in version 2.68.1. -------------------------- - Mac video settings dialog can now be disabled by adding "-nodialog" to options string passed to arVideoOpen(). - Fixed some build bugs. Changes in version 2.68. ------------------------ Version 2.65 of ARToolKit incorporated the enhanced Windows video capture library created by Thomas Pintaric (http://www.ims.tuwien.ac.at/~thomas/artoolkit.php). Version 2.68 is based on 2.65f with the following changes: - New gsub_lite library designed to allow easier use of ARToolKit in existing applications, plus complete documentation in HTML format in doc/gsub_lite. - New high-performance Macintosh video capture library by Philip Lamb. - Support throughout the toolkit for three extra pixel formats including two packed-pixel YCbCr types (Mac pixel format codes 'ARGB', '2vuy', 'yuvs'). - Several minor changes for compiler correctness, such as return values from main() and const declarations in some function parameter lists. - Fix for bug in arGetTransMat2.c identified by Joerg Stoecklein (http://www.hitl.washington.edu/artoolkit/mail-archive/message-thread-00627--variable--s1--not-initi.html). - Fix for bug in VideoLinuxDV/video.c identified by Tobias Laubach (http://www.hitl.washington.edu/artoolkit/mail-archive/message-thread-00626-Segmentation-error---fix.html). -- EOF Index: README.txt =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/README.txt,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** README.txt 22 Nov 2004 08:22:45 -0000 1.4 --- README.txt 22 Nov 2004 18:48:10 -0000 1.5 *************** *** 10,17 **** Building on Mac OS X. Latest changes. ! Changes in version 2.69. ! Changes in version 2.68.2. ! Changes in version 2.68.1. ! Changes in version 2.68. --- 10,14 ---- Building on Mac OS X. Latest changes. ! Previous changes. *************** *** 94,141 **** - VideoLinuxV4L patch by Uwe Woessner for YUV support (at last!) - VideoLinuxV4L patches by Raphael Grasset for improved camera parameter control and compressed jpeg video stream to support Sony Eyetoy camera. ! - VideoLinux1394Cam patch by Wayne Wayne Piekarski for improved lib1394 support, including multiple lib1394 versions. - Preliminary API documentation by Raphael Grasset. ! Changes in version 2.69. ! ------------------------ ! - Windows builds still depend on DSVideoLib, but DSVideoLib is no longer included in source-only ARToolKit releases and must be downloaded separately. ! - Fixed bugs identified by Raphael Grasset: typo 'DEFALUT' in config.h.in and arUtil.c, return values in arMultiActivate.c, implementation of arUtilSleep for Win32. ! - Fixed help text in arVideoDispOption for VideoWin32DirectShow. ! - Fixed bug in ar2VideoClose() identified by Joerg Hedrich (http://www.hitl.washington.edu/artoolkit/mail-archive/message-thread-00690-possible-bug-in-libARvid.html). ! - For builds under Visual Studio 6, all projects are now in one workspace (.dsw) file, and builds now go into lib/ and bin/ rather than lib.vc60/ and bin.vc60/. ! - For debug builds under Visual Studio, libraries and binaries now have the character 'd' appended to the name. ! - For builds under Visual Studio 6, all libraries now use multithreaded code generation model. ! - For builds under Apple XCode, creation of config.h is now performed by a script run by the aggregate target 'Configure'. ! - Changed the '_' character in releases to a '-' character to be more compatible with Unix packaging system conventions. ! - Fix bug identified by Alexandre Gillet: arLabelling.c allocates buffer for arImage with maximum dimension 512 pixels. ! ! ! Changes in version 2.68.2. ! -------------------------- ! - VideoWin32DirectShow uses DSVideoLib 0.0.4 (was 0.0.3). The samples now correct the vertical orientation of video from DSVideoLib by specifying the "flipV" parameter by default. An alternative is to use the WDM capture settings dialog 'Mirror horizontally' parameter and rotate the camera 180 degrees. ! - Rewrite of Windows AR/video.h interface to follow same scheme for multiple cameras as used on other platforms (i.e. using the ar2Video*() set of functions). ! - All platforms now support the arVideoDispOptions() call, which prints acceptable options for arVideoOpen()'s configuration string to the standard output. New applications using ARToolKit should provide a way for a user to specify a preferred configuration string at runtime (rather than compile time), and to see the output of arVideoDispOptions() so that he or she can learn possible configuration strings. ! - Optimisations in arLabelling.c and arGetCode.c by Thomas Pintaric. ! - gsub libraries compile correctly on platforms with older OpenGL headers. Removed extraneous glPixelStorei(GL_UNPACK_IMAGE_HEIGHT,...) calls. ! - New function arglDispImageStateful() in gsub_lite for special effects. ! - Removed the obsolete graphicsTest example. ! ! ! Changes in version 2.68.1. ! -------------------------- ! - Mac video settings dialog can now be disabled by adding "-nodialog" to options string passed to arVideoOpen(). ! - Fixed some build bugs. ! ! ! Changes in version 2.68. ! ------------------------ ! Version 2.65 of ARToolKit incorporated the enhanced Windows video capture library created by Thomas Pintaric (http://www.ims.tuwien.ac.at/~thomas/artoolkit.php). Version 2.68 is based on 2.65f with the following changes: ! - New gsub_lite library designed to allow easier use of ARToolKit in existing applications, plus complete documentation in HTML format in doc/gsub_lite. ! - New high-performance Macintosh video capture library by Philip Lamb. ! - Support throughout the toolkit for three extra pixel formats including two packed-pixel YCbCr types (Mac pixel format codes 'ARGB', '2vuy', 'yuvs'). ! - Several minor changes for compiler correctness, such as return values from main() and const declarations in some function parameter lists. ! - Fix for bug in arGetTransMat2.c identified by Joerg Stoecklein (http://www.hitl.washington.edu/artoolkit/mail-archive/message-thread-00627--variable--s1--not-initi.html). ! - Fix for bug in VideoLinuxDV/video.c identified by Tobias Laubach (http://www.hitl.washington.edu/artoolkit/mail-archive/message-thread-00626-Segmentation-error---fix.html). -- --- 91,101 ---- - VideoLinuxV4L patch by Uwe Woessner for YUV support (at last!) - VideoLinuxV4L patches by Raphael Grasset for improved camera parameter control and compressed jpeg video stream to support Sony Eyetoy camera. ! - VideoLinux1394Cam patch by Wayne Piekarski for improved lib1394 support, including multiple lib1394 versions. - Preliminary API documentation by Raphael Grasset. ! Previous changes. ! ----------------- ! Please see the file ChangeLog.txt. -- |
|
From: Philip L. <phi...@us...> - 2004-11-22 08:22:59
|
Update of /cvsroot/artoolkit/artoolkit In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10625 Modified Files: README.txt Log Message: Explain libARvrml addition. Index: README.txt =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/README.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** README.txt 22 Nov 2004 03:41:22 -0000 1.3 --- README.txt 22 Nov 2004 08:22:45 -0000 1.4 *************** *** 88,92 **** Latest changes. --------------- ! - Added libARvrml. - Turn off texturing in gsub/gsub_lite when argDrawMode/arglDrawmode is AR_DRAW_BY_GL_DRAW_PIXELS. - Added new examples collide, loadMultiple, paddle, paddleDemo, paddleInteraction, range and twoView. --- 88,92 ---- Latest changes. --------------- ! - Added libARvrml. Build instructions and examples are in the works. - Turn off texturing in gsub/gsub_lite when argDrawMode/arglDrawmode is AR_DRAW_BY_GL_DRAW_PIXELS. - Added new examples collide, loadMultiple, paddle, paddleDemo, paddleInteraction, range and twoView. |
|
From: Philip L. <phi...@us...> - 2004-11-22 08:17:47
|
Update of /cvsroot/artoolkit/artoolkit/include/AR In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9491 Modified Files: param.h Log Message: Add some "const" qualifiers to prototypes. Index: param.h =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/include/AR/param.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** param.h 22 Nov 2004 02:11:05 -0000 1.2 --- param.h 22 Nov 2004 08:17:34 -0000 1.3 *************** *** 1,30 **** ! /* -------------------------------------------------------------------------- ! * Copyright (C) 2004 Hitlab NZ. ! * The distribution policy is describe on the Copyright.txt furnish ! * with this library. * -------------------------------------------------------------------------*/ ! /** ! * \file param.h ! * \brief ARToolkit global structure (parameters) subroutines. ! * ! * This file contains principal routines for loading, saving, and modify ! * camera parameters for of ARToolkit library. Different structures are used ! * for modify in run-time this parameters in the library. A file structure ! * is use for input/output. ! * \remark ! * ! * History : ! * ! * \author Takeshi Mita tm...@in... ! * \author Shinsaku Hiura shi...@sy... ! * \author Hirokazu Kato ka...@sy... ! ! * \version 4.1 ! * \date 01/12/07 **/ ! /* -------------------------------------------------------------------------- ! * History : ! * Rev Date Who Changes ! * *----------------------------------------------------------------------------*/ --- 1,30 ---- ! /* -------------------------------------------------------------------------- ! * Copyright (C) 2004 Hitlab NZ. ! * The distribution policy is describe on the Copyright.txt furnish ! * with this library. * -------------------------------------------------------------------------*/ ! /** ! * \file param.h ! * \brief ARToolkit global structure (parameters) subroutines. ! * ! * This file contains principal routines for loading, saving, and modify ! * camera parameters for of ARToolkit library. Different structures are used ! * for modify in run-time this parameters in the library. A file structure ! * is use for input/output. ! * \remark ! * ! * History : ! * ! * \author Takeshi Mita tm...@in... ! * \author Shinsaku Hiura shi...@sy... ! * \author Hirokazu Kato ka...@sy... ! ! * \version 4.1 ! * \date 01/12/07 **/ ! /* -------------------------------------------------------------------------- ! * History : ! * Rev Date Who Changes ! * *----------------------------------------------------------------------------*/ *************** *** 123,128 **** int arParamDecompMat( double source[3][4], double cpara[3][4], double trans[3][4] ); ! /** \fn int arParamIdeal2Observ( double dist_factor[4], double ix, double iy, ! double *ox, double *oy ) * \brief XXXBK * --- 123,129 ---- int arParamDecompMat( double source[3][4], double cpara[3][4], double trans[3][4] ); ! /** \fn int int arParamIdeal2Observ( const double dist_factor[4], const double ix, const double iy, ! double *ox, double *oy ) ! * \brief XXXBK * *************** *** 135,143 **** * \return XXXBK */ ! int arParamIdeal2Observ( double dist_factor[4], double ix, double iy, double *ox, double *oy ); ! /** \fn int arParamObserv2Ideal( double dist_factor[4], double ox, double oy, double *ix, double *iy ) * \brief XXXBK * --- 136,145 ---- * \return XXXBK */ ! int arParamIdeal2Observ( const double dist_factor[4], const double ix, const double iy, double *ox, double *oy ); ! /** \fn int arParamObserv2Ideal( const double dist_factor[4], const double ox, const double oy, double *ix, double *iy ) + * \brief XXXBK * *************** *** 150,154 **** * \return XXXBK */ ! int arParamObserv2Ideal( double dist_factor[4], double ox, double oy, double *ix, double *iy ); --- 152,156 ---- * \return XXXBK */ ! int arParamObserv2Ideal( const double dist_factor[4], const double ox, const double oy, double *ix, double *iy ); *************** *** 176,180 **** int arParamSave( char *filename, int num, ARParam *param, ...); ! /** \fn int arParamLoad( char *filename, int num, ARParam *param, ...) * \brief load the camera intrinsic parameters. * --- 178,182 ---- int arParamSave( char *filename, int num, ARParam *param, ...); ! /** \fn int arParamLoad( const char *filename, int num, ARParam *param, ...) * \brief load the camera intrinsic parameters. * *************** *** 186,190 **** * \return 0 if success, -1 if Error (file not found, file structure problem) */ ! int arParamLoad( char *filename, int num, ARParam *param, ...); /** \fn int arParamDisp( ARParam *param ) --- 188,192 ---- * \return 0 if success, -1 if Error (file not found, file structure problem) */ ! int arParamLoad( const char *filename, int num, ARParam *param, ...); /** \fn int arParamDisp( ARParam *param ) *************** *** 213,215 **** } #endif ! #endif --- 215,217 ---- } #endif ! #endif |
|
From: Philip L. <phi...@us...> - 2004-11-22 08:17:10
|
Update of /cvsroot/artoolkit/artoolkit/examples/range In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9391 Modified Files: rangeTest.c Log Message: Fix Mac OS X build. Index: rangeTest.c =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/examples/range/rangeTest.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** rangeTest.c 22 Nov 2004 03:38:18 -0000 1.1 --- rangeTest.c 22 Nov 2004 08:16:54 -0000 1.2 *************** *** 1,232 **** ! #ifdef _WIN32 ! #include <windows.h> ! #endif ! #include <stdio.h> ! #include <stdlib.h> ! #include <string.h> ! #include <math.h> ! ! #include <GL/gl.h> ! #include <GL/glut.h> ! #include <AR/gsub.h> ! #include <AR/param.h> ! #include <AR/ar.h> ! #include <AR/video.h> ! ! char *patt_name = "Data/patt.hiro"; ! int patt_id; ! ! int marker_width = 80.0; ! double marker_center[2] = {0.0, 0.0}; ! double marker_trans[3][4]; ! ! int xsize, ysize; ! int thresh = 100; ! int count = 0; ! ! /* set video capture configuration */ ! /*****************************************************************************/ ! // modified by Thomas Pintaric, Vienna University of Technology ! ! #ifdef _WIN32 ! char *vconf = "flipV,showDlg"; // see video.h for a list of supported parameters ! #else ! char *vconf = ""; ! #endif ! /*****************************************************************************/ ! ! char *cparam_name = "Data/camera_para.dat"; ! ARParam cparam; ! ! static void init(void); ! static void cleanup(void); ! static void keyEvent( unsigned char key, int x, int y); ! static void mainLoop(void); ! static void draw(double marker_trans[3][4],double range); ! ! int main() ! { ! //initialize applications ! init(); ! ! arVideoCapStart(); ! ! //start the main event loop ! argMainLoop( NULL, keyEvent, mainLoop ); ! ! return 0; ! } ! ! static void keyEvent( unsigned char key, int x, int y) ! { ! /* quit if the ESC key is pressed */ ! if( key == 0x1b ) { ! printf("*** %f (frame/sec)\n", (double)count/arUtilTimer()); ! cleanup(); ! exit(0); ! } ! } ! ! /* main loop */ ! static void mainLoop(void) ! { ! ARUint8 *dataPtr; ! ARMarkerInfo *marker_info; ! int marker_num; ! int i,k; ! float Xpos, Ypos, Zpos; ! double range; ! ! /* grab a video frame */ ! if( (dataPtr = (ARUint8 *)arVideoGetImage()) == NULL ) { ! arUtilSleep(2); ! return; ! } ! ! if( count == 0 ) arUtilTimerReset(); ! count++; ! ! /*draw the video*/ ! argDrawMode2D(); ! argDispImage( dataPtr, 0,0 ); ! ! glColor3f( 1.0, 0.0, 0.0 ); ! glLineWidth(6.0); ! ! /* detect the markers in the video frame */ ! if(arDetectMarker(dataPtr, thresh, ! &marker_info, &marker_num) < 0 ) { ! cleanup(); ! exit(0); ! } ! ! arVideoCapNext(); ! ! for( i = 0; i < marker_num; i++ ) { ! argDrawSquare(marker_info[i].vertex,0,0); ! } ! ! /* check for known patterns */ ! k = -1; ! for( i = 0; i < marker_num; i++ ) { ! if( marker_info[i].id == patt_id) { ! ! /* you've found a pattern */ ! printf("Found pattern: %d ",patt_id); ! glColor3f( 0.0, 1.0, 0.0 ); ! argDrawSquare(marker_info[i].vertex,0,0); ! ! if( k == -1 ) k = i; ! else /* make sure you have the best pattern (highest confidence factor) */ ! if( marker_info[k].cf < marker_info[i].cf ) k = i; ! } ! } ! if( k == -1 ) { ! argSwapBuffers(); ! return; ! } ! ! /* get the transformation between the marker and the real camera */ ! arGetTransMat(&marker_info[k], marker_center, marker_width, marker_trans); ! ! /* find the range */ ! Xpos = marker_trans[0][3]; ! Ypos = marker_trans[1][3]; ! Zpos = marker_trans[2][3]; ! range = sqrt(Xpos*Xpos+Ypos*Ypos+Zpos*Zpos); ! ! printf(" X: %3.2f Y: %3.2f Z: %3.2f Range: %3.2f \n",Xpos,Ypos,Zpos,range); ! ! /* draw the AR graphics */ ! draw(marker_trans,range); ! ! /*swap the graphics buffers*/ ! argSwapBuffers(); ! } ! ! static void init( void ) ! { ! ARParam wparam; ! ! /* open the video path */ ! if( arVideoOpen( vconf ) < 0 ) exit(0); ! /* find the size of the window */ ! if( arVideoInqSize(&xsize, &ysize) < 0 ) exit(0); ! printf("Image size (x,y) = (%d,%d)\n", xsize, ysize); ! ! /* set the initial camera parameters */ ! if( arParamLoad(cparam_name, 1, &wparam) < 0 ) { ! printf("Camera parameter load error !!\n"); ! exit(0); ! } ! arParamChangeSize( &wparam, xsize, ysize, &cparam ); ! arInitCparam( &cparam ); ! printf("*** Camera Parameter ***\n"); ! arParamDisp( &cparam ); ! ! /* load pattern file */ ! if(patt_id=arLoadPatt (patt_name) < 0) ! { ! printf ("Pattern file load error !! \n"); ! exit(0); ! } ! ! /* open the graphics window */ ! argInit( &cparam, 2.0, 0, 0, 0, 0 ); ! } ! ! /* cleanup function called when program exits */ ! static void cleanup(void) ! { ! arVideoCapStop(); ! arVideoClose(); ! argCleanup(); ! } ! ! static void draw(double marker_trans[3][4], double range) ! { ! double gl_para[16]; ! double myScale; ! ! GLfloat mat_ambient[] = {0.0, 0.0, 1.0, 1.0}; ! GLfloat mat_flash[] = {0.0, 0.0, 1.0, 1.0}; ! GLfloat mat_flash_shiny[] = {50.0}; ! GLfloat light_position[] = {100.0,-200.0,200.0,0.0}; ! GLfloat ambi[] = {0.1, 0.1, 0.1, 0.1}; ! GLfloat lightZeroColor[] = {0.9, 0.9, 0.9, 0.1}; ! ! /* set the openGL projection mode */ ! argDrawMode3D(); ! argDraw3dCamera( 0, 0 ); ! glClearDepth( 1.0 ); ! glClear(GL_DEPTH_BUFFER_BIT); ! glEnable(GL_DEPTH_TEST); ! glDepthFunc(GL_LEQUAL); ! ! /* load the camera transformation matrix */ ! argConvGlpara(marker_trans, gl_para); ! glMatrixMode(GL_MODELVIEW); ! glLoadMatrixd( gl_para ); ! ! /* set the material */ ! glEnable(GL_LIGHTING); ! glEnable(GL_LIGHT0); ! glLightfv(GL_LIGHT0, GL_POSITION, light_position); ! glLightfv(GL_LIGHT0, GL_AMBIENT, ambi); ! glLightfv(GL_LIGHT0, GL_DIFFUSE, lightZeroColor); ! glMaterialfv(GL_FRONT, GL_SPECULAR, mat_flash); ! glMaterialfv(GL_FRONT, GL_SHININESS, mat_flash_shiny); ! glMaterialfv(GL_FRONT, GL_AMBIENT, mat_ambient); ! ! /* draw the object */ ! myScale = range/200.0; ! ! glScalef(myScale,myScale,myScale); ! glRotatef( 90, 1.0, 0.0, 0.0 ); ! glTranslatef( 0.0, 17.5, 0.0 ); ! ! glutSolidTeapot(30); ! ! glDisable( GL_LIGHTING ); ! glDisable( GL_DEPTH_TEST ); ! } --- 1,235 ---- ! #ifdef _WIN32 ! # include <windows.h> ! #endif ! #include <stdio.h> ! #include <stdlib.h> ! #include <string.h> ! #include <math.h> ! ! #ifndef __APPLE__ ! # include <GL/glut.h> ! #else ! # include <GLUT/glut.h> ! #endif ! #include <AR/gsub.h> ! #include <AR/param.h> ! #include <AR/ar.h> ! #include <AR/video.h> ! ! char *patt_name = "Data/patt.hiro"; ! int patt_id; ! ! int marker_width = 80.0; ! double marker_center[2] = {0.0, 0.0}; ! double marker_trans[3][4]; ! ! int xsize, ysize; ! int thresh = 100; ! int count = 0; ! ! /* set video capture configuration */ ! /*****************************************************************************/ ! // modified by Thomas Pintaric, Vienna University of Technology ! ! #ifdef _WIN32 ! char *vconf = "flipV,showDlg"; // see video.h for a list of supported parameters ! #else ! char *vconf = ""; ! #endif ! /*****************************************************************************/ ! ! char *cparam_name = "Data/camera_para.dat"; ! ARParam cparam; ! ! static void init(void); ! static void cleanup(void); ! static void keyEvent( unsigned char key, int x, int y); ! static void mainLoop(void); ! static void draw(double marker_trans[3][4],double range); ! ! int main() ! { ! //initialize applications ! init(); ! ! arVideoCapStart(); ! ! //start the main event loop ! argMainLoop( NULL, keyEvent, mainLoop ); ! ! return 0; ! } ! ! static void keyEvent( unsigned char key, int x, int y) ! { ! /* quit if the ESC key is pressed */ ! if( key == 0x1b ) { ! printf("*** %f (frame/sec)\n", (double)count/arUtilTimer()); ! cleanup(); ! exit(0); ! } ! } ! ! /* main loop */ ! static void mainLoop(void) ! { ! ARUint8 *dataPtr; ! ARMarkerInfo *marker_info; ! int marker_num; ! int i,k; ! float Xpos, Ypos, Zpos; ! double range; ! ! /* grab a video frame */ ! if( (dataPtr = (ARUint8 *)arVideoGetImage()) == NULL ) { ! arUtilSleep(2); ! return; ! } ! ! if( count == 0 ) arUtilTimerReset(); ! count++; ! ! /*draw the video*/ ! argDrawMode2D(); ! argDispImage( dataPtr, 0,0 ); ! ! glColor3f( 1.0, 0.0, 0.0 ); ! glLineWidth(6.0); ! ! /* detect the markers in the video frame */ ! if(arDetectMarker(dataPtr, thresh, ! &marker_info, &marker_num) < 0 ) { ! cleanup(); ! exit(0); ! } ! ! arVideoCapNext(); ! ! for( i = 0; i < marker_num; i++ ) { ! argDrawSquare(marker_info[i].vertex,0,0); ! } ! ! /* check for known patterns */ ! k = -1; ! for( i = 0; i < marker_num; i++ ) { ! if( marker_info[i].id == patt_id) { ! ! /* you've found a pattern */ ! printf("Found pattern: %d ",patt_id); ! glColor3f( 0.0, 1.0, 0.0 ); ! argDrawSquare(marker_info[i].vertex,0,0); ! ! if( k == -1 ) k = i; ! else /* make sure you have the best pattern (highest confidence factor) */ ! if( marker_info[k].cf < marker_info[i].cf ) k = i; ! } ! } ! if( k == -1 ) { ! argSwapBuffers(); ! return; ! } ! ! /* get the transformation between the marker and the real camera */ ! arGetTransMat(&marker_info[k], marker_center, marker_width, marker_trans); ! ! /* find the range */ ! Xpos = marker_trans[0][3]; ! Ypos = marker_trans[1][3]; ! Zpos = marker_trans[2][3]; ! range = sqrt(Xpos*Xpos+Ypos*Ypos+Zpos*Zpos); ! ! printf(" X: %3.2f Y: %3.2f Z: %3.2f Range: %3.2f \n",Xpos,Ypos,Zpos,range); ! ! /* draw the AR graphics */ ! draw(marker_trans,range); ! ! /*swap the graphics buffers*/ ! argSwapBuffers(); ! } ! ! static void init( void ) ! { ! ARParam wparam; ! ! /* open the video path */ ! if( arVideoOpen( vconf ) < 0 ) exit(0); ! /* find the size of the window */ ! if( arVideoInqSize(&xsize, &ysize) < 0 ) exit(0); ! printf("Image size (x,y) = (%d,%d)\n", xsize, ysize); ! ! /* set the initial camera parameters */ ! if( arParamLoad(cparam_name, 1, &wparam) < 0 ) { ! printf("Camera parameter load error !!\n"); ! exit(0); ! } ! arParamChangeSize( &wparam, xsize, ysize, &cparam ); ! arInitCparam( &cparam ); ! printf("*** Camera Parameter ***\n"); ! arParamDisp( &cparam ); ! ! /* load pattern file */ ! if(patt_id=arLoadPatt (patt_name) < 0) ! { ! printf ("Pattern file load error !! \n"); ! exit(0); ! } ! ! /* open the graphics window */ ! argInit( &cparam, 2.0, 0, 0, 0, 0 ); ! } ! ! /* cleanup function called when program exits */ ! static void cleanup(void) ! { ! arVideoCapStop(); ! arVideoClose(); ! argCleanup(); ! } ! ! static void draw(double marker_trans[3][4], double range) ! { ! double gl_para[16]; ! double myScale; ! ! GLfloat mat_ambient[] = {0.0, 0.0, 1.0, 1.0}; ! GLfloat mat_flash[] = {0.0, 0.0, 1.0, 1.0}; ! GLfloat mat_flash_shiny[] = {50.0}; ! GLfloat light_position[] = {100.0,-200.0,200.0,0.0}; ! GLfloat ambi[] = {0.1, 0.1, 0.1, 0.1}; ! GLfloat lightZeroColor[] = {0.9, 0.9, 0.9, 0.1}; ! ! /* set the openGL projection mode */ ! argDrawMode3D(); ! argDraw3dCamera( 0, 0 ); ! glClearDepth( 1.0 ); ! glClear(GL_DEPTH_BUFFER_BIT); ! glEnable(GL_DEPTH_TEST); ! glDepthFunc(GL_LEQUAL); ! ! /* load the camera transformation matrix */ ! argConvGlpara(marker_trans, gl_para); ! glMatrixMode(GL_MODELVIEW); ! glLoadMatrixd( gl_para ); ! ! /* set the material */ ! glEnable(GL_LIGHTING); ! glEnable(GL_LIGHT0); ! glLightfv(GL_LIGHT0, GL_POSITION, light_position); ! glLightfv(GL_LIGHT0, GL_AMBIENT, ambi); ! glLightfv(GL_LIGHT0, GL_DIFFUSE, lightZeroColor); ! glMaterialfv(GL_FRONT, GL_SPECULAR, mat_flash); ! glMaterialfv(GL_FRONT, GL_SHININESS, mat_flash_shiny); ! glMaterialfv(GL_FRONT, GL_AMBIENT, mat_ambient); ! ! /* draw the object */ ! myScale = range/200.0; ! ! glScalef(myScale,myScale,myScale); ! glRotatef( 90, 1.0, 0.0, 0.0 ); ! glTranslatef( 0.0, 17.5, 0.0 ); ! ! glutSolidTeapot(30); ! ! glDisable( GL_LIGHTING ); ! glDisable( GL_DEPTH_TEST ); ! } |
|
From: Philip L. <phi...@us...> - 2004-11-22 03:44:46
|
Update of /cvsroot/artoolkit/artoolkit/lib/SRC/ARvrml In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26569 Added Files: libarvrml.sln libarvrml.vcproj Log Message: Add Windows projects (paths will need fixing.) --- NEW FILE: libarvrml.sln --- Microsoft Visual Studio Solution File, Format Version 8.00 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libarvrml", "libarvrml.vcproj", "{C90F035F-437C-4285-BBCA-8DDC70582356}" ProjectSection(ProjectDependencies) = postProject EndProjectSection EndProject Global GlobalSection(SolutionConfiguration) = preSolution Debug = Debug Release = Release EndGlobalSection GlobalSection(ProjectConfiguration) = postSolution {C90F035F-437C-4285-BBCA-8DDC70582356}.Debug.ActiveCfg = Debug|Win32 {C90F035F-437C-4285-BBCA-8DDC70582356}.Debug.Build.0 = Debug|Win32 {C90F035F-437C-4285-BBCA-8DDC70582356}.Release.ActiveCfg = Release|Win32 {C90F035F-437C-4285-BBCA-8DDC70582356}.Release.Build.0 = Release|Win32 EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution EndGlobalSection GlobalSection(ExtensibilityAddIns) = postSolution EndGlobalSection EndGlobal --- NEW FILE: libarvrml.vcproj --- <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" Version="7.10" Name="libarvrml" ProjectGUID="{C90F035F-437C-4285-BBCA-8DDC70582356}" Keyword="Win32Proj"> <Platforms> <Platform Name="Win32"/> </Platforms> <Configurations> <Configuration Name="Debug|Win32" OutputDirectory="Debug" IntermediateDirectory="Debug" ConfigurationType="4" CharacterSet="2"> <Tool Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="include;dependencies\include;dependencies\dependencies\include" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;S;OPENVRML_ENABLE_IMAGETEXTURE_NODE;OPENVRML_ENABLE_GZIP" MinimalRebuild="TRUE" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="3" Detect64BitPortabilityProblems="TRUE" DebugInformationFormat="4" CompileAs="2"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLibrarianTool" OutputFile="lib/arvrml.lib"/> <Tool Name="VCMIDLTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCXMLDataGeneratorTool"/> <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> <Configuration Name="Release|Win32" OutputDirectory="Release" IntermediateDirectory="Release" ConfigurationType="4" CharacterSet="2"> <Tool Name="VCCLCompilerTool" PreprocessorDefinitions="WIN32;NDEBUG;_LIB" RuntimeLibrary="4" UsePrecompiledHeader="3" WarningLevel="3" Detect64BitPortabilityProblems="TRUE" DebugInformationFormat="3"/> <Tool Name="VCCustomBuildTool"/> <Tool Name="VCLibrarianTool" OutputFile="$(OutDir)/libarvrml.lib"/> <Tool Name="VCMIDLTool"/> <Tool Name="VCPostBuildEventTool"/> <Tool Name="VCPreBuildEventTool"/> <Tool Name="VCPreLinkEventTool"/> <Tool Name="VCResourceCompilerTool"/> <Tool Name="VCWebServiceProxyGeneratorTool"/> <Tool Name="VCXMLDataGeneratorTool"/> <Tool Name="VCManagedWrapperGeneratorTool"/> <Tool Name="VCAuxiliaryManagedWrapperGeneratorTool"/> </Configuration> </Configurations> <References> </References> <Files> <Filter Name="Source Files" Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> <File RelativePath=".\lib\Src\arViewer.cpp"> </File> <File RelativePath=".\lib\Src\arViewerCapi.cpp"> </File> </Filter> <Filter Name="Header Files" Filter="h;hpp;hxx;hm;inl;inc;xsd" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"> <File RelativePath=".\lib\Src\arViewer.h"> </File> <File RelativePath=".\include\arvrml.h"> </File> </Filter> <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> </Filter> <File RelativePath=".\ReadMe.txt"> </File> </Files> <Globals> </Globals> </VisualStudioProject> |
|
From: Philip L. <phi...@us...> - 2004-11-22 03:42:31
|
Update of /cvsroot/artoolkit/artoolkit In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26237 Modified Files: Configure ARToolKit.sln ARToolKit.dsw README.txt Log Message: Multiple changes. Index: ARToolKit.dsw =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/ARToolKit.dsw,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** ARToolKit.dsw 4 Nov 2004 08:50:24 -0000 1.1.1.1 --- ARToolKit.dsw 22 Nov 2004 03:41:22 -0000 1.2 *************** *** 67,70 **** --- 67,91 ---- ############################################################################### + Project: "collide"=.\examples\collide\collideTest.dsp - Package Owner=<4> + + Package=<5> + {{{ + }}} + + Package=<4> + {{{ + Begin Project Dependency + Project_Dep_Name libAR + End Project Dependency + Begin Project Dependency + Project_Dep_Name libARgsub + End Project Dependency + Begin Project Dependency + Project_Dep_Name libARvideo + End Project Dependency + }}} + + ############################################################################### + Project: "exview"=.\examples\exview\exview.dsp - Package Owner=<4> *************** *** 86,89 **** --- 107,133 ---- }}} + + ############################################################################### + + Project: "graphicsTest"=.\util\graphicsTest\graphicsTest.dsp - Package Owner=<4> + + Package=<5> + {{{ + }}} + + Package=<4> + {{{ + Begin Project Dependency + Project_Dep_Name libAR + End Project Dependency + Begin Project Dependency + Project_Dep_Name libARgsub + End Project Dependency + Begin Project Dependency + Project_Dep_Name libARvideo + End Project Dependency + }}} + + ############################################################################### *************** *** 158,161 **** --- 202,227 ---- }}} + + ############################################################################### + + Project: "loadMultiple"=.\examples\loadMultiple\loadMultiple.dsp - Package Owner=<4> + + Package=<5> + {{{ + }}} + + Package=<4> + {{{ + Begin Project Dependency + Project_Dep_Name libAR + End Project Dependency + Begin Project Dependency + Project_Dep_Name libARgsub + End Project Dependency + Begin Project Dependency + Project_Dep_Name libARvideo + End Project Dependency + }}} + ############################################################################### *************** *** 181,185 **** ############################################################################### ! Project: "modetest"=.\examples\modeTest\modetest.dsp - Package Owner=<4> Package=<5> --- 247,251 ---- ############################################################################### ! Project: "modeTest"=.\examples\modeTest\modeTest.dsp - Package Owner=<4> Package=<5> *************** *** 200,206 **** }}} ############################################################################### ! Project: "multi"=.\examples\multi\multi.dsp - Package Owner=<4> Package=<5> --- 266,273 ---- }}} + ############################################################################### ! Project: "multi"=.\examples\multi\multiTest.dsp - Package Owner=<4> Package=<5> *************** *** 250,254 **** ############################################################################### ! Project: "relation"=.\examples\relation\relation.dsp - Package Owner=<4> Package=<5> --- 317,321 ---- ############################################################################### ! Project: "paddle"=.\examples\paddle\paddleTest.dsp - Package Owner=<4> Package=<5> *************** *** 265,275 **** End Project Dependency Begin Project Dependency Project_Dep_Name libARvideo End Project Dependency }}} ############################################################################### ! Project: "simple"=.\examples\simple\simple.dsp - Package Owner=<4> Package=<5> --- 332,346 ---- End Project Dependency Begin Project Dependency + Project_Dep_Name libARgsubUtil + End Project Dependency + Begin Project Dependency Project_Dep_Name libARvideo End Project Dependency }}} + ############################################################################### ! Project: "paddleDemo"=.\examples\paddleDemo\paddleDemo.dsp - Package Owner=<4> Package=<5> *************** *** 286,296 **** End Project Dependency Begin Project Dependency Project_Dep_Name libARvideo End Project Dependency }}} ############################################################################### ! Project: "simple2"=.\examples\simple2\simple2.dsp - Package Owner=<4> Package=<5> --- 357,461 ---- End Project Dependency Begin Project Dependency + Project_Dep_Name libARgsubUtil + End Project Dependency + Begin Project Dependency Project_Dep_Name libARvideo End Project Dependency }}} + ############################################################################### ! Project: "paddleInteraction"=.\examples\paddleInteraction\paddleInteractionTest.dsp - Package Owner=<4> ! ! Package=<5> ! {{{ ! }}} ! ! Package=<4> ! {{{ ! Begin Project Dependency ! Project_Dep_Name libAR ! End Project Dependency ! Begin Project Dependency ! Project_Dep_Name libARgsub ! End Project Dependency ! Begin Project Dependency ! Project_Dep_Name libARgsubUtil ! End Project Dependency ! Begin Project Dependency ! Project_Dep_Name libARvideo ! End Project Dependency ! }}} ! ! ! ############################################################################### ! ! Project: "range"=.\examples\range\rangeTest.dsp - Package Owner=<4> ! ! Package=<5> ! {{{ ! }}} ! ! Package=<4> ! {{{ ! Begin Project Dependency ! Project_Dep_Name libAR ! End Project Dependency ! Begin Project Dependency ! Project_Dep_Name libARgsub ! End Project Dependency ! Begin Project Dependency ! Project_Dep_Name libARgsubUtil ! End Project Dependency ! Begin Project Dependency ! Project_Dep_Name libARvideo ! End Project Dependency ! }}} ! ############################################################################### ! ! Project: "relation"=.\examples\relation\relationTest.dsp - Package Owner=<4> ! ! Package=<5> ! {{{ ! }}} ! ! Package=<4> ! {{{ ! Begin Project Dependency ! Project_Dep_Name libAR ! End Project Dependency ! Begin Project Dependency ! Project_Dep_Name libARgsub ! End Project Dependency ! Begin Project Dependency ! Project_Dep_Name libARvideo ! End Project Dependency ! }}} ! ! ############################################################################### ! ! Project: "simple"=.\examples\simple\simpleTest.dsp - Package Owner=<4> ! ! Package=<5> ! {{{ ! }}} ! ! Package=<4> ! {{{ ! Begin Project Dependency ! Project_Dep_Name libAR ! End Project Dependency ! Begin Project Dependency ! Project_Dep_Name libARgsub ! End Project Dependency ! Begin Project Dependency ! Project_Dep_Name libARvideo ! End Project Dependency ! }}} ! ! ############################################################################### ! ! Project: "simple2"=.\examples\simple2\simpleTest2.dsp - Package Owner=<4> Package=<5> *************** *** 334,337 **** --- 499,548 ---- ############################################################################### + + ############################################################################### + + Project: "twoView"=.\examples\twoView\twoView.dsp - Package Owner=<4> + + Package=<5> + {{{ + }}} + + Package=<4> + {{{ + Begin Project Dependency + Project_Dep_Name libAR + End Project Dependency + Begin Project Dependency + Project_Dep_Name libARgsub_lite + End Project Dependency + Begin Project Dependency + Project_Dep_Name libARvideo + End Project Dependency + }}} + + ############################################################################### + + Project: "videoTest"=.\util\videoTest\videoTest.dsp - Package Owner=<4> + + Package=<5> + {{{ + }}} + + Package=<4> + {{{ + Begin Project Dependency + Project_Dep_Name libAR + End Project Dependency + Begin Project Dependency + Project_Dep_Name libARgsub_lite + End Project Dependency + Begin Project Dependency + Project_Dep_Name libARvideo + End Project Dependency + }}} + + ############################################################################### + + Global: Index: Configure =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/Configure,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Configure 19 Nov 2004 03:36:54 -0000 1.2 --- Configure 22 Nov 2004 03:41:22 -0000 1.3 *************** *** 13,21 **** util \ util/calib_camera2 util/calib_cparam util/calib_distortion \ ! util/mk_patt \ examples \ ! examples/exview examples/modeTest examples/multi \ ! examples/optical examples/relation examples/simple examples/simple2 \ ! examples/simpleLite \ " --- 13,22 ---- util \ util/calib_camera2 util/calib_cparam util/calib_distortion \ ! util/mk_patt util/graphicsTest util/videoTest \ examples \ ! examples/collide examples/exview \ ! examples/loadMultiple examples/modeTest examples/multi examples/optical \ ! examples/paddle examples/paddleDemo examples/paddleInteraction examples/range \ ! examples/relation examples/simple examples/simple2 examples/simpleLite examples/twoView \ " *************** *** 30,35 **** echo "Select a video capture driver." echo " 1: Video4Linux" ! echo " 2: Digital Video Camcoder through IEEE 1394 (DV Format)" ! echo " 3: Digital Video Camera through IEEE 1394 (VGA NONCOMPRESSED Image Format)" echo -n "Enter : " read ANS --- 31,37 ---- echo "Select a video capture driver." echo " 1: Video4Linux" ! echo " 2: Video4Linux+JPEG Decompression (EyeToy)" ! echo " 3: Digital Video Camcoder through IEEE 1394 (DV Format)" ! echo " 4: Digital Video Camera through IEEE 1394 (VGA NONCOMPRESSED Image Format)" echo -n "Enter : " read ANS *************** *** 45,48 **** --- 47,59 ---- elif [ "$ANS" = "2" ] then + VIDEO_DRIVER="VideoLinuxV4L" + CFLAG="-O -I/usr/X11R6/include -DUSE_EYETOY" + LDFLAG="-L/usr/X11R6/lib" + ARFLAG="rs" + RANLIB="" + LIBS="-lglut -lGLU -lGL -lXi -lXmu -lX11 -lm -ljpeg" + CONFIG="AR_INPUT_V4L" + elif [ "$ANS" = "3" ] + then VIDEO_DRIVER="VideoLinuxDV" CFLAG="-O -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include" *************** *** 52,56 **** LIBS="-lraw1394 -ldv -lpthread -lglut -lGLU -lGL -lXi -lXmu -lX11 -lm" CONFIG="AR_INPUT_DV" ! elif [ "$ANS" = "3" ] then VIDEO_DRIVER="VideoLinux1394Cam" --- 63,67 ---- LIBS="-lraw1394 -ldv -lpthread -lglut -lGLU -lGL -lXi -lXmu -lX11 -lm" CONFIG="AR_INPUT_DV" ! elif [ "$ANS" = "4" ] then VIDEO_DRIVER="VideoLinux1394Cam" *************** *** 65,72 **** echo -n "Enter : " read ANS ! if [ "$ANS" = "y" ] then DRAGON="y" ! elif [ "$ANS" = "n" ] then DRAGON="n" --- 76,83 ---- echo -n "Enter : " read ANS ! if ( [ "$ANS" = "y" ] || [ "$ANS" = "Y" ] || [ "$ANS" = "yes" ] || [ "$ANS" = "YES" ]) then DRAGON="y" ! elif ( [ "$ANS" = "n" ] || [ "$ANS" = "N" ] || [ "$ANS" = "no" ] || [ "$ANS" = "NO" ]) then DRAGON="n" *************** *** 77,81 **** else ! echo "Please enter 1,2 or 3." exit 0 fi --- 88,92 ---- else ! echo "Please enter 1,2,3 or 4." exit 0 fi *************** *** 103,107 **** ARFLAG="-r" RANLIB="ranlib \$\@" ! LIBS=" -framework Carbon -framework QuickTime -framework GLUT -framework OpenGL -lobjc" echo "Dose your Mac have fast texture mapping hardware? (y or n)" --- 114,118 ---- ARFLAG="-r" RANLIB="ranlib \$\@" ! LIBS="-framework Carbon -framework QuickTime -framework GLUT -framework OpenGL -lobjc" echo "Dose your Mac have fast texture mapping hardware? (y or n)" *************** *** 128,135 **** echo -n "Enter : " read ANS ! if [ "$ANS" = "y" ] then NVEXT="y" ! elif [ "$ANS" = "n" ] then NVEXT="n" --- 139,147 ---- echo -n "Enter : " read ANS ! if ( [ "$ANS" = "y" ] || [ "$ANS" = "Y" ] || [ "$ANS" = "yes" ] || [ "$ANS" = "YES" ]) then NVEXT="y" ! elif ( [ "$ANS" = "n" ] || [ "$ANS" = "N" ] || [ "$ANS" = "no" ] || [ "$ANS" = "NO" ]) ! then NVEXT="n" Index: README.txt =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/README.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** README.txt 19 Nov 2004 03:32:11 -0000 1.2 --- README.txt 22 Nov 2004 03:41:22 -0000 1.3 *************** *** 90,93 **** --- 90,99 ---- - Added libARvrml. - Turn off texturing in gsub/gsub_lite when argDrawMode/arglDrawmode is AR_DRAW_BY_GL_DRAW_PIXELS. + - Added new examples collide, loadMultiple, paddle, paddleDemo, paddleInteraction, range and twoView. + - Added new utilities for testing graphics and video without marker recognition, graphicsTest and videoTest. + - VideoLinuxV4L patch by Uwe Woessner for YUV support (at last!) + - VideoLinuxV4L patches by Raphael Grasset for improved camera parameter control and compressed jpeg video stream to support Sony Eyetoy camera. + - VideoLinux1394Cam patch by Wayne Wayne Piekarski for improved lib1394 support, including multiple lib1394 versions. + - Preliminary API documentation by Raphael Grasset. Index: ARToolKit.sln =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/ARToolKit.sln,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** ARToolKit.sln 4 Nov 2004 08:50:27 -0000 1.1.1.1 --- ARToolKit.sln 22 Nov 2004 03:41:22 -0000 1.2 *************** *** 60,64 **** EndProjectSection EndProject ! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "calib_camera2", "util\calib_camera2\calib_camera.vcproj", "{7218026D-600A-2D4D-C387-44E5B226FA6A}" ProjectSection(ProjectDependencies) = postProject {B5E62882-360E-46B2-A97F-50443BB795E3} = {B5E62882-360E-46B2-A97F-50443BB795E3} --- 60,64 ---- 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} *************** *** 103,106 **** --- 103,146 ---- EndProjectSection EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "collideTest", "examples\collide\collideTest.vcproj", "{89E3CB14-46DF-46BB-B87F-CC653045B14C}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "loadMultiple", "examples\loadMultiple\loadMultiple.vcproj", "{89E3CB14-46DF-46BB-B87F-CC653045B14C}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "modeTest", "examples\modeTest\modeTest.vcproj", "{89E3CB14-46DF-46BB-B87F-CC653045B14C}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "paddleTest", "examples\paddle\paddleTest.vcproj", "{89E3CB14-46DF-46BB-B87F-CC653045B14C}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "paddleDemo", "examples\paddleDemo\paddleDemo.vcproj", "{89E3CB14-46DF-46BB-B87F-CC653045B14C}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "paddleInteractionTest", "examples\paddleInteraction\paddleInteractionTest.vcproj", "{89E3CB14-46DF-46BB-B87F-CC653045B14C}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rangeTest", "examples\range\rangeTest.vcproj", "{89E3CB14-46DF-46BB-B87F-CC653045B14C}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "twoView", "examples\twoView\twoView.vcproj", "{89E3CB14-46DF-46BB-B87F-CC653045B14C}" + ProjectSection(ProjectDependencies) = postProject + 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 + EndProjectSection + EndProject Global GlobalSection(SolutionConfiguration) = preSolution *************** *** 135,138 **** --- 175,179 ---- {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 *************** *** 195,198 **** --- 236,299 ---- {B5E62882-360E-46B2-A97F-50443BB795E3}.Release.Build.0 = Release|Win32 {B5E62882-360E-46B2-A97F-50443BB795E3}.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 + {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 + {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 + {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 + {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 + {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 + {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 + {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 + {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 EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution |
|
From: Philip L. <phi...@us...> - 2004-11-22 03:42:27
|
Update of /cvsroot/artoolkit/artoolkit/ARToolKit.xcode In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26220 Modified Files: project.pbxproj Log Message: Multiple changes. Index: project.pbxproj =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/ARToolKit.xcode/project.pbxproj,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** project.pbxproj 19 Nov 2004 03:31:55 -0000 1.3 --- project.pbxproj 22 Nov 2004 03:41:15 -0000 1.4 *************** *** 1356,1359 **** --- 1356,1361 ---- 4A427C10048431FA00B56093 = { children = ( + 4AC3C076075188AB0073D2C6, + 4AC3C07B075188AB0073D2C6, 4A427C11048431FA00B56093, 4A427C21048431FA00B56093, *************** *** 1369,1373 **** 4A427C11048431FA00B56093 = { children = ( ! 4AAB8C920728944100708844, 4AAB8C930728944100708844, 4A427C12048431FA00B56093, --- 1371,1375 ---- 4A427C11048431FA00B56093 = { children = ( ! 4AC3C08A07518AF80073D2C6, 4AAB8C930728944100708844, 4A427C12048431FA00B56093, *************** *** 1552,1555 **** --- 1554,1564 ---- 4A427C900484329800B56093 = { children = ( + 4AC3C09007518C7E0073D2C6, + 4AC3C09707518C7E0073D2C6, + 4AC3C09E07518C7E0073D2C6, + 4AC3C0A507518C7E0073D2C6, + 4AC3C0B007518C7E0073D2C6, + 4AC3C0B707518C7E0073D2C6, + 4AC3C0BC07518C7E0073D2C6, 4A427C940484329800B56093, 4A427CA30484329800B56093, *************** *** 1623,1627 **** 4A427CA40484329800B56093 = { children = ( ! 4AAB8C84072893F300708844, 4AAB8C85072893F300708844, 4A427CA50484329800B56093, --- 1632,1636 ---- 4A427CA40484329800B56093 = { children = ( ! 4AC3C0D607518E840073D2C6, 4AAB8C85072893F300708844, 4A427CA50484329800B56093, *************** *** 1687,1691 **** 4A427CB50484329800B56093 = { children = ( ! 4AAB8C86072893FC00708844, 4AAB8C87072893FC00708844, 4A427CB70484329800B56093, --- 1696,1700 ---- 4A427CB50484329800B56093 = { children = ( ! 4AC3C0DD07518F350073D2C6, 4AAB8C87072893FC00708844, 4A427CB70484329800B56093, *************** *** 1779,1783 **** 4A427CD10484329800B56093 = { children = ( ! 4AAB8C8A0728940F00708844, 4AAB8C8B0728940F00708844, 4A427CD30484329800B56093, --- 1788,1792 ---- 4A427CD10484329800B56093 = { children = ( ! 4AC3C0DE07518F4B0073D2C6, 4AAB8C8B0728940F00708844, 4A427CD30484329800B56093, *************** *** 1807,1811 **** 4A427CDC0484329800B56093 = { children = ( ! 4AAB8C8C0728941B00708844, 4AAB8C8D0728941B00708844, 4A427CDE0484329800B56093, --- 1816,1820 ---- 4A427CDC0484329800B56093 = { children = ( ! 4AC3C0DF07518F650073D2C6, 4AAB8C8D0728941B00708844, 4A427CDE0484329800B56093, *************** *** 1835,1839 **** 4A427CE70484329800B56093 = { children = ( ! 4AAB8C8E0728942400708844, 4AAB8C8F0728942400708844, 4A427CE90484329800B56093, --- 1844,1848 ---- 4A427CE70484329800B56093 = { children = ( ! 4AC3C0E007518F790073D2C6, 4AAB8C8F0728942400708844, 4A427CE90484329800B56093, *************** *** 2596,2599 **** --- 2605,2612 ---- 4A427D6C0484329900B56093 = { children = ( + 4AC3C062075186FF0073D2C6, + 4AC3C063075186FF0073D2C6, + 4AC3C064075186FF0073D2C6, + 4AC3C065075186FF0073D2C6, 4A427D6E0484329900B56093, 4A427D6F0484329900B56093, *************** *** 2761,2764 **** --- 2774,2779 ---- 4A461B6104843FAA00B56093 = { children = ( + 4AC3C06C075187D00073D2C6, + 4AC3C06D075187D00073D2C6, 4A461B6204843FAA00B56093, 4A461B6304843FAA00B56093, *************** *** 4097,4101 **** ); buildSettings = { - OPTIMIZATION_CFLAGS = ""; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ""; --- 4112,4115 ---- *************** *** 4571,4582 **** sourceTree = "<group>"; }; - 4AAB8C84072893F300708844 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = text; - path = modetest.dsp; - refType = 4; - sourceTree = "<group>"; - }; 4AAB8C85072893F300708844 = { fileEncoding = 30; --- 4585,4588 ---- *************** *** 4587,4598 **** sourceTree = "<group>"; }; - 4AAB8C86072893FC00708844 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = text; - path = multi.dsp; - refType = 4; - sourceTree = "<group>"; - }; 4AAB8C87072893FC00708844 = { fileEncoding = 30; --- 4593,4596 ---- *************** *** 4619,4630 **** sourceTree = "<group>"; }; - 4AAB8C8A0728940F00708844 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = text; - path = relation.dsp; - refType = 4; - sourceTree = "<group>"; - }; 4AAB8C8B0728940F00708844 = { fileEncoding = 30; --- 4617,4620 ---- *************** *** 4635,4646 **** sourceTree = "<group>"; }; - 4AAB8C8C0728941B00708844 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = text; - path = simple.dsp; - refType = 4; - sourceTree = "<group>"; - }; 4AAB8C8D0728941B00708844 = { fileEncoding = 30; --- 4625,4628 ---- *************** *** 4651,4662 **** sourceTree = "<group>"; }; - 4AAB8C8E0728942400708844 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = text; - path = simple2.dsp; - refType = 4; - sourceTree = "<group>"; - }; 4AAB8C8F0728942400708844 = { fileEncoding = 30; --- 4633,4636 ---- *************** *** 4683,4694 **** sourceTree = "<group>"; }; - 4AAB8C920728944100708844 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = text.xml; - path = calib_camera.vcproj; - refType = 4; - sourceTree = "<group>"; - }; 4AAB8C930728944100708844 = { fileEncoding = 30; --- 4657,4660 ---- *************** *** 5509,5512 **** --- 5475,6096 ---- targetProxy = 4AB9FFA80651CE8C003B9097; }; + 4AC3C062075186FF0073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; + path = ccvt_c.c; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C063075186FF0073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = sourcecode.asm; + path = ccvt_i386.S; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C064075186FF0073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + path = ccvt.h; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C065075186FF0073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + path = jpegtorgb.h; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C06C075187D00073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = text; + path = object_data2; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C06D075187D00073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = text; + path = paddle_data; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C076075188AB0073D2C6 = { + children = ( + 4AC3C077075188AB0073D2C6, + 4AC3C078075188AB0073D2C6, + 4AC3C079075188AB0073D2C6, + 4AC3C07A075188AB0073D2C6, + ); + isa = PBXGroup; + path = graphicsTest; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C077075188AB0073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; + path = graphicsTest.c; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C078075188AB0073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = text; + path = graphicsTest.dsp; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C079075188AB0073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = text.xml; + path = graphicsTest.vcproj; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C07A075188AB0073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = text; + path = Makefile.in; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C07B075188AB0073D2C6 = { + children = ( + 4AC3C07C075188AB0073D2C6, + 4AC3C07D075188AB0073D2C6, + 4AC3C07E075188AB0073D2C6, + 4AC3C07F075188AB0073D2C6, + ); + isa = PBXGroup; + path = videoTest; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C07C075188AB0073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = text; + path = Makefile.in; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C07D075188AB0073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; + path = videoTest.c; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C07E075188AB0073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = text; + path = videoTest.dsp; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C07F075188AB0073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = text.xml; + path = videoTest.vcproj; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C08A07518AF80073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = text.xml; + path = calib_camera2.vcproj; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C09007518C7E0073D2C6 = { + children = ( + 4AC3C09107518C7E0073D2C6, + 4AC3C09207518C7E0073D2C6, + 4AC3C09307518C7E0073D2C6, + 4AC3C09407518C7E0073D2C6, + 4AC3C09507518C7E0073D2C6, + 4AC3C09607518C7E0073D2C6, + ); + isa = PBXGroup; + path = collide; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C09107518C7E0073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; + path = collideTest.c; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C09207518C7E0073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = text; + path = collideTest.dsp; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C09307518C7E0073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = text.xml; + path = collideTest.vcproj; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C09407518C7E0073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = text; + path = Makefile.in; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C09507518C7E0073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; + path = object.c; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C09607518C7E0073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + path = object.h; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C09707518C7E0073D2C6 = { + children = ( + 4AC3C09807518C7E0073D2C6, + 4AC3C09907518C7E0073D2C6, + 4AC3C09A07518C7E0073D2C6, + 4AC3C09B07518C7E0073D2C6, + 4AC3C09C07518C7E0073D2C6, + 4AC3C09D07518C7E0073D2C6, + ); + isa = PBXGroup; + path = loadMultiple; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C09807518C7E0073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; + path = loadMultiple.c; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C09907518C7E0073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = text; + path = loadMultiple.dsp; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C09A07518C7E0073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = text.xml; + path = loadMultiple.vcproj; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C09B07518C7E0073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = text; + path = Makefile.in; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C09C07518C7E0073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; + path = object.c; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C09D07518C7E0073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + path = object.h; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C09E07518C7E0073D2C6 = { + children = ( + 4AC3C09F07518C7E0073D2C6, + 4AC3C0A007518C7E0073D2C6, + 4AC3C0A107518C7E0073D2C6, + 4AC3C0A207518C7E0073D2C6, + 4AC3C0A307518C7E0073D2C6, + 4AC3C0A407518C7E0073D2C6, + ); + isa = PBXGroup; + path = paddle; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C09F07518C7E0073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = text; + path = Makefile.in; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C0A007518C7E0073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; + path = paddle.c; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C0A107518C7E0073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + path = paddle.h; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C0A207518C7E0073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; + path = paddleTest.c; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C0A307518C7E0073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = text; + path = paddleTest.dsp; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C0A407518C7E0073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = text.xml; + path = paddleTest.vcproj; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C0A507518C7E0073D2C6 = { + children = ( + 4AC3C0A607518C7E0073D2C6, + 4AC3C0A707518C7E0073D2C6, + 4AC3C0A807518C7E0073D2C6, + 4AC3C0A907518C7E0073D2C6, + 4AC3C0AA07518C7E0073D2C6, + 4AC3C0AB07518C7E0073D2C6, + 4AC3C0AC07518C7E0073D2C6, + 4AC3C0AD07518C7E0073D2C6, + 4AC3C0AE07518C7E0073D2C6, + 4AC3C0AF07518C7E0073D2C6, + ); + isa = PBXGroup; + path = paddleDemo; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C0A607518C7E0073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; + path = command_sub.c; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C0A707518C7E0073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + path = command_sub.h; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C0A807518C7E0073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = text; + path = Makefile.in; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C0A907518C7E0073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; + path = paddle.c; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C0AA07518C7E0073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + path = paddle.h; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C0AB07518C7E0073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; + path = paddleDemo.c; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C0AC07518C7E0073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = text; + path = paddleDemo.dsp; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C0AD07518C7E0073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = text.xml; + path = paddleDemo.vcproj; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C0AE07518C7E0073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; + path = util.c; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C0AF07518C7E0073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + path = util.h; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C0B007518C7E0073D2C6 = { + children = ( + 4AC3C0B107518C7E0073D2C6, + 4AC3C0B207518C7E0073D2C6, + 4AC3C0B307518C7E0073D2C6, + 4AC3C0B407518C7E0073D2C6, + 4AC3C0B507518C7E0073D2C6, + 4AC3C0B607518C7E0073D2C6, + ); + isa = PBXGroup; + path = paddleInteraction; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C0B107518C7E0073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = text; + path = Makefile.in; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C0B207518C7E0073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; + path = paddle.c; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C0B307518C7E0073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.h; + path = paddle.h; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C0B407518C7E0073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; + path = paddleInteractionTest.c; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C0B507518C7E0073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = text; + path = paddleInteractionTest.dsp; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C0B607518C7E0073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = text.xml; + path = paddleInteractionTest.vcproj; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C0B707518C7E0073D2C6 = { + children = ( + 4AC3C0B807518C7E0073D2C6, + 4AC3C0B907518C7E0073D2C6, + 4AC3C0BA07518C7E0073D2C6, + 4AC3C0BB07518C7E0073D2C6, + ); + isa = PBXGroup; + path = range; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C0B807518C7E0073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = text; + path = Makefile.in; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C0B907518C7E0073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; + path = rangeTest.c; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C0BA07518C7E0073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = text; + path = rangeTest.dsp; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C0BB07518C7E0073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = text.xml; + path = rangeTest.vcproj; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C0BC07518C7E0073D2C6 = { + children = ( + 4AC3C0BD07518C7E0073D2C6, + 4AC3C0BE07518C7E0073D2C6, + 4AC3C0BF07518C7E0073D2C6, + 4AC3C0C007518C7E0073D2C6, + ); + isa = PBXGroup; + path = twoView; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C0BD07518C7E0073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = text; + path = Makefile.in; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C0BE07518C7E0073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = sourcecode.c.c; + path = twoView.c; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C0BF07518C7E0073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = text; + path = twoView.dsp; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C0C007518C7E0073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = text.xml; + path = twoView.vcproj; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C0D607518E840073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = text; + path = modeTest.dsp; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C0DD07518F350073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = text; + path = multiTest.dsp; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C0DE07518F4B0073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = text; + path = relationTest.dsp; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C0DF07518F650073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = text; + path = simpleTest.dsp; + refType = 4; + sourceTree = "<group>"; + }; + 4AC3C0E007518F790073D2C6 = { + fileEncoding = 30; + isa = PBXFileReference; + lastKnownFileType = text; + path = simpleTest2.dsp; + refType = 4; + sourceTree = "<group>"; + }; 4ADF303606A78E0B00F6204E = { fileRef = 4A427D490484329900B56093; |
|
From: Philip L. <phi...@us...> - 2004-11-22 03:40:12
|
Update of /cvsroot/artoolkit/artoolkit/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25721 Modified Files: Makefile.in Log Message: Added new utils. Index: Makefile.in =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/util/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:01 -0000 1.1.1.1 --- Makefile.in 22 Nov 2004 03:38:53 -0000 1.2 *************** *** 1,3 **** --- 1,5 ---- all: + (cd graphicsTest; make -f Makefile) + (cd videoTest; make -f Makefile) (cd calib_distortion; make -f Makefile) (cd calib_cparam; make -f Makefile) *************** *** 6,9 **** --- 8,13 ---- clean: + (cd graphicsTest; make -f Makefile clean) + (cd videoTest; make -f Makefile clean) (cd calib_distortion; make -f Makefile clean) (cd calib_cparam; make -f Makefile clean) *************** *** 12,15 **** --- 16,21 ---- allclean: + (cd graphicsTest; make -f Makefile allclean) + (cd videoTest; make -f Makefile allclean) (cd calib_distortion; make -f Makefile allclean) (cd calib_cparam; make -f Makefile allclean) |
|
From: Philip L. <phi...@us...> - 2004-11-22 03:40:01
|
Update of /cvsroot/artoolkit/artoolkit/examples In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25666 Modified Files: Makefile.in Log Message: Added new examples. Index: Makefile.in =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/examples/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:50:55 -0000 1.1.1.1 --- Makefile.in 22 Nov 2004 03:38:40 -0000 1.2 *************** *** 1,30 **** all: ! (cd simple; make -f Makefile) ! (cd simple2; make -f Makefile) ! (cd simpleLite; make -f Makefile) ! (cd modeTest; make -f Makefile) ! (cd optical; make -f Makefile) ! (cd exview; make -f Makefile) ! (cd relation; make -f Makefile) ! (cd multi; make -f Makefile) ! clean: ! (cd simple; make -f Makefile clean) ! (cd simple2; make -f Makefile clean) ! (cd simpleLite; make -f Makefile clean) ! (cd modeTest; make -f Makefile clean) ! (cd optical; make -f Makefile clean) ! (cd exview; make -f Makefile clean) ! (cd relation; make -f Makefile clean) ! (cd multi; make -f Makefile clean) allclean: ! (cd simple; make -f Makefile allclean) ! (cd simple2; make -f Makefile allclean) ! (cd simpleLite; make -f Makefile allclean) ! (cd modeTest; make -f Makefile allclean) ! (cd optical; make -f Makefile allclean) ! (cd exview; make -f Makefile allclean) ! (cd relation; make -f Makefile allclean) ! (cd multi; make -f Makefile allclean) rm -f Makefile --- 1,51 ---- all: ! (cd simple; make -f Makefile) ! (cd simple2; make -f Makefile) ! (cd range; make -f Makefile) ! (cd loadMultiple; make -f Makefile) ! (cd relation; make -f Makefile) ! (cd collide; make -f Makefile) ! (cd multi; make -f Makefile) ! (cd paddle; make -f Makefile) ! (cd paddleInteraction; make -f Makefile) ! (cd paddleDemo; make -f Makefile) ! (cd simpleLite; make -f Makefile) ! (cd twoView; make -f Makefile) ! (cd optical; make -f Makefile) ! (cd modeTest; make -f Makefile) ! (cd exview; make -f Makefile) ! clean: ! (cd simple; make -f Makefile clean) ! (cd simple2; make -f Makefile clean) ! (cd range; make -f Makefile clean) ! (cd loadMultiple; make -f Makefile clean) ! (cd relation; make -f Makefile clean) ! (cd collide; make -f Makefile clean) ! (cd multi; make -f Makefile clean) ! (cd paddle; make -f Makefile clean) ! (cd paddleInteraction; make -f Makefile clean) ! (cd paddleDemo; make -f Makefile clean) ! (cd simpleLite; make -f Makefile clean) ! (cd twoView; make -f Makefile clean) ! (cd optical; make -f Makefile clean) ! (cd modeTest; make -f Makefile clean) ! (cd exview; make -f Makefile clean) allclean: ! (cd simple; make -f Makefile allclean) ! (cd simple2; make -f Makefile allclean) ! (cd range; make -f Makefile allclean) ! (cd loadMultiple; make -f Makefile allclean) ! (cd relation; make -f Makefile allclean) ! (cd collide; make -f Makefile allclean) ! (cd multi; make -f Makefile allclean) ! (cd paddle; make -f Makefile allclean) ! (cd paddleInteraction; make -f Makefile allclean) ! (cd paddleDemo; make -f Makefile allclean) ! (cd simpleLite; make -f Makefile allclean) ! (cd twoView; make -f Makefile allclean) ! (cd optical; make -f Makefile allclean) ! (cd modeTest; make -f Makefile allclean) ! (cd exview; make -f Makefile allclean) rm -f Makefile |
|
From: Philip L. <phi...@us...> - 2004-11-22 03:39:54
|
Update of /cvsroot/artoolkit/artoolkit/examples/paddle In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25628 Added Files: paddle.c paddleTest.dsp paddleTest.c Makefile.in paddle.h paddleTest.vcproj Log Message: Added new examples. --- NEW FILE: paddleTest.dsp --- # Microsoft Developer Studio Project File - Name="paddleTest" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Console Application" 0x0103 CFG=paddleTest - 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 "paddleTest.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 "paddleTest.mak" CFG="paddleTest - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "paddleTest - Win32 Release" (based on "Win32 (x86) Console Application") !MESSAGE "paddleTest - 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)" == "paddleTest - 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 libARmulti.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/paddleTest.exe" /libpath:"..\..\lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "paddleTest - 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 libARmultid.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/paddleTestd.exe" /pdbtype:sept /libpath:"..\..\lib" # SUBTRACT LINK32 /nodefaultlib !ENDIF # Begin Target # Name "paddleTest - Win32 Release" # Name "paddleTest - Win32 Debug" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File SOURCE=.\paddle.c # End Source File # Begin Source File SOURCE=.\paddleTest.c # End Source File # End Group # Begin Group "Header Files" # PROP Default_Filter "h;hpp;hxx;hm;inl" # Begin Source File SOURCE=.\paddle.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 --- NEW FILE: paddle.h --- #ifndef PADDLE_H #define PADDLE_H #include <AR/ar.h> #define PADDLE_RADIUS 41.0 typedef struct { char name[256]; int marker_id; double width; double center[2]; double trans[3][4]; double transL[3][4]; double transR[3][4]; int active; ARMarkerInfo prevInfo; ARMarkerInfo prevInfoL; ARMarkerInfo prevInfoR; int pcount; int pcountL; int pcountR; } ARPaddleInfo; ARPaddleInfo *paddleInit( char *name ); int paddleGetTrans( ARPaddleInfo *paddleInfo, ARMarkerInfo *markerInfo, int *flagL, int marker_num, ARParam *cparam ); #endif --- NEW FILE: paddle.c --- #include <stdio.h> #include <malloc.h> #include <stdlib.h> #include <AR/ar.h> #include "paddle.h" static ARMarkerInfo prevInfoL; static ARMarkerInfo prevInfoR; static int pcountL = 0; static int pcountR = 0; static char *get_buff( char *buf, int n, FILE *fp ); static int get_marker( ARMarkerInfo *markerInfo, int *markerFlag, int marker_num, int id, ARMarkerInfo *prevInfo, int *pcount ); ARPaddleInfo *paddleInit( char *name ) { FILE *fp; ARPaddleInfo *paddleInfo; char buf[256], buf1[256]; if( (fp=fopen(name, "r")) == NULL ) return(0); arMalloc( paddleInfo, ARPaddleInfo, 1 ); get_buff(buf, 256, fp); if( sscanf(buf, "%s", paddleInfo->name) != 1 ) { fclose(fp); free(paddleInfo); return 0; } get_buff(buf, 256, fp); if( sscanf(buf, "%s", buf1) != 1 ) { fclose(fp); free(paddleInfo); return 0; } if( (paddleInfo->marker_id = arLoadPatt(buf1)) < 0 ) { fclose(fp); free(paddleInfo); return 0; } get_buff(buf, 256, fp); if( sscanf(buf, "%lf", &paddleInfo->width) != 1 ) { fclose(fp); free(paddleInfo); return 0; } paddleInfo->center[0] = 0.0; paddleInfo->center[1] = 0.0; paddleInfo->active = 0; paddleInfo->pcount = 0; paddleInfo->pcountL = 0; paddleInfo->pcountR = 0; fclose(fp); return paddleInfo; } static char *get_buff( char *buf, int n, FILE *fp ) { char *ret; for(;;) { ret = fgets( buf, n, fp ); if( ret == NULL ) return(NULL); if( buf[0] != '\n' && buf[0] != '#' ) return(ret); } } int paddleGetTrans( ARPaddleInfo *paddleInfo, ARMarkerInfo *markerInfo, int *markerFlag, int marker_num, ARParam *cparam ) { int id; id = get_marker( markerInfo, markerFlag, marker_num, paddleInfo->marker_id, &(paddleInfo->prevInfo), &(paddleInfo->pcount) ); if( id == -1 ) { paddleInfo->active = 0; return 0; } arGetTransMat(&markerInfo[id], paddleInfo->center, paddleInfo->width, paddleInfo->trans); markerFlag[id] = 1; paddleInfo->active = 1; return 0; } static int get_marker( ARMarkerInfo *markerInfo, int *markerFlag, int marker_num, int id, ARMarkerInfo *prevInfo, int *pcount ) { double rlen, rlenmin, rarea, diff, diffmin; int cid, cdir; int i, j; cid = -1; for( i = 0; i < marker_num; i++ ) { if( markerInfo[i].id == id && markerFlag[i] == 0 ) { if( cid == -1 ) cid = i; else { if( markerInfo[cid].cf < markerInfo[i].cf ) cid = i; } } } if( cid == -1 ) { if( *pcount == 0 ) return -1; rlenmin = 10.0; for( i = 0; i < marker_num; i++ ) { if( markerFlag[i] ) continue; rarea = (double)prevInfo->area / (double)markerInfo[i].area; if( rarea < 0.7 || rarea > 1.43 ) continue; rlen = ( (markerInfo[i].pos[0] - prevInfo->pos[0]) * (markerInfo[i].pos[0] - prevInfo->pos[0]) + (markerInfo[i].pos[1] - prevInfo->pos[1]) * (markerInfo[i].pos[1] - prevInfo->pos[1]) ) / markerInfo[i].area; if( rlen < 0.5 && rlen < rlenmin ) { rlenmin = rlen; cid = i; } } if( cid >= 0 && markerInfo[cid].cf < prevInfo->cf ) { markerInfo[cid].cf = prevInfo->cf; markerInfo[cid].id = prevInfo->id; diffmin = 10000.0 * 10000.0; cdir = -1; for( i = 0; i < 4; i++ ) { diff = 0.0; for( j = 0; j < 4; j++ ) { diff += (prevInfo->vertex[j][0] - markerInfo[cid].vertex[(i+j)%4][0]) * (prevInfo->vertex[j][0] - markerInfo[cid].vertex[(i+j)%4][0]) + (prevInfo->vertex[j][1] - markerInfo[cid].vertex[(i+j)%4][1]) * (prevInfo->vertex[j][1] - markerInfo[cid].vertex[(i+j)%4][1]); } if( diff < diffmin ) { diffmin = diff; cdir = (prevInfo->dir - i + 4) % 4; } } markerInfo[cid].dir = cdir; *prevInfo = markerInfo[cid]; *pcount = 1; } else { *pcount = 0; return -1; } } else { *prevInfo = markerInfo[cid]; *pcount = 1; } return cid; } --- NEW FILE: Makefile.in --- INC_DIR= ../../include LIB_DIR= ../../lib BIN_DIR= ../../bin LDFLAG=@LDFLAG@ -L$(LIB_DIR) LIBS= -lARgsub -lARvideo -lARMulti -lAR @LIBS@ CFLAG= @CFLAG@ -I$(INC_DIR) OBJS = paddle.o HEADDERS = paddle.h all: $(BIN_DIR)/paddleTest $(BIN_DIR)/paddleTest: paddleTest.o $(OBJS) cc -o $(BIN_DIR)/paddleTest paddleTest.o $(OBJS) $(LDFLAG) $(LIBS) paddleTest.o: paddleTest.c $(HEADDERS) cc -c $(CFLAG) paddleTest.c paddle.o: paddle.c $(HEADDERS) cc -c $(CFLAG) paddle.c clean: rm -f *.o rm -f $(BIN_DIR)/paddleTest allclean: rm -f *.o rm -f $(BIN_DIR)/paddleTest rm -f Makefile --- NEW FILE: paddleTest.c --- #ifdef _WIN32 #include <windows.h> #endif #include <stdio.h> #include <stdlib.h> #include <string.h> #include <math.h> #include <GL/gl.h> #include <GL/glut.h> #include <AR/gsub.h> #include <AR/param.h> #include <AR/ar.h> #include <AR/video.h> #include <AR/arMulti.h> #include "paddle.h" int draw_paddle( ARPaddleInfo *paddleInfo ); int xsize, ysize; int thresh = 100; int count = 0; char *cparam_name = "Data/camera_para.dat"; ARParam cparam; /* set video capture configuration */ /*****************************************************************************/ // modified by Thomas Pintaric, Vienna University of Technology #ifdef _WIN32 char *vconf = "flipV,showDlg"; // see video.h for a list of supported parameters #else char *vconf = ""; #endif /*****************************************************************************/ char *config_name = "Data/multi/marker.dat"; ARMultiMarkerInfoT *config; //MB - paddle information int marker_flag[AR_SQUARE_MAX]; ARPaddleInfo *paddleInfo; char *paddle_name = "Data/paddle_data"; static void init(void); static void cleanup(void); static void keyEvent( unsigned char key, int x, int y); static void mainLoop(void); static void draw( double trans1[3][4], double trans2[3][4], int mode ); int main() { //initialize application init(); arVideoCapStart(); //start the main event loop argMainLoop( NULL, keyEvent, mainLoop ); return 0; } static void keyEvent( unsigned char key, int x, int y) { /* quit if the ESC key is pressed */ if( key == 0x1b ) { printf("*** %f (frame/sec)\n", (double)count/arUtilTimer()); cleanup(); exit(0); } /* turn on and off the debug mode with d key */ if( key == 'd' ) { printf("*** %f (frame/sec)\n", (double)count/arUtilTimer()); arDebug = 1 - arDebug; if( arDebug == 0 ) { glClearColor( 0.0, 0.0, 0.0, 0.0 ); glClear(GL_COLOR_BUFFER_BIT); argSwapBuffers(); glClear(GL_COLOR_BUFFER_BIT); argSwapBuffers(); } count = 0; } } /* main loop */ static void mainLoop(void) { ARUint8 *dataPtr; ARMarkerInfo *marker_info; int marker_num; int i; double err; /* grab a video frame */ if( (dataPtr = (ARUint8 *)arVideoGetImage()) == NULL ) { arUtilSleep(2); return; } if( count == 0 ) arUtilTimerReset(); count++; /* detect the markers in the video frame */ if( arDetectMarkerLite(dataPtr, thresh, &marker_info, &marker_num) < 0 ) { cleanup(); exit(0); } argDrawMode2D(); if( !arDebug ) { argDispImage( dataPtr, 0,0 ); } else { argDispImage( dataPtr, 1, 1 ); if( arImageProcMode == AR_IMAGE_PROC_IN_HALF ) argDispHalfImage( arImage, 0, 0 ); else argDispImage( arImage, 0, 0); glColor3f( 1.0, 0.0, 0.0 ); glLineWidth( 1.0 ); for( i = 0; i < marker_num; i++ ) { argDrawSquare( marker_info[i].vertex, 0, 0 ); } glLineWidth( 1.0 ); } arVideoCapNext(); //MB - multiple marker tracking for( i = 0; i < marker_num; i++ ) marker_flag[i] = 0; /* get the paddle position */ paddleGetTrans(paddleInfo, marker_info, marker_flag, marker_num, &cparam); /* draw the 3D models */ glClearDepth( 1.0 ); glClear(GL_DEPTH_BUFFER_BIT); /* draw the paddle */ if( paddleInfo->active ){ draw_paddle( paddleInfo); } /* get the translation from the multimarker pattern */ if( (err=arMultiGetTransMat(marker_info, marker_num, config)) < 0 ) { argSwapBuffers(); return; } //printf("err = %f\n", err); if(err > 100.0 ) { argSwapBuffers(); return; } /* draw the multimarker pattern */ for( i = 0; i < config->marker_num; i++ ) { if( config->marker[i].visible >= 0 ) draw( config->trans, config->marker[i].trans, 0 ); else draw( config->trans, config->marker[i].trans, 1 ); } argSwapBuffers(); } static void init( void ) { ARParam wparam; /* open the video path */ if( arVideoOpen( vconf ) < 0 ) exit(0); /* find the size of the window */ if( arVideoInqSize(&xsize, &ysize) < 0 ) exit(0); printf("Image size (x,y) = (%d,%d)\n", xsize, ysize); /* set the initial camera parameters */ if( arParamLoad(cparam_name, 1, &wparam) < 0 ) { printf("Camera parameter load error !!\n"); exit(0); } arParamChangeSize( &wparam, xsize, ysize, &cparam ); arInitCparam( &cparam ); printf("*** Camera Parameter ***\n"); arParamDisp( &cparam ); /* load the paddle marker file */ if( (paddleInfo = paddleInit(paddle_name)) == NULL ) { printf("paddleInit error!!\n"); exit(0); } printf("Loaded Paddle File\n"); if( (config = arMultiReadConfigFile(config_name)) == NULL ) { printf("config data load error !!\n"); exit(0); } printf("Loaded Multi Marker File\n"); /* open the graphics window */ // argInit( &cparam, 2.0, 0, 2, 1, 0 ); argInit( &cparam, 1.0, 0, 0, 0, 0 ); } /* cleanup function called when program exits */ static void cleanup(void) { arVideoCapStop(); arVideoClose(); argCleanup(); } static void draw( double trans1[3][4], double trans2[3][4], int mode ) { double gl_para[16]; GLfloat mat_ambient[] = {0.0, 0.0, 1.0, 1.0}; GLfloat mat_ambient1[] = {1.0, 0.0, 0.0, 1.0}; GLfloat mat_flash[] = {0.0, 0.0, 1.0, 1.0}; GLfloat mat_flash1[] = {1.0, 0.0, 0.0, 1.0}; GLfloat mat_flash_shiny[] = {50.0}; GLfloat mat_flash_shiny1[]= {50.0}; GLfloat light_position[] = {100.0,-200.0,200.0,0.0}; GLfloat ambi[] = {0.1, 0.1, 0.1, 0.1}; GLfloat lightZeroColor[] = {0.9, 0.9, 0.9, 0.1}; argDrawMode3D(); argDraw3dCamera( 0, 0 ); glEnable(GL_DEPTH_TEST); glDepthFunc(GL_LEQUAL); /* load the camera transformation matrix */ glMatrixMode(GL_MODELVIEW); argConvGlpara(trans1, gl_para); glLoadMatrixd( gl_para ); argConvGlpara(trans2, gl_para); glMultMatrixd( gl_para ); if( mode == 0 ) { glEnable(GL_LIGHTING); glEnable(GL_LIGHT0); glLightfv(GL_LIGHT0, GL_POSITION, light_position); glLightfv(GL_LIGHT0, GL_AMBIENT, ambi); glLightfv(GL_LIGHT0, GL_DIFFUSE, lightZeroColor); glMaterialfv(GL_FRONT, GL_SPECULAR, mat_flash); glMaterialfv(GL_FRONT, GL_SHININESS, mat_flash_shiny); glMaterialfv(GL_FRONT, GL_AMBIENT, mat_ambient); } else { glEnable(GL_LIGHTING); glEnable(GL_LIGHT0); glLightfv(GL_LIGHT0, GL_POSITION, light_position); glLightfv(GL_LIGHT0, GL_AMBIENT, ambi); glLightfv(GL_LIGHT0, GL_DIFFUSE, lightZeroColor); glMaterialfv(GL_FRONT, GL_SPECULAR, mat_flash1); glMaterialfv(GL_FRONT, GL_SHININESS, mat_flash_shiny1); glMaterialfv(GL_FRONT, GL_AMBIENT, mat_ambient1); } glMatrixMode(GL_MODELVIEW); glTranslatef( 0.0, 0.0, 25.0 ); if( !arDebug ) glutSolidCube(50.0); else glutWireCube(50.0); glDisable( GL_LIGHTING ); glDisable( GL_DEPTH_TEST ); argDrawMode2D(); } /* draw the paddle - using a stencil buffer */ int draw_paddle( ARPaddleInfo *paddleInfo ) { double gl_para[16]; int i; argDrawMode3D(); glEnable(GL_DEPTH_TEST); glDepthFunc(GL_LEQUAL); argDraw3dCamera( 0, 0 ); argConvGlpara(paddleInfo->trans, gl_para); glMatrixMode(GL_MODELVIEW); glLoadMatrixd( gl_para ); /* draw the paddle graphics */ glColor3f( 1.0, 0.0, 0.0 ); glLineWidth(4.0); glBegin(GL_LINE_LOOP); glVertex2f( -25.0, -25.0 ); glVertex2f( 25.0, -25.0 ); glVertex2f( 25.0, 25.0 ); glVertex2f( -25.0, 25.0 ); glEnd(); glColor3f( 0.0, 0.0, 1.0); glBegin(GL_LINE_LOOP); for( i = 0; i < 16; i++ ) { double x, y; x = PADDLE_RADIUS * cos(i*3.141592*2/16); y = PADDLE_RADIUS * sin(i*3.141592*2/16); glVertex2d( x, y ); } glEnd(); glBegin(GL_LINE_LOOP); glVertex2f( -7.5, 0.0 ); glVertex2f( 7.5, 0.0 ); glVertex2f( 7.5, -105.0 ); glVertex2f( -7.5, -105.0 ); glEnd(); /* start drawing the stencil */ glEnable(GL_BLEND); glBlendFunc(GL_ZERO,GL_ONE); glColor4f(1,1,1,0); glBegin(GL_POLYGON); for( i = 0; i < 16; i++ ) { double x, y; x = 40.0 * cos(i*3.141592*2/16); y = 40.0 * sin(i*3.141592*2/16); glVertex2d( x, y ); } glEnd(); glBegin(GL_POLYGON); glVertex2f( -7.5, 0.0 ); glVertex2f( 7.5, 0.0 ); glVertex2f( 7.5, -105.0 ); glVertex2f( -7.5, -105.0 ); glEnd(); glDisable(GL_BLEND); glDisable(GL_DEPTH_TEST); argDrawMode2D(); return 0; } --- NEW FILE: paddleTest.vcproj --- <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" Version="7.10" Name="paddleTest" ProjectGUID="{FDE263E5-1713-4E16-8199-663CAECA981E}"> <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 libARMultid.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 libARMulti.lib libARgsub.lib libARvideo.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="paddleTest.c"> </File> <File RelativePath="paddle.c"> </File> <File RelativePath="paddle.h"> </File> </Files> <Globals> </Globals> </VisualStudioProject> |
|
From: Philip L. <phi...@us...> - 2004-11-22 03:39:41
|
Update of /cvsroot/artoolkit/artoolkit/examples/simpleLite In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25601 Modified Files: simpleLite.vcproj Log Message: Added new examples. Index: simpleLite.vcproj =================================================================== RCS file: /cvsroot/artoolkit/artoolkit/examples/simpleLite/simpleLite.vcproj,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** simpleLite.vcproj 4 Nov 2004 08:51:11 -0000 1.1.1.1 --- simpleLite.vcproj 22 Nov 2004 03:38:25 -0000 1.2 *************** *** 109,113 **** UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> <File ! RelativePath=".\simpleLite.c"> </File> </Filter> --- 109,113 ---- UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"> <File ! RelativePath="simpleLite.c"> </File> </Filter> |
|
From: Philip L. <phi...@us...> - 2004-11-22 03:39:32
|
Update of /cvsroot/artoolkit/artoolkit/examples/range In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25565 Added Files: rangeTest.vcproj rangeTest.dsp Makefile.in rangeTest.c Log Message: Added new examples. --- NEW FILE: Makefile.in --- INC_DIR= ../../include LIB_DIR= ../../lib BIN_DIR= ../../bin LDFLAG=@LDFLAG@ -L$(LIB_DIR) LIBS= -lARgsub -lARvideo -lAR @LIBS@ CFLAG= @CFLAG@ -I$(INC_DIR) OBJS = HEADDERS = all: $(BIN_DIR)/rangeTest $(BIN_DIR)/rangeTest: rangeTest.o $(OBJS) cc -o $(BIN_DIR)/rangeTest rangeTest.o $(OBJS) $(LDFLAG) $(LIBS) rangeTest.o: rangeTest.c $(HEADDERS) cc -c $(CFLAG) rangeTest.c clean: rm -f *.o rm -f $(BIN_DIR)/rangeTest allclean: rm -f *.o rm -f $(BIN_DIR)/rangeTest rm -f Makefile --- NEW FILE: rangeTest.c --- #ifdef _WIN32 #include <windows.h> #endif #include <stdio.h> #include <stdlib.h> #include <string.h> #include <math.h> #include <GL/gl.h> #include <GL/glut.h> #include <AR/gsub.h> #include <AR/param.h> #include <AR/ar.h> #include <AR/video.h> char *patt_name = "Data/patt.hiro"; int patt_id; int marker_width = 80.0; double marker_center[2] = {0.0, 0.0}; double marker_trans[3][4]; int xsize, ysize; int thresh = 100; int count = 0; /* set video capture configuration */ /*****************************************************************************/ // modified by Thomas Pintaric, Vienna University of Technology #ifdef _WIN32 char *vconf = "flipV,showDlg"; // see video.h for a list of supported parameters #else char *vconf = ""; #endif /*****************************************************************************/ char *cparam_name = "Data/camera_para.dat"; ARParam cparam; static void init(void); static void cleanup(void); static void keyEvent( unsigned char key, int x, int y); static void mainLoop(void); static void draw(double marker_trans[3][4],double range); int main() { //initialize applications init(); arVideoCapStart(); //start the main event loop argMainLoop( NULL, keyEvent, mainLoop ); return 0; } static void keyEvent( unsigned char key, int x, int y) { /* quit if the ESC key is pressed */ if( key == 0x1b ) { printf("*** %f (frame/sec)\n", (double)count/arUtilTimer()); cleanup(); exit(0); } } /* main loop */ static void mainLoop(void) { ARUint8 *dataPtr; ARMarkerInfo *marker_info; int marker_num; int i,k; float Xpos, Ypos, Zpos; double range; /* grab a video frame */ if( (dataPtr = (ARUint8 *)arVideoGetImage()) == NULL ) { arUtilSleep(2); return; } if( count == 0 ) arUtilTimerReset(); count++; /*draw the video*/ argDrawMode2D(); argDispImage( dataPtr, 0,0 ); glColor3f( 1.0, 0.0, 0.0 ); glLineWidth(6.0); /* detect the markers in the video frame */ if(arDetectMarker(dataPtr, thresh, &marker_info, &marker_num) < 0 ) { cleanup(); exit(0); } arVideoCapNext(); for( i = 0; i < marker_num; i++ ) { argDrawSquare(marker_info[i].vertex,0,0); } /* check for known patterns */ k = -1; for( i = 0; i < marker_num; i++ ) { if( marker_info[i].id == patt_id) { /* you've found a pattern */ printf("Found pattern: %d ",patt_id); glColor3f( 0.0, 1.0, 0.0 ); argDrawSquare(marker_info[i].vertex,0,0); if( k == -1 ) k = i; else /* make sure you have the best pattern (highest confidence factor) */ if( marker_info[k].cf < marker_info[i].cf ) k = i; } } if( k == -1 ) { argSwapBuffers(); return; } /* get the transformation between the marker and the real camera */ arGetTransMat(&marker_info[k], marker_center, marker_width, marker_trans); /* find the range */ Xpos = marker_trans[0][3]; Ypos = marker_trans[1][3]; Zpos = marker_trans[2][3]; range = sqrt(Xpos*Xpos+Ypos*Ypos+Zpos*Zpos); printf(" X: %3.2f Y: %3.2f Z: %3.2f Range: %3.2f \n",Xpos,Ypos,Zpos,range); /* draw the AR graphics */ draw(marker_trans,range); /*swap the graphics buffers*/ argSwapBuffers(); } static void init( void ) { ARParam wparam; /* open the video path */ if( arVideoOpen( vconf ) < 0 ) exit(0); /* find the size of the window */ if( arVideoInqSize(&xsize, &ysize) < 0 ) exit(0); printf("Image size (x,y) = (%d,%d)\n", xsize, ysize); /* set the initial camera parameters */ if( arParamLoad(cparam_name, 1, &wparam) < 0 ) { printf("Camera parameter load error !!\n"); exit(0); } arParamChangeSize( &wparam, xsize, ysize, &cparam ); arInitCparam( &cparam ); printf("*** Camera Parameter ***\n"); arParamDisp( &cparam ); /* load pattern file */ if(patt_id=arLoadPatt (patt_name) < 0) { printf ("Pattern file load error !! \n"); exit(0); } /* open the graphics window */ argInit( &cparam, 2.0, 0, 0, 0, 0 ); } /* cleanup function called when program exits */ static void cleanup(void) { arVideoCapStop(); arVideoClose(); argCleanup(); } static void draw(double marker_trans[3][4], double range) { double gl_para[16]; double myScale; GLfloat mat_ambient[] = {0.0, 0.0, 1.0, 1.0}; GLfloat mat_flash[] = {0.0, 0.0, 1.0, 1.0}; GLfloat mat_flash_shiny[] = {50.0}; GLfloat light_position[] = {100.0,-200.0,200.0,0.0}; GLfloat ambi[] = {0.1, 0.1, 0.1, 0.1}; GLfloat lightZeroColor[] = {0.9, 0.9, 0.9, 0.1}; /* set the openGL projection mode */ argDrawMode3D(); argDraw3dCamera( 0, 0 ); glClearDepth( 1.0 ); glClear(GL_DEPTH_BUFFER_BIT); glEnable(GL_DEPTH_TEST); glDepthFunc(GL_LEQUAL); /* load the camera transformation matrix */ argConvGlpara(marker_trans, gl_para); glMatrixMode(GL_MODELVIEW); glLoadMatrixd( gl_para ); /* set the material */ glEnable(GL_LIGHTING); glEnable(GL_LIGHT0); glLightfv(GL_LIGHT0, GL_POSITION, light_position); glLightfv(GL_LIGHT0, GL_AMBIENT, ambi); glLightfv(GL_LIGHT0, GL_DIFFUSE, lightZeroColor); glMaterialfv(GL_FRONT, GL_SPECULAR, mat_flash); glMaterialfv(GL_FRONT, GL_SHININESS, mat_flash_shiny); glMaterialfv(GL_FRONT, GL_AMBIENT, mat_ambient); /* draw the object */ myScale = range/200.0; glScalef(myScale,myScale,myScale); glRotatef( 90, 1.0, 0.0, 0.0 ); glTranslatef( 0.0, 17.5, 0.0 ); glutSolidTeapot(30); glDisable( GL_LIGHTING ); glDisable( GL_DEPTH_TEST ); } --- NEW FILE: rangeTest.vcproj --- <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" Version="7.10" Name="rangeTest" ProjectGUID="{43965D43-1F96-4C4C-AB04-912B388A779C}"> <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 libARgsub.lib libARvideo.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="rangeTest.c"> </File> </Files> <Globals> </Globals> </VisualStudioProject> --- NEW FILE: rangeTest.dsp --- # Microsoft Developer Studio Project File - Name="rangeTest" - Package Owner=<4> # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** # TARGTYPE "Win32 (x86) Console Application" 0x0103 CFG=rangeTest - 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 "rangeTest.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 "rangeTest.mak" CFG="rangeTest - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "rangeTest - Win32 Release" (based on "Win32 (x86) Console Application") !MESSAGE "rangeTest - 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)" == "rangeTest - 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/rangeTest.exe" /libpath:"..\..\lib" # SUBTRACT LINK32 /nodefaultlib !ELSEIF "$(CFG)" == "rangeTest - 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/rangeTestd.exe" /pdbtype:sept /libpath:"..\..\lib" # SUBTRACT LINK32 /nodefaultlib !ENDIF # Begin Target # Name "rangeTest - Win32 Release" # Name "rangeTest - Win32 Debug" # Begin Group "Source Files" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File SOURCE=.\rangeTest.c # End Source File # End Group # Begin Group "Header Files" # PROP Default_Filter "h;hpp;hxx;hm;inl" # 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 |
