Thread: [artoolkit-commits] SF.net SVN: artoolkit: [272] trunk/artoolkit
Optical marker tracking and overlay for augmented reality.
Brought to you by:
philip_lamb
Menu
▾
▴
artoolkit-commits
|
From: <ret...@us...> - 2007-10-29 02:05:20
|
Revision: 272
http://artoolkit.svn.sourceforge.net/artoolkit/?rev=272&view=rev
Author: retrakker
Date: 2007-10-28 19:05:23 -0700 (Sun, 28 Oct 2007)
Log Message:
-----------
minor fixes for compilation on MacOS X Leopardand Ubuntu 7.10
Modified Paths:
--------------
trunk/artoolkit/ARToolKit.xcodeproj/project.pbxproj
trunk/artoolkit/doc/gsub_lite/CompositePage.html
trunk/artoolkit/doc/gsub_lite/DataTypes/DataTypes.html
trunk/artoolkit/doc/gsub_lite/Functions/Functions.html
trunk/artoolkit/doc/gsub_lite/gsub_lite.html
trunk/artoolkit/doc/gsub_lite/index.html
trunk/artoolkit/doc/gsub_lite/toc.html
trunk/artoolkit/util/calib_camera2/main.c
trunk/artoolkit/util/calib_cparam/calib_cparam.c
trunk/artoolkit/util/calib_distortion/calib_dist.c
Modified: trunk/artoolkit/ARToolKit.xcodeproj/project.pbxproj
===================================================================
--- trunk/artoolkit/ARToolKit.xcodeproj/project.pbxproj 2007-10-01 02:11:58 UTC (rev 271)
+++ trunk/artoolkit/ARToolKit.xcodeproj/project.pbxproj 2007-10-29 02:05:23 UTC (rev 272)
@@ -3280,6 +3280,7 @@
08FB7793FE84155DC02AAC07 /* Project object */ = {
isa = PBXProject;
buildConfigurationList = 4A7E913D085904A2001E80E8 /* Build configuration list for PBXProject "ARToolKit" */;
+ compatibilityVersion = "Xcode 2.4";
hasScannedForEncodings = 1;
mainGroup = 08FB7794FE84155DC02AAC07 /* ARToolKit */;
productRefGroup = 08FB7794FE84155DC02AAC07 /* ARToolKit */;
Modified: trunk/artoolkit/doc/gsub_lite/CompositePage.html
===================================================================
--- trunk/artoolkit/doc/gsub_lite/CompositePage.html 2007-10-01 02:11:58 UTC (rev 271)
+++ trunk/artoolkit/doc/gsub_lite/CompositePage.html 2007-10-29 02:05:23 UTC (rev 272)
@@ -1,16 +1,20 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
"http://www.w3.org/TR/1998/REC-html40-19980424/loose.dtd">
<html><head>
- <title>gsub_lite</title>
+ <title>gsub_lite </title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <meta name="generator" content="HeaderDoc">
-<style type="text/css"><!--a:link {text-decoration: none; font-family: lucida grande, geneva, helvetica, arial, sans-serif; font-size: small; color: #0000ff;}a:visited {text-decoration: none; font-family: lucida grande, geneva, helvetica, arial, sans-serif; font-size: small; color: #0000ff;}a:visited:hover {text-decoration: underline; font-family: lucida grande, geneva, helvetica, arial, sans-serif; font-size: small; color: #ff6600;}a:active {text-decoration: none; font-family: lucida grande, geneva, helvetica, arial, sans-serif; font-size: small; color: #ff6600;}a:hover {text-decoration: underline; font-family: lucida grande, geneva, helvetica, arial, sans-serif; font-size: small; color: #ff6600;}h4 {text-decoration: none; font-family: lucida grande, geneva, helvetica, arial, sans-serif; font-size: tiny; font-weight: bold;}body {text-decoration: none; font-family: lucida grande, geneva, helvetica, arial, sans-serif; font-size: 10pt;}--></style></head><body bgcolor="#ffffff">
-<h1><font face="Geneva,Arial,Helvtica">gsub_lite</font></h1><br>
-<a name="//apple_ref/doc/header/gsub_lite.h" title="gsub_lite"></a>
-<h2>Abstract</h2>
-A collection of useful OpenGL routines for ARToolKit.
-<h2>Discussion</h2>
-Sample code for example usage of gsub_lite is included with
+ <meta name="generator" content="HeaderDoc" />
+<style type="text/css"><!--.keyword {background:#ffffff; color:#761550;}.template {background:#ffffff; color:#761550;}.number {background: #ffffff; color:#0000ff;}.function {background:#ffffff; color:#000000;}.string {background: #ffffff; color:#891315;}.preprocessor {background:#ffffff; color:#236e25}.comment {background:#ffffff; color:#236e25}.char {background: #ffffff; color:#0000ff;}.var {background:#ffffff; color:#000000;}.type {background:#ffffff; color:#761550;}.param {background:#ffffff; color:#000000;}a:link {text-decoration: none; font-family: lucida grande, geneva, helvetica, arial, sans-serif; font-size: small; color: #0000ff;}a:visited {text-decoration: none; font-family: lucida grande, geneva, helvetica, arial, sans-serif; font-size: small; color: #0000ff;}a:visited:hover {text-decoration: underline; font-family: lucida grande, geneva, helvetica, arial, sans-serif; font-size: small; color: #ff6600;}a:active {text-decoration: none; font-family: lucida grande, geneva, helvetica, arial, sans-serif; font-size: small; color: #ff6600;}a:hover {text-decoration: underline; font-family: lucida grande, geneva, helvetica, arial, sans-serif; font-size: small; color: #ff6600;}h4 {text-decoration: none; font-family: lucida grande, geneva, helvetica, arial, sans-serif; font-size: tiny; font-weight: bold;}body {text-decoration: none; font-family: lucida grande, geneva, helvetica, arial, sans-serif; font-size: 10pt;}--></style></head><body bgcolor="#ffffff">
+<a name="top"></a>
+<a name="//apple_ref/doc/header/gsub_lite.h" title="gsub_lite "></a>
+<hr><table border="0" cellpadding="2" cellspacing="2" width="300"><tr><td valign="top" height="12" colspan="5"><h1><a name="gsub_lite">gsub_lite </a></h1>
+</td></tr></table><hr><p><!-- begin abstract -->A collection of useful OpenGL routines for ARToolKit.
+<!-- end abstract --></p>
+<p></p><dl><b>Includes:</b> <!-- a logicalPath="//apple_ref/doc/header/config.h" --><AR/config.h><!-- /a -->,
+<!-- a logicalPath="//apple_ref/doc/header/ar.h" --><AR/ar.h><!-- /a -->,
+<!-- a logicalPath="//apple_ref/doc/header/param.h" --><AR/param.h><!-- /a --><br>
+</dl><h5 class="tight"><font face="Lucida Grande,Helvetica,Arial">Discussion</font>
+</h5><p><!-- begin discussion -->Sample code for example usage of gsub_lite is included with
ARToolKit, in the directory <AR/examples/simpleLite>.
<br><br>
gsub_lite is the preferred means for drawing camera video
@@ -66,87 +70,89 @@
along with ARToolKit; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
<br><br>
+<!-- end discussion --></p>
+<p></p><dl><dt><i>Updated:</i></dt><dd>Tuesday, May 23, 2006</dd>
+</dl>
<hr><br><h2>Functions</h2>
<a name="HeaderDoc_functions"></a>
<dl>
-<dt><tt><a href="CompositePage.html#//apple_ref/doc/compositePage/c/func/arglCameraFrustum" target="_top">arglCameraFrustum</a></tt></dt>
+<dt><tt><a href="CompositePage.html#//apple_ref/doc/compositePage/c/func/arglCameraFrustum" target="_top">arglCameraFrustum </a></tt></dt>
<dd>Create an OpenGL perspective projection matrix.
</dd>
-<dt><tt><a href="CompositePage.html#//apple_ref/doc/compositePage/c/func/arglCameraFrustumRH" target="_top">arglCameraFrustumRH</a></tt></dt>
+<dt><tt><a href="CompositePage.html#//apple_ref/doc/compositePage/c/func/arglCameraFrustumRH" target="_top">arglCameraFrustumRH </a></tt></dt>
<dd>(description)
</dd>
-<dt><tt><a href="CompositePage.html#//apple_ref/doc/compositePage/c/func/arglCameraView" target="_top">arglCameraView</a></tt></dt>
+<dt><tt><a href="CompositePage.html#//apple_ref/doc/compositePage/c/func/arglCameraView" target="_top">arglCameraView </a></tt></dt>
<dd>Create an OpenGL viewing transformation matrix.
</dd>
-<dt><tt><a href="CompositePage.html#//apple_ref/doc/compositePage/c/func/arglCameraViewRH" target="_top">arglCameraViewRH</a></tt></dt>
+<dt><tt><a href="CompositePage.html#//apple_ref/doc/compositePage/c/func/arglCameraViewRH" target="_top">arglCameraViewRH </a></tt></dt>
<dd>(description)
</dd>
-<dt><tt><a href="CompositePage.html#//apple_ref/doc/compositePage/c/func/arglCleanup" target="_top">arglCleanup</a></tt></dt>
+<dt><tt><a href="CompositePage.html#//apple_ref/doc/compositePage/c/func/arglCleanup" target="_top">arglCleanup </a></tt></dt>
<dd>Free memory used by gsub_lite associated with the specified context.
</dd>
-<dt><tt><a href="CompositePage.html#//apple_ref/doc/compositePage/c/func/arglDispImage" target="_top">arglDispImage</a></tt></dt>
+<dt><tt><a href="CompositePage.html#//apple_ref/doc/compositePage/c/func/arglDispImage" target="_top">arglDispImage </a></tt></dt>
<dd>Display an ARVideo image, by drawing it using OpenGL.
</dd>
-<dt><tt><a href="CompositePage.html#//apple_ref/doc/compositePage/c/func/arglDispImageStateful" target="_top">arglDispImageStateful</a></tt></dt>
+<dt><tt><a href="CompositePage.html#//apple_ref/doc/compositePage/c/func/arglDispImageStateful" target="_top">arglDispImageStateful </a></tt></dt>
<dd>Display an ARVideo image, by drawing it using OpenGL, using and modifying current OpenGL state.
</dd>
-<dt><tt><a href="CompositePage.html#//apple_ref/doc/compositePage/c/func/arglDistortionCompensationGet" target="_top">arglDistortionCompensationGet</a></tt></dt>
+<dt><tt><a href="CompositePage.html#//apple_ref/doc/compositePage/c/func/arglDistortionCompensationGet" target="_top">arglDistortionCompensationGet </a></tt></dt>
<dd>Enquire as to the enable state of camera lens distortion compensation in arglDispImage.
</dd>
-<dt><tt><a href="CompositePage.html#//apple_ref/doc/compositePage/c/func/arglDistortionCompensationSet" target="_top">arglDistortionCompensationSet</a></tt></dt>
+<dt><tt><a href="CompositePage.html#//apple_ref/doc/compositePage/c/func/arglDistortionCompensationSet" target="_top">arglDistortionCompensationSet </a></tt></dt>
<dd>Set compensation for camera lens distortion in arglDispImage to off or on.
</dd>
-<dt><tt><a href="CompositePage.html#//apple_ref/doc/compositePage/c/func/arglDrawModeGet" target="_top">arglDrawModeGet</a></tt></dt>
+<dt><tt><a href="CompositePage.html#//apple_ref/doc/compositePage/c/func/arglDrawModeGet" target="_top">arglDrawModeGet </a></tt></dt>
<dd>Get method by which arglDispImage() is transfering pixels.
</dd>
-<dt><tt><a href="CompositePage.html#//apple_ref/doc/compositePage/c/func/arglDrawModeSet" target="_top">arglDrawModeSet</a></tt></dt>
+<dt><tt><a href="CompositePage.html#//apple_ref/doc/compositePage/c/func/arglDrawModeSet" target="_top">arglDrawModeSet </a></tt></dt>
<dd>Set method by which arglDispImage() will transfer pixels.
</dd>
-<dt><tt><a href="CompositePage.html#//apple_ref/doc/compositePage/c/func/arglPixelFormatGet" target="_top">arglPixelFormatGet</a></tt></dt>
+<dt><tt><a href="CompositePage.html#//apple_ref/doc/compositePage/c/func/arglPixelFormatGet" target="_top">arglPixelFormatGet </a></tt></dt>
<dd>Get the format of pixel data in which arglDispImage*() is expecting data to be passed.
</dd>
-<dt><tt><a href="CompositePage.html#//apple_ref/doc/compositePage/c/func/arglPixelFormatSet" target="_top">arglPixelFormatSet</a></tt></dt>
+<dt><tt><a href="CompositePage.html#//apple_ref/doc/compositePage/c/func/arglPixelFormatSet" target="_top">arglPixelFormatSet </a></tt></dt>
<dd>Set the format of pixel data which will be passed to arglDispImage*()
</dd>
-<dt><tt><a href="CompositePage.html#//apple_ref/doc/compositePage/c/func/arglSetupForCurrentContext" target="_top">arglSetupForCurrentContext</a></tt></dt>
+<dt><tt><a href="CompositePage.html#//apple_ref/doc/compositePage/c/func/arglSetupForCurrentContext" target="_top">arglSetupForCurrentContext </a></tt></dt>
<dd>Initialise the gsub_lite library for the current OpenGL context.
</dd>
-<dt><tt><a href="CompositePage.html#//apple_ref/doc/compositePage/c/func/arglTexmapModeGet" target="_top">arglTexmapModeGet</a></tt></dt>
+<dt><tt><a href="CompositePage.html#//apple_ref/doc/compositePage/c/func/arglTexmapModeGet" target="_top">arglTexmapModeGet </a></tt></dt>
<dd>Enquire whether full or half-resolution TexImage2D pixel-transfer is being used in arglDispImage().
</dd>
-<dt><tt><a href="CompositePage.html#//apple_ref/doc/compositePage/c/func/arglTexmapModeSet" target="_top">arglTexmapModeSet</a></tt></dt>
+<dt><tt><a href="CompositePage.html#//apple_ref/doc/compositePage/c/func/arglTexmapModeSet" target="_top">arglTexmapModeSet </a></tt></dt>
<dd>Determines use of full or half-resolution TexImage2D pixel-transfer in arglDispImage().
</dd>
-<dt><tt><a href="CompositePage.html#//apple_ref/doc/compositePage/c/func/arglTexRectangleGet" target="_top">arglTexRectangleGet</a></tt></dt>
+<dt><tt><a href="CompositePage.html#//apple_ref/doc/compositePage/c/func/arglTexRectangleGet" target="_top">arglTexRectangleGet </a></tt></dt>
<dd>Enquire as to use of rectangular TexImage2D pixel-transfer in arglDispImage().
</dd>
-<dt><tt><a href="CompositePage.html#//apple_ref/doc/compositePage/c/func/arglTexRectangleSet" target="_top">arglTexRectangleSet</a></tt></dt>
+<dt><tt><a href="CompositePage.html#//apple_ref/doc/compositePage/c/func/arglTexRectangleSet" target="_top">arglTexRectangleSet </a></tt></dt>
<dd>Determines use of rectangular TexImage2D pixel-transfer in arglDispImage().
</dd>
</dl>
<hr><!-- headerDoc=func; uid=//apple_ref/doc/compositePage/c/func/arglCameraFrustum; name=arglCameraFrustum -->
<a name="//apple_ref/doc/compositePage/c/func/arglCameraFrustum"></a>
-<table border="0" cellpadding="2" cellspacing="2" width="300"><tr><td valign="top" height="12" colspan="5"><h3><a name="arglCameraFrustum">arglCameraFrustum</a></h3>
-</td></tr></table><hr><dl></dl><p>Create an OpenGL perspective projection matrix.
-</p>
-<blockquote><pre><!-- a logicalPath="//apple_ref/c/cl/void //apple_ref/c/cl/void //apple_ref/c/tdef/void //apple_ref/c/tag/void //apple_ref/c/econst/void //apple_ref/c/struct/void //apple_ref/c/clconst/void" --><font class="type">void</font><!-- /a --> <!-- a logicalPath="//apple_ref/c/instm/arglCameraFrustum //apple_ref/c/clm/arglCameraFrustum //apple_ref/c/intfcm/arglCameraFrustum //apple_ref/c/func/arglCameraFrustum //apple_ref/c/ftmplt/arglCameraFrustum //apple_ref/c/defn/arglCameraFrustum //apple_ref/c/macro/arglCameraFrustum" --><font class="function">arglCameraFrustum</font><!-- /a -->(
- <font class="keyword">const</font> <!-- a logicalPath="//apple_ref/c/cl/ARParam //apple_ref/c/cl/ARParam //apple_ref/c/tdef/ARParam //apple_ref/c/tag/ARParam //apple_ref/c/econst/ARParam //apple_ref/c/struct/ARParam //apple_ref/c/clconst/ARParam" --><font class="type">ARParam</font><!-- /a --> *<font class="param">cparam</font>,
- <font class="keyword">const</font> <!-- a logicalPath="//apple_ref/c/cl/double //apple_ref/c/cl/double //apple_ref/c/tdef/double //apple_ref/c/tag/double //apple_ref/c/econst/double //apple_ref/c/struct/double //apple_ref/c/clconst/double" --><font class="type">double</font><!-- /a --> <font class="param">focalmin</font>,
- <font class="keyword">const</font> <!-- a logicalPath="//apple_ref/c/cl/double //apple_ref/c/cl/double //apple_ref/c/tdef/double //apple_ref/c/tag/double //apple_ref/c/econst/double //apple_ref/c/struct/double //apple_ref/c/clconst/double" --><font class="type">double</font><!-- /a --> <font class="param">focalmax</font>,
- <!-- a logicalPath="//apple_ref/c/cl/GLdouble //apple_ref/c/cl/GLdouble //apple_ref/c/tdef/GLdouble //apple_ref/c/tag/GLdouble //apple_ref/c/econst/GLdouble //apple_ref/c/struct/GLdouble //apple_ref/c/clconst/GLdouble" --><font class="type">GLdouble</font><!-- /a --> <!-- a logicalPath="//apple_ref/c/cl/m_projection //apple_ref/c/cl/m_projection //apple_ref/c/tdef/m_projection //apple_ref/c/tag/m_projection //apple_ref/c/econst/m_projection //apple_ref/c/struct/m_projection //apple_ref/c/clconst/m_projection" --><font class="type">m_projection</font><!-- /a -->[<font class="number">16</font>]); </pre></blockquote>
-<h5><font face="Lucida Grande,Helvetica,Arial">Parameter Descriptions</font></h5>
-<blockquote>
+<table border="0" cellpadding="2" cellspacing="2" width="300"><tr><td valign="top" height="12" colspan="5"><h3><a name="arglCameraFrustum">arglCameraFrustum </a></h3>
+</td></tr></table><hr><p><!-- begin abstract -->Create an OpenGL perspective projection matrix.
+<!-- end abstract --></p>
+<p></p><pre><!-- a logicalPath="//apple_ref/c/cl/void //apple_ref/c/tdef/void //apple_ref/c/tag/void //apple_ref/c/econst/void //apple_ref/c/struct/void //apple_ref/c/clconst/void //apple_ref/c/intf/void" --><span class="type">void</span><!-- /a --> <!-- a logicalPath="//apple_ref/c/instm/arglCameraFrustum //apple_ref/c/clm/arglCameraFrustum //apple_ref/c/intfcm/arglCameraFrustum //apple_ref/c/intfm/arglCameraFrustum //apple_ref/c/func/arglCameraFrustum //apple_ref/c/ftmplt/arglCameraFrustum //apple_ref/c/defn/arglCameraFrustum //apple_ref/c/macro/arglCameraFrustum" --><span class="function">arglCameraFrustum</span><!-- /a -->(
+ <span class="keyword">const</span> <!-- a logicalPath="//apple_ref/c/cl/ARParam //apple_ref/c/tdef/ARParam //apple_ref/c/tag/ARParam //apple_ref/c/econst/ARParam //apple_ref/c/struct/ARParam //apple_ref/c/clconst/ARParam //apple_ref/c/intf/ARParam" --><span class="type">ARParam</span><!-- /a --> *<span class="param">cparam</span>,
+ <span class="keyword">const</span> <!-- a logicalPath="//apple_ref/c/cl/double //apple_ref/c/tdef/double //apple_ref/c/tag/double //apple_ref/c/econst/double //apple_ref/c/struct/double //apple_ref/c/clconst/double //apple_ref/c/intf/double" --><span class="type">double</span><!-- /a --> <span class="param">focalmin</span>,
+ <span class="keyword">const</span> <!-- a logicalPath="//apple_ref/c/cl/double //apple_ref/c/tdef/double //apple_ref/c/tag/double //apple_ref/c/econst/double //apple_ref/c/struct/double //apple_ref/c/clconst/double //apple_ref/c/intf/double" --><span class="type">double</span><!-- /a --> <span class="param">focalmax</span>,
+ <!-- a logicalPath="//apple_ref/c/cl/GLdouble //apple_ref/c/tdef/GLdouble //apple_ref/c/tag/GLdouble //apple_ref/c/econst/GLdouble //apple_ref/c/struct/GLdouble //apple_ref/c/clconst/GLdouble //apple_ref/c/intf/GLdouble" --><span class="type">GLdouble</span><!-- /a --> <!-- a logicalPath="//apple_ref/c/cl/m_projection //apple_ref/c/tdef/m_projection //apple_ref/c/tag/m_projection //apple_ref/c/econst/m_projection //apple_ref/c/struct/m_projection //apple_ref/c/clconst/m_projection //apple_ref/c/intf/m_projection" --><span class="type">m_projection</span><!-- /a -->[<span class="number">16</span>]); </pre>
+<h5 class="tight"><font face="Lucida Grande,Helvetica,Arial">Parameters</font></h5>
<dl>
-<dt><code><i>cparam</i></code></dt><dd>Pointer to a set of ARToolKit camera parameters for the
+<dt><code>cparam </code></dt><dd>Pointer to a set of ARToolKit camera parameters for the
current video source.</dd>
-<dt><code><i>focalmax</i></code></dt><dd>The maximum distance at which geometry will be rendered.
+<dt><code>focalmax </code></dt><dd>The maximum distance at which geometry will be rendered.
Any geometry further away from the camera than this distance will be clipped
and will not be appear in a rendered frame. Thus, this value should be
set high enough to avoid clipping of any geometry you care about. However,
the precision of the depth buffer is correlated with the ratio of focalmin
to focalmax, thus you should not set focalmax any higher than it needs to be.
This value should be specified in the same units as your OpenGL drawing.</dd>
-<dt><code><i>focalmin</i></code></dt><dd>The minimum distance at which geometry will be rendered.
+<dt><code>focalmin </code></dt><dd>The minimum distance at which geometry will be rendered.
Any geometry closer to the camera than this distance will be clipped
and will not be appear in a rendered frame. Thus, this value should be
set low enough to avoid clipping of any geometry you care about. However,
@@ -157,125 +163,119 @@
perspectives you should set this value no lower than the near-point of
the eyes. The near point in humans varies, but usually lies between 0.1 m
0.3 m. This value should be specified in the same units as your OpenGL drawing.</li></ol></dd>
-<dt><code><i>m_projection</i></code></dt><dd>Pointer to a array of 16 GLdoubles, which will be filled
+<dt><code>m_projection </code></dt><dd>Pointer to a array of 16 GLdoubles, which will be filled
out with a projection matrix suitable for passing to OpenGL. The matrix
is specified in column major order.</dd>
</dl>
-</blockquote>
-<dl><h5><font face="Lucida Grande,Helvetica,Arial">Discussion</font></h5><p>Use this function to create a matrix suitable for passing to OpenGL
+<h5 class="tight"><font face="Lucida Grande,Helvetica,Arial">Discussion</font>
+</h5><p><!-- begin discussion -->Use this function to create a matrix suitable for passing to OpenGL
to set the viewing projection.
-</p>
-<dt><i>Availability</i></dt><dd>First appeared in ARToolKit 2.68.
+<!-- end discussion --></p>
+<p></p><dl><dt><i>Availability</i></dt><dd>First appeared in ARToolKit 2.68.
</dd>
</dl>
<hr><!-- headerDoc=func; uid=//apple_ref/doc/compositePage/c/func/arglCameraFrustumRH; name=arglCameraFrustumRH -->
<a name="//apple_ref/doc/compositePage/c/func/arglCameraFrustumRH"></a>
-<table border="0" cellpadding="2" cellspacing="2" width="300"><tr><td valign="top" height="12" colspan="5"><h3><a name="arglCameraFrustumRH">arglCameraFrustumRH</a></h3>
-</td></tr></table><hr><dl></dl><p>(description)
-</p>
-<blockquote><pre><!-- a logicalPath="//apple_ref/c/cl/void //apple_ref/c/cl/void //apple_ref/c/tdef/void //apple_ref/c/tag/void //apple_ref/c/econst/void //apple_ref/c/struct/void //apple_ref/c/clconst/void" --><font class="type">void</font><!-- /a --> <!-- a logicalPath="//apple_ref/c/instm/arglCameraFrustumRH //apple_ref/c/clm/arglCameraFrustumRH //apple_ref/c/intfcm/arglCameraFrustumRH //apple_ref/c/func/arglCameraFrustumRH //apple_ref/c/ftmplt/arglCameraFrustumRH //apple_ref/c/defn/arglCameraFrustumRH //apple_ref/c/macro/arglCameraFrustumRH" --><font class="function">arglCameraFrustumRH</font><!-- /a -->(
- <font class="keyword">const</font> <!-- a logicalPath="//apple_ref/c/cl/ARParam //apple_ref/c/cl/ARParam //apple_ref/c/tdef/ARParam //apple_ref/c/tag/ARParam //apple_ref/c/econst/ARParam //apple_ref/c/struct/ARParam //apple_ref/c/clconst/ARParam" --><font class="type">ARParam</font><!-- /a --> *<font class="param">cparam</font>,
- <font class="keyword">const</font> <!-- a logicalPath="//apple_ref/c/cl/double //apple_ref/c/cl/double //apple_ref/c/tdef/double //apple_ref/c/tag/double //apple_ref/c/econst/double //apple_ref/c/struct/double //apple_ref/c/clconst/double" --><font class="type">double</font><!-- /a --> <font class="param">focalmin</font>,
- <font class="keyword">const</font> <!-- a logicalPath="//apple_ref/c/cl/double //apple_ref/c/cl/double //apple_ref/c/tdef/double //apple_ref/c/tag/double //apple_ref/c/econst/double //apple_ref/c/struct/double //apple_ref/c/clconst/double" --><font class="type">double</font><!-- /a --> <font class="param">focalmax</font>,
- <!-- a logicalPath="//apple_ref/c/cl/GLdouble //apple_ref/c/cl/GLdouble //apple_ref/c/tdef/GLdouble //apple_ref/c/tag/GLdouble //apple_ref/c/econst/GLdouble //apple_ref/c/struct/GLdouble //apple_ref/c/clconst/GLdouble" --><font class="type">GLdouble</font><!-- /a --> <!-- a logicalPath="//apple_ref/c/cl/m_projection //apple_ref/c/cl/m_projection //apple_ref/c/tdef/m_projection //apple_ref/c/tag/m_projection //apple_ref/c/econst/m_projection //apple_ref/c/struct/m_projection //apple_ref/c/clconst/m_projection" --><font class="type">m_projection</font><!-- /a -->[<font class="number">16</font>]); </pre></blockquote>
-<h5><font face="Lucida Grande,Helvetica,Arial">Parameter Descriptions</font></h5>
-<blockquote>
+<table border="0" cellpadding="2" cellspacing="2" width="300"><tr><td valign="top" height="12" colspan="5"><h3><a name="arglCameraFrustumRH">arglCameraFrustumRH </a></h3>
+</td></tr></table><hr><p><!-- begin abstract -->(description)
+<!-- end abstract --></p>
+<p></p><pre><!-- a logicalPath="//apple_ref/c/cl/void //apple_ref/c/tdef/void //apple_ref/c/tag/void //apple_ref/c/econst/void //apple_ref/c/struct/void //apple_ref/c/clconst/void //apple_ref/c/intf/void" --><span class="type">void</span><!-- /a --> <!-- a logicalPath="//apple_ref/c/instm/arglCameraFrustumRH //apple_ref/c/clm/arglCameraFrustumRH //apple_ref/c/intfcm/arglCameraFrustumRH //apple_ref/c/intfm/arglCameraFrustumRH //apple_ref/c/func/arglCameraFrustumRH //apple_ref/c/ftmplt/arglCameraFrustumRH //apple_ref/c/defn/arglCameraFrustumRH //apple_ref/c/macro/arglCameraFrustumRH" --><span class="function">arglCameraFrustumRH</span><!-- /a -->(
+ <span class="keyword">const</span> <!-- a logicalPath="//apple_ref/c/cl/ARParam //apple_ref/c/tdef/ARParam //apple_ref/c/tag/ARParam //apple_ref/c/econst/ARParam //apple_ref/c/struct/ARParam //apple_ref/c/clconst/ARParam //apple_ref/c/intf/ARParam" --><span class="type">ARParam</span><!-- /a --> *<span class="param">cparam</span>,
+ <span class="keyword">const</span> <!-- a logicalPath="//apple_ref/c/cl/double //apple_ref/c/tdef/double //apple_ref/c/tag/double //apple_ref/c/econst/double //apple_ref/c/struct/double //apple_ref/c/clconst/double //apple_ref/c/intf/double" --><span class="type">double</span><!-- /a --> <span class="param">focalmin</span>,
+ <span class="keyword">const</span> <!-- a logicalPath="//apple_ref/c/cl/double //apple_ref/c/tdef/double //apple_ref/c/tag/double //apple_ref/c/econst/double //apple_ref/c/struct/double //apple_ref/c/clconst/double //apple_ref/c/intf/double" --><span class="type">double</span><!-- /a --> <span class="param">focalmax</span>,
+ <!-- a logicalPath="//apple_ref/c/cl/GLdouble //apple_ref/c/tdef/GLdouble //apple_ref/c/tag/GLdouble //apple_ref/c/econst/GLdouble //apple_ref/c/struct/GLdouble //apple_ref/c/clconst/GLdouble //apple_ref/c/intf/GLdouble" --><span class="type">GLdouble</span><!-- /a --> <!-- a logicalPath="//apple_ref/c/cl/m_projection //apple_ref/c/tdef/m_projection //apple_ref/c/tag/m_projection //apple_ref/c/econst/m_projection //apple_ref/c/struct/m_projection //apple_ref/c/clconst/m_projection //apple_ref/c/intf/m_projection" --><span class="type">m_projection</span><!-- /a -->[<span class="number">16</span>]); </pre>
+<h5 class="tight"><font face="Lucida Grande,Helvetica,Arial">Parameters</font></h5>
<dl>
-<dt><code><i>(name)</i></code></dt><dd>(description)</dd>
+<dt><code>(name) </code></dt><dd>(description)</dd>
</dl>
-</blockquote>
-<dl><dt><i>function result</i></dt><dd>(description)
-</dd>
-<h5><font face="Lucida Grande,Helvetica,Arial">Discussion</font></h5><p>(description)
-</p>
-</dl>
-<hr><!-- headerDoc=func; uid=//apple_ref/doc/compositePage/c/func/arglCameraView; name=arglCameraView -->
+<h5 class="tight"><font face="Lucida Grande,Helvetica,Arial">Return Value</font></h5><p><!-- begin return value -->(description)
+
+<!-- end return value --></p><h5 class="tight"><font face="Lucida Grande,Helvetica,Arial">Discussion</font>
+</h5><p><!-- begin discussion -->(description)
+<!-- end discussion --></p>
+<p></p><hr><!-- headerDoc=func; uid=//apple_ref/doc/compositePage/c/func/arglCameraView; name=arglCameraView -->
<a name="//apple_ref/doc/compositePage/c/func/arglCameraView"></a>
-<table border="0" cellpadding="2" cellspacing="2" width="300"><tr><td valign="top" height="12" colspan="5"><h3><a name="arglCameraView">arglCameraView</a></h3>
-</td></tr></table><hr><dl></dl><p>Create an OpenGL viewing transformation matrix.
-</p>
-<blockquote><pre><!-- a logicalPath="//apple_ref/c/cl/void //apple_ref/c/cl/void //apple_ref/c/tdef/void //apple_ref/c/tag/void //apple_ref/c/econst/void //apple_ref/c/struct/void //apple_ref/c/clconst/void" --><font class="type">void</font><!-- /a --> <!-- a logicalPath="//apple_ref/c/instm/arglCameraView //apple_ref/c/clm/arglCameraView //apple_ref/c/intfcm/arglCameraView //apple_ref/c/func/arglCameraView //apple_ref/c/ftmplt/arglCameraView //apple_ref/c/defn/arglCameraView //apple_ref/c/macro/arglCameraView" --><font class="function">arglCameraView</font><!-- /a -->(
- <font class="keyword">const</font> <!-- a logicalPath="//apple_ref/c/cl/double //apple_ref/c/cl/double //apple_ref/c/tdef/double //apple_ref/c/tag/double //apple_ref/c/econst/double //apple_ref/c/struct/double //apple_ref/c/clconst/double" --><font class="type">double</font><!-- /a --> <!-- a logicalPath="//apple_ref/c/cl/para //apple_ref/c/cl/para //apple_ref/c/tdef/para //apple_ref/c/tag/para //apple_ref/c/econst/para //apple_ref/c/struct/para //apple_ref/c/clconst/para" --><font class="type">para</font><!-- /a -->[<font class="number">3</font>][<font class="number">4</font>],
- <!-- a logicalPath="//apple_ref/c/cl/GLdouble //apple_ref/c/cl/GLdouble //apple_ref/c/tdef/GLdouble //apple_ref/c/tag/GLdouble //apple_ref/c/econst/GLdouble //apple_ref/c/struct/GLdouble //apple_ref/c/clconst/GLdouble" --><font class="type">GLdouble</font><!-- /a --> <!-- a logicalPath="//apple_ref/c/cl/m_modelview //apple_ref/c/cl/m_modelview //apple_ref/c/tdef/m_modelview //apple_ref/c/tag/m_modelview //apple_ref/c/econst/m_modelview //apple_ref/c/struct/m_modelview //apple_ref/c/clconst/m_modelview" --><font class="type">m_modelview</font><!-- /a -->[<font class="number">16</font>],
- <font class="keyword">const</font> <!-- a logicalPath="//apple_ref/c/cl/double //apple_ref/c/cl/double //apple_ref/c/tdef/double //apple_ref/c/tag/double //apple_ref/c/econst/double //apple_ref/c/struct/double //apple_ref/c/clconst/double" --><font class="type">double</font><!-- /a --> <font class="param">scale</font>); </pre></blockquote>
-<h5><font face="Lucida Grande,Helvetica,Arial">Parameter Descriptions</font></h5>
-<blockquote>
+<table border="0" cellpadding="2" cellspacing="2" width="300"><tr><td valign="top" height="12" colspan="5"><h3><a name="arglCameraView">arglCameraView </a></h3>
+</td></tr></table><hr><p><!-- begin abstract -->Create an OpenGL viewing transformation matrix.
+<!-- end abstract --></p>
+<p></p><pre><!-- a logicalPath="//apple_ref/c/cl/void //apple_ref/c/tdef/void //apple_ref/c/tag/void //apple_ref/c/econst/void //apple_ref/c/struct/void //apple_ref/c/clconst/void //apple_ref/c/intf/void" --><span class="type">void</span><!-- /a --> <!-- a logicalPath="//apple_ref/c/instm/arglCameraView //apple_ref/c/clm/arglCameraView //apple_ref/c/intfcm/arglCameraView //apple_ref/c/intfm/arglCameraView //apple_ref/c/func/arglCameraView //apple_ref/c/ftmplt/arglCameraView //apple_ref/c/defn/arglCameraView //apple_ref/c/macro/arglCameraView" --><span class="function">arglCameraView</span><!-- /a -->(
+ <span class="keyword">const</span> <!-- a logicalPath="//apple_ref/c/cl/double //apple_ref/c/tdef/double //apple_ref/c/tag/double //apple_ref/c/econst/double //apple_ref/c/struct/double //apple_ref/c/clconst/double //apple_ref/c/intf/double" --><span class="type">double</span><!-- /a --> <!-- a logicalPath="//apple_ref/c/cl/para //apple_ref/c/tdef/para //apple_ref/c/tag/para //apple_ref/c/econst/para //apple_ref/c/struct/para //apple_ref/c/clconst/para //apple_ref/c/intf/para" --><span class="type">para</span><!-- /a -->[<span class="number">3</span>][<span class="number">4</span>],
+ <!-- a logicalPath="//apple_ref/c/cl/GLdouble //apple_ref/c/tdef/GLdouble //apple_ref/c/tag/GLdouble //apple_ref/c/econst/GLdouble //apple_ref/c/struct/GLdouble //apple_ref/c/clconst/GLdouble //apple_ref/c/intf/GLdouble" --><span class="type">GLdouble</span><!-- /a --> <!-- a logicalPath="//apple_ref/c/cl/m_modelview //apple_ref/c/tdef/m_modelview //apple_ref/c/tag/m_modelview //apple_ref/c/econst/m_modelview //apple_ref/c/struct/m_modelview //apple_ref/c/clconst/m_modelview //apple_ref/c/intf/m_modelview" --><span class="type">m_modelview</span><!-- /a -->[<span class="number">16</span>],
+ <span class="keyword">const</span> <!-- a logicalPath="//apple_ref/c/cl/double //apple_ref/c/tdef/double //apple_ref/c/tag/double //apple_ref/c/econst/double //apple_ref/c/struct/double //apple_ref/c/clconst/double //apple_ref/c/intf/double" --><span class="type">double</span><!-- /a --> <span class="param">scale</span>); </pre>
+<h5 class="tight"><font face="Lucida Grande,Helvetica,Arial">Parameters</font></h5>
<dl>
-<dt><code><i>para</i></code></dt><dd>Pointer to 3x4 matrix array of doubles which specify the
+<dt><code>para </code></dt><dd>Pointer to 3x4 matrix array of doubles which specify the
position of an ARToolKit marker, as returned by arGetTransMat().</dd>
-<dt><code><i>m_modelview</i></code></dt><dd>Pointer to a array of 16 GLdoubles, which will be filled
+<dt><code>m_modelview </code></dt><dd>Pointer to a array of 16 GLdoubles, which will be filled
out with a modelview matrix suitable for passing to OpenGL. The matrix
is specified in column major order.</dd>
-<dt><code><i>scale</i></code></dt><dd>Specifies a scaling between ARToolKit's
+<dt><code>scale </code></dt><dd>Specifies a scaling between ARToolKit's
units (usually millimeters) and OpenGL's coordinate system units.
What you pass for the scalefactor parameter depends on what units you
-want to do your OpenGL drawing in. If you use a scalefactor of 1.0, then<br>
+want to do your OpenGL drawing in. If you use a scalefactor of 1.0, then
+1.0 OpenGL unit will equal 1.0 millimetre (ARToolKit's default units).
To use different OpenGL units, e.g. metres, then you would pass 0.001.</li></ol></dd>
</dl>
-</blockquote>
-<dl><h5><font face="Lucida Grande,Helvetica,Arial">Discussion</font></h5><p>Use this function to create a matrix suitable for passing to OpenGL
+<h5 class="tight"><font face="Lucida Grande,Helvetica,Arial">Discussion</font>
+</h5><p><!-- begin discussion -->Use this function to create a matrix suitable for passing to OpenGL
to set the viewing transformation of the virtual camera.
-</p>
-<dt><i>Availability</i></dt><dd>First appeared in ARToolKit 2.68.
+<!-- end discussion --></p>
+<p></p><dl><dt><i>Availability</i></dt><dd>First appeared in ARToolKit 2.68.
</dd>
</dl>
<hr><!-- headerDoc=func; uid=//apple_ref/doc/compositePage/c/func/arglCameraViewRH; name=arglCameraViewRH -->
<a name="//apple_ref/doc/compositePage/c/func/arglCameraViewRH"></a>
-<table border="0" cellpadding="2" cellspacing="2" width="300"><tr><td valign="top" height="12" colspan="5"><h3><a name="arglCameraViewRH">arglCameraViewRH</a></h3>
-</td></tr></table><hr><dl></dl><p>(description)
-</p>
-<blockquote><pre><!-- a logicalPath="//apple_ref/c/cl/void //apple_ref/c/cl/void //apple_ref/c/tdef/void //apple_ref/c/tag/void //apple_ref/c/econst/void //apple_ref/c/struct/void //apple_ref/c/clconst/void" --><font class="type">void</font><!-- /a --> <!-- a logicalPath="//apple_ref/c/instm/arglCameraViewRH //apple_ref/c/clm/arglCameraViewRH //apple_ref/c/intfcm/arglCameraViewRH //apple_ref/c/func/arglCameraViewRH //apple_ref/c/ftmplt/arglCameraViewRH //apple_ref/c/defn/arglCameraViewRH //apple_ref/c/macro/arglCameraViewRH" --><font class="function">arglCameraViewRH</font><!-- /a -->(
- <font class="keyword">const</font> <!-- a logicalPath="//apple_ref/c/cl/double //apple_ref/c/cl/double //apple_ref/c/tdef/double //apple_ref/c/tag/double //apple_ref/c/econst/double //apple_ref/c/struct/double //apple_ref/c/clconst/double" --><font class="type">double</font><!-- /a --> <!-- a logicalPath="//apple_ref/c/cl/para //apple_ref/c/cl/para //apple_ref/c/tdef/para //apple_ref/c/tag/para //apple_ref/c/econst/para //apple_ref/c/struct/para //apple_ref/c/clconst/para" --><font class="type">para</font><!-- /a -->[<font class="number">3</font>][<font class="number">4</font>],
- <!-- a logicalPath="//apple_ref/c/cl/GLdouble //apple_ref/c/cl/GLdouble //apple_ref/c/tdef/GLdouble //apple_ref/c/tag/GLdouble //apple_ref/c/econst/GLdouble //apple_ref/c/struct/GLdouble //apple_ref/c/clconst/GLdouble" --><font class="type">GLdouble</font><!-- /a --> <!-- a logicalPath="//apple_ref/c/cl/m_modelview //apple_ref/c/cl/m_modelview //apple_ref/c/tdef/m_modelview //apple_ref/c/tag/m_modelview //apple_ref/c/econst/m_modelview //apple_ref/c/struct/m_modelview //apple_ref/c/clconst/m_modelview" --><font class="type">m_modelview</font><!-- /a -->[<font class="number">16</font>],
- <font class="keyword">const</font> <!-- a logicalPath="//apple_ref/c/cl/double //apple_ref/c/cl/double //apple_ref/c/tdef/double //apple_ref/c/tag/double //apple_ref/c/econst/double //apple_ref/c/struct/double //apple_ref/c/clconst/double" --><font class="type">double</font><!-- /a --> <font class="param">scale</font>); </pre></blockquote>
-<h5><font face="Lucida Grande,Helvetica,Arial">Parameter Descriptions</font></h5>
-<blockquote>
+<table border="0" cellpadding="2" cellspacing="2" width="300"><tr><td valign="top" height="12" colspan="5"><h3><a name="arglCameraViewRH">arglCameraViewRH </a></h3>
+</td></tr></table><hr><p><!-- begin abstract -->(description)
+<!-- end abstract --></p>
+<p></p><pre><!-- a logicalPath="//apple_ref/c/cl/void //apple_ref/c/tdef/void //apple_ref/c/tag/void //apple_ref/c/econst/void //apple_ref/c/struct/void //apple_ref/c/clconst/void //apple_ref/c/intf/void" --><span class="type">void</span><!-- /a --> <!-- a logicalPath="//apple_ref/c/instm/arglCameraViewRH //apple_ref/c/clm/arglCameraViewRH //apple_ref/c/intfcm/arglCameraViewRH //apple_ref/c/intfm/arglCameraViewRH //apple_ref/c/func/arglCameraViewRH //apple_ref/c/ftmplt/arglCameraViewRH //apple_ref/c/defn/arglCameraViewRH //apple_ref/c/macro/arglCameraViewRH" --><span class="function">arglCameraViewRH</span><!-- /a -->(
+ <span class="keyword">const</span> <!-- a logicalPath="//apple_ref/c/cl/double //apple_ref/c/tdef/double //apple_ref/c/tag/double //apple_ref/c/econst/double //apple_ref/c/struct/double //apple_ref/c/clconst/double //apple_ref/c/intf/double" --><span class="type">double</span><!-- /a --> <!-- a logicalPath="//apple_ref/c/cl/para //apple_ref/c/tdef/para //apple_ref/c/tag/para //apple_ref/c/econst/para //apple_ref/c/struct/para //apple_ref/c/clconst/para //apple_ref/c/intf/para" --><span class="type">para</span><!-- /a -->[<span class="number">3</span>][<span class="number">4</span>],
+ <!-- a logicalPath="//apple_ref/c/cl/GLdouble //apple_ref/c/tdef/GLdouble //apple_ref/c/tag/GLdouble //apple_ref/c/econst/GLdouble //apple_ref/c/struct/GLdouble //apple_ref/c/clconst/GLdouble //apple_ref/c/intf/GLdouble" --><span class="type">GLdouble</span><!-- /a --> <!-- a logicalPath="//apple_ref/c/cl/m_modelview //apple_ref/c/tdef/m_modelview //apple_ref/c/tag/m_modelview //apple_ref/c/econst/m_modelview //apple_ref/c/struct/m_modelview //apple_ref/c/clconst/m_modelview //apple_ref/c/intf/m_modelview" --><span class="type">m_modelview</span><!-- /a -->[<span class="number">16</span>],
+ <span class="keyword">const</span> <!-- a logicalPath="//apple_ref/c/cl/double //apple_ref/c/tdef/double //apple_ref/c/tag/double //apple_ref/c/econst/double //apple_ref/c/struct/double //apple_ref/c/clconst/double //apple_ref/c/intf/double" --><span class="type">double</span><!-- /a --> <span class="param">scale</span>); </pre>
+<h5 class="tight"><font face="Lucida Grande,Helvetica,Arial">Parameters</font></h5>
<dl>
-<dt><code><i>(name)</i></code></dt><dd>(description)</dd>
+<dt><code>(name) </code></dt><dd>(description)</dd>
</dl>
-</blockquote>
-<dl><dt><i>function result</i></dt><dd>(description)
-</dd>
-<h5><font face="Lucida Grande,Helvetica,Arial">Discussion</font></h5><p>(description)
-</p>
-</dl>
-<hr><!-- headerDoc=func; uid=//apple_ref/doc/compositePage/c/func/arglCleanup; name=arglCleanup -->
+<h5 class="tight"><font face="Lucida Grande,Helvetica,Arial">Return Value</font></h5><p><!-- begin return value -->(description)
+
+<!-- end return value --></p><h5 class="tight"><font face="Lucida Grande,Helvetica,Arial">Discussion</font>
+</h5><p><!-- begin discussion -->(description)
+<!-- end discussion --></p>
+<p></p><hr><!-- headerDoc=func; uid=//apple_ref/doc/compositePage/c/func/arglCleanup; name=arglCleanup -->
<a name="//apple_ref/doc/compositePage/c/func/arglCleanup"></a>
-<table border="0" cellpadding="2" cellspacing="2" width="300"><tr><td valign="top" height="12" colspan="5"><h3><a name="arglCleanup">arglCleanup</a></h3>
-</td></tr></table><hr><dl></dl><p>Free memory used by gsub_lite associated with the specified context.
-</p>
-<blockquote><pre><!-- a logicalPath="//apple_ref/c/cl/void //apple_ref/c/cl/void //apple_ref/c/tdef/void //apple_ref/c/tag/void //apple_ref/c/econst/void //apple_ref/c/struct/void //apple_ref/c/clconst/void" --><font class="type">void</font><!-- /a --> <!-- a logicalPath="//apple_ref/c/instm/arglCleanup //apple_ref/c/clm/arglCleanup //apple_ref/c/intfcm/arglCleanup //apple_ref/c/func/arglCleanup //apple_ref/c/ftmplt/arglCleanup //apple_ref/c/defn/arglCleanup //apple_ref/c/macro/arglCleanup" --><font class="function">arglCleanup</font><!-- /a -->(
- <!-- a logicalPath="//apple_ref/c/cl/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/cl/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/tdef/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/tag/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/econst/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/struct/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/clconst/ARGL_CONTEXT_SETTINGS_REF" --><font class="type">ARGL_CONTEXT_SETTINGS_REF</font><!-- /a --> <font class="param">contextSettings</font>); </pre></blockquote>
-<h5><font face="Lucida Grande,Helvetica,Arial">Parameter Descriptions</font></h5>
-<blockquote>
+<table border="0" cellpadding="2" cellspacing="2" width="300"><tr><td valign="top" height="12" colspan="5"><h3><a name="arglCleanup">arglCleanup </a></h3>
+</td></tr></table><hr><p><!-- begin abstract -->Free memory used by gsub_lite associated with the specified context.
+<!-- end abstract --></p>
+<p></p><pre><!-- a logicalPath="//apple_ref/c/cl/void //apple_ref/c/tdef/void //apple_ref/c/tag/void //apple_ref/c/econst/void //apple_ref/c/struct/void //apple_ref/c/clconst/void //apple_ref/c/intf/void" --><span class="type">void</span><!-- /a --> <!-- a logicalPath="//apple_ref/c/instm/arglCleanup //apple_ref/c/clm/arglCleanup //apple_ref/c/intfcm/arglCleanup //apple_ref/c/intfm/arglCleanup //apple_ref/c/func/arglCleanup //apple_ref/c/ftmplt/arglCleanup //apple_ref/c/defn/arglCleanup //apple_ref/c/macro/arglCleanup" --><span class="function">arglCleanup</span><!-- /a -->(
+ <!-- a logicalPath="//apple_ref/c/cl/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/tdef/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/tag/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/econst/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/struct/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/clconst/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/intf/ARGL_CONTEXT_SETTINGS_REF" --><span class="type">ARGL_CONTEXT_SETTINGS_REF</span><!-- /a --> <span class="param">contextSettings</span>); </pre>
+<h5 class="tight"><font face="Lucida Grande,Helvetica,Arial">Parameters</font></h5>
<dl>
-<dt><code><i>contextSettings</i></code></dt><dd>A reference to ARGL's settings for an OpenGL
+<dt><code>contextSettings </code></dt><dd>A reference to ARGL's settings for an OpenGL
context, as returned by arglSetupForCurrentContext().</dd>
</dl>
-</blockquote>
-<dl><h5><font face="Lucida Grande,Helvetica,Arial">Discussion</font></h5><p>Should be called after no more argl* functions are needed, in order
+<h5 class="tight"><font face="Lucida Grande,Helvetica,Arial">Discussion</font>
+</h5><p><!-- begin discussion -->Should be called after no more argl* functions are needed, in order
to prevent memory leaks etc.
<br><br>
The library can be setup again for the context at a later time by calling
arglSetupForCurrentContext() again.
-</p>
-<dt><i>Availability</i></dt><dd>First appeared in ARToolKit 2.68.
+<!-- end discussion --></p>
+<p></p><dl><dt><i>Availability</i></dt><dd>First appeared in ARToolKit 2.68.
</dd>
</dl>
<hr><!-- headerDoc=func; uid=//apple_ref/doc/compositePage/c/func/arglDispImage; name=arglDispImage -->
<a name="//apple_ref/doc/compositePage/c/func/arglDispImage"></a>
-<table border="0" cellpadding="2" cellspacing="2" width="300"><tr><td valign="top" height="12" colspan="5"><h3><a name="arglDispImage">arglDispImage</a></h3>
-</td></tr></table><hr><dl></dl><p>Display an ARVideo image, by drawing it using OpenGL.
-</p>
-<blockquote><pre><!-- a logicalPath="//apple_ref/c/cl/void //apple_ref/c/cl/void //apple_ref/c/tdef/void //apple_ref/c/tag/void //apple_ref/c/econst/void //apple_ref/c/struct/void //apple_ref/c/clconst/void" --><font class="type">void</font><!-- /a --> <!-- a logicalPath="//apple_ref/c/instm/arglDispImage //apple_ref/c/clm/arglDispImage //apple_ref/c/intfcm/arglDispImage //apple_ref/c/func/arglDispImage //apple_ref/c/ftmplt/arglDispImage //apple_ref/c/defn/arglDispImage //apple_ref/c/macro/arglDispImage" --><font class="function">arglDispImage</font><!-- /a -->(
- <!-- a logicalPath="//apple_ref/c/cl/ARUint8 //apple_ref/c/cl/ARUint8 //apple_ref/c/tdef/ARUint8 //apple_ref/c/tag/ARUint8 //apple_ref/c/econst/ARUint8 //apple_ref/c/struct/ARUint8 //apple_ref/c/clconst/ARUint8" --><font class="type">ARUint8</font><!-- /a --> *<font class="param">image</font>,
- <font class="keyword">const</font> <!-- a logicalPath="//apple_ref/c/cl/ARParam //apple_ref/c/cl/ARParam //apple_ref/c/tdef/ARParam //apple_ref/c/tag/ARParam //apple_ref/c/econst/ARParam //apple_ref/c/struct/ARParam //apple_ref/c/clconst/ARParam" --><font class="type">ARParam</font><!-- /a --> *<font class="param">cparam</font>,
- <font class="keyword">const</font> <!-- a logicalPath="//apple_ref/c/cl/double //apple_ref/c/cl/double //apple_ref/c/tdef/double //apple_ref/c/tag/double //apple_ref/c/econst/double //apple_ref/c/struct/double //apple_ref/c/clconst/double" --><font class="type">double</font><!-- /a --> <font class="param">zoom</font>,
- <!-- a logicalPath="//apple_ref/c/cl/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/cl/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/tdef/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/tag/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/econst/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/struct/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/clconst/ARGL_CONTEXT_SETTINGS_REF" --><font class="type">ARGL_CONTEXT_SETTINGS_REF</font><!-- /a --> <font class="param">contextSettings</font>); </pre></blockquote>
-<h5><font face="Lucida Grande,Helvetica,Arial">Parameter Descriptions</font></h5>
-<blockquote>
+<table border="0" cellpadding="2" cellspacing="2" width="300"><tr><td valign="top" height="12" colspan="5"><h3><a name="arglDispImage">arglDispImage </a></h3>
+</td></tr></table><hr><p><!-- begin abstract -->Display an ARVideo image, by drawing it using OpenGL.
+<!-- end abstract --></p>
+<p></p><pre><!-- a logicalPath="//apple_ref/c/cl/void //apple_ref/c/tdef/void //apple_ref/c/tag/void //apple_ref/c/econst/void //apple_ref/c/struct/void //apple_ref/c/clconst/void //apple_ref/c/intf/void" --><span class="type">void</span><!-- /a --> <!-- a logicalPath="//apple_ref/c/instm/arglDispImage //apple_ref/c/clm/arglDispImage //apple_ref/c/intfcm/arglDispImage //apple_ref/c/intfm/arglDispImage //apple_ref/c/func/arglDispImage //apple_ref/c/ftmplt/arglDispImage //apple_ref/c/defn/arglDispImage //apple_ref/c/macro/arglDispImage" --><span class="function">arglDispImage</span><!-- /a -->(
+ <!-- a logicalPath="//apple_ref/c/cl/ARUint8 //apple_ref/c/tdef/ARUint8 //apple_ref/c/tag/ARUint8 //apple_ref/c/econst/ARUint8 //apple_ref/c/struct/ARUint8 //apple_ref/c/clconst/ARUint8 //apple_ref/c/intf/ARUint8" --><span class="type">ARUint8</span><!-- /a --> *<span class="param">image</span>,
+ <span class="keyword">const</span> <!-- a logicalPath="//apple_ref/c/cl/ARParam //apple_ref/c/tdef/ARParam //apple_ref/c/tag/ARParam //apple_ref/c/econst/ARParam //apple_ref/c/struct/ARParam //apple_ref/c/clconst/ARParam //apple_ref/c/intf/ARParam" --><span class="type">ARParam</span><!-- /a --> *<span class="param">cparam</span>,
+ <span class="keyword">const</span> <!-- a logicalPath="//apple_ref/c/cl/double //apple_ref/c/tdef/double //apple_ref/c/tag/double //apple_ref/c/econst/double //apple_ref/c/struct/double //apple_ref/c/clconst/double //apple_ref/c/intf/double" --><span class="type">double</span><!-- /a --> <span class="param">zoom</span>,
+ <!-- a logicalPath="//apple_ref/c/cl/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/tdef/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/tag/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/econst/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/struct/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/clconst/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/intf/ARGL_CONTEXT_SETTINGS_REF" --><span class="type">ARGL_CONTEXT_SETTINGS_REF</span><!-- /a --> <span class="param">contextSettings</span>); </pre>
+<h5 class="tight"><font face="Lucida Grande,Helvetica,Arial">Parameters</font></h5>
<dl>
-<dt><code><i>image</i></code></dt><dd>Pointer to the tightly-packed image data (as returned by
+<dt><code>image </code></dt><dd>Pointer to the tightly-packed image data (as returned by
arVideoGetImage()). The horizontal and vertical dimensions of the image
data must exactly match the values specified in the fields cparam->xsize
and cparam->ysize (see below).
@@ -285,24 +285,24 @@
pixels of the first row, followed immediately by the pixels of the second
row, and so on to the last byte of the image data, which corresponds to
the last component of the bottom-right-most pixel.</dd>
-<dt><code><i>cparam</i></code></dt><dd>Pointer to a set of ARToolKit camera parameters for the
+<dt><code>cparam </code></dt><dd>Pointer to a set of ARToolKit camera parameters for the
current video source. The size of the source image is taken from the
fields xsize and ysize of the ARParam structure pointed to. Also, when
the draw mode is AR_DRAW_BY_TEXTURE_MAPPING (see the documentation for
the global variable arglDrawMode) the field dist_factor of the ARParam
structure pointed to will be taken as the amount to un-warp the supplied
image.</dd>
-<dt><code><i>zoom</i></code></dt><dd>The amount to scale the video image up or down. To draw the video
+<dt><code>zoom </code></dt><dd>The amount to scale the video image up or down. To draw the video
image double size, use a zoom value of 2.0. To draw the video image
half size use a zoom value of 0.5.</dd>
-<dt><code><i>contextSettings</i></code></dt><dd>A reference to ARGL's settings for the current OpenGL
+<dt><code>contextSettings </code></dt><dd>A reference to ARGL's settings for the current OpenGL
context, as returned by arglSetupForCurrentContext() for this context. It
is the callers responsibility to make sure that the current context at the
time arglDisplayImage() is called matches that under which contextSettings
was created.</dd>
</dl>
-</blockquote>
-<dl><h5><font face="Lucida Grande,Helvetica,Arial">Discussion</font></h5><p>This function draws an image from an ARVideo source to the current
+<h5 class="tight"><font face="Lucida Grande,Helvetica,Arial">Discussion</font>
+</h5><p><!-- begin discussion -->This function draws an image from an ARVideo source to the current
OpenGL context. This operation is most useful in video see-through
augmented reality applications for drawing the camera view as a
background image, but can also be used in other ways.
@@ -322,21 +322,22 @@
the drawing is done in replacement texture environment mode.
The depth test enable and lighting enable state and the texture
environment mode are restored before the function returns.
-</p>
-<dt><i>Availability</i></dt><dd>First appeared in ARToolKit 2.68.
+<!-- end discussion --></p>
+<p></p><dl><dt><i>Availability</i></dt><dd>First appeared in ARToolKit 2.68.
</dd>
</dl>
<hr><!-- headerDoc=func; uid=//apple_ref/doc/compositePage/c/func/arglDispImageStateful; name=arglDispImageStateful -->
<a name="//apple_ref/doc/compositePage/c/func/arglDispImageStateful"></a>
-<table border="0" cellpadding="2" cellspacing="2" width="300"><tr><td valign="top" height="12" colspan="5"><h3><a name="arglDispImageStateful">arglDispImageStateful</a></h3>
-</td></tr></table><hr><dl></dl><p>Display an ARVideo image, by drawing it using OpenGL, using and modifying current OpenGL state.
-</p>
-<blockquote><pre><!-- a logicalPath="//apple_ref/c/cl/void //apple_ref/c/cl/void //apple_ref/c/tdef/void //apple_ref/c/tag/void //apple_ref/c/econst/void //apple_ref/c/struct/void //apple_ref/c/clconst/void" --><font class="type">void</font><!-- /a --> <!-- a logicalPath="//apple_ref/c/instm/arglDispImageStateful //apple_ref/c/clm/arglDispImageStateful //apple_ref/c/intfcm/arglDispImageStateful //apple_ref/c/func/arglDispImageStateful //apple_ref/c/ftmplt/arglDispImageStateful //apple_ref/c/defn/arglDispImageStateful //apple_ref/c/macro/arglDispImageStateful" --><font class="function">arglDispImageStateful</font><!-- /a -->(
- <!-- a logicalPath="//apple_ref/c/cl/ARUint8 //apple_ref/c/cl/ARUint8 //apple_ref/c/tdef/ARUint8 //apple_ref/c/tag/ARUint8 //apple_ref/c/econst/ARUint8 //apple_ref/c/struct/ARUint8 //apple_ref/c/clconst/ARUint8" --><font class="type">ARUint8</font><!-- /a --> *<font class="param">image</font>,
- <font class="keyword">const</font> <!-- a logicalPath="//apple_ref/c/cl/ARParam //apple_ref/c/cl/ARParam //apple_ref/c/tdef/ARParam //apple_ref/c/tag/ARParam //apple_ref/c/econst/ARParam //apple_ref/c/struct/ARParam //apple_ref/c/clconst/ARParam" --><font class="type">ARParam</font><!-- /a --> *<font class="param">cparam</font>,
- <font class="keyword">const</font> <!-- a logicalPath="//apple_ref/c/cl/double //apple_ref/c/cl/double //apple_ref/c/tdef/double //apple_ref/c/tag/double //apple_ref/c/econst/double //apple_ref/c/struct/double //apple_ref/c/clconst/double" --><font class="type">double</font><!-- /a --> <font class="param">zoom</font>,
- <!-- a logicalPath="//apple_ref/c/cl/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/cl/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/tdef/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/tag/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/econst/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/struct/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/clconst/ARGL_CONTEXT_SETTINGS_REF" --><font class="type">ARGL_CONTEXT_SETTINGS_REF</font><!-- /a --> <font class="param">contextSettings</font>); </pre></blockquote>
-<dl><h5><font face="Lucida Grande,Helvetica,Arial">Discussion</font></h5><p>This function is identical to arglDispImage except that whereas
+<table border="0" cellpadding="2" cellspacing="2" width="300"><tr><td valign="top" height="12" colspan="5"><h3><a name="arglDispImageStateful">arglDispImageStateful </a></h3>
+</td></tr></table><hr><p><!-- begin abstract -->Display an ARVideo image, by drawing it using OpenGL, using and modifying current OpenGL state.
+<!-- end abstract --></p>
+<p></p><pre><!-- a logicalPath="//apple_ref/c/cl/void //apple_ref/c/tdef/void //apple_ref/c/tag/void //apple_ref/c/econst/void //apple_ref/c/struct/void //apple_ref/c/clconst/void //apple_ref/c/intf/void" --><span class="type">void</span><!-- /a --> <!-- a logicalPath="//apple_ref/c/instm/arglDispImageStateful //apple_ref/c/clm/arglDispImageStateful //apple_ref/c/intfcm/arglDispImageStateful //apple_ref/c/intfm/arglDispImageStateful //apple_ref/c/func/arglDispImageStateful //apple_ref/c/ftmplt/arglDispImageStateful //apple_ref/c/defn/arglDispImageStateful //apple_ref/c/macro/arglDispImageStateful" --><span class="function">arglDispImageStateful</span><!-- /a -->(
+ <!-- a logicalPath="//apple_ref/c/cl/ARUint8 //apple_ref/c/tdef/ARUint8 //apple_ref/c/tag/ARUint8 //apple_ref/c/econst/ARUint8 //apple_ref/c/struct/ARUint8 //apple_ref/c/clconst/ARUint8 //apple_ref/c/intf/ARUint8" --><span class="type">ARUint8</span><!-- /a --> *<span class="param">image</span>,
+ <span class="keyword">const</span> <!-- a logicalPath="//apple_ref/c/cl/ARParam //apple_ref/c/tdef/ARParam //apple_ref/c/tag/ARParam //apple_ref/c/econst/ARParam //apple_ref/c/struct/ARParam //apple_ref/c/clconst/ARParam //apple_ref/c/intf/ARParam" --><span class="type">ARParam</span><!-- /a --> *<span class="param">cparam</span>,
+ <span class="keyword">const</span> <!-- a logicalPath="//apple_ref/c/cl/double //apple_ref/c/tdef/double //apple_ref/c/tag/double //apple_ref/c/econst/double //apple_ref/c/struct/double //apple_ref/c/clconst/double //apple_ref/c/intf/double" --><span class="type">double</span><!-- /a --> <span class="param">zoom</span>,
+ <!-- a logicalPath="//apple_ref/c/cl/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/tdef/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/tag/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/econst/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/struct/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/clconst/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/intf/ARGL_CONTEXT_SETTINGS_REF" --><span class="type">ARGL_CONTEXT_SETTINGS_REF</span><!-- /a --> <span class="param">contextSettings</span>); </pre>
+<h5 class="tight"><font face="Lucida Grande,Helvetica,Arial">Discussion</font>
+</h5><p><!-- begin discussion -->This function is identical to arglDispImage except that whereas
arglDispImage sets an orthographic 2D projection and the OpenGL state
prior to drawing, this function does not. It also does not restore any
changes made to OpenGL state.
@@ -350,56 +351,54 @@
and leave depth-testing enabled.
<br><br>
See the documentation for arglDispImage() for more information.
-</p>
-<dt><i>Availability</i></dt><dd>First appeared in ARToolKit 2.68.2.
+<!-- end discussion --></p>
+<p></p><dl><dt><i>Availability</i></dt><dd>First appeared in ARToolKit 2.68.2.
</dd>
</dl>
<hr><!-- headerDoc=func; uid=//apple_ref/doc/compositePage/c/func/arglDistortionCompensationGet; name=arglDistortionCompensationGet -->
<a name="//apple_ref/doc/compositePage/c/func/arglDistortionCompensationGet"></a>
-<table border="0" cellpadding="2" cellspacing="2" width="300"><tr><td valign="top" height="12" colspan="5"><h3><a name="arglDistortionCompensationGet">arglDistortionCompensationGet</a></h3>
-</td></tr></table><hr><dl></dl><p>Enquire as to the enable state of camera lens distortion compensation in arglDispImage.
-</p>
-<blockquote><pre><!-- a logicalPath="//apple_ref/c/cl/int //apple_ref/c/cl/int //apple_ref/c/tdef/int //apple_ref/c/tag/int //apple_ref/c/econst/int //apple_ref/c/struct/int //apple_ref/c/clconst/int" --><font class="type">int</font><!-- /a --> <!-- a logicalPath="//apple_ref/c/instm/arglDistortionCompensationGet //apple_ref/c/clm/arglDistortionCompensationGet //apple_ref/c/intfcm/arglDistortionCompensationGet //apple_ref/c/func/arglDistortionCompensationGet //apple_ref/c/ftmplt/arglDistortionCompensationGet //apple_ref/c/defn/arglDistortionCompensationGet //apple_ref/c/macro/arglDistortionCompensationGet" --><font class="function">arglDistortionCompensationGet</font><!-- /a -->(
- <!-- a logicalPath="//apple_ref/c/cl/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/cl/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/tdef/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/tag/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/econst/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/struct/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/clconst/ARGL_CONTEXT_SETTINGS_REF" --><font class="type">ARGL_CONTEXT_SETTINGS_REF</font><!-- /a --> <font class="param">contextSettings</font>,
- <!-- a logicalPath="//apple_ref/c/cl/int //apple_ref/c/cl/int //apple_ref/c/tdef/int //apple_ref/c/tag/int //apple_ref/c/econst/int //apple_ref/c/struct/int //apple_ref/c/clconst/int" --><font class="type">int</font><!-- /a --> *<font class="param">enable</font>); </pre></blockquote>
-<h5><font face="Lucida Grande,Helvetica,Arial">Parameter Descriptions</font></h5>
-<blockquote>
+<table border="0" cellpadding="2" cellspacing="2" width="300"><tr><td valign="top" height="12" colspan="5"><h3><a name="arglDistortionCompensationGet">arglDistortionCompensationGet </a></h3>
+</td></tr></table><hr><p><!-- begin abstract -->Enquire as to the enable state of camera lens distortion compensation in arglDispImage.
+<!-- end abstract --></p>
+<p></p><pre><!-- a logicalPath="//apple_ref/c/cl/int //apple_ref/c/tdef/int //apple_ref/c/tag/int //apple_ref/c/econst/int //apple_ref/c/struct/int //apple_ref/c/clconst/int //apple_ref/c/intf/int" --><span class="type">int</span><!-- /a --> <!-- a logicalPath="//apple_ref/c/instm/arglDistortionCompensationGet //apple_ref/c/clm/arglDistortionCompensationGet //apple_ref/c/intfcm/arglDistortionCompensationGet //apple_ref/c/intfm/arglDistortionCompensationGet //apple_ref/c/func/arglDistortionCompensationGet //apple_ref/c/ftmplt/arglDistortionCompensationGet //apple_ref/c/defn/arglDistortionCompensationGet //apple_ref/c/macro/arglDistortionCompensationGet" --><span class="function">arglDistortionCompensationGet</span><!-- /a -->(
+ <!-- a logicalPath="//apple_ref/c/cl/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/tdef/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/tag/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/econst/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/struct/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/clconst/ARGL_CONTEXT_SETTINGS_REF //apple_ref/c/intf/ARGL_CONTEXT_SETTINGS_REF" --><span class="type">ARGL_CONTEXT_SETTINGS_REF</span><!-- /a ...
[truncated message content] |
|
From: <ret...@us...> - 2008-01-22 22:13:34
|
Revision: 276
http://artoolkit.svn.sourceforge.net/artoolkit/?rev=276&view=rev
Author: retrakker
Date: 2008-01-22 14:13:36 -0800 (Tue, 22 Jan 2008)
Log Message:
-----------
Updated GStreamer video capture:
- if no configuration string is given at all, fall back to video test
image
- dereference pad on the sink
- changed license to LGPL v2
Updated Configure script:
- added fPIC flag to fix compilation issues on x86_ia64 systems where
only relocatable code is allowed
Modified Paths:
--------------
trunk/artoolkit/Configure
trunk/artoolkit/include/AR/sys/videoGStreamer.h
trunk/artoolkit/lib/SRC/VideoGStreamer/video.c
Modified: trunk/artoolkit/Configure
===================================================================
--- trunk/artoolkit/Configure 2008-01-04 10:10:10 UTC (rev 275)
+++ trunk/artoolkit/Configure 2008-01-22 22:13:36 UTC (rev 276)
@@ -108,7 +108,7 @@
GST_INCLUDE=`pkg-config --cflags gstreamer-0.10`
GST_LIBS=`pkg-config --libs gstreamer-0.10`
- CFLAG="-O $GST_INCLUDE -I/usr/X11R6/include"
+ CFLAG="-O $GST_INCLUDE -I/usr/X11R6/include -fPIC"
LDFLAG="$GST_LIBS -L/usr/X11R6/lib -L/usr/local/lib"
ARFLAG="rs"
RANLIB=""
Modified: trunk/artoolkit/include/AR/sys/videoGStreamer.h
===================================================================
--- trunk/artoolkit/include/AR/sys/videoGStreamer.h 2008-01-04 10:10:10 UTC (rev 275)
+++ trunk/artoolkit/include/AR/sys/videoGStreamer.h 2008-01-22 22:13:36 UTC (rev 276)
@@ -1,9 +1,9 @@
/*
* Video capture module utilising the GStreamer pipeline for AR Toolkit
*
- * (c) Copyrights 2003-2006 Hartmut Seichter
+ * (c) Copyrights 2003-2008 Hartmut Seichter <http://www.technotecture.com>
*
- * Licensed under the terms of the GPL
+ * Licensed under the terms of the LGPL v2
*
*/
#ifndef AR_VIDEO_GSTREAMER_H
Modified: trunk/artoolkit/lib/SRC/VideoGStreamer/video.c
===================================================================
--- trunk/artoolkit/lib/SRC/VideoGStreamer/video.c 2008-01-04 10:10:10 UTC (rev 275)
+++ trunk/artoolkit/lib/SRC/VideoGStreamer/video.c 2008-01-22 22:13:36 UTC (rev 276)
@@ -1,9 +1,9 @@
/*
* Video capture module utilising the GStreamer pipeline for AR Toolkit
*
- * (c) Copyrights 2003-2007 Hartmut Seichter
+ * (c) Copyrights 2003-2008 Hartmut Seichter <http://www.technotecture.com>
*
- * licensed under the terms of the GPL v2.0
+ * licensed under the terms of the LGPL v2
*
*/
@@ -22,6 +22,9 @@
#include <string.h>
+#define GSTREAMER_TEST_LAUNCH_CFG "videotestsrc ! capsfilter caps=video/x-raw-rgb,bpp=24 ! identity name=artoolkit ! fakesink"
+
+
struct _AR2VideoParamT {
/* size of the image */
@@ -201,8 +204,14 @@
g_printf ("Using config string from environment [%s].\n", envconf);
} else {
config = NULL;
- g_printf ("No video config string supplied, using defaults.\n");
+
+ g_printf ("Warning: no video config string supplied, using default!.\n");
+
+ /* setting up defaults - we fall back to the TV test signal simulator */
+ config = GSTREAMER_TEST_LAUNCH_CFG;
+
}
+
} else {
config = config_in;
g_printf ("Using supplied video config string [%s].\n", config_in);
@@ -254,13 +263,10 @@
pad = gst_element_get_pad (vid->probe, "src");
- /* install the probe callback for capturing */
-
+ /* install the probe callback for capturing */
gst_pad_add_buffer_probe (pad, G_CALLBACK (cb_have_data), vid);
- /* gst_object_unref(pad);*/
-
#if 0
/* request ready state */
gst_element_set_state (vid->pipeline, GST_STATE_READY);
@@ -282,6 +288,9 @@
/* dismiss the pad */
gst_object_unref (pad);
+
+ /* dismiss the peer-pad */
+ gst_object_unref (peerpad);
/* wait until it's up and running or failed */
if (gst_element_get_state (vid->pipeline, NULL, NULL, -1) == GST_STATE_CHANGE_FAILURE) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <phi...@us...> - 2008-02-18 23:50:16
|
Revision: 279
http://artoolkit.svn.sourceforge.net/artoolkit/?rev=279&view=rev
Author: philip_lamb
Date: 2008-02-18 15:50:16 -0800 (Mon, 18 Feb 2008)
Log Message:
-----------
- Pulldowns from ARToolKit4: Add Linux/Unix scripts to set ARTOOLKIT_2_ROOT env variable. Add share/artoolkit-config script to ease linking to ARToolKit in third-party binaries. Remove Xmu and add pthread to link libs on Linux.
- Correct version number in config.h.in.
- Add share directory in Xcode project files list.
Modified Paths:
--------------
trunk/artoolkit/ARToolKit.xcodeproj/project.pbxproj
trunk/artoolkit/Configure
trunk/artoolkit/Makefile.in
trunk/artoolkit/include/AR/config.h.in
Added Paths:
-----------
trunk/artoolkit/share/artoolkit-config.in
trunk/artoolkit/share/artoolkit-setenv
trunk/artoolkit/share/artoolkit-unsetenv
Modified: trunk/artoolkit/ARToolKit.xcodeproj/project.pbxproj
===================================================================
--- trunk/artoolkit/ARToolKit.xcodeproj/project.pbxproj 2008-02-17 22:34:52 UTC (rev 278)
+++ trunk/artoolkit/ARToolKit.xcodeproj/project.pbxproj 2008-02-18 23:50:16 UTC (rev 279)
@@ -1424,6 +1424,13 @@
4A934D80086A2DB700DF2FAC /* libARvrml.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libARvrml.a; sourceTree = "<group>"; };
4A99C6520A59DCC3001B4C35 /* Makefile.in */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = Makefile.in; sourceTree = "<group>"; };
4A99C6530A59DCC3001B4C35 /* video.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = video.c; sourceTree = "<group>"; };
+ 4A9F9ABD0D6A4E7B00C7456B /* artoolkit-config */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "artoolkit-config"; sourceTree = "<group>"; };
+ 4A9F9ABE0D6A4E7B00C7456B /* artoolkit-config.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "artoolkit-config.in"; sourceTree = "<group>"; };
+ 4A9F9ABF0D6A4E7B00C7456B /* artoolkit-setenv */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "artoolkit-setenv"; sourceTree = "<group>"; };
+ 4A9F9AC00D6A4E7B00C7456B /* artoolkit-unsetenv */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "artoolkit-unsetenv"; sourceTree = "<group>"; };
+ 4A9F9AC10D6A4E7B00C7456B /* globals.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = globals.lua; sourceTree = "<group>"; };
+ 4A9F9AC20D6A4E7B00C7456B /* modules.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = modules.lua; sourceTree = "<group>"; };
+ 4A9F9AC30D6A4E7B00C7456B /* premake.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = premake.lua; sourceTree = "<group>"; };
4AAB8C740728934300708844 /* ARToolKit.dsw */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; lineEnding = 2; path = ARToolKit.dsw; sourceTree = "<group>"; };
4AAB8C750728934300708844 /* ARToolKit.sln */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = ARToolKit.sln; sourceTree = "<group>"; };
4AAB8C760728937100708844 /* libARvideo.dsp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = libARvideo.dsp; sourceTree = "<group>"; };
@@ -1948,6 +1955,7 @@
4A427C06048431FA00B56093 /* patterns */,
4A427C10048431FA00B56093 /* util */,
4A461B5C04843FAA00B56093 /* bin */,
+ 4A9F9ABC0D6A4E7B00C7456B /* share */,
4A3F1552064A0C7C0042B0D7 /* External Libraries & Frameworks */,
4AE2305E0659B7D10047D402 /* Products */,
);
@@ -2469,6 +2477,20 @@
path = VideoGStreamer;
sourceTree = "<group>";
};
+ 4A9F9ABC0D6A4E7B00C7456B /* share */ = {
+ isa = PBXGroup;
+ children = (
+ 4A9F9ABD0D6A4E7B00C7456B /* artoolkit-config */,
+ 4A9F9ABE0D6A4E7B00C7456B /* artoolkit-config.in */,
+ 4A9F9ABF0D6A4E7B00C7456B /* artoolkit-setenv */,
+ 4A9F9AC00D6A4E7B00C7456B /* artoolkit-unsetenv */,
+ 4A9F9AC10D6A4E7B00C7456B /* globals.lua */,
+ 4A9F9AC20D6A4E7B00C7456B /* modules.lua */,
+ 4A9F9AC30D6A4E7B00C7456B /* premake.lua */,
+ );
+ path = share;
+ sourceTree = "<group>";
+ };
4AC3C076075188AB0073D2C6 /* graphicsTest */ = {
isa = PBXGroup;
children = (
Modified: trunk/artoolkit/Configure
===================================================================
--- trunk/artoolkit/Configure 2008-02-17 22:34:52 UTC (rev 278)
+++ trunk/artoolkit/Configure 2008-02-18 23:50:16 UTC (rev 279)
@@ -1,32 +1,51 @@
#!/bin/sh
-# ARToolKit Configure for Linux Video Devices
+# ARToolKit Configure for Linux/Unix Video Devices
#
#####################################################
MDIR=". \
lib/SRC \
- lib/SRC/AR lib/SRC/ARMulti lib/SRC/Gl \
- lib/SRC/VideoLinux1394Cam lib/SRC/VideoLinuxDV \
- lib/SRC/VideoLinuxV4L lib/SRC/VideoSGI \
+ lib/SRC/AR \
+ lib/SRC/ARMulti \
+ lib/SRC/Gl \
+ lib/SRC/VideoLinux1394Cam \
+ lib/SRC/VideoLinuxDV \
+ lib/SRC/VideoLinuxV4L \
+ lib/SRC/VideoSGI \
lib/SRC/VideoMacOSX \
lib/SRC/VideoGStreamer \
lib/SRC/ARvrml \
util \
- util/calib_camera2 util/calib_cparam util/calib_distortion \
- util/mk_patt util/graphicsTest util/videoTest \
+ 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 examples/simpleVRML \
+ 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 \
+ examples/simpleVRML \
"
SED=/tmp/SED.$$
trap "rm -f $SED; exit 0" 0 1 2 3 15
+VERSION=`grep -E 'AR_HEADER_VERSION_STRING[[:space:]]+"[0-9]+\.[0-9]+(\.[0-9]+)*"' include/AR/config.h.in | grep -Eo "[0-9]+\.[0-9]+(\.[0-9]+)*"`
-
E=`uname`
if [ "$E" = "Linux" ]
then
@@ -42,7 +61,7 @@
then
echo
echo "Color conversion should use x86 assembly (choose 'n' for 64bit systems)?"
- echo -n "Enter : "
+ echo -n "Enter : "
read ANS
if [ "$ANS" = "y" ]
then
@@ -59,13 +78,13 @@
LDFLAG="-L/usr/X11R6/lib"
ARFLAG="rs"
RANLIB=""
- LIBS="-lglut -lGLU -lGL -lXi -lXmu -lX11 -lm"
+ LIBS="-lglut -lGLU -lGL -lXi -lX11 -lm -lpthread"
CONFIG="AR_INPUT_V4L"
elif [ "$ANS" = "2" ]
then
echo
- echo "Color conversion should use x86 assembly (not working for 64bit)?"
- echo -n "Enter : "
+ echo "Color conversion should use x86 assembly (Answer n if compiling for 64 bit)?"
+ echo -n "Enter : "
read ANS
if [ "$ANS" = "y" ]
then
@@ -82,16 +101,16 @@
LDFLAG="-L/usr/X11R6/lib"
ARFLAG="rs"
RANLIB=""
- LIBS="-lglut -lGLU -lGL -lXi -lXmu -lX11 -lm -ljpeg"
+ LIBS="-lglut -lGLU -lGL -lXi -lX11 -lm -lpthread -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"
- LDFLAG="-L/usr/X11R6/lib -L/usr/local/lib"
+ CFLAG="-O -I/usr/X11R6/include"
+ LDFLAG="-L/usr/X11R6/lib"
ARFLAG="rs"
RANLIB=""
- LIBS="-lraw1394 -ldv -lpthread -lglut -lGLU -lGL -lXi -lXmu -lX11 -lm"
+ LIBS="-lglut -lGLU -lGL -lXi -lX11 -lm -lpthread -lraw1394 -ldv"
CONFIG="AR_INPUT_DV"
elif [ "$ANS" = "4" ]
then
@@ -100,20 +119,21 @@
LDFLAG="-L/usr/X11R6/lib"
ARFLAG="rs"
RANLIB=""
- LIBS="-lglut -lGLU -lGL -lXi -lXmu -lX11 -lm -lraw1394 -ldc1394_control"
+ LIBS="-lglut -lGLU -lGL -lXi -lX11 -lm -lpthread -lraw1394 -ldc1394_control"
CONFIG="AR_INPUT_1394CAM"
elif [ "$ANS" = "5" ]
then
VIDEO_DRIVER="VideoGStreamer"
- GST_INCLUDE=`pkg-config --cflags gstreamer-0.10`
- GST_LIBS=`pkg-config --libs gstreamer-0.10`
-
- CFLAG="-O $GST_INCLUDE -I/usr/X11R6/include -fPIC"
- LDFLAG="$GST_LIBS -L/usr/X11R6/lib -L/usr/local/lib"
+ CFLAG="-O -I/usr/X11R6/include -fPIC"
+ LDFLAG="-L/usr/X11R6/lib"
ARFLAG="rs"
RANLIB=""
- LIBS="-lpthread -lglut -lGLU -lGL -lXi -lX11 -lm"
+ LIBS="-lglut -lGLU -lGL -lXi -lX11 -lm -lpthread"
CONFIG="AR_INPUT_GSTREAMER"
+ GST_CFLAGS=`pkg-config --cflags gstreamer-0.10`
+ GST_LIBS=`pkg-config --libs gstreamer-0.10`
+ CFLAG="$CFLAG $GST_CFLAGS"
+ LIBS="$LIBS $GST_LIBS"
else
echo "Please enter 1,2,3,4 or 5."
exit 0
@@ -155,7 +175,7 @@
LDFLAG=""
ARFLAG="-r"
RANLIB="ranlib \$\@"
- LIBS="-framework Carbon -framework QuickTime -framework GLUT -framework OpenGL -framework AppKit -framework Foundation -lobjc"
+ LIBS="-framework Carbon -framework QuickTime -framework GLUT -framework OpenGL -framework Cocoa"
echo "Does your Mac have fast texture mapping hardware? (y or n)"
echo -n "Enter : "
@@ -192,6 +212,12 @@
exit 0
fi
+#
+# Output step 1.
+# Create Makefiles, setting symbols, and selecting directories for compilation.
+#
+
+# Prefix any slashes with '\' for sed.
echo $VIDEO_DRIVER | sed -e 's/\//\\\//g' >$SED
VIDEO_DRIVER=`cat $SED`
echo $CFLAG | sed -e 's/\//\\\//g' >$SED
@@ -223,7 +249,15 @@
echo " create $i/Makefile"
sed -f $SED <$i/Makefile.in > $i/Makefile
done
+echo " create share/artoolkit-config"
+sed -f $SED <share/artoolkit-config.in > share/artoolkit-config
+chmod ugo+rx share/artoolkit-config
+#
+# Output step 2.
+# Record configuration in config.h.
+#
+
if [ "$NVEXT" = "y" ]
then
cat > $SED <<EOF
Modified: trunk/artoolkit/Makefile.in
===================================================================
--- trunk/artoolkit/Makefile.in 2008-02-17 22:34:52 UTC (rev 278)
+++ trunk/artoolkit/Makefile.in 2008-02-18 23:50:16 UTC (rev 279)
@@ -14,3 +14,4 @@
(cd examples; make -f Makefile allclean)
rm -f Makefile
rm -f include/AR/config.h
+ rm -f share/artoolkit-config
Modified: trunk/artoolkit/include/AR/config.h.in
===================================================================
--- trunk/artoolkit/include/AR/config.h.in 2008-02-17 22:34:52 UTC (rev 278)
+++ trunk/artoolkit/include/AR/config.h.in 2008-02-18 23:50:16 UTC (rev 279)
@@ -19,7 +19,7 @@
// The TINY version number defines bug-fixes to existing
// functionality. Range: [0-99].
-#define AR_HEADER_VERSION_TINY 0
+#define AR_HEADER_VERSION_TINY 1
// The BUILD version number will always be zero in releases,
// but may be non-zero in internal builds or in version-control
@@ -28,7 +28,7 @@
// The string representation below must match the major, minor
// and tiny release numbers.
-#define AR_HEADER_VERSION_STRING "2.72.0"
+#define AR_HEADER_VERSION_STRING "2.72.1"
// The macros below are convenience macros to enable use
// of certain ARToolKit header functionality by the release
Added: trunk/artoolkit/share/artoolkit-config.in
===================================================================
--- trunk/artoolkit/share/artoolkit-config.in (rev 0)
+++ trunk/artoolkit/share/artoolkit-config.in 2008-02-18 23:50:16 UTC (rev 279)
@@ -0,0 +1,100 @@
+#! /bin/sh
+
+prefix="${ARTOOLKIT_2_ROOT}"
+exec_prefix="${prefix}"
+includedir="${prefix}/include"
+libdir="${exec_prefix}/lib"
+version=@VERSION@
+cflags="@CFLAG@"
+ldflags="@LDFLAG@"
+libs="@LIBS@"
+
+usage()
+{
+ cat <<EOF
+Usage: artoolkit-config [OPTION]
+
+Known values for OPTION are:
+
+ --prefix=DIR change artoolkit prefix [default $prefix]
+ --exec-prefix=DIR change artoolkit exec prefix [default $exec_prefix]
+ --libs print all library linking information
+ --libs-only-l print only -l library linking information
+ --cflags print pre-processor and compiler flags
+ --help display this help and exit
+ --version output version information
+EOF
+
+ exit $1
+}
+
+if test $# -eq 0; then
+ usage 1
+fi
+
+while test $# -gt 0; do
+ case "$1" in
+ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+ *) optarg= ;;
+ esac
+
+ case "$1" in
+ --prefix=*)
+ prefix=$optarg
+ includedir=$prefix/include
+ libdir=$prefix/lib
+ ;;
+
+ --prefix)
+ echo $prefix
+ ;;
+
+ --exec-prefix=*)
+ exec_prefix=$optarg
+ libdir=$exec_prefix/lib
+ ;;
+
+ --exec-prefix)
+ echo $exec_prefix
+ ;;
+
+ --version)
+ echo $version
+ exit 0
+ ;;
+
+ --help)
+ usage 0
+ ;;
+
+ --cflags)
+ echo $cflags
+ ;;
+
+ --libs-only-l)
+ echo $libs
+ ;;
+
+ --libs)
+ if [ "`uname`" = "Linux" ]
+ then
+ if [ "-L${libdir}" = "-L/usr/lib64" ]
+ then
+ echo "$ldflags $libs"
+ else
+ echo "-L${libdir} $ldflags $libs"
+ fi
+ else
+ echo "-L${libdir} $ldflags $libs"
+ fi
+ ;;
+
+ *)
+ usage
+ exit 1
+ ;;
+ esac
+ shift
+done
+
+exit 0
Added: trunk/artoolkit/share/artoolkit-setenv
===================================================================
--- trunk/artoolkit/share/artoolkit-setenv (rev 0)
+++ trunk/artoolkit/share/artoolkit-setenv 2008-02-18 23:50:16 UTC (rev 279)
@@ -0,0 +1,15 @@
+#! /bin/sh
+
+# Assume we're in the share dir.
+ARTOOLKIT_2_ROOT=`echo $0 | sed "s/\/share\/.*//"`
+if [ "`echo ${ARTOOLKIT_2_ROOT} | cut -c 1`" != "/" ]
+then
+ ARTOOLKIT_2_ROOT="`pwd`/${ARTOOLKIT_2_ROOT}"
+fi
+
+echo "ARTOOLKIT_2_ROOT=${ARTOOLKIT_2_ROOT}; export ARTOOLKIT_2_ROOT" >> ~/.profile
+echo "setenv ARTOOLKIT_2_ROOT ${ARTOOLKIT_2_ROOT}" >> ~/.cshrc
+if [ "`uname`" = "Darwin" ]
+then
+ defaults write ~/.MacOSX/environment ARTOOLKIT_2_ROOT -string "${ARTOOLKIT_2_ROOT}"; plutil -convert xml1 ~/.MacOSX/environment.plist
+fi
Property changes on: trunk/artoolkit/share/artoolkit-setenv
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/artoolkit/share/artoolkit-unsetenv
===================================================================
--- trunk/artoolkit/share/artoolkit-unsetenv (rev 0)
+++ trunk/artoolkit/share/artoolkit-unsetenv 2008-02-18 23:50:16 UTC (rev 279)
@@ -0,0 +1,7 @@
+#! /bin/sh
+sed -i.bak '/ARTOOLKIT_2_ROOT=/d' ~/.profile
+sed -i.bak '/setenv ARTOOLKIT_2_ROOT/d' ~/.cshrc
+if [ "`uname`" = "Darwin" ]
+then
+ defaults delete ~/.MacOSX/environment ARTOOLKIT_2_ROOT; plutil -convert xml1 ~/.MacOSX/environment.plist
+fi
Property changes on: trunk/artoolkit/share/artoolkit-unsetenv
___________________________________________________________________
Name: svn:executable
+ *
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X