OpenSimulator GForge > Projects > IdealistViewer > SVN

Diff of /branches/idealistviewer_mxp_0_0_1/IdealistViewer/Application/Module/MetaverseExchangeProtocol.cs

-trunk/IdealistViewer/Application/Module/MetaverseExchangeProtocol.cs
revision 252, Thu Mar  5 19:08:53 2009 UTC
+branches/idealistviewer_mxp_0_0_1/IdealistViewer/Application/Module/MetaverseExchangeProtocol.cs
revision 253, Sun Mar  8 20:08:53 2009 UTC
 Line 9
  using MXP.Extentions.OpenMetaverseFragments.Proto;
  using OpenMetaverse;
  using MXP.Util;
+ using MXP.Common.Proto;
  namespace IdealistViewer.Module
  {
-Line 24
+Line 25
          private VSimulator m_simulator;
          private bool m_translateChange = false;
          private bool m_orientateChange = false;
+         private bool m_walking = false;
          private Vector3 FORWARD = new Vector3(1, 0, 0);
          private Vector3 BACKWARD = new Vector3(-1, 0, 0);
          private Vector3 LEFT = new Vector3(0, 0, -1);
-Line 88
+Line 90
              modifyRequest.ObjectFragment.OwnerId = m_userId.Guid;
              modifyRequest.ObjectFragment.TypeId = Guid.Empty;
              modifyRequest.ObjectFragment.TypeName = "Avatar";
-             modifyRequest.ObjectFragment.Acceleration = new float[3];
+             modifyRequest.ObjectFragment.Acceleration = new MsdVector3f();
-             modifyRequest.ObjectFragment.AngularAcceleration = new float[4];
+             modifyRequest.ObjectFragment.AngularAcceleration = new MsdQuaternion4f();
-             modifyRequest.ObjectFragment.AngularVelocity = new float[4];
+             modifyRequest.ObjectFragment.AngularVelocity = new MsdQuaternion4f();
              modifyRequest.ObjectFragment.BoundingSphereRadius = m_avatar.Scale.Length();
-             modifyRequest.ObjectFragment.Location = ToFloatVector(m_avatar.Position);
+             modifyRequest.ObjectFragment.Location = ToOmVector(m_avatar.Position);
              modifyRequest.ObjectFragment.Mass = 1.0f;
-             modifyRequest.ObjectFragment.Orientation = ToFloatQuaternion(m_avatar.Rotation);
+             modifyRequest.ObjectFragment.Orientation = ToOmQuaternion(m_avatar.Rotation);
-             modifyRequest.ObjectFragment.Velocity = ToFloatVector(m_avatar.Velocity);
+             modifyRequest.ObjectFragment.Velocity = ToOmVector(m_avatar.Velocity);
              OmAvatarExt avatarExt=new OmAvatarExt();
              //avatarExt.TargetLocation
-             if (m_translateChange)
+             //if (m_translateChange)
-             {
+             //{
                  Quaternion orientation = m_avatar.Rotation;
                  Vector3 movementDirection = new Vector3(0,0,0);
                  if (m_forward)
-Line 128
+Line 130
                      movementDirection += DOWN * orientation;
                  }
                  avatarExt.MovementDirection = ToOmVector(movementDirection);
-             }
+             //}
              if (m_orientateChange)
              {
                  avatarExt.TargetOrientation=ToOmQuaternion(Quaternion.CreateFromAxisAngle(Vector3.UnitZ,m_heading));
              }
+             if (m_translateChange)
+             {
+                 m_walking = !m_walking;
+                 if (m_walking)
+                 {
+                     m_avatarAnimations[m_avatar.ID] = new List<UUID>();
+                     m_avatarAnimations[m_avatar.ID].Add(Animations.WALK);
+                 }
+                 else
+                 {
+                     m_avatarAnimations[m_avatar.ID] = new List<UUID>();
+                     m_avatarAnimations[m_avatar.ID].Add(Animations.STAND);
+                 }
+             }
              modifyRequest.SetExtension<OmAvatarExt>(avatarExt);
              m_client.Send(modifyRequest);
