OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BulletSim: comments and removing small compile errors introduced in last commit.

user_profiles
Robert Adams 2013-01-06 22:56:16 -08:00
parent 9393403253
commit 2e5222055f
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
View File

@ -6,7 +6,7 @@
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright * * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyrightD * * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSimulator Project nor the * * Neither the name of the OpenSimulator Project nor the

2
OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
View File

@ -58,8 +58,6 @@ public sealed class BSCharacter : BSPhysObject
private bool _flying; private bool _flying;
private bool _setAlwaysRun; private bool _setAlwaysRun;
private bool _throttleUpdates; private bool _throttleUpdates;
private bool _isColliding;
private bool _collidingObj;
private bool _floatOnWater; private bool _floatOnWater;
private OMV.Vector3 _rotationalVelocity; private OMV.Vector3 _rotationalVelocity;
private bool _kinematic; private bool _kinematic;

8
OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
View File

@ -95,9 +95,9 @@ public abstract class BSShape
// protected abstract static BSShape GetReference(); // protected abstract static BSShape GetReference();
// Returns a string for debugging that uniquily identifies the memory used by this instance // Returns a string for debugging that uniquily identifies the memory used by this instance
public string AddrString public virtual string AddrString
{ {
get { return ptr.ToString("X"); } get { return "unknown"; }
} }
public override string ToString() public override string ToString()
@ -105,10 +105,6 @@ public abstract class BSShape
StringBuilder buff = new StringBuilder(); StringBuilder buff = new StringBuilder();
buff.Append("<p="); buff.Append("<p=");
buff.Append(AddrString); buff.Append(AddrString);
buff.Append(",s=");
buff.Append(type.ToString());
buff.Append(",k=");
buff.Append(key.ToString("X"));
buff.Append(",c="); buff.Append(",c=");
buff.Append(referenceCount.ToString()); buff.Append(referenceCount.ToString());
buff.Append(">"); buff.Append(">");