From de3180a63ecb89971321b7dce60dd86703f87e6d Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Wed, 5 Dec 2012 23:19:18 +0000
Subject: avatar collision plane send to viewer is only relative to feet.
change avatar collider, just rounding the boxes, etc
---
OpenSim/Region/Physics/Manager/PhysicsActor.cs | 2 ++
1 file changed, 2 insertions(+)
(limited to 'OpenSim/Region/Physics/Manager')
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
index 5af6373..e1168bd 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
@@ -61,6 +61,7 @@ namespace OpenSim.Region.Physics.Manager
public Vector3 SurfaceNormal;
public float PenetrationDepth;
public float RelativeSpeed;
+ public bool CharacterFeet;
public ContactPoint(Vector3 position, Vector3 surfaceNormal, float penetrationDepth)
{
@@ -68,6 +69,7 @@ namespace OpenSim.Region.Physics.Manager
SurfaceNormal = surfaceNormal;
PenetrationDepth = penetrationDepth;
RelativeSpeed = 0f; // for now let this one be set explicity
+ CharacterFeet = true; // keep other plugins work as before
}
}
--
cgit v1.1
From d2499c4c314b290c42f454913305d97c6eec92d6 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Fri, 7 Dec 2012 15:54:46 +0000
Subject: *TEST* Use new avatar size in ubitODE.
---
OpenSim/Region/Physics/Manager/PhysicsActor.cs | 5 +++++
1 file changed, 5 insertions(+)
(limited to 'OpenSim/Region/Physics/Manager')
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
index e1168bd..0405dad 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
@@ -175,6 +175,11 @@ namespace OpenSim.Region.Physics.Manager
public abstract Vector3 Size { get; set; }
+ public virtual void setAvatarSize(Vector3 size, float feetOffset)
+ {
+ Size = size;
+ }
+
public virtual bool Phantom { get; set; }
public virtual bool IsVolumeDtc
--
cgit v1.1
From 2ea0dc55d7ea6da6e91ab614856cdeece7eae5d2 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Fri, 7 Dec 2012 20:06:35 +0000
Subject: create a new ode character also with the new information
---
OpenSim/Region/Physics/Manager/PhysicsScene.cs | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
(limited to 'OpenSim/Region/Physics/Manager')
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index ce269fa..c07213e 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -127,8 +127,10 @@ namespace OpenSim.Region.Physics.Manager
///
///
///
- public abstract PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 size, bool isFlying);
-
+ public virtual PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 size, bool isFlying)
+ {
+ return null;
+ }
///
/// Add an avatar
///
@@ -145,6 +147,18 @@ namespace OpenSim.Region.Physics.Manager
return ret;
}
+ public virtual PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 size,float feetOffset, bool isFlying)
+ {
+ return null;
+ }
+
+ public virtual PhysicsActor AddAvatar(uint localID,string avName, Vector3 position, Vector3 size, float feetOffset, bool isFlying)
+ {
+ PhysicsActor ret = AddAvatar(avName, position, size,feetOffset, isFlying);
+ if (ret != null) ret.LocalID = localID;
+ return ret;
+ }
+
///
/// Remove an avatar.
///
--
cgit v1.1
From 420015b7d0dafe956d7ab1980d8e4f499395df76 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Tue, 11 Dec 2012 04:47:40 +0000
Subject: missing file
---
OpenSim/Region/Physics/Manager/PhysicsActor.cs | 9 +++++++++
1 file changed, 9 insertions(+)
(limited to 'OpenSim/Region/Physics/Manager')
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
index 0405dad..e39cee7 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
@@ -71,6 +71,15 @@ namespace OpenSim.Region.Physics.Manager
RelativeSpeed = 0f; // for now let this one be set explicity
CharacterFeet = true; // keep other plugins work as before
}
+
+ public ContactPoint(Vector3 position, Vector3 surfaceNormal, float penetrationDepth, bool feet)
+ {
+ Position = position;
+ SurfaceNormal = surfaceNormal;
+ PenetrationDepth = penetrationDepth;
+ RelativeSpeed = 0f; // for now let this one be set explicity
+ CharacterFeet = feet; // keep other plugins work as before
+ }
}
public struct ContactData
--
cgit v1.1
From 28ea08c3e234f8ca3c6590af4045349af7fed844 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Tue, 11 Dec 2012 17:14:32 +0000
Subject: fix let other phys plugins work.. broken when added feetOffset
---
OpenSim/Region/Physics/Manager/PhysicsScene.cs | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
(limited to 'OpenSim/Region/Physics/Manager')
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index c07213e..cdffa6b 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -147,15 +147,9 @@ namespace OpenSim.Region.Physics.Manager
return ret;
}
- public virtual PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 size,float feetOffset, bool isFlying)
+ public virtual PhysicsActor AddAvatar(uint localID, string avName, Vector3 position, Vector3 size, float feetOffset, bool isFlying)
{
- return null;
- }
-
- public virtual PhysicsActor AddAvatar(uint localID,string avName, Vector3 position, Vector3 size, float feetOffset, bool isFlying)
- {
- PhysicsActor ret = AddAvatar(avName, position, size,feetOffset, isFlying);
- if (ret != null) ret.LocalID = localID;
+ PhysicsActor ret = AddAvatar(localID, avName, position, size, isFlying);
return ret;
}
--
cgit v1.1