-Line 175
+Line 196
          private void LandPerceptionReceived(PerceptionEventMessage pe)
          {
              ObjectFragment objectFragment = pe.ObjectFragment;
-             m_log.Info("Received terrain: " + objectFragment.ObjectName + " (" + pe.ObjectFragment.StatePayloadLength + ")");
+             m_log.Info("Received terrain: " + objectFragment.ObjectName + " (" + pe.ObjectFragment.ExtensionLength + ")");
              OmBitmapTerrainExt terrainExt = pe.GetExtension<OmBitmapTerrainExt>();
              m_simulator.WaterHeight = terrainExt.WaterLevel;
-             float[] map = CompressionUtil.DecompressHeightMap(terrainExt.HeightMap, terrainExt.Offset, terrainExt.Scale);
+             float[] map = CompressUtil.DecompressHeightMap(terrainExt.HeightMap, terrainExt.Offset, terrainExt.Scale);
              for (int x = 0; x < terrainExt.Width; x += 16)
              {
                  for (int y = 0; y < terrainExt.Height; y += 16)
-Line 210
+Line 231
              primitive.OwnerID = new UUID(objectFragment.OwnerId);
              primitive.RegionHandle = m_simulator.Handle;
-             primitive.Rotation = FromFloatQuaternion(objectFragment.Orientation);
+             primitive.Rotation = FromOmQuaternion(objectFragment.Orientation);
-             primitive.AngularVelocity = FromFloatQuaternionToEulerAngles(objectFragment.AngularVelocity);
+             primitive.AngularVelocity = FromOmQuaternionToEulerAngles(objectFragment.AngularVelocity);
-             primitive.Position = FromFloatVector(objectFragment.Location);
+             primitive.Position = FromOmVector(objectFragment.Location);
-             primitive.Velocity = FromFloatVector(objectFragment.Velocity);
+             primitive.Velocity = FromOmVector(objectFragment.Velocity);
-             primitive.Acceleration = FromFloatVector(objectFragment.Acceleration);
+             primitive.Acceleration = FromOmVector(objectFragment.Acceleration);
              if (m_userId.Guid == objectFragment.OwnerId)
              {
-Line 232
+Line 253
              ObjectUpdate objectUpdate = new ObjectUpdate();
              objectUpdate.LocalID = movementEvent.ObjectIndex;
              objectUpdate.Avatar = m_avatar.LocalID == movementEvent.ObjectIndex;
-             objectUpdate.Position = FromFloatVector(movementEvent.Location);
+             objectUpdate.Position = FromOmVector(movementEvent.Location);
-             objectUpdate.Rotation = FromFloatQuaternion(movementEvent.Orientation);
+             objectUpdate.Rotation = FromOmQuaternion(movementEvent.Orientation);
-             /*
-             if (!(m_avatar.LocalID == movementEvent.ObjectIndex))
-             {
-                 objectUpdate.Rotation = FromFloatQuaternion(movementEvent.Orientation);
-             }
-             else
-             {
-                 // Not respecting server sent orientation for own avatar.
-                 objectUpdate.Rotation = m_avatar.Rotation;
-             }
-             */
              objectUpdate.Velocity = new Vector3();
              objectUpdate.Acceleration = new Vector3();
              objectUpdate.AngularVelocity = new Vector3();
-Line 265
+Line 275
              primitive.OwnerID = new UUID(objectFragment.OwnerId);
              primitive.RegionHandle = m_simulator.Handle;
-             primitive.Rotation = FromFloatQuaternion(objectFragment.Orientation);
+             primitive.Rotation = FromOmQuaternion(objectFragment.Orientation);
-             primitive.AngularVelocity = FromFloatQuaternionToEulerAngles(objectFragment.AngularVelocity);
+             primitive.AngularVelocity = FromOmQuaternionToEulerAngles(objectFragment.AngularVelocity);
-             primitive.Position = FromFloatVector(objectFragment.Location);
+             primitive.Position = FromOmVector(objectFragment.Location);
-             primitive.Velocity = FromFloatVector(objectFragment.Velocity);
+             primitive.Velocity = FromOmVector(objectFragment.Velocity);
-             primitive.Acceleration = FromFloatVector(objectFragment.Acceleration);
+             primitive.Acceleration = FromOmVector(objectFragment.Acceleration);
              if (pe.HasExtension)
              {
-Line 383
+Line 393
              throw new Exception("Unknown PCode: "+value);
          }
-         private Color4 FromOmColor(OmColor4f value)
+         private Color4 FromOmColor(MsdColor4f value)
          {
              return new Color4(value.R / 255, value.G / 255, value.B / 255, value.A / 255);
          }
-         private Vector3 FromFloatVector(float[] values)
+         private Vector3 FromOmVector(MsdVector3f values)
-         {
-             return new Vector3(values[0], values[1], values[2]);
-         }
-         private Vector3 FromOmVector(OmVector3f values)
          {
              return new Vector3(values.X, values.Y, values.Z);
          }
-         private Vector3 FromFloatQuaternionToEulerAngles(float[] values)
+         private Vector3 FromOmQuaternionToEulerAngles(MsdQuaternion4f value)
          {
-             Quaternion quaternion = FromFloatQuaternion(values);
+             Quaternion quaternion = FromOmQuaternion(value);
              float roll;
              float pitch;
              float yaw;
-Line 408
+Line 413
              return new Vector3(roll, pitch, yaw);
          }
-         private Quaternion FromFloatQuaternion(float[] values)
+         private Quaternion FromOmQuaternion(MsdQuaternion4f quaternion)
-         {
-             return new Quaternion(values[0], values[1], values[2],values[3]);
-         }
-         private Quaternion FromOmQuaternion(OmQuaternion4f quaternion)
          {
              return new Quaternion(quaternion.X, quaternion.Y, quaternion.Z, quaternion.W);
          }
-         private OmVector3f ToOmVector(Vector3 value)
+         private MsdVector3f ToOmVector(Vector3 value)
          {
-             OmVector3f encodedValue = new OmVector3f();
+             MsdVector3f encodedValue = new MsdVector3f();
              encodedValue.X = value.X;
              encodedValue.Y = value.Y;
              encodedValue.Z = value.Z;
              return encodedValue;
          }
-         private OmQuaternion4f ToOmQuaternion(Quaternion value)
+         private MsdQuaternion4f ToOmQuaternion(Quaternion value)
          {
-             OmQuaternion4f encodedValue = new OmQuaternion4f();
+             MsdQuaternion4f encodedValue = new MsdQuaternion4f();
              encodedValue.X = value.X;
              encodedValue.Y = value.Y;
              encodedValue.Z = value.Z;
 Line 437
              return encodedValue;
          }
-         private float[] ToFloatVector(Vector3 value)
-         {
-             float[] floatVector=new float[3];
-             floatVector[0]=value.X;
-             floatVector[1]=value.Y;
-             floatVector[2]=value.Z;
-             return floatVector;
-         }
-         private float[] ToFloatQuaternion(Quaternion value)
-         {
-             float[] floatQuaternion = new float[4];
-             floatQuaternion[0] = value.X;
-             floatQuaternion[1] = value.Y;
-             floatQuaternion[2] = value.Z;
-             floatQuaternion[3] = value.W;
-             return floatQuaternion;
-         }
-         private OmColor4f ToOmColor(byte[] value)
-         {
-             OmColor4f encodedValue = new OmColor4f();
-             encodedValue.R = value[0];
-             encodedValue.G = value[1];
-             encodedValue.B = value[2];
-             encodedValue.A = value[3];
-             return encodedValue;
-         }
          #region IProtocol Members
          public void BeginLogin(string loginURI, string username, string password, string startlocation)
-Line 712
+Line 683
          public OpenMetaverse.UUID GetSelfUUID
          {
-             get { return m_avatar.ID; }
+             get { return m_avatar!=null?m_avatar.ID:UUID.Zero; }
          }
          public Dictionary<OpenMetaverse.UUID, OpenMetaverse.FriendInfo> Friends
          {
-             get { throw new NotImplementedException(); }
+             get { return new Dictionary<OpenMetaverse.UUID, OpenMetaverse.FriendInfo>(); }
          }
-         public Dictionary<UUID, List<UUID>> avatarAnimations = new Dictionary<UUID, List<UUID>>();
+         public Dictionary<UUID, List<UUID>> m_avatarAnimations = new Dictionary<UUID, List<UUID>>();
          public Dictionary<UUID, List<UUID>> AvatarAnimations
          {
              get
              {
-                 return avatarAnimations;
+                 return m_avatarAnimations;
              }
              set
              {
-                 avatarAnimations = value;
+                 m_avatarAnimations = value;
              }
          }
-Line 740
+Line 711
          public void Say(string message)
          {
-             throw new NotImplementedException();
+             //throw new NotImplementedException();
          }
          public void SetCameraPosition(OpenMetaverse.Vector3[] camdata)

 Legend:



Removed from v.252
 


changed lines


 
Added in v.253
 Legend:



Removed from v.252
 


changed lines


 
Added in v.253
-Removed from v.252
+Added in v.253

	ViewVC Help
Powered by ViewVC 1.0.0

MyGforge Home

IdealistViewer

Diff of /branches/idealistviewer_mxp_0_0_1/IdealistViewer/Application/Module/MetaverseExchangeProtocol.cs