diff options
author | Melanie | 2013-01-24 00:25:08 +0000 |
---|---|---|
committer | Melanie | 2013-01-24 00:25:08 +0000 |
commit | be4c8c4931637b7b0849d12c634599c702483364 (patch) | |
tree | 9a49626efcc10f1272b37176616a41476b044045 /OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Merge branch 'master' into cooptermination (diff) | |
download | opensim-SC_OLD-be4c8c4931637b7b0849d12c634599c702483364.zip opensim-SC_OLD-be4c8c4931637b7b0849d12c634599c702483364.tar.gz opensim-SC_OLD-be4c8c4931637b7b0849d12c634599c702483364.tar.bz2 opensim-SC_OLD-be4c8c4931637b7b0849d12c634599c702483364.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs index bc163eb..2828cab 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs | |||
@@ -140,6 +140,25 @@ public struct EntityProperties | |||
140 | public Vector3 Velocity; | 140 | public Vector3 Velocity; |
141 | public Vector3 Acceleration; | 141 | public Vector3 Acceleration; |
142 | public Vector3 RotationalVelocity; | 142 | public Vector3 RotationalVelocity; |
143 | |||
144 | public override string ToString() | ||
145 | { | ||
146 | StringBuilder buff = new StringBuilder(); | ||
147 | buff.Append("<i="); | ||
148 | buff.Append(ID.ToString()); | ||
149 | buff.Append(",p="); | ||
150 | buff.Append(Position.ToString()); | ||
151 | buff.Append(",r="); | ||
152 | buff.Append(Rotation.ToString()); | ||
153 | buff.Append(",v="); | ||
154 | buff.Append(Velocity.ToString()); | ||
155 | buff.Append(",a="); | ||
156 | buff.Append(Acceleration.ToString()); | ||
157 | buff.Append(",rv="); | ||
158 | buff.Append(RotationalVelocity.ToString()); | ||
159 | buff.Append(">"); | ||
160 | return buff.ToString(); | ||
161 | } | ||
143 | } | 162 | } |
144 | 163 | ||
145 | // Format of this structure must match the definition in the C++ code | 164 | // Format of this structure must match the definition in the C++ code |