[flokk-checkins] Added ability to specify a rotation speed... and max rotation speed and current ro
Status: Pre-Alpha
Brought to you by:
dshipton
Menu
▾
▴
[flokk-checkins] Added ability to specify a rotation speed... and max rotation speed and current rotation speed.
|
From: Daniel E. S. <dsh...@us...> - 2004-12-23 21:41:03
|
<html>
<head>
<style><!--
body {background-color:#ffffff;}
.file {border:1px solid #eeeeee;margin-top:1em;margin-bottom:1em;}
.pathname {font-family:monospace; float:right;}
.fileheader {margin-bottom:.5em;}
.diff {margin:0;}
.tasklist {padding:4px;border:1px dashed #000000;margin-top:1em;}
.tasklist ul {margin-top:0;margin-bottom:0;}
tr.alt {background-color:#eeeeee}
#added {background-color:#ddffdd;}
#addedchars {background-color:#99ff99;font-weight:bolder;}
tr.alt #added {background-color:#ccf7cc;}
#removed {background-color:#ffdddd;}
#removedchars {background-color:#ff9999;font-weight:bolder;}
tr.alt #removed {background-color:#f7cccc;}
#info {color:#888888;}
#context {background-color:#eeeeee;}
td {padding-left:.3em;padding-right:.3em;}
tr.head {border-bottom-width:1px;border-bottom-style:solid;}
tr.head td {padding:0;padding-top:.2em;}
.task {background-color:#ffff00;}
.comment {padding:4px;border:1px dashed #000000;background-color:#ffffdd}
.error {color:red;}
hr {border-width:0px;height:2px;background:black;}
--></style>
</head>
<body>
<table cellspacing="0" cellpadding="0" border="0" rules="cols">
<tr class="head"><td colspan="4">Commit in <b><tt>flokk/src/flokk</tt></b><span id="info"> on MAIN</span></td></tr>
<tr><td><tt><a href="#file1">LocationalAgent.cpp</a></tt></td><td align="right" id="added">+22</td><td align="right" id="removed">-2</td><td nowrap="nowrap" align="center"><a href="http://cvs.sourceforge.net/viewcvs.py/flokk/flokk/src/flokk/LocationalAgent.cpp?rev=1.9&content-type=text/vnd.viewcvs-markup">1.9</a> <a href="http://cvs.sourceforge.net/viewcvs.py/flokk/flokk/src/flokk/LocationalAgent.cpp.diff?r1=1.9&r2=1.10">-></a> <a href="http://cvs.sourceforge.net/viewcvs.py/flokk/flokk/src/flokk/LocationalAgent.cpp?rev=1.10&content-type=text/vnd.viewcvs-markup">1.10</a></td></tr>
<tr class="alt"><td><tt><a href="#file2">LocationalAgent.h</a></tt></td><td align="right" id="added">+26</td><td align="right" id="removed">-4</td><td nowrap="nowrap" align="center"><a href="http://cvs.sourceforge.net/viewcvs.py/flokk/flokk/src/flokk/LocationalAgent.h?rev=1.8&content-type=text/vnd.viewcvs-markup">1.8</a> <a href="http://cvs.sourceforge.net/viewcvs.py/flokk/flokk/src/flokk/LocationalAgent.h.diff?r1=1.8&r2=1.9">-></a> <a href="http://cvs.sourceforge.net/viewcvs.py/flokk/flokk/src/flokk/LocationalAgent.h?rev=1.9&content-type=text/vnd.viewcvs-markup">1.9</a></td></tr>
<tr><td></td><td align="right" id="added">+48</td><td align="right" id="removed">-6</td><td></td></tr>
</table>
<small id="info">2 modified files</small><br />
<pre class="comment">
Added ability to specify a rotation speed... and max rotation speed and current rotation speed.
</pre>
<hr /><a name="file1" /><div class="file">
<span class="pathname"><a href="http://cvs.sourceforge.net/viewcvs.py/flokk/flokk">flokk</a>/<a href="http://cvs.sourceforge.net/viewcvs.py/flokk/flokk/src">src</a>/<a href="http://cvs.sourceforge.net/viewcvs.py/flokk/flokk/src/flokk">flokk</a><br /></span>
<div class="fileheader"><big><b>LocationalAgent.cpp</b></big> <small id="info"><a href="http://cvs.sourceforge.net/viewcvs.py/flokk/flokk/src/flokk/LocationalAgent.cpp?rev=1.9&content-type=text/vnd.viewcvs-markup">1.9</a> <a href="http://cvs.sourceforge.net/viewcvs.py/flokk/flokk/src/flokk/LocationalAgent.cpp.diff?r1=1.9&r2=1.10">-></a> <a href="http://cvs.sourceforge.net/viewcvs.py/flokk/flokk/src/flokk/LocationalAgent.cpp?rev=1.10&content-type=text/vnd.viewcvs-markup">1.10</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.9 -r1.10
--- LocationalAgent.cpp 15 Dec 2004 01:53:50 -0000 1.9
+++ LocationalAgent.cpp 23 Dec 2004 21:40:55 -0000 1.10
@@ -3,8 +3,8 @@
</small></pre><pre class="diff" id="context"> *
* -----------------------------------------------------------------
* File: $RCSfile: LocationalAgent.cpp,v $
</pre><pre class="diff" id="removed">- * Date modified: $Date: 2004/12/15 01:53:50 $
- * Version: $Revision: 1.9 $
</pre><pre class="diff" id="added">+ * Date modified: $Date: 2004/12/23 21:40:55 $
+ * Version: $Revision: 1.10 $
</pre><pre class="diff" id="context"> * -----------------------------------------------------------------
*
*
</pre><pre class="diff"><small id="info">@@ -83,6 +83,26 @@
</small></pre><pre class="diff" id="context"> mDesiredPosition = desiredPos;
}
</pre><pre class="diff" id="added">+ const gmtl::Vec3f LocationalAgent::getRotationSpeed()const
+ {
+ return mRotationSpeed;
+ }
+
+ const gmtl::Vec3f LocationalAgent::getDesiredRotationSpeed()const
+ {
+ return mDesiredRotationSpeed;
+ }
+
+ void LocationalAgent::setDesiredRotationSpeed( gmtl::Vec3f desiredRotSpeed)
+ {
+ mRotationSpeed = desiredRotSpeed;
+ }
+
+ void LocationalAgent::setMaxRotationSpeed( gmtl::Vec3f maxRotSpeed )
+ {
+ mMaxRotationSpeed = maxRotSpeed;
+ }
+
</pre><pre class="diff" id="context"> const gmtl::Matrix33f & LocationalAgent::getOrientation()const
{
return mOrientation;
</pre></div>
<hr /><a name="file2" /><div class="file">
<span class="pathname"><a href="http://cvs.sourceforge.net/viewcvs.py/flokk/flokk">flokk</a>/<a href="http://cvs.sourceforge.net/viewcvs.py/flokk/flokk/src">src</a>/<a href="http://cvs.sourceforge.net/viewcvs.py/flokk/flokk/src/flokk">flokk</a><br /></span>
<div class="fileheader"><big><b>LocationalAgent.h</b></big> <small id="info"><a href="http://cvs.sourceforge.net/viewcvs.py/flokk/flokk/src/flokk/LocationalAgent.h?rev=1.8&content-type=text/vnd.viewcvs-markup">1.8</a> <a href="http://cvs.sourceforge.net/viewcvs.py/flokk/flokk/src/flokk/LocationalAgent.h.diff?r1=1.8&r2=1.9">-></a> <a href="http://cvs.sourceforge.net/viewcvs.py/flokk/flokk/src/flokk/LocationalAgent.h?rev=1.9&content-type=text/vnd.viewcvs-markup">1.9</a></small></div>
<pre class="diff"><small id="info">diff -u -r1.8 -r1.9
--- LocationalAgent.h 15 Dec 2004 01:53:50 -0000 1.8
+++ LocationalAgent.h 23 Dec 2004 21:40:55 -0000 1.9
@@ -3,8 +3,8 @@
</small></pre><pre class="diff" id="context"> *
* -----------------------------------------------------------------
* File: $RCSfile: LocationalAgent.h,v $
</pre><pre class="diff" id="removed">- * Date modified: $Date: 2004/12/15 01:53:50 $
- * Version: $Revision: 1.8 $
</pre><pre class="diff" id="added">+ * Date modified: $Date: 2004/12/23 21:40:55 $
+ * Version: $Revision: 1.9 $
</pre><pre class="diff" id="context"> * -----------------------------------------------------------------
*
*
</pre><pre class="diff"><small id="info">@@ -116,7 +116,25 @@
</small></pre><pre class="diff" id="context"> */
void setDesiredSpeed( float speed );
</pre><pre class="diff" id="added">+ /**
+ * Returns the Agent's current rotation speed
+ */
+ const gmtl::Vec3f getRotationSpeed()const;
</pre><pre class="diff" id="context">
</pre><pre class="diff" id="added">+ /**
+ * Returns the Agent's desired rotation speed
+ */
+ const gmtl::Vec3f getDesiredRotationSpeed()const;
+
+ /**
+ * Sets the Agent's current rotation speed
+ */
+ void setDesiredRotationSpeed( gmtl::Vec3f desiredRotSpeed);
+
+ /**
+ * Sets the Agent's max rotation speed
+ */
+ void setMaxRotationSpeed( gmtl::Vec3f maxRotSpeed );
</pre><pre class="diff" id="context">
/**
* Returns the Agent's current orientation as a rotation matrix.
</pre><pre class="diff"><small id="info">@@ -179,8 +197,12 @@
</small></pre><pre class="diff" id="context"> float mDesiredSpeed; /*< Desired Speed */
float mMaxSpeed; /*< Maximum Speed */
</pre><pre class="diff" id="removed">- gmtl::Matrix33f mOrientation; /*< Current Orientation as a rotation matrix */
- gmtl::Matrix33f mDesiredOrientation; /*< Desired Orientation as a rotation matrix */
</pre><pre class="diff" id="added">+ gmtl::Matrix33f mOrientation; /*< Current Orientation as a rotation matrix */
+ gmtl::Matrix33f mDesiredOrientation; /*< Desired Orientation as a rotation matrix */
+
+ gmtl::Vec3f mRotationSpeed;
+ gmtl::Vec3f mDesiredRotationSpeed;
+ gmtl::Vec3f mMaxRotationSpeed;
</pre><pre class="diff" id="context">
gmtl::AABoxf mAABox;
};
</pre></div>
<center><small><a href="http://www.badgers-in-foil.co.uk/projects/cvsspam/" title="commit -> email">CVSspam</a> 0.2.10</small></center>
</body></html>
|