diff options
author | MW | 2007-07-13 16:12:38 +0000 |
---|---|---|
committer | MW | 2007-07-13 16:12:38 +0000 |
commit | fcc7f86427f14f9a43a918f30cdf97b438c49a77 (patch) | |
tree | aad3ff8beb98e63365db9b6982fff14817aad2f6 /OpenSim/Region/Environment/Scenes/SceneObject.cs | |
parent | rename file to not have spaces in it (diff) | |
download | opensim-SC_OLD-fcc7f86427f14f9a43a918f30cdf97b438c49a77.zip opensim-SC_OLD-fcc7f86427f14f9a43a918f30cdf97b438c49a77.tar.gz opensim-SC_OLD-fcc7f86427f14f9a43a918f30cdf97b438c49a77.tar.bz2 opensim-SC_OLD-fcc7f86427f14f9a43a918f30cdf97b438c49a77.tar.xz |
Changed simpleApp to use basic physics.
Done some work of fixing primitive/SceneObject copying.
Set DefaultHome region to 1000,1000.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObject.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObject.cs | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObject.cs b/OpenSim/Region/Environment/Scenes/SceneObject.cs index 5eed115..c586e9b 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObject.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObject.cs | |||
@@ -46,7 +46,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
46 | private bool physicsEnabled = false; | 46 | private bool physicsEnabled = false; |
47 | private PhysicsScene m_PhysScene; | 47 | private PhysicsScene m_PhysScene; |
48 | private PhysicsActor m_PhysActor; | 48 | private PhysicsActor m_PhysActor; |
49 | 49 | ||
50 | public LLUUID rootUUID | 50 | public LLUUID rootUUID |
51 | { | 51 | { |
52 | get | 52 | get |
@@ -73,7 +73,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
73 | m_regionHandle = regionHandle; | 73 | m_regionHandle = regionHandle; |
74 | m_world = world; | 74 | m_world = world; |
75 | this.Pos = pos; | 75 | this.Pos = pos; |
76 | this.CreateRootFromPacket(ownerID, localID, shape, pos ); | 76 | this.CreateRootFromShape(ownerID, localID, shape, pos); |
77 | } | 77 | } |
78 | 78 | ||
79 | /// <summary> | 79 | /// <summary> |
@@ -91,11 +91,11 @@ namespace OpenSim.Region.Environment.Scenes | |||
91 | /// <param name="addPacket"></param> | 91 | /// <param name="addPacket"></param> |
92 | /// <param name="agentID"></param> | 92 | /// <param name="agentID"></param> |
93 | /// <param name="localID"></param> | 93 | /// <param name="localID"></param> |
94 | public void CreateRootFromPacket(LLUUID agentID, uint localID, PrimitiveBaseShape shape, LLVector3 pos) | 94 | public void CreateRootFromShape(LLUUID agentID, uint localID, PrimitiveBaseShape shape, LLVector3 pos) |
95 | { | 95 | { |
96 | this.rootPrimitive = new Primitive( this.m_regionHandle, this.m_world, agentID, localID, true, this, this, shape, pos); | 96 | this.rootPrimitive = new Primitive(this.m_regionHandle, this.m_world, agentID, localID, true, this, this, shape, pos); |
97 | this.children.Add(rootPrimitive); | 97 | this.children.Add(rootPrimitive); |
98 | this.ChildPrimitives.Add(this.rootUUID, this.rootPrimitive); | 98 | this.ChildPrimitives.Add(this.rootUUID, this.rootPrimitive); |
99 | } | 99 | } |
100 | 100 | ||
101 | /// <summary> | 101 | /// <summary> |
@@ -207,7 +207,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
207 | /// <param name="remoteClient"></param> | 207 | /// <param name="remoteClient"></param> |
208 | public void GrapMovement(LLVector3 offset, LLVector3 pos, IClientAPI remoteClient) | 208 | public void GrapMovement(LLVector3 offset, LLVector3 pos, IClientAPI remoteClient) |
209 | { | 209 | { |
210 | this.rootPrimitive.Pos = pos ; | 210 | this.rootPrimitive.Pos = pos; |
211 | this.rootPrimitive.SendTerseUpdateForAllChildren(remoteClient); | 211 | this.rootPrimitive.SendTerseUpdateForAllChildren(remoteClient); |
212 | } | 212 | } |
213 | 213 | ||
@@ -232,16 +232,16 @@ namespace OpenSim.Region.Environment.Scenes | |||
232 | proper.ObjectData[0].OwnerID = this.rootPrimitive.OwnerID; | 232 | proper.ObjectData[0].OwnerID = this.rootPrimitive.OwnerID; |
233 | proper.ObjectData[0].TouchName = enc.GetBytes(this.rootPrimitive.TouchName + "\0"); | 233 | proper.ObjectData[0].TouchName = enc.GetBytes(this.rootPrimitive.TouchName + "\0"); |
234 | proper.ObjectData[0].TextureID = new byte[0]; | 234 | proper.ObjectData[0].TextureID = new byte[0]; |
235 | proper.ObjectData[0].SitName = enc.GetBytes(this.rootPrimitive.SitName +"\0") ; | 235 | proper.ObjectData[0].SitName = enc.GetBytes(this.rootPrimitive.SitName + "\0"); |
236 | proper.ObjectData[0].Name = enc.GetBytes(this.rootPrimitive.Name +"\0"); | 236 | proper.ObjectData[0].Name = enc.GetBytes(this.rootPrimitive.Name + "\0"); |
237 | proper.ObjectData[0].Description = enc.GetBytes(this.rootPrimitive.Description +"\0"); | 237 | proper.ObjectData[0].Description = enc.GetBytes(this.rootPrimitive.Description + "\0"); |
238 | proper.ObjectData[0].OwnerMask = this.rootPrimitive.OwnerMask; | 238 | proper.ObjectData[0].OwnerMask = this.rootPrimitive.OwnerMask; |
239 | proper.ObjectData[0].NextOwnerMask = this.rootPrimitive.NextOwnerMask; | 239 | proper.ObjectData[0].NextOwnerMask = this.rootPrimitive.NextOwnerMask; |
240 | proper.ObjectData[0].GroupMask = this.rootPrimitive.GroupMask; | 240 | proper.ObjectData[0].GroupMask = this.rootPrimitive.GroupMask; |
241 | proper.ObjectData[0].EveryoneMask = this.rootPrimitive.EveryoneMask; | 241 | proper.ObjectData[0].EveryoneMask = this.rootPrimitive.EveryoneMask; |
242 | proper.ObjectData[0].BaseMask = this.rootPrimitive.BaseMask; | 242 | proper.ObjectData[0].BaseMask = this.rootPrimitive.BaseMask; |
243 | 243 | ||
244 | client.OutPacket(proper); | 244 | client.OutPacket(proper); |
245 | } | 245 | } |
246 | } | 246 | } |
247 | } | 247 | } |