1 files changed, 35 insertions, 39 deletions

diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour2.cs
index 478dd95..1ec2046 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Tools/pCampBot/Behaviours/PhysicsBehaviour2.cs
@@ -25,66 +25,62 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using OpenMetaverse;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Reflection;
-using System.Runtime.InteropServices;
 using System.Threading;
-using System.IO;
-using System.Diagnostics;
 using log4net;
-using Nini.Config;
-using Ode.NET;
-using OpenSim.Framework;
-using OpenSim.Region.Physics.Manager;
-using OpenMetaverse;
+using pCampBot.Interfaces;
 
-namespace OpenSim.Region.Physics.OdePlugin
+namespace pCampBot
 {
     /// <summary>
-    /// ODE plugin
+    /// This behavior is for the systematic study of some performance improvements made
+    /// for OSCC'13.
+    /// Walk around, sending AgentUpdate packets all the time.
     /// </summary>
-    public class OdePlugin : IPhysicsPlugin
+    public class PhysicsBehaviour2 : AbstractBehaviour
     {
-        private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
-
-        private OdeScene m_scene;
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        public bool Init()
-        {
-            return true;
+        public PhysicsBehaviour2() 
+        { 
+            AbbreviatedName = "ph2";
+            Name = "Physics2"; 
         }
 
-        public PhysicsScene GetScene(String sceneIdentifier)
+        private const int TIME_WALKING = 5 * 10; // 5 seconds
+        private int counter = 0;
+
+        public override void Action()
         {
-            if (m_scene == null)
+
+            if (counter >= TIME_WALKING)
             {
-                // We do this so that OpenSimulator on Windows loads the correct native ODE library depending on whether
-                // it's running as a 32-bit process or a 64-bit one.  By invoking LoadLibary here, later DLLImports
-                // will find it already loaded later on.
-                //
-                // This isn't necessary for other platforms (e.g. Mac OSX and Linux) since the DLL used can be
-                // controlled in Ode.NET.dll.config
-                if (Util.IsWindows())
-                    Util.LoadArchSpecificWindowsDll("ode.dll");
+                counter = 0;
 
-                // Initializing ODE only when a scene is created allows alternative ODE plugins to co-habit (according to
-                // http://opensimulator.org/mantis/view.php?id=2750).
-                d.InitODE();
-                
-                m_scene = new OdeScene(sceneIdentifier);
-            }
+                Vector3 target = new Vector3(Bot.Random.Next(1, 254), Bot.Random.Next(1, 254), Bot.Client.Self.SimPosition.Z);
+                MyTurnToward(target);
 
-            return m_scene;
-        }
+                Bot.Client.Self.Movement.AtPos = true;
 
-        public string GetName()
-        {
-            return ("OpenDynamicsEngine");
+            }
+            else
+                counter++;
+            // In any case, send an update
+            Bot.Client.Self.Movement.SendUpdate();
         }
 
-        public void Dispose()
+        private void MyTurnToward(Vector3 target)
         {
+            Quaternion between = Vector3.RotationBetween(Vector3.UnitX, Vector3.Normalize(target - Bot.Client.Self.SimPosition));
+            Quaternion rot = between ;
+
+            Bot.Client.Self.Movement.BodyRotation = rot;
+            Bot.Client.Self.Movement.HeadRotation = rot;
+            Bot.Client.Self.Movement.Camera.LookAt(Bot.Client.Self.SimPosition, target);
         }
     }
 }
\ No newline at end of file