diff options
author | cw | 2007-02-12 01:38:21 +0000 |
---|---|---|
committer | cw | 2007-02-12 01:38:21 +0000 |
commit | 7322d41d81309bc2dbdcc42c2f984676230688d9 (patch) | |
tree | 23a6828cf1b7fe179388030846d16f5de5a10215 /Agent_Manager.cs | |
parent | (no commit message) (diff) | |
download | opensim-SC-7322d41d81309bc2dbdcc42c2f984676230688d9.zip opensim-SC-7322d41d81309bc2dbdcc42c2f984676230688d9.tar.gz opensim-SC-7322d41d81309bc2dbdcc42c2f984676230688d9.tar.bz2 opensim-SC-7322d41d81309bc2dbdcc42c2f984676230688d9.tar.xz |
[0000048] Animations
Diffstat (limited to '')
-rw-r--r-- | Agent_Manager.cs | 36 |
1 files changed, 32 insertions, 4 deletions
diff --git a/Agent_Manager.cs b/Agent_Manager.cs index 5ff40cd..a5b041c 100644 --- a/Agent_Manager.cs +++ b/Agent_Manager.cs | |||
@@ -112,7 +112,10 @@ namespace OpenSim | |||
112 | agent.Position = new LLVector3(100, 100, 22); | 112 | agent.Position = new LLVector3(100, 100, 22); |
113 | agent.BaseFolder = baseFolder; | 113 | agent.BaseFolder = baseFolder; |
114 | agent.InventoryFolder = inventoryFolder; | 114 | agent.InventoryFolder = inventoryFolder; |
115 | this.AgentList.Add(agent.FullID, agent); | 115 | agent.AnimID = OpenSim.Globals.Instance.ANIM_AGENT_STAND; |
116 | agent.AnimSequenceID = 1; | ||
117 | |||
118 | this.AgentList.Add(agent.FullID, agent); | ||
116 | 119 | ||
117 | //Create new Wearable Assets and place in Inventory | 120 | //Create new Wearable Assets and place in Inventory |
118 | this.assetManager.CreateNewInventorySet(ref agent, userInfo); | 121 | this.assetManager.CreateNewInventorySet(ref agent, userInfo); |
@@ -149,6 +152,7 @@ namespace OpenSim | |||
149 | mov.Data.Position = new LLVector3(100f, 100f, 22f); | 152 | mov.Data.Position = new LLVector3(100f, 100f, 22f); |
150 | mov.Data.LookAt = new LLVector3(0.99f, 0.042f, 0); | 153 | mov.Data.LookAt = new LLVector3(0.99f, 0.042f, 0); |
151 | _server.SendPacket(mov, true, userInfo); | 154 | _server.SendPacket(mov, true, userInfo); |
155 | |||
152 | } | 156 | } |
153 | 157 | ||
154 | /// <summary> | 158 | /// <summary> |
@@ -164,8 +168,30 @@ namespace OpenSim | |||
164 | kp.Value.Position.Y += (kp.Value.Velocity.Y * 0.2f); | 168 | kp.Value.Position.Y += (kp.Value.Velocity.Y * 0.2f); |
165 | kp.Value.Position.Z += (kp.Value.Velocity.Z * 0.2f); | 169 | kp.Value.Position.Z += (kp.Value.Velocity.Z * 0.2f); |
166 | } | 170 | } |
171 | |||
167 | } | 172 | } |
168 | 173 | ||
174 | public void UpdateAnim(UserAgentInfo userInfo, LLUUID AnimID, int AnimSeq) | ||
175 | { | ||
176 | AgentList[userInfo.AgentID].AnimID = AnimID; | ||
177 | AgentList[userInfo.AgentID].AnimSequenceID = AnimSeq; | ||
178 | UpdateAnim(userInfo); | ||
179 | } | ||
180 | |||
181 | public void UpdateAnim(UserAgentInfo userInfo) | ||
182 | { | ||
183 | AvatarAnimationPacket ani = new AvatarAnimationPacket(); | ||
184 | ani.AnimationSourceList = new AvatarAnimationPacket.AnimationSourceListBlock[1]; | ||
185 | ani.AnimationSourceList[0] = new AvatarAnimationPacket.AnimationSourceListBlock(); | ||
186 | ani.AnimationSourceList[0].ObjectID = new LLUUID("00000000000000000000000000000000"); | ||
187 | ani.Sender = new AvatarAnimationPacket.SenderBlock(); | ||
188 | ani.Sender.ID = userInfo.AgentID; | ||
189 | ani.AnimationList = new AvatarAnimationPacket.AnimationListBlock[1]; | ||
190 | ani.AnimationList[0] = new AvatarAnimationPacket.AnimationListBlock(); | ||
191 | ani.AnimationList[0].AnimID = AgentList[userInfo.AgentID].AnimID; | ||
192 | ani.AnimationList[0].AnimSequenceID = AgentList[userInfo.AgentID].AnimSequenceID; | ||
193 | _server.SendPacket(ani, true, userInfo); | ||
194 | } | ||
169 | /// <summary> | 195 | /// <summary> |
170 | /// | 196 | /// |
171 | /// </summary> | 197 | /// </summary> |
@@ -271,7 +297,7 @@ namespace OpenSim | |||
271 | //send intial set of captured prims data? | 297 | //send intial set of captured prims data? |
272 | this.Prim_Manager.ReadPrimDatabase( "objectdatabase.ini", userInfo); | 298 | this.Prim_Manager.ReadPrimDatabase( "objectdatabase.ini", userInfo); |
273 | 299 | ||
274 | //send prims that have been created by users | 300 | //send prims that have been created by users |
275 | //prim_man.send_existing_prims(User_info); | 301 | //prim_man.send_existing_prims(User_info); |
276 | 302 | ||
277 | //send update about clients avatar | 303 | //send update about clients avatar |
@@ -624,7 +650,9 @@ namespace OpenSim | |||
624 | public AvatarWearable[] Wearables; | 650 | public AvatarWearable[] Wearables; |
625 | public LLUUID InventoryFolder; | 651 | public LLUUID InventoryFolder; |
626 | public LLUUID BaseFolder; | 652 | public LLUUID BaseFolder; |
627 | 653 | public LLUUID AnimID; | |
654 | public int AnimSequenceID; | ||
655 | |||
628 | public AvatarData() | 656 | public AvatarData() |
629 | { | 657 | { |
630 | Wearables=new AvatarWearable[2]; //should be 13 | 658 | Wearables=new AvatarWearable[2]; //should be 13 |