diff options
author | lbsa71 | 2007-08-06 12:49:08 +0000 |
---|---|---|
committer | lbsa71 | 2007-08-06 12:49:08 +0000 |
commit | 95de99ff0a2f1d810c3f3dffc7a55cee98d5f28f (patch) | |
tree | a441b5906df6b6a665c91696d38587f3f8c8d615 /OpenSim/Region/Environment/Scenes/Primitive.cs | |
parent | * SimpleApp works again: (diff) | |
download | opensim-SC_OLD-95de99ff0a2f1d810c3f3dffc7a55cee98d5f28f.zip opensim-SC_OLD-95de99ff0a2f1d810c3f3dffc7a55cee98d5f28f.tar.gz opensim-SC_OLD-95de99ff0a2f1d810c3f3dffc7a55cee98d5f28f.tar.bz2 opensim-SC_OLD-95de99ff0a2f1d810c3f3dffc7a55cee98d5f28f.tar.xz |
* Now we have boxes. Yay!
* Removed unused SendPrimitiveToClient that didn't have rot.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Primitive.cs | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Primitive.cs b/OpenSim/Region/Environment/Scenes/Primitive.cs index f36f555..132eabb 100644 --- a/OpenSim/Region/Environment/Scenes/Primitive.cs +++ b/OpenSim/Region/Environment/Scenes/Primitive.cs | |||
@@ -42,7 +42,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
42 | public uint EveryoneMask = 0;//FULL_MASK_PERMISSIONS; | 42 | public uint EveryoneMask = 0;//FULL_MASK_PERMISSIONS; |
43 | public uint BaseMask = 0;//FULL_MASK_PERMISSIONS; | 43 | public uint BaseMask = 0;//FULL_MASK_PERMISSIONS; |
44 | 44 | ||
45 | private PrimitiveBaseShape m_Shape; | 45 | private PrimitiveBaseShape m_shape; |
46 | private byte[] m_particleSystem = new byte[0]; | 46 | private byte[] m_particleSystem = new byte[0]; |
47 | 47 | ||
48 | public SceneObject m_RootParent; | 48 | public SceneObject m_RootParent; |
@@ -83,7 +83,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
83 | 83 | ||
84 | public PrimitiveBaseShape Shape | 84 | public PrimitiveBaseShape Shape |
85 | { | 85 | { |
86 | get { return m_Shape; } | 86 | get { return m_shape; } |
87 | } | 87 | } |
88 | 88 | ||
89 | public LLVector3 WorldPos | 89 | public LLVector3 WorldPos |
@@ -112,8 +112,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
112 | 112 | ||
113 | public LLVector3 Scale | 113 | public LLVector3 Scale |
114 | { | 114 | { |
115 | set { m_Shape.Scale = value; } | 115 | set { m_shape.Scale = value; } |
116 | get { return m_Shape.Scale; } | 116 | get { return m_shape.Scale; } |
117 | } | 117 | } |
118 | 118 | ||
119 | private string m_sitName = ""; | 119 | private string m_sitName = ""; |
@@ -195,7 +195,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
195 | 195 | ||
196 | dupe.m_inventoryItems = m_inventoryItems; | 196 | dupe.m_inventoryItems = m_inventoryItems; |
197 | dupe.m_children = new List<EntityBase>(); | 197 | dupe.m_children = new List<EntityBase>(); |
198 | dupe.m_Shape = m_Shape.Copy(); | 198 | dupe.m_shape = m_shape.Copy(); |
199 | dupe.m_regionHandle = m_regionHandle; | 199 | dupe.m_regionHandle = m_regionHandle; |
200 | dupe.m_scene = m_scene; | 200 | dupe.m_scene = m_scene; |
201 | 201 | ||
@@ -288,7 +288,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
288 | m_uuid = LLUUID.Random(); | 288 | m_uuid = LLUUID.Random(); |
289 | m_localId = (uint)(localID); | 289 | m_localId = (uint)(localID); |
290 | 290 | ||
291 | m_Shape = shape; | 291 | m_shape = shape; |
292 | 292 | ||
293 | ScheduleFullUpdate(); | 293 | ScheduleFullUpdate(); |
294 | } | 294 | } |
@@ -428,7 +428,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
428 | /// <param name="scale"></param> | 428 | /// <param name="scale"></param> |
429 | public void ResizeGoup(LLVector3 scale) | 429 | public void ResizeGoup(LLVector3 scale) |
430 | { | 430 | { |
431 | m_Shape.Scale = scale; | 431 | m_shape.Scale = scale; |
432 | 432 | ||
433 | ScheduleFullUpdate(); | 433 | ScheduleFullUpdate(); |
434 | } | 434 | } |
@@ -545,24 +545,24 @@ namespace OpenSim.Region.Environment.Scenes | |||
545 | /// <param name="shapeBlock"></param> | 545 | /// <param name="shapeBlock"></param> |
546 | public void UpdateShape(ObjectShapePacket.ObjectDataBlock shapeBlock) | 546 | public void UpdateShape(ObjectShapePacket.ObjectDataBlock shapeBlock) |
547 | { | 547 | { |
548 | m_Shape.PathBegin = shapeBlock.PathBegin; | 548 | m_shape.PathBegin = shapeBlock.PathBegin; |
549 | m_Shape.PathEnd = shapeBlock.PathEnd; | 549 | m_shape.PathEnd = shapeBlock.PathEnd; |
550 | m_Shape.PathScaleX = shapeBlock.PathScaleX; | 550 | m_shape.PathScaleX = shapeBlock.PathScaleX; |
551 | m_Shape.PathScaleY = shapeBlock.PathScaleY; | 551 | m_shape.PathScaleY = shapeBlock.PathScaleY; |
552 | m_Shape.PathShearX = shapeBlock.PathShearX; | 552 | m_shape.PathShearX = shapeBlock.PathShearX; |
553 | m_Shape.PathShearY = shapeBlock.PathShearY; | 553 | m_shape.PathShearY = shapeBlock.PathShearY; |
554 | m_Shape.PathSkew = shapeBlock.PathSkew; | 554 | m_shape.PathSkew = shapeBlock.PathSkew; |
555 | m_Shape.ProfileBegin = shapeBlock.ProfileBegin; | 555 | m_shape.ProfileBegin = shapeBlock.ProfileBegin; |
556 | m_Shape.ProfileEnd = shapeBlock.ProfileEnd; | 556 | m_shape.ProfileEnd = shapeBlock.ProfileEnd; |
557 | m_Shape.PathCurve = shapeBlock.PathCurve; | 557 | m_shape.PathCurve = shapeBlock.PathCurve; |
558 | m_Shape.ProfileCurve = shapeBlock.ProfileCurve; | 558 | m_shape.ProfileCurve = shapeBlock.ProfileCurve; |
559 | m_Shape.ProfileHollow = shapeBlock.ProfileHollow; | 559 | m_shape.ProfileHollow = shapeBlock.ProfileHollow; |
560 | m_Shape.PathRadiusOffset = shapeBlock.PathRadiusOffset; | 560 | m_shape.PathRadiusOffset = shapeBlock.PathRadiusOffset; |
561 | m_Shape.PathRevolutions = shapeBlock.PathRevolutions; | 561 | m_shape.PathRevolutions = shapeBlock.PathRevolutions; |
562 | m_Shape.PathTaperX = shapeBlock.PathTaperX; | 562 | m_shape.PathTaperX = shapeBlock.PathTaperX; |
563 | m_Shape.PathTaperY = shapeBlock.PathTaperY; | 563 | m_shape.PathTaperY = shapeBlock.PathTaperY; |
564 | m_Shape.PathTwist = shapeBlock.PathTwist; | 564 | m_shape.PathTwist = shapeBlock.PathTwist; |
565 | m_Shape.PathTwistBegin = shapeBlock.PathTwistBegin; | 565 | m_shape.PathTwistBegin = shapeBlock.PathTwistBegin; |
566 | ScheduleFullUpdate(); | 566 | ScheduleFullUpdate(); |
567 | } | 567 | } |
568 | 568 | ||
@@ -580,18 +580,18 @@ namespace OpenSim.Region.Environment.Scenes | |||
580 | 580 | ||
581 | public void UpdateExtraParam(ushort type, bool inUse, byte[] data) | 581 | public void UpdateExtraParam(ushort type, bool inUse, byte[] data) |
582 | { | 582 | { |
583 | this.m_Shape.ExtraParams = new byte[data.Length + 7]; | 583 | this.m_shape.ExtraParams = new byte[data.Length + 7]; |
584 | int i =0; | 584 | int i =0; |
585 | uint length = (uint) data.Length; | 585 | uint length = (uint) data.Length; |
586 | this.m_Shape.ExtraParams[i++] = 1; | 586 | this.m_shape.ExtraParams[i++] = 1; |
587 | this.m_Shape.ExtraParams[i++] = (byte)(type % 256); | 587 | this.m_shape.ExtraParams[i++] = (byte)(type % 256); |
588 | this.m_Shape.ExtraParams[i++] = (byte)((type >> 8) % 256); | 588 | this.m_shape.ExtraParams[i++] = (byte)((type >> 8) % 256); |
589 | 589 | ||
590 | this.m_Shape.ExtraParams[i++] = (byte)(length % 256); | 590 | this.m_shape.ExtraParams[i++] = (byte)(length % 256); |
591 | this.m_Shape.ExtraParams[i++] = (byte)((length >> 8) % 256); | 591 | this.m_shape.ExtraParams[i++] = (byte)((length >> 8) % 256); |
592 | this.m_Shape.ExtraParams[i++] = (byte)((length >> 16) % 256); | 592 | this.m_shape.ExtraParams[i++] = (byte)((length >> 16) % 256); |
593 | this.m_Shape.ExtraParams[i++] = (byte)((length >> 24) % 256); | 593 | this.m_shape.ExtraParams[i++] = (byte)((length >> 24) % 256); |
594 | Array.Copy(data, 0, this.m_Shape.ExtraParams, i, data.Length); | 594 | Array.Copy(data, 0, this.m_shape.ExtraParams, i, data.Length); |
595 | 595 | ||
596 | this.ScheduleFullUpdate(); | 596 | this.ScheduleFullUpdate(); |
597 | } | 597 | } |
@@ -604,7 +604,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
604 | /// <param name="textureEntry"></param> | 604 | /// <param name="textureEntry"></param> |
605 | public void UpdateTextureEntry(byte[] textureEntry) | 605 | public void UpdateTextureEntry(byte[] textureEntry) |
606 | { | 606 | { |
607 | m_Shape.TextureEntry = textureEntry; | 607 | m_shape.TextureEntry = textureEntry; |
608 | ScheduleFullUpdate(); | 608 | ScheduleFullUpdate(); |
609 | } | 609 | } |
610 | 610 | ||
@@ -648,8 +648,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
648 | LLQuaternion lRot; | 648 | LLQuaternion lRot; |
649 | lRot = new LLQuaternion(Rotation.x, Rotation.y, Rotation.z, Rotation.w); | 649 | lRot = new LLQuaternion(Rotation.x, Rotation.y, Rotation.z, Rotation.w); |
650 | 650 | ||
651 | remoteClient.SendPrimitiveToClient(m_regionHandle, 64096, LocalId, m_Shape, lPos, lRot, m_flags, m_uuid, | 651 | remoteClient.SendPrimitiveToClient(m_regionHandle, 64096, LocalId, m_shape, lPos, m_flags, m_uuid, OwnerID, |
652 | OwnerID, m_text, ParentID, this.m_particleSystem); | 652 | m_text, ParentID, this.m_particleSystem, lRot); |
653 | } | 653 | } |
654 | 654 | ||
655 | /// <summary> | 655 | /// <summary> |