ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-10 11:33:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added danx0r's physics patch, although for now have disabled the lines in Scene.cs, as any changes to prims (like size or position changes) are only updated to the physics engine when you restart opensim. Also prims aren't deleted from the physics engine. These shouldn't be hard to fix.

Browse Source
This commit is contained in:
MW
2007-08-23 10:53:42 +00:00
parent 107469ed93
commit 9a8742e838
4 changed files with 50 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@@ -503,6 +503,11 @@ namespace OpenSim.Region.Environment.Scenes
foreach (SceneObjectGroup prim in PrimsFromDB)
{
AddEntityFromStorage(prim);
// phyScene.AddPrim(
// new PhysicsVector(prim.RootPart.AbsolutePosition.X, prim.RootPart.AbsolutePosition.Y, prim.RootPart.AbsolutePosition.Z),
// new PhysicsVector(prim.RootPart.Scale.X, prim.RootPart.Scale.Y, prim.RootPart.Scale.Z),
// new Axiom.Math.Quaternion(prim.RootPart.RotationOffset.W, prim.RootPart.RotationOffset.X,
// prim.RootPart.RotationOffset.Y, prim.RootPart.RotationOffset.Z));
}
MainLog.Instance.Verbose("Loaded " + PrimsFromDB.Count.ToString() + " SceneObject(s)");
}
@@ -540,6 +545,8 @@ namespace OpenSim.Region.Environment.Scenes
{
SceneObjectGroup sceneOb = new SceneObjectGroup(this, this.m_regionHandle, ownerID, PrimIDAllocate(), pos, shape);
AddEntity(sceneOb);
//phyScene.AddPrim(new PhysicsVector(pos.X, pos.Y, pos.Z), new PhysicsVector(shape.Scale.X, shape.Scale.Y, shape.Scale.Z),
// new Axiom.Math.Quaternion());
}
public void RemovePrim(uint localID, LLUUID avatar_deleter)
@@ -615,6 +622,11 @@ namespace OpenSim.Region.Environment.Scenes
//if we want this to be a import method then we need new uuids for the object to avoid any clashes
//obj.RegenerateFullIDs();
AddEntity(obj);
// phyScene.AddPrim(
// new PhysicsVector(obj.RootPart.AbsolutePosition.X, obj.RootPart.AbsolutePosition.Y, obj.RootPart.AbsolutePosition.Z),
// new PhysicsVector(obj.RootPart.Scale.X, obj.RootPart.Scale.Y, obj.RootPart.Scale.Z),
// new Axiom.Math.Quaternion(obj.RootPart.RotationOffset.W, obj.RootPart.RotationOffset.X,
// obj.RootPart.RotationOffset.Y, obj.RootPart.RotationOffset.Z));
primCount++;
}
}

1
OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
View File

@@ -57,6 +57,7 @@ namespace OpenSim.Region.Environment.Scenes
public SceneObjectPart RootPart
{
get { return this.m_rootPart; }
set { m_rootPart = value; }
}