aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorlbsa712009-02-25 16:29:43 +0000
committerlbsa712009-02-25 16:29:43 +0000
commit309eaf47357354e0b303520d399f6fdca90eae40 (patch)
tree90b3d7e921c0cc9077c56e266737e0a789988361
parentFrom: Alan Webb <awebb@linux.vnet.ibm.com> (diff)
downloadopensim-SC_OLD-309eaf47357354e0b303520d399f6fdca90eae40.zip
opensim-SC_OLD-309eaf47357354e0b303520d399f6fdca90eae40.tar.gz
opensim-SC_OLD-309eaf47357354e0b303520d399f6fdca90eae40.tar.bz2
opensim-SC_OLD-309eaf47357354e0b303520d399f6fdca90eae40.tar.xz
* Applied a patch that: Added prim parameters support to MXP client
* Updated MXP to contain extension fragment with prims and updated MXPClientView to fill in the parameters. * Added google protobuffers dll. * Update MXP dll. * Updated MXPClientView to send prim parameters as Perception event extension * Started OpenSim and connected with IdealistViewer via MXP and ensured from log that parameters are being sent. * Ensured that nant test target runs succesfully. This closes mantis #3229. Thanks, tlaukkan!
-rw-r--r--OpenSim/Client/MXP/ClientStack/MXPClientView.cs110
-rw-r--r--ThirdPartyLicenses/Protobuf-net.txt218
-rw-r--r--bin/MXP.dllbin68096 -> 102400 bytes
-rw-r--r--bin/MXP.pdbbin292352 -> 339456 bytes
-rw-r--r--bin/protobuf-net.dllbin0 -> 107008 bytes
-rw-r--r--bin/protobuf-net.pdbbin0 -> 331264 bytes
-rw-r--r--prebuild.xml3
7 files changed, 318 insertions, 13 deletions
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
index c34c6b0..289b38c 100644
--- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
+++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
@@ -38,6 +38,7 @@ using OpenMetaverse.Packets;
38using OpenSim.Framework; 38using OpenSim.Framework;
39using OpenSim.Framework.Client; 39using OpenSim.Framework.Client;
40using Packet=OpenMetaverse.Packets.Packet; 40using Packet=OpenMetaverse.Packets.Packet;
41using MXP.Extentions.OpenMetaverseFragments.Proto;
41 42
42namespace OpenSim.Client.MXP.ClientStack 43namespace OpenSim.Client.MXP.ClientStack
43{ 44{
@@ -586,43 +587,128 @@ namespace OpenSim.Client.MXP.ClientStack
586 587
587 public void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, Vector3 pos, Vector3 vel, Vector3 acc, Quaternion rotation, Vector3 rvel, uint flags, UUID objectID, UUID ownerID, string text, byte[] color, uint parentID, byte[] particleSystem, byte clickAction, byte material, byte[] textureanim, bool attachment, uint AttachPoint, UUID AssetId, UUID SoundId, double SoundVolume, byte SoundFlags, double SoundRadius) 588 public void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, Vector3 pos, Vector3 vel, Vector3 acc, Quaternion rotation, Vector3 rvel, uint flags, UUID objectID, UUID ownerID, string text, byte[] color, uint parentID, byte[] particleSystem, byte clickAction, byte material, byte[] textureanim, bool attachment, uint AttachPoint, UUID AssetId, UUID SoundId, double SoundVolume, byte SoundFlags, double SoundRadius)
588 { 589 {
589 MXPSendPrimitive(localID, ownerID, acc, rvel, primShape, pos, objectID, vel, rotation); 590 MXPSendPrimitive(localID, ownerID, acc, rvel, primShape, pos, objectID, vel, rotation, flags,text,color,parentID,particleSystem,clickAction,material,textureanim);
590 } 591 }
591 592
592 private void MXPSendPrimitive(uint localID, UUID ownerID, Vector3 acc, Vector3 rvel, PrimitiveBaseShape primShape, Vector3 pos, UUID objectID, Vector3 vel, Quaternion rotation) 593 private void MXPSendPrimitive(uint localID, UUID ownerID, Vector3 acc, Vector3 rvel, PrimitiveBaseShape primShape, Vector3 pos, UUID objectID, Vector3 vel, Quaternion rotation, uint flags, string text, byte[] textColor, uint parentID, byte[] particleSystem, byte clickAction, byte material, byte[] textureanim)
593 { 594 {
594 m_log.Info("[MXP] Transmitting Primitive"); 595 String typeName = PCodeToString(primShape.PCode);
596 m_log.Info("[MXP] Transmitting Primitive" + typeName);
595 597
596 PerceptionEventMessage pe = new PerceptionEventMessage(); 598 PerceptionEventMessage pe = new PerceptionEventMessage();
597 599
600 pe.ObjectFragment.ObjectId = objectID.Guid;
601 // TODO Resolve ParentID
602 pe.ObjectFragment.ParentObjectId = Guid.Empty;
598 pe.ObjectFragment.ObjectIndex = localID; 603 pe.ObjectFragment.ObjectIndex = localID;
599 pe.ObjectFragment.ObjectName = "Object"; 604 pe.ObjectFragment.ObjectName = typeName + " Object";
600 pe.ObjectFragment.OwnerId = ownerID.Guid; 605 pe.ObjectFragment.OwnerId = ownerID.Guid;
601 pe.ObjectFragment.TypeId = Guid.Empty; 606 pe.ObjectFragment.TypeId = Guid.Empty;
602 607 pe.ObjectFragment.TypeName = typeName;
603 pe.ObjectFragment.Acceleration = new float[] { acc.X, acc.Y, acc.Z }; 608 pe.ObjectFragment.Acceleration = new float[] { acc.X, acc.Y, acc.Z };
604 pe.ObjectFragment.AngularAcceleration = new float[4]; 609 pe.ObjectFragment.AngularAcceleration = new float[4];
605 pe.ObjectFragment.AngularVelocity = new float[] { rvel.X, rvel.Y, rvel.Z, 0.0f }; 610 pe.ObjectFragment.AngularVelocity = new float[] { rvel.X, rvel.Y, rvel.Z, 0.0f };
606 pe.ObjectFragment.BoundingSphereRadius = primShape.Scale.Length()/2.0f; 611 pe.ObjectFragment.BoundingSphereRadius = primShape.Scale.Length();
607 612
608 pe.ObjectFragment.Location = new float[] { pos.X - 120.0f, pos.Z, pos.Y - 128.0f }; 613 pe.ObjectFragment.Location = new float[] { pos.X - 120.0f, pos.Z, pos.Y - 128.0f };
609 614
610 pe.ObjectFragment.Mass = 1.0f; 615 pe.ObjectFragment.Mass = 1.0f;
611 pe.ObjectFragment.ObjectId = objectID.Guid;
612 pe.ObjectFragment.Orientation = new float[] { rotation.X, rotation.Y, rotation.Z, rotation.W }; 616 pe.ObjectFragment.Orientation = new float[] { rotation.X, rotation.Y, rotation.Z, rotation.W };
613 pe.ObjectFragment.ParentObjectId = Guid.Empty;
614 pe.ObjectFragment.Velocity = new float[] { vel.X, vel.Y, vel.Z }; 617 pe.ObjectFragment.Velocity = new float[] { vel.X, vel.Y, vel.Z };
615 618
616 pe.ObjectFragment.StatePayloadDialect = ""; 619 if (!((primShape.PCode == (byte)PCode.NewTree) || (primShape.PCode == (byte)PCode.Tree) || (primShape.PCode == (byte)PCode.Grass)))
617 pe.ObjectFragment.StatePayloadLength = 0; 620 {
618 pe.ObjectFragment.SetStatePayloadData(new byte[0]); 621 ObjectExtFragment ext = new ObjectExtFragment();
622 ext.UpdateFlags = flags;
623
624 ext.TextureEntry = primShape.TextureEntry;
625 ext.TextureAnim = textureanim;
626 ext.State = primShape.State;
627 ext.PathBegin = primShape.PathBegin;
628 ext.PathEnd = primShape.PathEnd;
629 ext.PathScaleX = primShape.PathScaleX;
630 ext.PathScaleY = primShape.PathScaleY;
631 ext.PathShearX = primShape.PathShearX;
632 ext.PathShearY = primShape.PathShearY;
633 ext.PathSkew = primShape.PathSkew;
634 ext.ProfileBegin = primShape.ProfileBegin;
635 ext.ProfileEnd = primShape.ProfileEnd;
636 ext.Scale = EncodeVector(primShape.Scale);
637 ext.PathCurve = primShape.PathCurve;
638 ext.ProfileCurve = primShape.ProfileCurve;
639 ext.ProfileHollow = primShape.ProfileHollow;
640 ext.PathRadiusOffset = primShape.PathRadiusOffset;
641 ext.PathRevolutions = primShape.PathRevolutions;
642 ext.PathTaperX = primShape.PathTaperX;
643 ext.PathTaperY = primShape.PathTaperY;
644 ext.PathTwist = primShape.PathTwist;
645 ext.PathTwistBegin = primShape.PathTwistBegin;
646 ext.ExtraParams = primShape.ExtraParams;
647
648 ext.Text = text;
649 ext.TextColor = EncodeColor(textColor);
650 ext.PSBlock = particleSystem;
651 ext.ClickAction = clickAction;
652 ext.Material = material;
653
654 pe.SetExtension<ObjectExtFragment>(ext);
655
656 }
619 657
620 Session.Send(pe); 658 Session.Send(pe);
621 } 659 }
622 660
661 private vectorf EncodeVector(Vector3 value)
662 {
663 vectorf encodedValue=new vectorf();
664 encodedValue.X=value.X;
665 encodedValue.Y=value.Y;
666 encodedValue.Z=value.Z;
667 return encodedValue;
668 }
669
670 private color EncodeColor(byte[] value)
671 {
672 color encodedValue = new color();
673 encodedValue.R = value[0];
674 encodedValue.G = value[1];
675 encodedValue.B = value[2];
676 encodedValue.A = value[3];
677 return encodedValue;
678 }
679
680 private string PCodeToString(byte value)
681 {
682 if(value==(byte)PCodeEnum.Avatar)
683 {
684 return "Avatar";
685 }
686 if (value == (byte)PCodeEnum.Grass)
687 {
688 return "Grass";
689 }
690 if (value == (byte)PCodeEnum.NewTree)
691 {
692 return "NewTree";
693 }
694 if (value == (byte)PCodeEnum.ParticleSystem)
695 {
696 return "ParticleSystem";
697 }
698 if (value == (byte)PCodeEnum.Primitive)
699 {
700 return "Primitive";
701 }
702 if (value == (byte)PCodeEnum.Tree)
703 {
704 return "Tree";
705 }
706 throw new Exception("Unsupported PCode value: "+value);
707 }
708
623 public void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, Vector3 pos, Vector3 vel, Vector3 acc, Quaternion rotation, Vector3 rvel, uint flags, UUID objectID, UUID ownerID, string text, byte[] color, uint parentID, byte[] particleSystem, byte clickAction, byte material) 709 public void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, Vector3 pos, Vector3 vel, Vector3 acc, Quaternion rotation, Vector3 rvel, uint flags, UUID objectID, UUID ownerID, string text, byte[] color, uint parentID, byte[] particleSystem, byte clickAction, byte material)
624 { 710 {
625 MXPSendPrimitive(localID, ownerID, acc, rvel, primShape, pos, objectID, vel, rotation); 711 MXPSendPrimitive(localID, ownerID, acc, rvel, primShape, pos, objectID, vel, rotation, flags, text, color, parentID, particleSystem, clickAction, material, new byte[0]);
626 } 712 }
627 713
628 public void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, Vector3 position, Quaternion rotation, Vector3 velocity, Vector3 rotationalvelocity, byte state, UUID AssetId, UUID owner, int attachPoint) 714 public void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, Vector3 position, Quaternion rotation, Vector3 velocity, Vector3 rotationalvelocity, byte state, UUID AssetId, UUID owner, int attachPoint)
diff --git a/ThirdPartyLicenses/Protobuf-net.txt b/ThirdPartyLicenses/Protobuf-net.txt
new file mode 100644
index 0000000..c195c0e
--- /dev/null
+++ b/ThirdPartyLicenses/Protobuf-net.txt
@@ -0,0 +1,218 @@
1Google protocol buffers home page:
2
3http://code.google.com/apis/protocolbuffers/docs/overview.html [^]
4
5The .NET implementation which is licensed under Apache 2.0 License:
6
7http://code.google.com/p/protobuf-net/ [^]
8
9Download link:
10
11http://protobuf-net.googlecode.com/files/protobuf-net%20r237.zip [^]
12
13I chose to NET2.0 version from the zip.
14
15---
16
17 Apache License
18 Version 2.0, January 2004
19 http://www.apache.org/licenses/
20
21 TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
22
23 1. Definitions.
24
25 "License" shall mean the terms and conditions for use, reproduction,
26 and distribution as defined by Sections 1 through 9 of this document.
27
28 "Licensor" shall mean the copyright owner or entity authorized by
29 the copyright owner that is granting the License.
30
31 "Legal Entity" shall mean the union of the acting entity and all
32 other entities that control, are controlled by, or are under common
33 control with that entity. For the purposes of this definition,
34 "control" means (i) the power, direct or indirect, to cause the
35 direction or management of such entity, whether by contract or
36 otherwise, or (ii) ownership of fifty percent (50%) or more of the
37 outstanding shares, or (iii) beneficial ownership of such entity.
38
39 "You" (or "Your") shall mean an individual or Legal Entity
40 exercising permissions granted by this License.
41
42 "Source" form shall mean the preferred form for making modifications,
43 including but not limited to software source code, documentation
44 source, and configuration files.
45
46 "Object" form shall mean any form resulting from mechanical
47 transformation or translation of a Source form, including but
48 not limited to compiled object code, generated documentation,
49 and conversions to other media types.
50
51 "Work" shall mean the work of authorship, whether in Source or
52 Object form, made available under the License, as indicated by a
53 copyright notice that is included in or attached to the work
54 (an example is provided in the Appendix below).
55
56 "Derivative Works" shall mean any work, whether in Source or Object
57 form, that is based on (or derived from) the Work and for which the
58 editorial revisions, annotations, elaborations, or other modifications
59 represent, as a whole, an original work of authorship. For the purposes
60 of this License, Derivative Works shall not include works that remain
61 separable from, or merely link (or bind by name) to the interfaces of,
62 the Work and Derivative Works thereof.
63
64 "Contribution" shall mean any work of authorship, including
65 the original version of the Work and any modifications or additions
66 to that Work or Derivative Works thereof, that is intentionally
67 submitted to Licensor for inclusion in the Work by the copyright owner
68 or by an individual or Legal Entity authorized to submit on behalf of
69 the copyright owner. For the purposes of this definition, "submitted"
70 means any form of electronic, verbal, or written communication sent
71 to the Licensor or its representatives, including but not limited to
72 communication on electronic mailing lists, source code control systems,
73 and issue tracking systems that are managed by, or on behalf of, the
74 Licensor for the purpose of discussing and improving the Work, but
75 excluding communication that is conspicuously marked or otherwise
76 designated in writing by the copyright owner as "Not a Contribution."
77
78 "Contributor" shall mean Licensor and any individual or Legal Entity
79 on behalf of whom a Contribution has been received by Licensor and
80 subsequently incorporated within the Work.
81
82 2. Grant of Copyright License. Subject to the terms and conditions of
83 this License, each Contributor hereby grants to You a perpetual,
84 worldwide, non-exclusive, no-charge, royalty-free, irrevocable
85 copyright license to reproduce, prepare Derivative Works of,
86 publicly display, publicly perform, sublicense, and distribute the
87 Work and such Derivative Works in Source or Object form.
88
89 3. Grant of Patent License. Subject to the terms and conditions of
90 this License, each Contributor hereby grants to You a perpetual,
91 worldwide, non-exclusive, no-charge, royalty-free, irrevocable
92 (except as stated in this section) patent license to make, have made,
93 use, offer to sell, sell, import, and otherwise transfer the Work,
94 where such license applies only to those patent claims licensable
95 by such Contributor that are necessarily infringed by their
96 Contribution(s) alone or by combination of their Contribution(s)
97 with the Work to which such Contribution(s) was submitted. If You
98 institute patent litigation against any entity (including a
99 cross-claim or counterclaim in a lawsuit) alleging that the Work
100 or a Contribution incorporated within the Work constitutes direct
101 or contributory patent infringement, then any patent licenses
102 granted to You under this License for that Work shall terminate
103 as of the date such litigation is filed.
104
105 4. Redistribution. You may reproduce and distribute copies of the
106 Work or Derivative Works thereof in any medium, with or without
107 modifications, and in Source or Object form, provided that You
108 meet the following conditions:
109
110 (a) You must give any other recipients of the Work or
111 Derivative Works a copy of this License; and
112
113 (b) You must cause any modified files to carry prominent notices
114 stating that You changed the files; and
115
116 (c) You must retain, in the Source form of any Derivative Works
117 that You distribute, all copyright, patent, trademark, and
118 attribution notices from the Source form of the Work,
119 excluding those notices that do not pertain to any part of
120 the Derivative Works; and
121
122 (d) If the Work includes a "NOTICE" text file as part of its
123 distribution, then any Derivative Works that You distribute must
124 include a readable copy of the attribution notices contained
125 within such NOTICE file, excluding those notices that do not
126 pertain to any part of the Derivative Works, in at least one
127 of the following places: within a NOTICE text file distributed
128 as part of the Derivative Works; within the Source form or
129 documentation, if provided along with the Derivative Works; or,
130 within a display generated by the Derivative Works, if and
131 wherever such third-party notices normally appear. The contents
132 of the NOTICE file are for informational purposes only and
133 do not modify the License. You may add Your own attribution
134 notices within Derivative Works that You distribute, alongside
135 or as an addendum to the NOTICE text from the Work, provided
136 that such additional attribution notices cannot be construed
137 as modifying the License.
138
139 You may add Your own copyright statement to Your modifications and
140 may provide additional or different license terms and conditions
141 for use, reproduction, or distribution of Your modifications, or
142 for any such Derivative Works as a whole, provided Your use,
143 reproduction, and distribution of the Work otherwise complies with
144 the conditions stated in this License.
145
146 5. Submission of Contributions. Unless You explicitly state otherwise,
147 any Contribution intentionally submitted for inclusion in the Work
148 by You to the Licensor shall be under the terms and conditions of
149 this License, without any additional terms or conditions.
150 Notwithstanding the above, nothing herein shall supersede or modify
151 the terms of any separate license agreement you may have executed
152 with Licensor regarding such Contributions.
153
154 6. Trademarks. This License does not grant permission to use the trade
155 names, trademarks, service marks, or product names of the Licensor,
156 except as required for reasonable and customary use in describing the
157 origin of the Work and reproducing the content of the NOTICE file.
158
159 7. Disclaimer of Warranty. Unless required by applicable law or
160 agreed to in writing, Licensor provides the Work (and each
161 Contributor provides its Contributions) on an "AS IS" BASIS,
162 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
163 implied, including, without limitation, any warranties or conditions
164 of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
165 PARTICULAR PURPOSE. You are solely responsible for determining the
166 appropriateness of using or redistributing the Work and assume any
167 risks associated with Your exercise of permissions under this License.
168
169 8. Limitation of Liability. In no event and under no legal theory,
170 whether in tort (including negligence), contract, or otherwise,
171 unless required by applicable law (such as deliberate and grossly
172 negligent acts) or agreed to in writing, shall any Contributor be
173 liable to You for damages, including any direct, indirect, special,
174 incidental, or consequential damages of any character arising as a
175 result of this License or out of the use or inability to use the
176 Work (including but not limited to damages for loss of goodwill,
177 work stoppage, computer failure or malfunction, or any and all
178 other commercial damages or losses), even if such Contributor
179 has been advised of the possibility of such damages.
180
181 9. Accepting Warranty or Additional Liability. While redistributing
182 the Work or Derivative Works thereof, You may choose to offer,
183 and charge a fee for, acceptance of support, warranty, indemnity,
184 or other liability obligations and/or rights consistent with this
185 License. However, in accepting such obligations, You may act only
186 on Your own behalf and on Your sole responsibility, not on behalf
187 of any other Contributor, and only if You agree to indemnify,
188 defend, and hold each Contributor harmless for any liability
189 incurred by, or claims asserted against, such Contributor by reason
190 of your accepting any such warranty or additional liability.
191
192 END OF TERMS AND CONDITIONS
193
194 APPENDIX: How to apply the Apache License to your work.
195
196 To apply the Apache License to your work, attach the following
197 boilerplate notice, with the fields enclosed by brackets "[]"
198 replaced with your own identifying information. (Don't include
199 the brackets!) The text should be enclosed in the appropriate
200 comment syntax for the file format. We also recommend that a
201 file or class name and description of purpose be included on the
202 same "printed page" as the copyright notice for easier
203 identification within third-party archives.
204
205 Copyright [yyyy] [name of copyright owner]
206
207 Licensed under the Apache License, Version 2.0 (the "License");
208 you may not use this file except in compliance with the License.
209 You may obtain a copy of the License at
210
211 http://www.apache.org/licenses/LICENSE-2.0
212
213 Unless required by applicable law or agreed to in writing, software
214 distributed under the License is distributed on an "AS IS" BASIS,
215 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
216 See the License for the specific language governing permissions and
217 limitations under the License.
218
diff --git a/bin/MXP.dll b/bin/MXP.dll
index 5c708ee..0904544 100644
--- a/bin/MXP.dll
+++ b/bin/MXP.dll
Binary files differ
diff --git a/bin/MXP.pdb b/bin/MXP.pdb
index 0ca0371..89572ca 100644
--- a/bin/MXP.pdb
+++ b/bin/MXP.pdb
Binary files differ
diff --git a/bin/protobuf-net.dll b/bin/protobuf-net.dll
new file mode 100644
index 0000000..057a411
--- /dev/null
+++ b/bin/protobuf-net.dll
Binary files differ
diff --git a/bin/protobuf-net.pdb b/bin/protobuf-net.pdb
new file mode 100644
index 0000000..9c85bdc
--- /dev/null
+++ b/bin/protobuf-net.pdb
Binary files differ
diff --git a/prebuild.xml b/prebuild.xml
index 6fad329..8b388e4 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1662,7 +1662,8 @@
1662 <Reference name="OpenSim.Region.Framework"/> 1662 <Reference name="OpenSim.Region.Framework"/>
1663 <Reference name="Nini.dll" /> 1663 <Reference name="Nini.dll" />
1664 <Reference name="log4net.dll"/> 1664 <Reference name="log4net.dll"/>
1665 <Reference name="MXP.dll"/> 1665 <Reference name="protobuf-net"/>
1666 <Reference name="MXP.dll"/>
1666 <Files> 1667 <Files>
1667 <Match pattern="*.cs" recurse="true"/> 1668 <Match pattern="*.cs" recurse="true"/>
1668 </Files> 1669 </Files>