diff options
author | MW | 2007-05-26 14:55:17 +0000 |
---|---|---|
committer | MW | 2007-05-26 14:55:17 +0000 |
commit | 06387d0344b8fa84b790a9dd910fda8a0a1128bb (patch) | |
tree | faf19abd4c940e6c6fddf805beaee47b9b175e32 /OpenSim/OpenSim.RegionServer | |
parent | Die WebFrontEnd, Die Grid class! (diff) | |
download | opensim-SC-06387d0344b8fa84b790a9dd910fda8a0a1128bb.zip opensim-SC-06387d0344b8fa84b790a9dd910fda8a0a1128bb.tar.gz opensim-SC-06387d0344b8fa84b790a9dd910fda8a0a1128bb.tar.bz2 opensim-SC-06387d0344b8fa84b790a9dd910fda8a0a1128bb.tar.xz |
Goodbye World
Diffstat (limited to 'OpenSim/OpenSim.RegionServer')
22 files changed, 28 insertions, 2645 deletions
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj index 08a9e4c..a6bc5ae 100644 --- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj +++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj | |||
@@ -1,4 +1,4 @@ | |||
1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
2 | <PropertyGroup> | 2 | <PropertyGroup> |
3 | <ProjectType>Local</ProjectType> | 3 | <ProjectType>Local</ProjectType> |
4 | <ProductVersion>8.0.50727</ProductVersion> | 4 | <ProductVersion>8.0.50727</ProductVersion> |
@@ -6,8 +6,7 @@ | |||
6 | <ProjectGuid>{632E1BFD-0000-0000-0000-000000000000}</ProjectGuid> | 6 | <ProjectGuid>{632E1BFD-0000-0000-0000-000000000000}</ProjectGuid> |
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
9 | <ApplicationIcon> | 9 | <ApplicationIcon></ApplicationIcon> |
10 | </ApplicationIcon> | ||
11 | <AssemblyKeyContainerName> | 10 | <AssemblyKeyContainerName> |
12 | </AssemblyKeyContainerName> | 11 | </AssemblyKeyContainerName> |
13 | <AssemblyName>OpenSim.RegionServer</AssemblyName> | 12 | <AssemblyName>OpenSim.RegionServer</AssemblyName> |
@@ -16,11 +15,9 @@ | |||
16 | <DefaultTargetSchema>IE50</DefaultTargetSchema> | 15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> |
17 | <DelaySign>false</DelaySign> | 16 | <DelaySign>false</DelaySign> |
18 | <OutputType>Library</OutputType> | 17 | <OutputType>Library</OutputType> |
19 | <AppDesignerFolder> | 18 | <AppDesignerFolder></AppDesignerFolder> |
20 | </AppDesignerFolder> | ||
21 | <RootNamespace>OpenSim.RegionServer</RootNamespace> | 19 | <RootNamespace>OpenSim.RegionServer</RootNamespace> |
22 | <StartupObject> | 20 | <StartupObject></StartupObject> |
23 | </StartupObject> | ||
24 | <FileUpgradeFlags> | 21 | <FileUpgradeFlags> |
25 | </FileUpgradeFlags> | 22 | </FileUpgradeFlags> |
26 | </PropertyGroup> | 23 | </PropertyGroup> |
@@ -31,8 +28,7 @@ | |||
31 | <ConfigurationOverrideFile> | 28 | <ConfigurationOverrideFile> |
32 | </ConfigurationOverrideFile> | 29 | </ConfigurationOverrideFile> |
33 | <DefineConstants>TRACE;DEBUG</DefineConstants> | 30 | <DefineConstants>TRACE;DEBUG</DefineConstants> |
34 | <DocumentationFile> | 31 | <DocumentationFile></DocumentationFile> |
35 | </DocumentationFile> | ||
36 | <DebugSymbols>True</DebugSymbols> | 32 | <DebugSymbols>True</DebugSymbols> |
37 | <FileAlignment>4096</FileAlignment> | 33 | <FileAlignment>4096</FileAlignment> |
38 | <Optimize>False</Optimize> | 34 | <Optimize>False</Optimize> |
@@ -41,8 +37,7 @@ | |||
41 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
42 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
43 | <WarningLevel>4</WarningLevel> | 39 | <WarningLevel>4</WarningLevel> |
44 | <NoWarn> | 40 | <NoWarn></NoWarn> |
45 | </NoWarn> | ||
46 | </PropertyGroup> | 41 | </PropertyGroup> |
47 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | 42 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> |
48 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | 43 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> |
@@ -51,8 +46,7 @@ | |||
51 | <ConfigurationOverrideFile> | 46 | <ConfigurationOverrideFile> |
52 | </ConfigurationOverrideFile> | 47 | </ConfigurationOverrideFile> |
53 | <DefineConstants>TRACE</DefineConstants> | 48 | <DefineConstants>TRACE</DefineConstants> |
54 | <DocumentationFile> | 49 | <DocumentationFile></DocumentationFile> |
55 | </DocumentationFile> | ||
56 | <DebugSymbols>False</DebugSymbols> | 50 | <DebugSymbols>False</DebugSymbols> |
57 | <FileAlignment>4096</FileAlignment> | 51 | <FileAlignment>4096</FileAlignment> |
58 | <Optimize>True</Optimize> | 52 | <Optimize>True</Optimize> |
@@ -61,28 +55,26 @@ | |||
61 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
62 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
63 | <WarningLevel>4</WarningLevel> | 57 | <WarningLevel>4</WarningLevel> |
64 | <NoWarn> | 58 | <NoWarn></NoWarn> |
65 | </NoWarn> | ||
66 | </PropertyGroup> | 59 | </PropertyGroup> |
67 | <ItemGroup> | 60 | <ItemGroup> |
68 | <Reference Include="System"> | 61 | <Reference Include="System" > |
69 | <HintPath>System.dll</HintPath> | 62 | <HintPath>System.dll</HintPath> |
70 | <Private>False</Private> | 63 | <Private>False</Private> |
71 | </Reference> | 64 | </Reference> |
72 | <Reference Include="System.Data" /> | 65 | <Reference Include="System.Xml" > |
73 | <Reference Include="System.Xml"> | ||
74 | <HintPath>System.Xml.dll</HintPath> | 66 | <HintPath>System.Xml.dll</HintPath> |
75 | <Private>False</Private> | 67 | <Private>False</Private> |
76 | </Reference> | 68 | </Reference> |
77 | <Reference Include="libsecondlife.dll"> | 69 | <Reference Include="libsecondlife.dll" > |
78 | <HintPath>..\..\bin\libsecondlife.dll</HintPath> | 70 | <HintPath>..\..\bin\libsecondlife.dll</HintPath> |
79 | <Private>False</Private> | 71 | <Private>False</Private> |
80 | </Reference> | 72 | </Reference> |
81 | <Reference Include="Axiom.MathLib.dll"> | 73 | <Reference Include="Axiom.MathLib.dll" > |
82 | <HintPath>..\..\bin\Axiom.MathLib.dll</HintPath> | 74 | <HintPath>..\..\bin\Axiom.MathLib.dll</HintPath> |
83 | <Private>False</Private> | 75 | <Private>False</Private> |
84 | </Reference> | 76 | </Reference> |
85 | <Reference Include="Db4objects.Db4o.dll"> | 77 | <Reference Include="Db4objects.Db4o.dll" > |
86 | <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath> | 78 | <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath> |
87 | <Private>False</Private> | 79 | <Private>False</Private> |
88 | </Reference> | 80 | </Reference> |
@@ -92,43 +84,43 @@ | |||
92 | <Name>OpenSim.Terrain.BasicTerrain</Name> | 84 | <Name>OpenSim.Terrain.BasicTerrain</Name> |
93 | <Project>{2270B8FE-0000-0000-0000-000000000000}</Project> | 85 | <Project>{2270B8FE-0000-0000-0000-000000000000}</Project> |
94 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 86 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
95 | <Private>False</Private> | 87 | <Private>False</Private> |
96 | </ProjectReference> | 88 | </ProjectReference> |
97 | <ProjectReference Include="..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj"> | 89 | <ProjectReference Include="..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj"> |
98 | <Name>OpenSim.Framework</Name> | 90 | <Name>OpenSim.Framework</Name> |
99 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> | 91 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> |
100 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 92 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
101 | <Private>False</Private> | 93 | <Private>False</Private> |
102 | </ProjectReference> | 94 | </ProjectReference> |
103 | <ProjectReference Include="..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> | 95 | <ProjectReference Include="..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj"> |
104 | <Name>OpenSim.Framework.Console</Name> | 96 | <Name>OpenSim.Framework.Console</Name> |
105 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> | 97 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> |
106 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 98 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
107 | <Private>False</Private> | 99 | <Private>False</Private> |
108 | </ProjectReference> | 100 | </ProjectReference> |
109 | <ProjectReference Include="..\..\Common\OpenSim.GenericConfig\Xml\OpenSim.GenericConfig.Xml.csproj"> | 101 | <ProjectReference Include="..\..\Common\OpenSim.GenericConfig\Xml\OpenSim.GenericConfig.Xml.csproj"> |
110 | <Name>OpenSim.GenericConfig.Xml</Name> | 102 | <Name>OpenSim.GenericConfig.Xml</Name> |
111 | <Project>{E88EF749-0000-0000-0000-000000000000}</Project> | 103 | <Project>{E88EF749-0000-0000-0000-000000000000}</Project> |
112 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 104 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
113 | <Private>False</Private> | 105 | <Private>False</Private> |
114 | </ProjectReference> | 106 | </ProjectReference> |
115 | <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj"> | 107 | <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj"> |
116 | <Name>OpenSim.Physics.Manager</Name> | 108 | <Name>OpenSim.Physics.Manager</Name> |
117 | <Project>{8BE16150-0000-0000-0000-000000000000}</Project> | 109 | <Project>{8BE16150-0000-0000-0000-000000000000}</Project> |
118 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 110 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
119 | <Private>False</Private> | 111 | <Private>False</Private> |
120 | </ProjectReference> | 112 | </ProjectReference> |
121 | <ProjectReference Include="..\..\Common\OpenSim.Servers\OpenSim.Servers.csproj"> | 113 | <ProjectReference Include="..\..\Common\OpenSim.Servers\OpenSim.Servers.csproj"> |
122 | <Name>OpenSim.Servers</Name> | 114 | <Name>OpenSim.Servers</Name> |
123 | <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project> | 115 | <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project> |
124 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 116 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
125 | <Private>False</Private> | 117 | <Private>False</Private> |
126 | </ProjectReference> | 118 | </ProjectReference> |
127 | <ProjectReference Include="..\..\Common\XmlRpcCS\XMLRPC.csproj"> | 119 | <ProjectReference Include="..\..\Common\XmlRpcCS\XMLRPC.csproj"> |
128 | <Name>XMLRPC</Name> | 120 | <Name>XMLRPC</Name> |
129 | <Project>{8E81D43C-0000-0000-0000-000000000000}</Project> | 121 | <Project>{8E81D43C-0000-0000-0000-000000000000}</Project> |
130 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 122 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
131 | <Private>False</Private> | 123 | <Private>False</Private> |
132 | </ProjectReference> | 124 | </ProjectReference> |
133 | </ItemGroup> | 125 | </ItemGroup> |
134 | <ItemGroup> | 126 | <ItemGroup> |
@@ -144,7 +136,9 @@ | |||
144 | <Compile Include="AuthenticateSessionsRemote.cs"> | 136 | <Compile Include="AuthenticateSessionsRemote.cs"> |
145 | <SubType>Code</SubType> | 137 | <SubType>Code</SubType> |
146 | </Compile> | 138 | </Compile> |
147 | <Compile Include="ClientView.API.cs" /> | 139 | <Compile Include="ClientView.API.cs"> |
140 | <SubType>Code</SubType> | ||
141 | </Compile> | ||
148 | <Compile Include="ClientView.cs"> | 142 | <Compile Include="ClientView.cs"> |
149 | <SubType>Code</SubType> | 143 | <SubType>Code</SubType> |
150 | </Compile> | 144 | </Compile> |
@@ -160,6 +154,9 @@ | |||
160 | <Compile Include="ClientViewBase.cs"> | 154 | <Compile Include="ClientViewBase.cs"> |
161 | <SubType>Code</SubType> | 155 | <SubType>Code</SubType> |
162 | </Compile> | 156 | </Compile> |
157 | <Compile Include="CommsManager.cs"> | ||
158 | <SubType>Code</SubType> | ||
159 | </Compile> | ||
163 | <Compile Include="Grid.cs"> | 160 | <Compile Include="Grid.cs"> |
164 | <SubType>Code</SubType> | 161 | <SubType>Code</SubType> |
165 | </Compile> | 162 | </Compile> |
@@ -264,4 +261,4 @@ | |||
264 | <PostBuildEvent> | 261 | <PostBuildEvent> |
265 | </PostBuildEvent> | 262 | </PostBuildEvent> |
266 | </PropertyGroup> | 263 | </PropertyGroup> |
267 | </Project> \ No newline at end of file | 264 | </Project> |
diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj.user b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj.user index d47d65d..9bfaf67 100644 --- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj.user +++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj.user | |||
@@ -2,7 +2,7 @@ | |||
2 | <PropertyGroup> | 2 | <PropertyGroup> |
3 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 3 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
4 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 4 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
5 | <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\bin\</ReferencePath> | 5 | <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim26-05\branches\Sugilite\bin\</ReferencePath> |
6 | <LastOpenVersion>8.0.50727</LastOpenVersion> | 6 | <LastOpenVersion>8.0.50727</LastOpenVersion> |
7 | <ProjectView>ProjectFiles</ProjectView> | 7 | <ProjectView>ProjectFiles</ProjectView> |
8 | <ProjectTrust>0</ProjectTrust> | 8 | <ProjectTrust>0</ProjectTrust> |
diff --git a/OpenSim/OpenSim.RegionServer/types/Mesh.cs b/OpenSim/OpenSim.RegionServer/types/Mesh.cs deleted file mode 100644 index 3e00c91..0000000 --- a/OpenSim/OpenSim.RegionServer/types/Mesh.cs +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | using System; | ||
2 | using System.Collections.Generic; | ||
3 | using System.Text; | ||
4 | |||
5 | namespace OpenSim.types | ||
6 | { | ||
7 | // TODO: This will need some performance tuning no doubt. | ||
8 | public class Mesh | ||
9 | { | ||
10 | public List<Triangle> mesh; | ||
11 | |||
12 | public Mesh() | ||
13 | { | ||
14 | mesh = new List<Triangle>(); | ||
15 | } | ||
16 | |||
17 | public void AddTri(Triangle tri) | ||
18 | { | ||
19 | mesh.Add(tri); | ||
20 | } | ||
21 | |||
22 | public static Mesh operator +(Mesh a, Mesh b) | ||
23 | { | ||
24 | a.mesh.AddRange(b.mesh); | ||
25 | return a; | ||
26 | } | ||
27 | } | ||
28 | } | ||
diff --git a/OpenSim/OpenSim.RegionServer/types/Triangle.cs b/OpenSim/OpenSim.RegionServer/types/Triangle.cs deleted file mode 100644 index 8dfea6e..0000000 --- a/OpenSim/OpenSim.RegionServer/types/Triangle.cs +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | using System; | ||
2 | using System.Collections.Generic; | ||
3 | using System.Text; | ||
4 | using Axiom.MathLib; | ||
5 | |||
6 | namespace OpenSim.types | ||
7 | { | ||
8 | public class Triangle | ||
9 | { | ||
10 | Vector3 a; | ||
11 | Vector3 b; | ||
12 | Vector3 c; | ||
13 | |||
14 | public Triangle() | ||
15 | { | ||
16 | a = new Vector3(); | ||
17 | b = new Vector3(); | ||
18 | c = new Vector3(); | ||
19 | } | ||
20 | |||
21 | public Triangle(Vector3 A, Vector3 B, Vector3 C) | ||
22 | { | ||
23 | a = A; | ||
24 | b = B; | ||
25 | c = C; | ||
26 | } | ||
27 | } | ||
28 | } | ||
diff --git a/OpenSim/OpenSim.RegionServer/world/Avatar.Client.cs b/OpenSim/OpenSim.RegionServer/world/Avatar.Client.cs deleted file mode 100644 index 7656a89..0000000 --- a/OpenSim/OpenSim.RegionServer/world/Avatar.Client.cs +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | using System; | ||
2 | using System.Collections.Generic; | ||
3 | using System.Text; | ||
4 | using libsecondlife.Packets; | ||
5 | |||
6 | namespace OpenSim.world | ||
7 | { | ||
8 | partial class Avatar | ||
9 | { | ||
10 | private List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock> updateList = new List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>(); | ||
11 | private List<Entity> interestList = new List<Entity>(); | ||
12 | |||
13 | public void SendPacketToViewer(Packet packet) | ||
14 | { | ||
15 | this.ControllingClient.OutPacket(packet); | ||
16 | } | ||
17 | |||
18 | public void AddTerseUpdateToViewersList(ImprovedTerseObjectUpdatePacket.ObjectDataBlock terseBlock) | ||
19 | { | ||
20 | |||
21 | } | ||
22 | |||
23 | public void SendUpdateListToViewer() | ||
24 | { | ||
25 | |||
26 | } | ||
27 | |||
28 | private void UpdateInterestList() | ||
29 | { | ||
30 | |||
31 | } | ||
32 | } | ||
33 | } | ||
diff --git a/OpenSim/OpenSim.RegionServer/world/Avatar.Update.cs b/OpenSim/OpenSim.RegionServer/world/Avatar.Update.cs deleted file mode 100644 index 33132cf..0000000 --- a/OpenSim/OpenSim.RegionServer/world/Avatar.Update.cs +++ /dev/null | |||
@@ -1,76 +0,0 @@ | |||
1 | using System; | ||
2 | using System.Collections.Generic; | ||
3 | using System.Text; | ||
4 | using libsecondlife; | ||
5 | using libsecondlife.Packets; | ||
6 | using OpenSim.Physics.Manager; | ||
7 | |||
8 | namespace OpenSim.world | ||
9 | { | ||
10 | partial class Avatar | ||
11 | { | ||
12 | public override void update() | ||
13 | { | ||
14 | |||
15 | |||
16 | } | ||
17 | |||
18 | public void SendUpdateToOtherClient(Avatar remoteAvatar) | ||
19 | { | ||
20 | |||
21 | } | ||
22 | |||
23 | public ObjectUpdatePacket CreateUpdatePacket() | ||
24 | { | ||
25 | |||
26 | } | ||
27 | |||
28 | public void SendInitialPosition() | ||
29 | { | ||
30 | |||
31 | } | ||
32 | |||
33 | public void SendOurAppearance() | ||
34 | { | ||
35 | |||
36 | } | ||
37 | |||
38 | public void SendOurAppearance(ClientView OurClient) | ||
39 | { | ||
40 | |||
41 | } | ||
42 | |||
43 | public void SendAppearanceToOtherAgent(Avatar avatarInfo) | ||
44 | { | ||
45 | |||
46 | } | ||
47 | |||
48 | public void SetAppearance(byte[] texture, AgentSetAppearancePacket.VisualParamBlock[] visualParam) | ||
49 | { | ||
50 | |||
51 | } | ||
52 | |||
53 | public void StopMovement() | ||
54 | { | ||
55 | |||
56 | } | ||
57 | |||
58 | public ImprovedTerseObjectUpdatePacket.ObjectDataBlock CreateTerseBlock() | ||
59 | { | ||
60 | |||
61 | } | ||
62 | |||
63 | // Sends animation update | ||
64 | public void SendAnimPack(LLUUID animID, int seq) | ||
65 | { | ||
66 | |||
67 | |||
68 | } | ||
69 | |||
70 | public void SendAnimPack() | ||
71 | { | ||
72 | |||
73 | } | ||
74 | |||
75 | } | ||
76 | } | ||
diff --git a/OpenSim/OpenSim.RegionServer/world/Avatar.cs b/OpenSim/OpenSim.RegionServer/world/Avatar.cs deleted file mode 100644 index cca266b..0000000 --- a/OpenSim/OpenSim.RegionServer/world/Avatar.cs +++ /dev/null | |||
@@ -1,157 +0,0 @@ | |||
1 | using System; | ||
2 | using System.Collections.Generic; | ||
3 | using System.IO; | ||
4 | using System.Text; | ||
5 | using libsecondlife; | ||
6 | using libsecondlife.Packets; | ||
7 | using OpenSim.Physics.Manager; | ||
8 | using OpenSim.Framework.Inventory; | ||
9 | using OpenSim.Framework.Interfaces; | ||
10 | using Axiom.MathLib; | ||
11 | |||
12 | namespace OpenSim.world | ||
13 | { | ||
14 | public partial class Avatar : Entity | ||
15 | { | ||
16 | public static bool PhysicsEngineFlying = false; | ||
17 | public static AvatarAnimations Animations; | ||
18 | public string firstname; | ||
19 | public string lastname; | ||
20 | public ClientView ControllingClient; | ||
21 | public LLUUID current_anim; | ||
22 | public int anim_seq; | ||
23 | private static libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock AvatarTemplate; | ||
24 | private bool updateflag = false; | ||
25 | private byte movementflag = 0; | ||
26 | private List<NewForce> forcesList = new List<NewForce>(); | ||
27 | private short _updateCount = 0; | ||
28 | private Axiom.MathLib.Quaternion bodyRot; | ||
29 | private LLObject.TextureEntry avatarAppearanceTexture = null; | ||
30 | private byte[] visualParams; | ||
31 | private AvatarWearable[] Wearables; | ||
32 | private LLVector3 positionLastFrame = new LLVector3(0, 0, 0); | ||
33 | private ulong m_regionHandle; | ||
34 | //private Dictionary<uint, ClientView> m_clientThreads; | ||
35 | private string m_regionName; | ||
36 | private ushort m_regionWaterHeight; | ||
37 | private bool m_regionTerraform; | ||
38 | private bool childAvatar = false; | ||
39 | |||
40 | public Avatar(ClientView TheClient, World world, string regionName, Dictionary<uint, ClientView> clientThreads, ulong regionHandle, bool regionTerraform, ushort regionWater) | ||
41 | { | ||
42 | m_world = world; | ||
43 | // m_clientThreads = clientThreads; | ||
44 | m_regionName = regionName; | ||
45 | m_regionHandle = regionHandle; | ||
46 | m_regionTerraform = regionTerraform; | ||
47 | m_regionWaterHeight = regionWater; | ||
48 | |||
49 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Avatar.cs - Loading details from grid (DUMMY)"); | ||
50 | ControllingClient = TheClient; | ||
51 | localid = 8880000 + (this.m_world._localNumber++); | ||
52 | Pos = ControllingClient.startpos; | ||
53 | visualParams = new byte[218]; | ||
54 | for (int i = 0; i < 218; i++) | ||
55 | { | ||
56 | visualParams[i] = 100; | ||
57 | } | ||
58 | Wearables = new AvatarWearable[13]; //should be 13 of these | ||
59 | for (int i = 0; i < 13; i++) | ||
60 | { | ||
61 | Wearables[i] = new AvatarWearable(); | ||
62 | } | ||
63 | this.Wearables[0].AssetID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73"); | ||
64 | this.Wearables[0].ItemID = LLUUID.Random(); | ||
65 | |||
66 | this.avatarAppearanceTexture = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005")); | ||
67 | |||
68 | //register for events | ||
69 | ControllingClient.OnRequestWearables += new ClientView.GenericCall(this.SendOurAppearance); | ||
70 | ControllingClient.OnSetAppearance += new SetAppearance(this.SetAppearance); | ||
71 | ControllingClient.OnCompleteMovementToRegion += new ClientView.GenericCall2(this.CompleteMovement); | ||
72 | ControllingClient.OnCompleteMovementToRegion += new ClientView.GenericCall2(this.SendInitialPosition); | ||
73 | ControllingClient.OnAgentUpdate += new ClientView.GenericCall3(this.HandleAgentUpdate); | ||
74 | ControllingClient.OnStartAnim += new StartAnim(this.SendAnimPack); | ||
75 | ControllingClient.OnChildAgentStatus += new ClientView.StatusChange(this.ChildStatusChange); | ||
76 | ControllingClient.OnStopMovement += new ClientView.GenericCall2(this.StopMovement); | ||
77 | } | ||
78 | |||
79 | public PhysicsActor PhysActor | ||
80 | { | ||
81 | set | ||
82 | { | ||
83 | this._physActor = value; | ||
84 | } | ||
85 | get | ||
86 | { | ||
87 | return _physActor; | ||
88 | } | ||
89 | } | ||
90 | |||
91 | public void ChildStatusChange(bool status) | ||
92 | { | ||
93 | |||
94 | } | ||
95 | |||
96 | public override void addForces() | ||
97 | { | ||
98 | |||
99 | } | ||
100 | |||
101 | public static void SetupTemplate(string name) | ||
102 | { | ||
103 | |||
104 | } | ||
105 | |||
106 | protected static void SetDefaultPacketValues(ObjectUpdatePacket.ObjectDataBlock objdata) | ||
107 | { | ||
108 | |||
109 | |||
110 | |||
111 | } | ||
112 | |||
113 | public void CompleteMovement() | ||
114 | { | ||
115 | |||
116 | } | ||
117 | |||
118 | public void HandleAgentUpdate(Packet pack) | ||
119 | { | ||
120 | this.HandleUpdate((AgentUpdatePacket)pack); | ||
121 | } | ||
122 | |||
123 | public void HandleUpdate(AgentUpdatePacket pack) | ||
124 | { | ||
125 | |||
126 | } | ||
127 | |||
128 | //really really should be moved somewhere else (RegionInfo.cs ?) | ||
129 | public void SendRegionHandshake(World regionInfo) | ||
130 | { | ||
131 | |||
132 | } | ||
133 | |||
134 | public static void LoadAnims() | ||
135 | { | ||
136 | |||
137 | } | ||
138 | |||
139 | public override void LandRenegerated() | ||
140 | { | ||
141 | |||
142 | } | ||
143 | } | ||
144 | |||
145 | public class NewForce | ||
146 | { | ||
147 | public float X; | ||
148 | public float Y; | ||
149 | public float Z; | ||
150 | |||
151 | public NewForce() | ||
152 | { | ||
153 | |||
154 | } | ||
155 | } | ||
156 | |||
157 | } | ||
diff --git a/OpenSim/OpenSim.RegionServer/world/AvatarAnimations.cs b/OpenSim/OpenSim.RegionServer/world/AvatarAnimations.cs deleted file mode 100644 index b554af8..0000000 --- a/OpenSim/OpenSim.RegionServer/world/AvatarAnimations.cs +++ /dev/null | |||
@@ -1,163 +0,0 @@ | |||
1 | using System; | ||
2 | using System.Collections.Generic; | ||
3 | using System.Text; | ||
4 | using libsecondlife; | ||
5 | |||
6 | namespace OpenSim.world | ||
7 | { | ||
8 | public class AvatarAnimations | ||
9 | { | ||
10 | |||
11 | public Dictionary<string, LLUUID> AnimsLLUUID = new Dictionary<string, LLUUID>(); | ||
12 | public Dictionary<LLUUID, string> AnimsNames = new Dictionary<LLUUID, string>(); | ||
13 | |||
14 | public AvatarAnimations() | ||
15 | { | ||
16 | } | ||
17 | |||
18 | public void LoadAnims() | ||
19 | { | ||
20 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Avatar.cs:LoadAnims() - Loading avatar animations"); | ||
21 | AnimsLLUUID.Add("ANIM_AGENT_AFRAID", new LLUUID("6b61c8e8-4747-0d75-12d7-e49ff207a4ca")); | ||
22 | AnimsLLUUID.Add("ANIM_AGENT_AIM_BAZOOKA_R", new LLUUID("b5b4a67d-0aee-30d2-72cd-77b333e932ef")); | ||
23 | AnimsLLUUID.Add("ANIM_AGENT_AIM_BOW_L", new LLUUID("46bb4359-de38-4ed8-6a22-f1f52fe8f506")); | ||
24 | AnimsLLUUID.Add("ANIM_AGENT_AIM_HANDGUN_R", new LLUUID("3147d815-6338-b932-f011-16b56d9ac18b")); | ||
25 | AnimsLLUUID.Add("ANIM_AGENT_AIM_RIFLE_R", new LLUUID("ea633413-8006-180a-c3ba-96dd1d756720")); | ||
26 | AnimsLLUUID.Add("ANIM_AGENT_ANGRY", new LLUUID("5747a48e-073e-c331-f6f3-7c2149613d3e")); | ||
27 | AnimsLLUUID.Add("ANIM_AGENT_AWAY", new LLUUID("fd037134-85d4-f241-72c6-4f42164fedee")); | ||
28 | AnimsLLUUID.Add("ANIM_AGENT_BACKFLIP", new LLUUID("c4ca6188-9127-4f31-0158-23c4e2f93304")); | ||
29 | AnimsLLUUID.Add("ANIM_AGENT_BELLY_LAUGH", new LLUUID("18b3a4b5-b463-bd48-e4b6-71eaac76c515")); | ||
30 | AnimsLLUUID.Add("ANIM_AGENT_BLOW_KISS", new LLUUID("db84829b-462c-ee83-1e27-9bbee66bd624")); | ||
31 | AnimsLLUUID.Add("ANIM_AGENT_BORED", new LLUUID("b906c4ba-703b-1940-32a3-0c7f7d791510")); | ||
32 | AnimsLLUUID.Add("ANIM_AGENT_BOW", new LLUUID("82e99230-c906-1403-4d9c-3889dd98daba")); | ||
33 | AnimsLLUUID.Add("ANIM_AGENT_BRUSH", new LLUUID("349a3801-54f9-bf2c-3bd0-1ac89772af01")); | ||
34 | AnimsLLUUID.Add("ANIM_AGENT_BUSY", new LLUUID("efcf670c-2d18-8128-973a-034ebc806b67")); | ||
35 | AnimsLLUUID.Add("ANIM_AGENT_CLAP", new LLUUID("9b0c1c4e-8ac7-7969-1494-28c874c4f668")); | ||
36 | AnimsLLUUID.Add("ANIM_AGENT_COURTBOW", new LLUUID("9ba1c942-08be-e43a-fb29-16ad440efc50")); | ||
37 | AnimsLLUUID.Add("ANIM_AGENT_CROUCH", new LLUUID("201f3fdf-cb1f-dbec-201f-7333e328ae7c")); | ||
38 | AnimsLLUUID.Add("ANIM_AGENT_CROUCHWALK", new LLUUID("47f5f6fb-22e5-ae44-f871-73aaaf4a6022")); | ||
39 | AnimsLLUUID.Add("ANIM_AGENT_CRY", new LLUUID("92624d3e-1068-f1aa-a5ec-8244585193ed")); | ||
40 | AnimsLLUUID.Add("ANIM_AGENT_CUSTOMIZE", new LLUUID("038fcec9-5ebd-8a8e-0e2e-6e71a0a1ac53")); | ||
41 | AnimsLLUUID.Add("ANIM_AGENT_CUSTOMIZE_DONE", new LLUUID("6883a61a-b27b-5914-a61e-dda118a9ee2c")); | ||
42 | AnimsLLUUID.Add("ANIM_AGENT_DANCE1", new LLUUID("b68a3d7c-de9e-fc87-eec8-543d787e5b0d")); | ||
43 | AnimsLLUUID.Add("ANIM_AGENT_DANCE2", new LLUUID("928cae18-e31d-76fd-9cc9-2f55160ff818")); | ||
44 | AnimsLLUUID.Add("ANIM_AGENT_DANCE3", new LLUUID("30047778-10ea-1af7-6881-4db7a3a5a114")); | ||
45 | AnimsLLUUID.Add("ANIM_AGENT_DANCE4", new LLUUID("951469f4-c7b2-c818-9dee-ad7eea8c30b7")); | ||
46 | AnimsLLUUID.Add("ANIM_AGENT_DANCE5", new LLUUID("4bd69a1d-1114-a0b4-625f-84e0a5237155")); | ||
47 | AnimsLLUUID.Add("ANIM_AGENT_DANCE6", new LLUUID("cd28b69b-9c95-bb78-3f94-8d605ff1bb12")); | ||
48 | AnimsLLUUID.Add("ANIM_AGENT_DANCE7", new LLUUID("a54d8ee2-28bb-80a9-7f0c-7afbbe24a5d6")); | ||
49 | AnimsLLUUID.Add("ANIM_AGENT_DANCE8", new LLUUID("b0dc417c-1f11-af36-2e80-7e7489fa7cdc")); | ||
50 | AnimsLLUUID.Add("ANIM_AGENT_DEAD", new LLUUID("57abaae6-1d17-7b1b-5f98-6d11a6411276")); | ||
51 | AnimsLLUUID.Add("ANIM_AGENT_DRINK", new LLUUID("0f86e355-dd31-a61c-fdb0-3a96b9aad05f")); | ||
52 | AnimsLLUUID.Add("ANIM_AGENT_EMBARRASSED", new LLUUID("514af488-9051-044a-b3fc-d4dbf76377c6")); | ||
53 | AnimsLLUUID.Add("ANIM_AGENT_EXPRESS_AFRAID", new LLUUID("aa2df84d-cf8f-7218-527b-424a52de766e")); | ||
54 | AnimsLLUUID.Add("ANIM_AGENT_EXPRESS_ANGER", new LLUUID("1a03b575-9634-b62a-5767-3a679e81f4de")); | ||
55 | AnimsLLUUID.Add("ANIM_AGENT_EXPRESS_BORED", new LLUUID("214aa6c1-ba6a-4578-f27c-ce7688f61d0d")); | ||
56 | AnimsLLUUID.Add("ANIM_AGENT_EXPRESS_CRY", new LLUUID("d535471b-85bf-3b4d-a542-93bea4f59d33")); | ||
57 | AnimsLLUUID.Add("ANIM_AGENT_EXPRESS_DISDAIN", new LLUUID("d4416ff1-09d3-300f-4183-1b68a19b9fc1")); | ||
58 | AnimsLLUUID.Add("ANIM_AGENT_EXPRESS_EMBARRASSED", new LLUUID("0b8c8211-d78c-33e8-fa28-c51a9594e424")); | ||
59 | AnimsLLUUID.Add("ANIM_AGENT_EXPRESS_FROWN", new LLUUID("fee3df48-fa3d-1015-1e26-a205810e3001")); | ||
60 | AnimsLLUUID.Add("ANIM_AGENT_EXPRESS_KISS", new LLUUID("1e8d90cc-a84e-e135-884c-7c82c8b03a14")); | ||
61 | AnimsLLUUID.Add("ANIM_AGENT_EXPRESS_LAUGH", new LLUUID("62570842-0950-96f8-341c-809e65110823")); | ||
62 | AnimsLLUUID.Add("ANIM_AGENT_EXPRESS_OPEN_MOUTH", new LLUUID("d63bc1f9-fc81-9625-a0c6-007176d82eb7")); | ||
63 | AnimsLLUUID.Add("ANIM_AGENT_EXPRESS_REPULSED", new LLUUID("f76cda94-41d4-a229-2872-e0296e58afe1")); | ||
64 | AnimsLLUUID.Add("ANIM_AGENT_EXPRESS_SAD", new LLUUID("eb6ebfb2-a4b3-a19c-d388-4dd5c03823f7")); | ||
65 | AnimsLLUUID.Add("ANIM_AGENT_EXPRESS_SHRUG", new LLUUID("a351b1bc-cc94-aac2-7bea-a7e6ebad15ef")); | ||
66 | AnimsLLUUID.Add("ANIM_AGENT_EXPRESS_SMILE", new LLUUID("b7c7c833-e3d3-c4e3-9fc0-131237446312")); | ||
67 | AnimsLLUUID.Add("ANIM_AGENT_EXPRESS_SURPRISE", new LLUUID("728646d9-cc79-08b2-32d6-937f0a835c24")); | ||
68 | AnimsLLUUID.Add("ANIM_AGENT_EXPRESS_TONGUE_OUT", new LLUUID("835965c6-7f2f-bda2-5deb-2478737f91bf")); | ||
69 | AnimsLLUUID.Add("ANIM_AGENT_EXPRESS_TOOTHSMILE", new LLUUID("b92ec1a5-e7ce-a76b-2b05-bcdb9311417e")); | ||
70 | AnimsLLUUID.Add("ANIM_AGENT_EXPRESS_WINK", new LLUUID("da020525-4d94-59d6-23d7-81fdebf33148")); | ||
71 | AnimsLLUUID.Add("ANIM_AGENT_EXPRESS_WORRY", new LLUUID("9c05e5c7-6f07-6ca4-ed5a-b230390c3950")); | ||
72 | AnimsLLUUID.Add("ANIM_AGENT_FALLDOWN", new LLUUID("666307d9-a860-572d-6fd4-c3ab8865c094")); | ||
73 | AnimsLLUUID.Add("ANIM_AGENT_FEMALE_WALK", new LLUUID("f5fc7433-043d-e819-8298-f519a119b688")); | ||
74 | AnimsLLUUID.Add("ANIM_AGENT_FINGER_WAG", new LLUUID("c1bc7f36-3ba0-d844-f93c-93be945d644f")); | ||
75 | AnimsLLUUID.Add("ANIM_AGENT_FIST_PUMP", new LLUUID("7db00ccd-f380-f3ee-439d-61968ec69c8a")); | ||
76 | AnimsLLUUID.Add("ANIM_AGENT_FLY", new LLUUID("aec4610c-757f-bc4e-c092-c6e9caf18daf")); | ||
77 | AnimsLLUUID.Add("ANIM_AGENT_FLYSLOW", new LLUUID("2b5a38b2-5e00-3a97-a495-4c826bc443e6")); | ||
78 | AnimsLLUUID.Add("ANIM_AGENT_HELLO", new LLUUID("9b29cd61-c45b-5689-ded2-91756b8d76a9")); | ||
79 | AnimsLLUUID.Add("ANIM_AGENT_HOLD_BAZOOKA_R", new LLUUID("ef62d355-c815-4816-2474-b1acc21094a6")); | ||
80 | AnimsLLUUID.Add("ANIM_AGENT_HOLD_BOW_L", new LLUUID("8b102617-bcba-037b-86c1-b76219f90c88")); | ||
81 | AnimsLLUUID.Add("ANIM_AGENT_HOLD_HANDGUN_R", new LLUUID("efdc1727-8b8a-c800-4077-975fc27ee2f2")); | ||
82 | AnimsLLUUID.Add("ANIM_AGENT_HOLD_RIFLE_R", new LLUUID("3d94bad0-c55b-7dcc-8763-033c59405d33")); | ||
83 | AnimsLLUUID.Add("ANIM_AGENT_HOLD_THROW_R", new LLUUID("7570c7b5-1f22-56dd-56ef-a9168241bbb6")); | ||
84 | AnimsLLUUID.Add("ANIM_AGENT_HOVER", new LLUUID("4ae8016b-31b9-03bb-c401-b1ea941db41d")); | ||
85 | AnimsLLUUID.Add("ANIM_AGENT_HOVER_DOWN", new LLUUID("20f063ea-8306-2562-0b07-5c853b37b31e")); | ||
86 | AnimsLLUUID.Add("ANIM_AGENT_HOVER_UP", new LLUUID("62c5de58-cb33-5743-3d07-9e4cd4352864")); | ||
87 | AnimsLLUUID.Add("ANIM_AGENT_IMPATIENT", new LLUUID("5ea3991f-c293-392e-6860-91dfa01278a3")); | ||
88 | AnimsLLUUID.Add("ANIM_AGENT_JUMP", new LLUUID("2305bd75-1ca9-b03b-1faa-b176b8a8c49e")); | ||
89 | AnimsLLUUID.Add("ANIM_AGENT_JUMP_FOR_JOY", new LLUUID("709ea28e-1573-c023-8bf8-520c8bc637fa")); | ||
90 | AnimsLLUUID.Add("ANIM_AGENT_KISS_MY_BUTT", new LLUUID("19999406-3a3a-d58c-a2ac-d72e555dcf51")); | ||
91 | AnimsLLUUID.Add("ANIM_AGENT_LAND", new LLUUID("7a17b059-12b2-41b1-570a-186368b6aa6f")); | ||
92 | AnimsLLUUID.Add("ANIM_AGENT_LAUGH_SHORT", new LLUUID("ca5b3f14-3194-7a2b-c894-aa699b718d1f")); | ||
93 | AnimsLLUUID.Add("ANIM_AGENT_MEDIUM_LAND", new LLUUID("f4f00d6e-b9fe-9292-f4cb-0ae06ea58d57")); | ||
94 | AnimsLLUUID.Add("ANIM_AGENT_MOTORCYCLE_SIT", new LLUUID("08464f78-3a8e-2944-cba5-0c94aff3af29")); | ||
95 | AnimsLLUUID.Add("ANIM_AGENT_MUSCLE_BEACH", new LLUUID("315c3a41-a5f3-0ba4-27da-f893f769e69b")); | ||
96 | AnimsLLUUID.Add("ANIM_AGENT_NO", new LLUUID("5a977ed9-7f72-44e9-4c4c-6e913df8ae74")); | ||
97 | AnimsLLUUID.Add("ANIM_AGENT_NO_UNHAPPY", new LLUUID("d83fa0e5-97ed-7eb2-e798-7bd006215cb4")); | ||
98 | AnimsLLUUID.Add("ANIM_AGENT_NYAH_NYAH", new LLUUID("f061723d-0a18-754f-66ee-29a44795a32f")); | ||
99 | AnimsLLUUID.Add("ANIM_AGENT_ONETWO_PUNCH", new LLUUID("eefc79be-daae-a239-8c04-890f5d23654a")); | ||
100 | AnimsLLUUID.Add("ANIM_AGENT_PEACE", new LLUUID("b312b10e-65ab-a0a4-8b3c-1326ea8e3ed9")); | ||
101 | AnimsLLUUID.Add("ANIM_AGENT_POINT_ME", new LLUUID("17c024cc-eef2-f6a0-3527-9869876d7752")); | ||
102 | AnimsLLUUID.Add("ANIM_AGENT_POINT_YOU", new LLUUID("ec952cca-61ef-aa3b-2789-4d1344f016de")); | ||
103 | AnimsLLUUID.Add("ANIM_AGENT_PRE_JUMP", new LLUUID("7a4e87fe-de39-6fcb-6223-024b00893244")); | ||
104 | AnimsLLUUID.Add("ANIM_AGENT_PUNCH_LEFT", new LLUUID("f3300ad9-3462-1d07-2044-0fef80062da0")); | ||
105 | AnimsLLUUID.Add("ANIM_AGENT_PUNCH_RIGHT", new LLUUID("c8e42d32-7310-6906-c903-cab5d4a34656")); | ||
106 | AnimsLLUUID.Add("ANIM_AGENT_REPULSED", new LLUUID("36f81a92-f076-5893-dc4b-7c3795e487cf")); | ||
107 | AnimsLLUUID.Add("ANIM_AGENT_ROUNDHOUSE_KICK", new LLUUID("49aea43b-5ac3-8a44-b595-96100af0beda")); | ||
108 | AnimsLLUUID.Add("ANIM_AGENT_RPS_COUNTDOWN", new LLUUID("35db4f7e-28c2-6679-cea9-3ee108f7fc7f")); | ||
109 | AnimsLLUUID.Add("ANIM_AGENT_RPS_PAPER", new LLUUID("0836b67f-7f7b-f37b-c00a-460dc1521f5a")); | ||
110 | AnimsLLUUID.Add("ANIM_AGENT_RPS_ROCK", new LLUUID("42dd95d5-0bc6-6392-f650-777304946c0f")); | ||
111 | AnimsLLUUID.Add("ANIM_AGENT_RPS_SCISSORS", new LLUUID("16803a9f-5140-e042-4d7b-d28ba247c325")); | ||
112 | AnimsLLUUID.Add("ANIM_AGENT_RUN", new LLUUID("05ddbff8-aaa9-92a1-2b74-8fe77a29b445")); | ||
113 | AnimsLLUUID.Add("ANIM_AGENT_SAD", new LLUUID("0eb702e2-cc5a-9a88-56a5-661a55c0676a")); | ||
114 | AnimsLLUUID.Add("ANIM_AGENT_SALUTE", new LLUUID("cd7668a6-7011-d7e2-ead8-fc69eff1a104")); | ||
115 | AnimsLLUUID.Add("ANIM_AGENT_SHOOT_BOW_L", new LLUUID("e04d450d-fdb5-0432-fd68-818aaf5935f8")); | ||
116 | AnimsLLUUID.Add("ANIM_AGENT_SHOUT", new LLUUID("6bd01860-4ebd-127a-bb3d-d1427e8e0c42")); | ||
117 | AnimsLLUUID.Add("ANIM_AGENT_SHRUG", new LLUUID("70ea714f-3a97-d742-1b01-590a8fcd1db5")); | ||
118 | AnimsLLUUID.Add("ANIM_AGENT_SIT", new LLUUID("1a5fe8ac-a804-8a5d-7cbd-56bd83184568")); | ||
119 | AnimsLLUUID.Add("ANIM_AGENT_SIT_FEMALE", new LLUUID("b1709c8d-ecd3-54a1-4f28-d55ac0840782")); | ||
120 | AnimsLLUUID.Add("ANIM_AGENT_SIT_GENERIC", new LLUUID("245f3c54-f1c0-bf2e-811f-46d8eeb386e7")); | ||
121 | AnimsLLUUID.Add("ANIM_AGENT_SIT_GROUND", new LLUUID("1c7600d6-661f-b87b-efe2-d7421eb93c86")); | ||
122 | AnimsLLUUID.Add("ANIM_AGENT_SIT_GROUND_CONSTRAINED", new LLUUID("1a2bd58e-87ff-0df8-0b4c-53e047b0bb6e")); | ||
123 | AnimsLLUUID.Add("ANIM_AGENT_SIT_TO_STAND", new LLUUID("a8dee56f-2eae-9e7a-05a2-6fb92b97e21e")); | ||
124 | AnimsLLUUID.Add("ANIM_AGENT_SLEEP", new LLUUID("f2bed5f9-9d44-39af-b0cd-257b2a17fe40")); | ||
125 | AnimsLLUUID.Add("ANIM_AGENT_SMOKE_IDLE", new LLUUID("d2f2ee58-8ad1-06c9-d8d3-3827ba31567a")); | ||
126 | AnimsLLUUID.Add("ANIM_AGENT_SMOKE_INHALE", new LLUUID("6802d553-49da-0778-9f85-1599a2266526")); | ||
127 | AnimsLLUUID.Add("ANIM_AGENT_SMOKE_THROW_DOWN", new LLUUID("0a9fb970-8b44-9114-d3a9-bf69cfe804d6")); | ||
128 | AnimsLLUUID.Add("ANIM_AGENT_SNAPSHOT", new LLUUID("eae8905b-271a-99e2-4c0e-31106afd100c")); | ||
129 | AnimsLLUUID.Add("ANIM_AGENT_STAND", new LLUUID("2408fe9e-df1d-1d7d-f4ff-1384fa7b350f")); | ||
130 | AnimsLLUUID.Add("ANIM_AGENT_STANDUP", new LLUUID("3da1d753-028a-5446-24f3-9c9b856d9422")); | ||
131 | AnimsLLUUID.Add("ANIM_AGENT_STAND_1", new LLUUID("15468e00-3400-bb66-cecc-646d7c14458e")); | ||
132 | AnimsLLUUID.Add("ANIM_AGENT_STAND_2", new LLUUID("370f3a20-6ca6-9971-848c-9a01bc42ae3c")); | ||
133 | AnimsLLUUID.Add("ANIM_AGENT_STAND_3", new LLUUID("42b46214-4b44-79ae-deb8-0df61424ff4b")); | ||
134 | AnimsLLUUID.Add("ANIM_AGENT_STAND_4", new LLUUID("f22fed8b-a5ed-2c93-64d5-bdd8b93c889f")); | ||
135 | AnimsLLUUID.Add("ANIM_AGENT_STRETCH", new LLUUID("80700431-74ec-a008-14f8-77575e73693f")); | ||
136 | AnimsLLUUID.Add("ANIM_AGENT_STRIDE", new LLUUID("1cb562b0-ba21-2202-efb3-30f82cdf9595")); | ||
137 | AnimsLLUUID.Add("ANIM_AGENT_SURF", new LLUUID("41426836-7437-7e89-025d-0aa4d10f1d69")); | ||
138 | AnimsLLUUID.Add("ANIM_AGENT_SURPRISE", new LLUUID("313b9881-4302-73c0-c7d0-0e7a36b6c224")); | ||
139 | AnimsLLUUID.Add("ANIM_AGENT_SWORD_STRIKE", new LLUUID("85428680-6bf9-3e64-b489-6f81087c24bd")); | ||
140 | AnimsLLUUID.Add("ANIM_AGENT_TALK", new LLUUID("5c682a95-6da4-a463-0bf6-0f5b7be129d1")); | ||
141 | AnimsLLUUID.Add("ANIM_AGENT_TANTRUM", new LLUUID("11000694-3f41-adc2-606b-eee1d66f3724")); | ||
142 | AnimsLLUUID.Add("ANIM_AGENT_THROW_R", new LLUUID("aa134404-7dac-7aca-2cba-435f9db875ca")); | ||
143 | AnimsLLUUID.Add("ANIM_AGENT_TRYON_SHIRT", new LLUUID("83ff59fe-2346-f236-9009-4e3608af64c1")); | ||
144 | AnimsLLUUID.Add("ANIM_AGENT_TURNLEFT", new LLUUID("56e0ba0d-4a9f-7f27-6117-32f2ebbf6135")); | ||
145 | AnimsLLUUID.Add("ANIM_AGENT_TURNRIGHT", new LLUUID("2d6daa51-3192-6794-8e2e-a15f8338ec30")); | ||
146 | AnimsLLUUID.Add("ANIM_AGENT_TYPE", new LLUUID("c541c47f-e0c0-058b-ad1a-d6ae3a4584d9")); | ||
147 | AnimsLLUUID.Add("ANIM_AGENT_WALK", new LLUUID("6ed24bd8-91aa-4b12-ccc7-c97c857ab4e0")); | ||
148 | AnimsLLUUID.Add("ANIM_AGENT_WHISPER", new LLUUID("7693f268-06c7-ea71-fa21-2b30d6533f8f")); | ||
149 | AnimsLLUUID.Add("ANIM_AGENT_WHISTLE", new LLUUID("b1ed7982-c68e-a982-7561-52a88a5298c0")); | ||
150 | AnimsLLUUID.Add("ANIM_AGENT_WINK", new LLUUID("869ecdad-a44b-671e-3266-56aef2e3ac2e")); | ||
151 | AnimsLLUUID.Add("ANIM_AGENT_WINK_HOLLYWOOD", new LLUUID("c0c4030f-c02b-49de-24ba-2331f43fe41c")); | ||
152 | AnimsLLUUID.Add("ANIM_AGENT_WORRY", new LLUUID("9f496bd2-589a-709f-16cc-69bf7df1d36c")); | ||
153 | AnimsLLUUID.Add("ANIM_AGENT_YES", new LLUUID("15dd911d-be82-2856-26db-27659b142875")); | ||
154 | AnimsLLUUID.Add("ANIM_AGENT_YES_HAPPY", new LLUUID("b8c8b2a3-9008-1771-3bfc-90924955ab2d")); | ||
155 | AnimsLLUUID.Add("ANIM_AGENT_YOGA_FLOAT", new LLUUID("42ecd00b-9947-a97c-400a-bbc9174c7aeb")); | ||
156 | |||
157 | foreach (KeyValuePair<string, LLUUID> kp in OpenSim.world.Avatar.Animations.AnimsLLUUID) | ||
158 | { | ||
159 | AnimsNames.Add(kp.Value, kp.Key); | ||
160 | } | ||
161 | } | ||
162 | } | ||
163 | } | ||
diff --git a/OpenSim/OpenSim.RegionServer/world/Entity.cs b/OpenSim/OpenSim.RegionServer/world/Entity.cs deleted file mode 100644 index 96e039a..0000000 --- a/OpenSim/OpenSim.RegionServer/world/Entity.cs +++ /dev/null | |||
@@ -1,124 +0,0 @@ | |||
1 | using System; | ||
2 | using System.Collections.Generic; | ||
3 | using System.Text; | ||
4 | using Axiom.MathLib; | ||
5 | using OpenSim.Physics.Manager; | ||
6 | using OpenSim.types; | ||
7 | using libsecondlife; | ||
8 | using OpenSim.RegionServer.world.scripting; | ||
9 | |||
10 | namespace OpenSim.world | ||
11 | { | ||
12 | public abstract class Entity : IScriptReadonlyEntity | ||
13 | { | ||
14 | public libsecondlife.LLUUID uuid; | ||
15 | public uint localid; | ||
16 | public LLVector3 velocity; | ||
17 | public Quaternion rotation; | ||
18 | protected List<Entity> children; | ||
19 | |||
20 | protected string m_name; | ||
21 | public virtual string Name | ||
22 | { | ||
23 | get { return m_name; } | ||
24 | } | ||
25 | |||
26 | protected LLVector3 m_pos; | ||
27 | protected PhysicsActor _physActor; | ||
28 | protected World m_world; | ||
29 | |||
30 | public virtual LLVector3 Pos | ||
31 | { | ||
32 | get | ||
33 | { | ||
34 | if (this._physActor != null) | ||
35 | { | ||
36 | m_pos.X = _physActor.Position.X; | ||
37 | m_pos.Y = _physActor.Position.Y; | ||
38 | m_pos.Z = _physActor.Position.Z; | ||
39 | } | ||
40 | |||
41 | return m_pos; | ||
42 | } | ||
43 | set | ||
44 | { | ||
45 | if (this._physActor != null) | ||
46 | { | ||
47 | try | ||
48 | { | ||
49 | lock (this.m_world.LockPhysicsEngine) | ||
50 | { | ||
51 | |||
52 | this._physActor.Position = new PhysicsVector(value.X, value.Y, value.Z); | ||
53 | } | ||
54 | } | ||
55 | catch (Exception e) | ||
56 | { | ||
57 | Console.WriteLine(e.Message); | ||
58 | } | ||
59 | } | ||
60 | |||
61 | m_pos = value; | ||
62 | } | ||
63 | } | ||
64 | |||
65 | /// <summary> | ||
66 | /// Creates a new Entity (should not occur on it's own) | ||
67 | /// </summary> | ||
68 | public Entity() | ||
69 | { | ||
70 | uuid = new libsecondlife.LLUUID(); | ||
71 | localid = 0; | ||
72 | m_pos = new LLVector3(); | ||
73 | velocity = new LLVector3(); | ||
74 | rotation = new Quaternion(); | ||
75 | m_name = "(basic entity)"; | ||
76 | children = new List<Entity>(); | ||
77 | } | ||
78 | |||
79 | public virtual void addForces() | ||
80 | { | ||
81 | foreach (Entity child in children) | ||
82 | { | ||
83 | child.addForces(); | ||
84 | } | ||
85 | } | ||
86 | |||
87 | /// <summary> | ||
88 | /// Performs any updates that need to be done at each frame. This function is overridable from it's children. | ||
89 | /// </summary> | ||
90 | public virtual void update() { | ||
91 | // Do any per-frame updates needed that are applicable to every type of entity | ||
92 | foreach (Entity child in children) | ||
93 | { | ||
94 | child.update(); | ||
95 | } | ||
96 | } | ||
97 | |||
98 | /// <summary> | ||
99 | /// Returns a mesh for this object and any dependents | ||
100 | /// </summary> | ||
101 | /// <returns>The mesh of this entity tree</returns> | ||
102 | public virtual Mesh getMesh() | ||
103 | { | ||
104 | Mesh mesh = new Mesh(); | ||
105 | |||
106 | foreach (Entity child in children) | ||
107 | { | ||
108 | mesh += child.getMesh(); | ||
109 | } | ||
110 | |||
111 | return mesh; | ||
112 | } | ||
113 | |||
114 | public virtual void BackUp() | ||
115 | { | ||
116 | |||
117 | } | ||
118 | |||
119 | public virtual void LandRenegerated() | ||
120 | { | ||
121 | |||
122 | } | ||
123 | } | ||
124 | } | ||
diff --git a/OpenSim/OpenSim.RegionServer/world/Primitive.cs b/OpenSim/OpenSim.RegionServer/world/Primitive.cs deleted file mode 100644 index 433ea9e..0000000 --- a/OpenSim/OpenSim.RegionServer/world/Primitive.cs +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | using System; | ||
2 | using System.Collections.Generic; | ||
3 | using System.Text; | ||
4 | using OpenSim.types; | ||
5 | using libsecondlife; | ||
6 | using libsecondlife.Packets; | ||
7 | using OpenSim.Framework.Interfaces; | ||
8 | using OpenSim.Physics.Manager; | ||
9 | using OpenSim.Framework.Types; | ||
10 | |||
11 | namespace OpenSim.world | ||
12 | { | ||
13 | public class Primitive : Entity | ||
14 | { | ||
15 | |||
16 | } | ||
17 | } | ||
diff --git a/OpenSim/OpenSim.RegionServer/world/Primitive2.cs b/OpenSim/OpenSim.RegionServer/world/Primitive2.cs deleted file mode 100644 index 6d071d4..0000000 --- a/OpenSim/OpenSim.RegionServer/world/Primitive2.cs +++ /dev/null | |||
@@ -1,491 +0,0 @@ | |||
1 | using System; | ||
2 | using System.Collections.Generic; | ||
3 | using System.Text; | ||
4 | using OpenSim.types; | ||
5 | using libsecondlife; | ||
6 | using libsecondlife.Packets; | ||
7 | using OpenSim.Framework.Interfaces; | ||
8 | using OpenSim.Physics.Manager; | ||
9 | using OpenSim.Framework.Types; | ||
10 | using OpenSim.Framework.Inventory; | ||
11 | |||
12 | namespace OpenSim.world | ||
13 | { | ||
14 | public class Primitive2 : Entity | ||
15 | { | ||
16 | protected PrimData primData; | ||
17 | //private ObjectUpdatePacket OurPacket; | ||
18 | private LLVector3 positionLastFrame = new LLVector3(0, 0, 0); | ||
19 | private Dictionary<uint, ClientView> m_clientThreads; | ||
20 | private ulong m_regionHandle; | ||
21 | private const uint FULL_MASK_PERMISSIONS = 2147483647; | ||
22 | private bool physicsEnabled = false; | ||
23 | |||
24 | private Dictionary<LLUUID, InventoryItem> inventoryItems; | ||
25 | |||
26 | #region Properties | ||
27 | |||
28 | public LLVector3 Scale | ||
29 | { | ||
30 | set | ||
31 | { | ||
32 | this.primData.Scale = value; | ||
33 | //this.dirtyFlag = true; | ||
34 | } | ||
35 | get | ||
36 | { | ||
37 | return this.primData.Scale; | ||
38 | } | ||
39 | } | ||
40 | |||
41 | public PhysicsActor PhysActor | ||
42 | { | ||
43 | set | ||
44 | { | ||
45 | this._physActor = value; | ||
46 | } | ||
47 | } | ||
48 | public override LLVector3 Pos | ||
49 | { | ||
50 | get | ||
51 | { | ||
52 | return base.Pos; | ||
53 | } | ||
54 | set | ||
55 | { | ||
56 | base.Pos = value; | ||
57 | } | ||
58 | } | ||
59 | #endregion | ||
60 | |||
61 | public Primitive2(Dictionary<uint, ClientView> clientThreads, ulong regionHandle, World world) | ||
62 | { | ||
63 | m_clientThreads = clientThreads; | ||
64 | m_regionHandle = regionHandle; | ||
65 | m_world = world; | ||
66 | inventoryItems = new Dictionary<LLUUID, InventoryItem>(); | ||
67 | } | ||
68 | |||
69 | public Primitive2(Dictionary<uint, ClientView> clientThreads, ulong regionHandle, World world, LLUUID owner) | ||
70 | { | ||
71 | m_clientThreads = clientThreads; | ||
72 | m_regionHandle = regionHandle; | ||
73 | m_world = world; | ||
74 | inventoryItems = new Dictionary<LLUUID, InventoryItem>(); | ||
75 | this.primData = new PrimData(); | ||
76 | this.primData.CreationDate = (Int32)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds; | ||
77 | this.primData.OwnerID = owner; | ||
78 | } | ||
79 | |||
80 | public byte[] GetByteArray() | ||
81 | { | ||
82 | byte[] result = null; | ||
83 | List<byte[]> dataArrays = new List<byte[]>(); | ||
84 | dataArrays.Add(primData.ToBytes()); | ||
85 | foreach (Entity child in children) | ||
86 | { | ||
87 | if (child is OpenSim.world.Primitive2) | ||
88 | { | ||
89 | dataArrays.Add(((OpenSim.world.Primitive2)child).GetByteArray()); | ||
90 | } | ||
91 | } | ||
92 | byte[] primstart = Helpers.StringToField("<Prim>"); | ||
93 | byte[] primend = Helpers.StringToField("</Prim>"); | ||
94 | int totalLength = primstart.Length + primend.Length; | ||
95 | for (int i = 0; i < dataArrays.Count; i++) | ||
96 | { | ||
97 | totalLength += dataArrays[i].Length; | ||
98 | } | ||
99 | |||
100 | result = new byte[totalLength]; | ||
101 | int arraypos = 0; | ||
102 | Array.Copy(primstart, 0, result, 0, primstart.Length); | ||
103 | arraypos += primstart.Length; | ||
104 | for (int i = 0; i < dataArrays.Count; i++) | ||
105 | { | ||
106 | Array.Copy(dataArrays[i], 0, result, arraypos, dataArrays[i].Length); | ||
107 | arraypos += dataArrays[i].Length; | ||
108 | } | ||
109 | Array.Copy(primend, 0, result, arraypos, primend.Length); | ||
110 | |||
111 | return result; | ||
112 | } | ||
113 | |||
114 | #region Overridden Methods | ||
115 | |||
116 | public override void update() | ||
117 | { | ||
118 | LLVector3 pos2 = new LLVector3(0, 0, 0); | ||
119 | } | ||
120 | |||
121 | public override void BackUp() | ||
122 | { | ||
123 | |||
124 | } | ||
125 | |||
126 | #endregion | ||
127 | |||
128 | #region Packet handlers | ||
129 | |||
130 | public void UpdatePosition(LLVector3 pos) | ||
131 | { | ||
132 | |||
133 | } | ||
134 | |||
135 | public void UpdateShape(ObjectShapePacket.ObjectDataBlock addPacket) | ||
136 | { | ||
137 | this.primData.PathBegin = addPacket.PathBegin; | ||
138 | this.primData.PathEnd = addPacket.PathEnd; | ||
139 | this.primData.PathScaleX = addPacket.PathScaleX; | ||
140 | this.primData.PathScaleY = addPacket.PathScaleY; | ||
141 | this.primData.PathShearX = addPacket.PathShearX; | ||
142 | this.primData.PathShearY = addPacket.PathShearY; | ||
143 | this.primData.PathSkew = addPacket.PathSkew; | ||
144 | this.primData.ProfileBegin = addPacket.ProfileBegin; | ||
145 | this.primData.ProfileEnd = addPacket.ProfileEnd; | ||
146 | this.primData.PathCurve = addPacket.PathCurve; | ||
147 | this.primData.ProfileCurve = addPacket.ProfileCurve; | ||
148 | this.primData.ProfileHollow = addPacket.ProfileHollow; | ||
149 | this.primData.PathRadiusOffset = addPacket.PathRadiusOffset; | ||
150 | this.primData.PathRevolutions = addPacket.PathRevolutions; | ||
151 | this.primData.PathTaperX = addPacket.PathTaperX; | ||
152 | this.primData.PathTaperY = addPacket.PathTaperY; | ||
153 | this.primData.PathTwist = addPacket.PathTwist; | ||
154 | this.primData.PathTwistBegin = addPacket.PathTwistBegin; | ||
155 | } | ||
156 | |||
157 | public void UpdateTexture(byte[] tex) | ||
158 | { | ||
159 | this.primData.Texture = tex; | ||
160 | //this.dirtyFlag = true; | ||
161 | } | ||
162 | |||
163 | public void UpdateObjectFlags(ObjectFlagUpdatePacket pack) | ||
164 | { | ||
165 | |||
166 | } | ||
167 | |||
168 | public void AssignToParent(Primitive prim) | ||
169 | { | ||
170 | |||
171 | } | ||
172 | |||
173 | public void GetProperites(ClientView client) | ||
174 | { | ||
175 | ObjectPropertiesPacket proper = new ObjectPropertiesPacket(); | ||
176 | proper.ObjectData = new ObjectPropertiesPacket.ObjectDataBlock[1]; | ||
177 | proper.ObjectData[0] = new ObjectPropertiesPacket.ObjectDataBlock(); | ||
178 | proper.ObjectData[0].ItemID = LLUUID.Zero; | ||
179 | proper.ObjectData[0].CreationDate = (ulong)this.primData.CreationDate; | ||
180 | proper.ObjectData[0].CreatorID = this.primData.OwnerID; | ||
181 | proper.ObjectData[0].FolderID = LLUUID.Zero; | ||
182 | proper.ObjectData[0].FromTaskID = LLUUID.Zero; | ||
183 | proper.ObjectData[0].GroupID = LLUUID.Zero; | ||
184 | proper.ObjectData[0].InventorySerial = 0; | ||
185 | proper.ObjectData[0].LastOwnerID = LLUUID.Zero; | ||
186 | proper.ObjectData[0].ObjectID = this.uuid; | ||
187 | proper.ObjectData[0].OwnerID = primData.OwnerID; | ||
188 | proper.ObjectData[0].TouchName = new byte[0]; | ||
189 | proper.ObjectData[0].TextureID = new byte[0]; | ||
190 | proper.ObjectData[0].SitName = new byte[0]; | ||
191 | proper.ObjectData[0].Name = new byte[0]; | ||
192 | proper.ObjectData[0].Description = new byte[0]; | ||
193 | proper.ObjectData[0].OwnerMask = this.primData.OwnerMask; | ||
194 | proper.ObjectData[0].NextOwnerMask = this.primData.NextOwnerMask; | ||
195 | proper.ObjectData[0].GroupMask = this.primData.GroupMask; | ||
196 | proper.ObjectData[0].EveryoneMask = this.primData.EveryoneMask; | ||
197 | proper.ObjectData[0].BaseMask = this.primData.BaseMask; | ||
198 | |||
199 | client.OutPacket(proper); | ||
200 | } | ||
201 | |||
202 | #endregion | ||
203 | |||
204 | # region Inventory Methods | ||
205 | |||
206 | public bool AddToInventory(InventoryItem item) | ||
207 | { | ||
208 | return false; | ||
209 | } | ||
210 | |||
211 | public InventoryItem RemoveFromInventory(LLUUID itemID) | ||
212 | { | ||
213 | return null; | ||
214 | } | ||
215 | |||
216 | public void RequestInventoryInfo(ClientView simClient, RequestTaskInventoryPacket packet) | ||
217 | { | ||
218 | |||
219 | } | ||
220 | |||
221 | public void RequestXferInventory(ClientView simClient, ulong xferID) | ||
222 | { | ||
223 | //will only currently work if the total size of the inventory data array is under about 1000 bytes | ||
224 | SendXferPacketPacket send = new SendXferPacketPacket(); | ||
225 | |||
226 | send.XferID.ID = xferID; | ||
227 | send.XferID.Packet = 1 + 2147483648; | ||
228 | send.DataPacket.Data = this.ConvertInventoryToBytes(); | ||
229 | |||
230 | simClient.OutPacket(send); | ||
231 | } | ||
232 | |||
233 | public byte[] ConvertInventoryToBytes() | ||
234 | { | ||
235 | System.Text.Encoding enc = System.Text.Encoding.ASCII; | ||
236 | byte[] result = new byte[0]; | ||
237 | List<byte[]> inventoryData = new List<byte[]>(); | ||
238 | int totallength = 0; | ||
239 | foreach (InventoryItem invItem in inventoryItems.Values) | ||
240 | { | ||
241 | byte[] data = enc.GetBytes(invItem.ExportString()); | ||
242 | inventoryData.Add(data); | ||
243 | totallength += data.Length; | ||
244 | } | ||
245 | //TODO: copy arrays into the single result array | ||
246 | |||
247 | return result; | ||
248 | } | ||
249 | |||
250 | public void CreateInventoryFromBytes(byte[] data) | ||
251 | { | ||
252 | |||
253 | } | ||
254 | |||
255 | #endregion | ||
256 | |||
257 | #region Update viewers Methods | ||
258 | |||
259 | //should change these mehtods, so that outgoing packets are sent through the avatar class | ||
260 | public void SendFullUpdateToClient(ClientView remoteClient) | ||
261 | { | ||
262 | LLVector3 lPos; | ||
263 | if (this._physActor != null && this.physicsEnabled) | ||
264 | { | ||
265 | PhysicsVector pPos = this._physActor.Position; | ||
266 | lPos = new LLVector3(pPos.X, pPos.Y, pPos.Z); | ||
267 | } | ||
268 | else | ||
269 | { | ||
270 | lPos = this.Pos; | ||
271 | } | ||
272 | |||
273 | ObjectUpdatePacket outPacket = new ObjectUpdatePacket(); | ||
274 | outPacket.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[1]; | ||
275 | outPacket.ObjectData[0] = this.CreateUpdateBlock(); | ||
276 | byte[] pb = lPos.GetBytes(); | ||
277 | Array.Copy(pb, 0, outPacket.ObjectData[0].ObjectData, 0, pb.Length); | ||
278 | |||
279 | remoteClient.OutPacket(outPacket); | ||
280 | } | ||
281 | |||
282 | public void SendFullUpdateToAllClients() | ||
283 | { | ||
284 | |||
285 | } | ||
286 | |||
287 | public void SendTerseUpdateToClient(ClientView RemoteClient) | ||
288 | { | ||
289 | |||
290 | } | ||
291 | |||
292 | public void SendTerseUpdateToALLClients() | ||
293 | { | ||
294 | |||
295 | } | ||
296 | |||
297 | #endregion | ||
298 | |||
299 | #region Create Methods | ||
300 | |||
301 | public void CreateFromPacket(ObjectAddPacket addPacket, LLUUID ownerID, uint localID) | ||
302 | { | ||
303 | PrimData PData = new PrimData(); | ||
304 | this.primData = PData; | ||
305 | this.primData.CreationDate = (Int32)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds; | ||
306 | |||
307 | PData.OwnerID = ownerID; | ||
308 | PData.PCode = addPacket.ObjectData.PCode; | ||
309 | PData.PathBegin = addPacket.ObjectData.PathBegin; | ||
310 | PData.PathEnd = addPacket.ObjectData.PathEnd; | ||
311 | PData.PathScaleX = addPacket.ObjectData.PathScaleX; | ||
312 | PData.PathScaleY = addPacket.ObjectData.PathScaleY; | ||
313 | PData.PathShearX = addPacket.ObjectData.PathShearX; | ||
314 | PData.PathShearY = addPacket.ObjectData.PathShearY; | ||
315 | PData.PathSkew = addPacket.ObjectData.PathSkew; | ||
316 | PData.ProfileBegin = addPacket.ObjectData.ProfileBegin; | ||
317 | PData.ProfileEnd = addPacket.ObjectData.ProfileEnd; | ||
318 | PData.Scale = addPacket.ObjectData.Scale; | ||
319 | PData.PathCurve = addPacket.ObjectData.PathCurve; | ||
320 | PData.ProfileCurve = addPacket.ObjectData.ProfileCurve; | ||
321 | PData.ParentID = 0; | ||
322 | PData.ProfileHollow = addPacket.ObjectData.ProfileHollow; | ||
323 | PData.PathRadiusOffset = addPacket.ObjectData.PathRadiusOffset; | ||
324 | PData.PathRevolutions = addPacket.ObjectData.PathRevolutions; | ||
325 | PData.PathTaperX = addPacket.ObjectData.PathTaperX; | ||
326 | PData.PathTaperY = addPacket.ObjectData.PathTaperY; | ||
327 | PData.PathTwist = addPacket.ObjectData.PathTwist; | ||
328 | PData.PathTwistBegin = addPacket.ObjectData.PathTwistBegin; | ||
329 | LLVector3 pos1 = addPacket.ObjectData.RayEnd; | ||
330 | this.primData.FullID = this.uuid = LLUUID.Random(); | ||
331 | this.localid = (uint)(localID); | ||
332 | this.primData.Position = this.Pos = pos1; | ||
333 | } | ||
334 | |||
335 | public void CreateFromBytes(byte[] data) | ||
336 | { | ||
337 | |||
338 | } | ||
339 | |||
340 | public void CreateFromPrimData(PrimData primData) | ||
341 | { | ||
342 | this.CreateFromPrimData(primData, primData.Position, primData.LocalID, false); | ||
343 | } | ||
344 | |||
345 | public void CreateFromPrimData(PrimData primData, LLVector3 posi, uint localID, bool newprim) | ||
346 | { | ||
347 | |||
348 | } | ||
349 | |||
350 | #endregion | ||
351 | |||
352 | #region Packet Update Methods | ||
353 | protected void SetDefaultPacketValues(ObjectUpdatePacket.ObjectDataBlock objdata) | ||
354 | { | ||
355 | objdata.PSBlock = new byte[0]; | ||
356 | objdata.ExtraParams = new byte[1]; | ||
357 | objdata.MediaURL = new byte[0]; | ||
358 | objdata.NameValue = new byte[0]; | ||
359 | objdata.Text = new byte[0]; | ||
360 | objdata.TextColor = new byte[4]; | ||
361 | objdata.JointAxisOrAnchor = new LLVector3(0, 0, 0); | ||
362 | objdata.JointPivot = new LLVector3(0, 0, 0); | ||
363 | objdata.Material = 3; | ||
364 | objdata.TextureAnim = new byte[0]; | ||
365 | objdata.Sound = LLUUID.Zero; | ||
366 | LLObject.TextureEntry ntex = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005")); | ||
367 | this.primData.Texture = objdata.TextureEntry = ntex.ToBytes(); | ||
368 | objdata.State = 0; | ||
369 | objdata.Data = new byte[0]; | ||
370 | |||
371 | objdata.ObjectData = new byte[60]; | ||
372 | objdata.ObjectData[46] = 128; | ||
373 | objdata.ObjectData[47] = 63; | ||
374 | } | ||
375 | |||
376 | protected void SetPacketShapeData(ObjectUpdatePacket.ObjectDataBlock objectData) | ||
377 | { | ||
378 | objectData.OwnerID = this.primData.OwnerID; | ||
379 | objectData.PCode = this.primData.PCode; | ||
380 | objectData.PathBegin = this.primData.PathBegin; | ||
381 | objectData.PathEnd = this.primData.PathEnd; | ||
382 | objectData.PathScaleX = this.primData.PathScaleX; | ||
383 | objectData.PathScaleY = this.primData.PathScaleY; | ||
384 | objectData.PathShearX = this.primData.PathShearX; | ||
385 | objectData.PathShearY = this.primData.PathShearY; | ||
386 | objectData.PathSkew = this.primData.PathSkew; | ||
387 | objectData.ProfileBegin = this.primData.ProfileBegin; | ||
388 | objectData.ProfileEnd = this.primData.ProfileEnd; | ||
389 | objectData.Scale = this.primData.Scale; | ||
390 | objectData.PathCurve = this.primData.PathCurve; | ||
391 | objectData.ProfileCurve = this.primData.ProfileCurve; | ||
392 | objectData.ParentID = this.primData.ParentID; | ||
393 | objectData.ProfileHollow = this.primData.ProfileHollow; | ||
394 | objectData.PathRadiusOffset = this.primData.PathRadiusOffset; | ||
395 | objectData.PathRevolutions = this.primData.PathRevolutions; | ||
396 | objectData.PathTaperX = this.primData.PathTaperX; | ||
397 | objectData.PathTaperY = this.primData.PathTaperY; | ||
398 | objectData.PathTwist = this.primData.PathTwist; | ||
399 | objectData.PathTwistBegin = this.primData.PathTwistBegin; | ||
400 | } | ||
401 | |||
402 | #endregion | ||
403 | protected ObjectUpdatePacket.ObjectDataBlock CreateUpdateBlock() | ||
404 | { | ||
405 | ObjectUpdatePacket.ObjectDataBlock objupdate = new ObjectUpdatePacket.ObjectDataBlock(); | ||
406 | this.SetDefaultPacketValues(objupdate); | ||
407 | objupdate.UpdateFlags = 32 + 65536 + 131072 + 256 + 4 + 8 + 2048 + 524288 + 268435456; | ||
408 | this.SetPacketShapeData(objupdate); | ||
409 | byte[] pb = this.Pos.GetBytes(); | ||
410 | Array.Copy(pb, 0, objupdate.ObjectData, 0, pb.Length); | ||
411 | return objupdate; | ||
412 | } | ||
413 | |||
414 | protected ImprovedTerseObjectUpdatePacket.ObjectDataBlock CreateImprovedBlock() | ||
415 | { | ||
416 | uint ID = this.localid; | ||
417 | byte[] bytes = new byte[60]; | ||
418 | |||
419 | int i = 0; | ||
420 | ImprovedTerseObjectUpdatePacket.ObjectDataBlock dat = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock(); | ||
421 | dat.TextureEntry = new byte[0]; | ||
422 | bytes[i++] = (byte)(ID % 256); | ||
423 | bytes[i++] = (byte)((ID >> 8) % 256); | ||
424 | bytes[i++] = (byte)((ID >> 16) % 256); | ||
425 | bytes[i++] = (byte)((ID >> 24) % 256); | ||
426 | bytes[i++] = 0; | ||
427 | bytes[i++] = 0; | ||
428 | |||
429 | LLVector3 lPos; | ||
430 | Axiom.MathLib.Quaternion lRot; | ||
431 | if (this._physActor != null && this.physicsEnabled) | ||
432 | { | ||
433 | PhysicsVector pPos = this._physActor.Position; | ||
434 | lPos = new LLVector3(pPos.X, pPos.Y, pPos.Z); | ||
435 | lRot = this._physActor.Orientation; | ||
436 | } | ||
437 | else | ||
438 | { | ||
439 | lPos = this.Pos; | ||
440 | lRot = this.rotation; | ||
441 | } | ||
442 | byte[] pb = lPos.GetBytes(); | ||
443 | Array.Copy(pb, 0, bytes, i, pb.Length); | ||
444 | i += 12; | ||
445 | ushort ac = 32767; | ||
446 | |||
447 | //vel | ||
448 | bytes[i++] = (byte)(ac % 256); | ||
449 | bytes[i++] = (byte)((ac >> 8) % 256); | ||
450 | bytes[i++] = (byte)(ac % 256); | ||
451 | bytes[i++] = (byte)((ac >> 8) % 256); | ||
452 | bytes[i++] = (byte)(ac % 256); | ||
453 | bytes[i++] = (byte)((ac >> 8) % 256); | ||
454 | |||
455 | //accel | ||
456 | bytes[i++] = (byte)(ac % 256); | ||
457 | bytes[i++] = (byte)((ac >> 8) % 256); | ||
458 | bytes[i++] = (byte)(ac % 256); | ||
459 | bytes[i++] = (byte)((ac >> 8) % 256); | ||
460 | bytes[i++] = (byte)(ac % 256); | ||
461 | bytes[i++] = (byte)((ac >> 8) % 256); | ||
462 | |||
463 | ushort rw, rx, ry, rz; | ||
464 | rw = (ushort)(32768 * (lRot.w + 1)); | ||
465 | rx = (ushort)(32768 * (lRot.x + 1)); | ||
466 | ry = (ushort)(32768 * (lRot.y + 1)); | ||
467 | rz = (ushort)(32768 * (lRot.z + 1)); | ||
468 | |||
469 | //rot | ||
470 | bytes[i++] = (byte)(rx % 256); | ||
471 | bytes[i++] = (byte)((rx >> 8) % 256); | ||
472 | bytes[i++] = (byte)(ry % 256); | ||
473 | bytes[i++] = (byte)((ry >> 8) % 256); | ||
474 | bytes[i++] = (byte)(rz % 256); | ||
475 | bytes[i++] = (byte)((rz >> 8) % 256); | ||
476 | bytes[i++] = (byte)(rw % 256); | ||
477 | bytes[i++] = (byte)((rw >> 8) % 256); | ||
478 | |||
479 | //rotation vel | ||
480 | bytes[i++] = (byte)(ac % 256); | ||
481 | bytes[i++] = (byte)((ac >> 8) % 256); | ||
482 | bytes[i++] = (byte)(ac % 256); | ||
483 | bytes[i++] = (byte)((ac >> 8) % 256); | ||
484 | bytes[i++] = (byte)(ac % 256); | ||
485 | bytes[i++] = (byte)((ac >> 8) % 256); | ||
486 | |||
487 | dat.Data = bytes; | ||
488 | return dat; | ||
489 | } | ||
490 | } | ||
491 | } | ||
diff --git a/OpenSim/OpenSim.RegionServer/world/SceneObject.cs b/OpenSim/OpenSim.RegionServer/world/SceneObject.cs deleted file mode 100644 index a846fb5..0000000 --- a/OpenSim/OpenSim.RegionServer/world/SceneObject.cs +++ /dev/null | |||
@@ -1,77 +0,0 @@ | |||
1 | using System; | ||
2 | using System.Collections.Generic; | ||
3 | using System.Text; | ||
4 | using OpenSim.types; | ||
5 | using libsecondlife; | ||
6 | using libsecondlife.Packets; | ||
7 | using OpenSim.Framework.Interfaces; | ||
8 | using OpenSim.Physics.Manager; | ||
9 | using OpenSim.Framework.Types; | ||
10 | using OpenSim.Framework.Inventory; | ||
11 | |||
12 | namespace OpenSim.world | ||
13 | { | ||
14 | public class SceneObject : Entity | ||
15 | { | ||
16 | private LLUUID rootUUID; | ||
17 | private Dictionary<LLUUID, Primitive2> ChildPrimitives = new Dictionary<LLUUID, Primitive2>(); | ||
18 | private Dictionary<uint, ClientView> m_clientThreads; | ||
19 | private World m_world; | ||
20 | |||
21 | public SceneObject() | ||
22 | { | ||
23 | |||
24 | } | ||
25 | |||
26 | public void CreateFromPacket(ObjectAddPacket addPacket, LLUUID agentID, uint localID) | ||
27 | { | ||
28 | } | ||
29 | |||
30 | public void CreateFromBytes(byte[] data) | ||
31 | { | ||
32 | |||
33 | } | ||
34 | |||
35 | public override void update() | ||
36 | { | ||
37 | |||
38 | } | ||
39 | |||
40 | public override void BackUp() | ||
41 | { | ||
42 | |||
43 | } | ||
44 | |||
45 | public void GetProperites(ClientView client) | ||
46 | { | ||
47 | /* | ||
48 | ObjectPropertiesPacket proper = new ObjectPropertiesPacket(); | ||
49 | proper.ObjectData = new ObjectPropertiesPacket.ObjectDataBlock[1]; | ||
50 | proper.ObjectData[0] = new ObjectPropertiesPacket.ObjectDataBlock(); | ||
51 | proper.ObjectData[0].ItemID = LLUUID.Zero; | ||
52 | proper.ObjectData[0].CreationDate = (ulong)this.primData.CreationDate; | ||
53 | proper.ObjectData[0].CreatorID = this.primData.OwnerID; | ||
54 | proper.ObjectData[0].FolderID = LLUUID.Zero; | ||
55 | proper.ObjectData[0].FromTaskID = LLUUID.Zero; | ||
56 | proper.ObjectData[0].GroupID = LLUUID.Zero; | ||
57 | proper.ObjectData[0].InventorySerial = 0; | ||
58 | proper.ObjectData[0].LastOwnerID = LLUUID.Zero; | ||
59 | proper.ObjectData[0].ObjectID = this.uuid; | ||
60 | proper.ObjectData[0].OwnerID = primData.OwnerID; | ||
61 | proper.ObjectData[0].TouchName = new byte[0]; | ||
62 | proper.ObjectData[0].TextureID = new byte[0]; | ||
63 | proper.ObjectData[0].SitName = new byte[0]; | ||
64 | proper.ObjectData[0].Name = new byte[0]; | ||
65 | proper.ObjectData[0].Description = new byte[0]; | ||
66 | proper.ObjectData[0].OwnerMask = this.primData.OwnerMask; | ||
67 | proper.ObjectData[0].NextOwnerMask = this.primData.NextOwnerMask; | ||
68 | proper.ObjectData[0].GroupMask = this.primData.GroupMask; | ||
69 | proper.ObjectData[0].EveryoneMask = this.primData.EveryoneMask; | ||
70 | proper.ObjectData[0].BaseMask = this.primData.BaseMask; | ||
71 | |||
72 | client.OutPacket(proper); | ||
73 | * */ | ||
74 | } | ||
75 | |||
76 | } | ||
77 | } | ||
diff --git a/OpenSim/OpenSim.RegionServer/world/World.PacketHandlers.cs b/OpenSim/OpenSim.RegionServer/world/World.PacketHandlers.cs deleted file mode 100644 index ee5a23a..0000000 --- a/OpenSim/OpenSim.RegionServer/world/World.PacketHandlers.cs +++ /dev/null | |||
@@ -1,261 +0,0 @@ | |||
1 | using System; | ||
2 | using System.Collections.Generic; | ||
3 | using System.Text; | ||
4 | using libsecondlife; | ||
5 | using libsecondlife.Packets; | ||
6 | using OpenSim.Physics.Manager; | ||
7 | using OpenSim.Framework.Interfaces; | ||
8 | using OpenSim.Framework.Types; | ||
9 | using OpenSim.Framework.Terrain; | ||
10 | using OpenSim.Framework.Inventory; | ||
11 | using OpenSim.Framework.Utilities; | ||
12 | using OpenSim.Assets; | ||
13 | |||
14 | namespace OpenSim.world | ||
15 | { | ||
16 | public partial class World | ||
17 | { | ||
18 | public void ModifyTerrain(byte action, float north, float west) | ||
19 | { | ||
20 | switch (action) | ||
21 | { | ||
22 | case 1: | ||
23 | // raise terrain | ||
24 | Terrain.raise(north, west, 10.0, 0.001); | ||
25 | RegenerateTerrain(true, (int)north, (int)west); | ||
26 | break; | ||
27 | case 2: | ||
28 | //lower terrain | ||
29 | Terrain.lower(north, west, 10.0, 0.001); | ||
30 | RegenerateTerrain(true, (int)north, (int)west); | ||
31 | break; | ||
32 | } | ||
33 | return; | ||
34 | } | ||
35 | |||
36 | public void SimChat(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID) | ||
37 | { | ||
38 | foreach (ClientView client in m_clientThreads.Values) | ||
39 | { | ||
40 | // int dis = Util.fast_distance2d((int)(client.ClientAvatar.Pos.X - simClient.ClientAvatar.Pos.X), (int)(client.ClientAvatar.Pos.Y - simClient.ClientAvatar.Pos.Y)); | ||
41 | int dis = (int)client.ClientAvatar.Pos.GetDistanceTo(fromPos); | ||
42 | |||
43 | switch (type) | ||
44 | { | ||
45 | case 0: // Whisper | ||
46 | if ((dis < 10) && (dis > -10)) | ||
47 | { | ||
48 | //should change so the message is sent through the avatar rather than direct to the ClientView | ||
49 | client.SendChatMessage(message, type, fromPos, fromName, fromAgentID); | ||
50 | } | ||
51 | break; | ||
52 | case 1: // Say | ||
53 | if ((dis < 30) && (dis > -30)) | ||
54 | { | ||
55 | client.SendChatMessage(message, type, fromPos, fromName, fromAgentID); | ||
56 | } | ||
57 | break; | ||
58 | case 2: // Shout | ||
59 | if ((dis < 100) && (dis > -100)) | ||
60 | { | ||
61 | client.SendChatMessage(message, type, fromPos, fromName, fromAgentID); | ||
62 | } | ||
63 | break; | ||
64 | |||
65 | case 0xff: // Broadcast | ||
66 | client.SendChatMessage(message, type, fromPos, fromName, fromAgentID); | ||
67 | break; | ||
68 | } | ||
69 | |||
70 | } | ||
71 | } | ||
72 | |||
73 | public void RezObject(AssetBase primAsset, LLVector3 pos) | ||
74 | { | ||
75 | PrimData primd = new PrimData(primAsset.Data); | ||
76 | Primitive nPrim = new Primitive(m_clientThreads, m_regionHandle, this); | ||
77 | nPrim.CreateFromStorage(primd, pos, this._primCount, true); | ||
78 | this.Entities.Add(nPrim.uuid, nPrim); | ||
79 | this._primCount++; | ||
80 | } | ||
81 | |||
82 | public void DeRezObject(Packet packet, ClientView simClient) | ||
83 | { | ||
84 | DeRezObjectPacket DeRezPacket = (DeRezObjectPacket)packet; | ||
85 | |||
86 | //Needs to delete object from physics at a later date | ||
87 | if (DeRezPacket.AgentBlock.DestinationID == LLUUID.Zero) | ||
88 | { | ||
89 | //currently following code not used (or don't know of any case of destination being zero | ||
90 | |||
91 | } | ||
92 | else | ||
93 | { | ||
94 | foreach (DeRezObjectPacket.ObjectDataBlock Data in DeRezPacket.ObjectData) | ||
95 | { | ||
96 | Entity selectedEnt = null; | ||
97 | //OpenSim.Framework.Console.MainConsole.Instance.WriteLine("LocalID:" + Data.ObjectLocalID.ToString()); | ||
98 | foreach (Entity ent in this.Entities.Values) | ||
99 | { | ||
100 | if (ent.localid == Data.ObjectLocalID) | ||
101 | { | ||
102 | AssetBase primAsset = new AssetBase(); | ||
103 | primAsset.FullID = LLUUID.Random();//DeRezPacket.AgentBlock.TransactionID.Combine(LLUUID.Zero); //should be combining with securesessionid | ||
104 | primAsset.InvType = 6; | ||
105 | primAsset.Type = 6; | ||
106 | primAsset.Name = "Prim"; | ||
107 | primAsset.Description = ""; | ||
108 | primAsset.Data = ((Primitive)ent).GetByteArray(); | ||
109 | this._assetCache.AddAsset(primAsset); | ||
110 | this._inventoryCache.AddNewInventoryItem(simClient, DeRezPacket.AgentBlock.DestinationID, primAsset); | ||
111 | selectedEnt = ent; | ||
112 | break; | ||
113 | } | ||
114 | } | ||
115 | if (selectedEnt != null) | ||
116 | { | ||
117 | this.localStorage.RemovePrim(selectedEnt.uuid); | ||
118 | KillObjectPacket kill = new KillObjectPacket(); | ||
119 | kill.ObjectData = new KillObjectPacket.ObjectDataBlock[1]; | ||
120 | kill.ObjectData[0] = new KillObjectPacket.ObjectDataBlock(); | ||
121 | kill.ObjectData[0].ID = selectedEnt.localid; | ||
122 | foreach (ClientView client in m_clientThreads.Values) | ||
123 | { | ||
124 | client.OutPacket(kill); | ||
125 | } | ||
126 | lock (Entities) | ||
127 | { | ||
128 | Entities.Remove(selectedEnt.uuid); | ||
129 | } | ||
130 | } | ||
131 | } | ||
132 | } | ||
133 | |||
134 | } | ||
135 | |||
136 | public void SendAvatarsToClient(ClientView remoteClient) | ||
137 | { | ||
138 | foreach (ClientView client in m_clientThreads.Values) | ||
139 | { | ||
140 | if (client.AgentID != remoteClient.AgentID) | ||
141 | { | ||
142 | // ObjectUpdatePacket objupdate = client.ClientAvatar.CreateUpdatePacket(); | ||
143 | // RemoteClient.OutPacket(objupdate); | ||
144 | client.ClientAvatar.SendUpdateToOtherClient(remoteClient.ClientAvatar); | ||
145 | client.ClientAvatar.SendAppearanceToOtherAgent(remoteClient.ClientAvatar); | ||
146 | } | ||
147 | } | ||
148 | } | ||
149 | |||
150 | public void LinkObjects(uint parentPrim, List<uint> childPrims) | ||
151 | { | ||
152 | Primitive parentprim = null; | ||
153 | foreach (Entity ent in Entities.Values) | ||
154 | { | ||
155 | if (ent.localid == parentPrim) | ||
156 | { | ||
157 | parentprim = (OpenSim.world.Primitive)ent; | ||
158 | |||
159 | } | ||
160 | } | ||
161 | |||
162 | for (int i = 0; i < childPrims.Count; i++) | ||
163 | { | ||
164 | uint childId = childPrims[i]; | ||
165 | foreach (Entity ent in Entities.Values) | ||
166 | { | ||
167 | if (ent.localid == childId) | ||
168 | { | ||
169 | ((OpenSim.world.Primitive)ent).MakeParent(parentprim); | ||
170 | } | ||
171 | } | ||
172 | } | ||
173 | |||
174 | } | ||
175 | |||
176 | public void UpdatePrimShape(uint primLocalID, ObjectShapePacket.ObjectDataBlock shapeBlock) | ||
177 | { | ||
178 | foreach (Entity ent in Entities.Values) | ||
179 | { | ||
180 | if (ent.localid == primLocalID) | ||
181 | { | ||
182 | ((OpenSim.world.Primitive)ent).UpdateShape(shapeBlock); | ||
183 | break; | ||
184 | } | ||
185 | } | ||
186 | } | ||
187 | |||
188 | public void SelectPrim(uint primLocalID, ClientView remoteClient) | ||
189 | { | ||
190 | foreach (Entity ent in Entities.Values) | ||
191 | { | ||
192 | if (ent.localid == primLocalID) | ||
193 | { | ||
194 | ((OpenSim.world.Primitive)ent).GetProperites(remoteClient); | ||
195 | break; | ||
196 | } | ||
197 | } | ||
198 | } | ||
199 | |||
200 | public void UpdatePrimFlags(uint localID, Packet packet, ClientView remoteClient) | ||
201 | { | ||
202 | foreach (Entity ent in Entities.Values) | ||
203 | { | ||
204 | if (ent.localid == localID) | ||
205 | { | ||
206 | ((OpenSim.world.Primitive)ent).UpdateObjectFlags((ObjectFlagUpdatePacket) packet); | ||
207 | break; | ||
208 | } | ||
209 | } | ||
210 | } | ||
211 | |||
212 | public void UpdatePrimTexture(uint localID, byte[] texture, ClientView remoteClient) | ||
213 | { | ||
214 | foreach (Entity ent in Entities.Values) | ||
215 | { | ||
216 | if (ent.localid == localID) | ||
217 | { | ||
218 | ((OpenSim.world.Primitive)ent).UpdateTexture(texture); | ||
219 | break; | ||
220 | } | ||
221 | } | ||
222 | } | ||
223 | |||
224 | public void UpdatePrimPosition(uint localID, LLVector3 pos, ClientView remoteClient) | ||
225 | { | ||
226 | foreach (Entity ent in Entities.Values) | ||
227 | { | ||
228 | if (ent.localid == localID) | ||
229 | { | ||
230 | ((OpenSim.world.Primitive)ent).UpdatePosition(pos); | ||
231 | break; | ||
232 | } | ||
233 | } | ||
234 | } | ||
235 | |||
236 | public void UpdatePrimRotation(uint localID, LLQuaternion rot, ClientView remoteClient) | ||
237 | { | ||
238 | foreach (Entity ent in Entities.Values) | ||
239 | { | ||
240 | if (ent.localid == localID) | ||
241 | { | ||
242 | ent.rotation = new Axiom.MathLib.Quaternion(rot.W, rot.X, rot.Y, rot.Z); | ||
243 | ((OpenSim.world.Primitive)ent).UpdateFlag = true; | ||
244 | break; | ||
245 | } | ||
246 | } | ||
247 | } | ||
248 | |||
249 | public void UpdatePrimScale(uint localID, LLVector3 scale, ClientView remoteClient) | ||
250 | { | ||
251 | foreach (Entity ent in Entities.Values) | ||
252 | { | ||
253 | if (ent.localid == localID) | ||
254 | { | ||
255 | ((OpenSim.world.Primitive)ent).Scale = scale; | ||
256 | break; | ||
257 | } | ||
258 | } | ||
259 | } | ||
260 | } | ||
261 | } | ||
diff --git a/OpenSim/OpenSim.RegionServer/world/World.Scripting.cs b/OpenSim/OpenSim.RegionServer/world/World.Scripting.cs deleted file mode 100644 index 44ef05a..0000000 --- a/OpenSim/OpenSim.RegionServer/world/World.Scripting.cs +++ /dev/null | |||
@@ -1,124 +0,0 @@ | |||
1 | using System; | ||
2 | using System.Collections.Generic; | ||
3 | using System.Text; | ||
4 | using System.IO; | ||
5 | using System.Reflection; | ||
6 | using OpenSim.Framework; | ||
7 | using OpenSim.Framework.Interfaces; | ||
8 | using OpenSim.Framework.Types; | ||
9 | using libsecondlife; | ||
10 | |||
11 | namespace OpenSim.world | ||
12 | { | ||
13 | public partial class World | ||
14 | { | ||
15 | private Dictionary<string, IScriptEngine> scriptEngines = new Dictionary<string, IScriptEngine>(); | ||
16 | |||
17 | private void LoadScriptEngines() | ||
18 | { | ||
19 | this.LoadScriptPlugins(); | ||
20 | } | ||
21 | |||
22 | public void LoadScriptPlugins() | ||
23 | { | ||
24 | string path = Path.Combine(System.AppDomain.CurrentDomain.BaseDirectory, "ScriptEngines"); | ||
25 | string[] pluginFiles = Directory.GetFiles(path, "*.dll"); | ||
26 | |||
27 | |||
28 | for (int i = 0; i < pluginFiles.Length; i++) | ||
29 | { | ||
30 | this.AddPlugin(pluginFiles[i]); | ||
31 | } | ||
32 | } | ||
33 | |||
34 | private void AddPlugin(string FileName) | ||
35 | { | ||
36 | Assembly pluginAssembly = Assembly.LoadFrom(FileName); | ||
37 | |||
38 | foreach (Type pluginType in pluginAssembly.GetTypes()) | ||
39 | { | ||
40 | if (pluginType.IsPublic) | ||
41 | { | ||
42 | if (!pluginType.IsAbstract) | ||
43 | { | ||
44 | Type typeInterface = pluginType.GetInterface("IScriptEngine", true); | ||
45 | |||
46 | if (typeInterface != null) | ||
47 | { | ||
48 | IScriptEngine plug = (IScriptEngine)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); | ||
49 | plug.Init(this); | ||
50 | this.scriptEngines.Add(plug.GetName(), plug); | ||
51 | |||
52 | } | ||
53 | |||
54 | typeInterface = null; | ||
55 | } | ||
56 | } | ||
57 | } | ||
58 | |||
59 | pluginAssembly = null; | ||
60 | } | ||
61 | |||
62 | public void LoadScript(string scriptType, string scriptName, string script, Entity ent) | ||
63 | { | ||
64 | if(this.scriptEngines.ContainsKey(scriptType)) | ||
65 | { | ||
66 | this.scriptEngines[scriptType].LoadScript(script, scriptName, ent.localid); | ||
67 | } | ||
68 | } | ||
69 | |||
70 | #region IScriptAPI Methods | ||
71 | |||
72 | public OSVector3 GetEntityPosition(uint localID) | ||
73 | { | ||
74 | OSVector3 res = new OSVector3(); | ||
75 | // Console.WriteLine("script- getting entity " + localID + " position"); | ||
76 | foreach (Entity entity in this.Entities.Values) | ||
77 | { | ||
78 | if (entity.localid == localID) | ||
79 | { | ||
80 | res.X = entity.Pos.X; | ||
81 | res.Y = entity.Pos.Y; | ||
82 | res.Z = entity.Pos.Z; | ||
83 | } | ||
84 | } | ||
85 | return res; | ||
86 | } | ||
87 | |||
88 | public void SetEntityPosition(uint localID, float x , float y, float z) | ||
89 | { | ||
90 | foreach (Entity entity in this.Entities.Values) | ||
91 | { | ||
92 | if (entity.localid == localID && entity is Primitive) | ||
93 | { | ||
94 | LLVector3 pos = entity.Pos; | ||
95 | pos.X = x; | ||
96 | pos.Y = y; | ||
97 | Primitive prim = entity as Primitive; | ||
98 | // Of course, we really should have asked the physEngine if this is possible, and if not, returned false. | ||
99 | prim.UpdatePosition(pos); | ||
100 | // Console.WriteLine("script- setting entity " + localID + " positon"); | ||
101 | } | ||
102 | } | ||
103 | |||
104 | } | ||
105 | |||
106 | public uint GetRandomAvatarID() | ||
107 | { | ||
108 | //Console.WriteLine("script- getting random avatar id"); | ||
109 | uint res = 0; | ||
110 | foreach (Entity entity in this.Entities.Values) | ||
111 | { | ||
112 | if (entity is Avatar) | ||
113 | { | ||
114 | res = entity.localid; | ||
115 | } | ||
116 | } | ||
117 | return res; | ||
118 | } | ||
119 | |||
120 | #endregion | ||
121 | |||
122 | |||
123 | } | ||
124 | } | ||
diff --git a/OpenSim/OpenSim.RegionServer/world/World.cs b/OpenSim/OpenSim.RegionServer/world/World.cs deleted file mode 100644 index ec9bbc9..0000000 --- a/OpenSim/OpenSim.RegionServer/world/World.cs +++ /dev/null | |||
@@ -1,658 +0,0 @@ | |||
1 | using System; | ||
2 | using libsecondlife; | ||
3 | using libsecondlife.Packets; | ||
4 | using System.Collections.Generic; | ||
5 | using System.Text; | ||
6 | using System.Reflection; | ||
7 | using System.IO; | ||
8 | using System.Threading; | ||
9 | using OpenSim.Physics.Manager; | ||
10 | using OpenSim.Framework.Interfaces; | ||
11 | using OpenSim.Framework.Types; | ||
12 | using OpenSim.Framework.Terrain; | ||
13 | using OpenSim.Framework.Inventory; | ||
14 | using OpenSim.Assets; | ||
15 | //using OpenSim.world.scripting; | ||
16 | using OpenSim.RegionServer.world.scripting; | ||
17 | using OpenSim.Terrain; | ||
18 | |||
19 | namespace OpenSim.world | ||
20 | { | ||
21 | public partial class World : WorldBase, ILocalStorageReceiver, IScriptAPI | ||
22 | { | ||
23 | public object LockPhysicsEngine = new object(); | ||
24 | public Dictionary<libsecondlife.LLUUID, Avatar> Avatars; | ||
25 | public Dictionary<libsecondlife.LLUUID, Primitive> Prims; | ||
26 | //public ScriptEngine Scripts; | ||
27 | public uint _localNumber = 0; | ||
28 | private PhysicsScene phyScene; | ||
29 | private float timeStep = 0.1f; | ||
30 | public ILocalStorage localStorage; | ||
31 | private Random Rand = new Random(); | ||
32 | private uint _primCount = 702000; | ||
33 | private int storageCount; | ||
34 | private Dictionary<LLUUID, ScriptHandler> m_scriptHandlers; | ||
35 | private Dictionary<string, ScriptFactory> m_scripts; | ||
36 | private Mutex updateLock; | ||
37 | public string m_datastore; | ||
38 | |||
39 | #region Properties | ||
40 | public PhysicsScene PhysScene | ||
41 | { | ||
42 | set | ||
43 | { | ||
44 | this.phyScene = value; | ||
45 | } | ||
46 | get | ||
47 | { | ||
48 | return (this.phyScene); | ||
49 | } | ||
50 | } | ||
51 | #endregion | ||
52 | |||
53 | #region Constructors | ||
54 | /// <summary> | ||
55 | /// Creates a new World class, and a region to go with it. | ||
56 | /// </summary> | ||
57 | /// <param name="clientThreads">Dictionary to contain client threads</param> | ||
58 | /// <param name="regionHandle">Region Handle for this region</param> | ||
59 | /// <param name="regionName">Region Name for this region</param> | ||
60 | public World(Dictionary<uint, ClientView> clientThreads, RegionInfo regInfo, ulong regionHandle, string regionName) | ||
61 | { | ||
62 | try | ||
63 | { | ||
64 | updateLock = new Mutex(false); | ||
65 | m_clientThreads = clientThreads; | ||
66 | m_regionHandle = regionHandle; | ||
67 | m_regionName = regionName; | ||
68 | m_regInfo = regInfo; | ||
69 | |||
70 | m_scriptHandlers = new Dictionary<LLUUID, ScriptHandler>(); | ||
71 | m_scripts = new Dictionary<string, ScriptFactory>(); | ||
72 | |||
73 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs - creating new entitities instance"); | ||
74 | Entities = new Dictionary<libsecondlife.LLUUID, Entity>(); | ||
75 | Avatars = new Dictionary<LLUUID, Avatar>(); | ||
76 | Prims = new Dictionary<LLUUID, Primitive>(); | ||
77 | |||
78 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs - creating LandMap"); | ||
79 | TerrainManager = new TerrainManager(new SecondLife()); | ||
80 | Terrain = new TerrainEngine(); | ||
81 | Avatar.SetupTemplate("avatar-texture.dat"); | ||
82 | // MainConsole.Instance.WriteLine("World.cs - Creating script engine instance"); | ||
83 | // Initialise this only after the world has loaded | ||
84 | // Scripts = new ScriptEngine(this); | ||
85 | Avatar.LoadAnims(); | ||
86 | this.SetDefaultScripts(); | ||
87 | this.LoadScriptEngines(); | ||
88 | } | ||
89 | catch (Exception e) | ||
90 | { | ||
91 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.CRITICAL, "World.cs: Constructor failed with exception " + e.ToString()); | ||
92 | } | ||
93 | } | ||
94 | #endregion | ||
95 | |||
96 | #region Script Methods | ||
97 | /// <summary> | ||
98 | /// Loads a new script into the specified entity | ||
99 | /// </summary> | ||
100 | /// <param name="entity">Entity to be scripted</param> | ||
101 | /// <param name="script">The script to load</param> | ||
102 | public void AddScript(Entity entity, Script script) | ||
103 | { | ||
104 | try | ||
105 | { | ||
106 | ScriptHandler scriptHandler = new ScriptHandler(script, entity, this); | ||
107 | m_scriptHandlers.Add(scriptHandler.ScriptId, scriptHandler); | ||
108 | } | ||
109 | catch (Exception e) | ||
110 | { | ||
111 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: AddScript() - Failed with exception " + e.ToString()); | ||
112 | } | ||
113 | } | ||
114 | |||
115 | /// <summary> | ||
116 | /// Loads a new script into the specified entity, using a script loaded from a string. | ||
117 | /// </summary> | ||
118 | /// <param name="entity">The entity to be scripted</param> | ||
119 | /// <param name="scriptData">The string containing the script</param> | ||
120 | public void AddScript(Entity entity, string scriptData) | ||
121 | { | ||
122 | try | ||
123 | { | ||
124 | int scriptstart = 0; | ||
125 | int scriptend = 0; | ||
126 | string substring; | ||
127 | scriptstart = scriptData.LastIndexOf("<Script>"); | ||
128 | scriptend = scriptData.LastIndexOf("</Script>"); | ||
129 | substring = scriptData.Substring(scriptstart + 8, scriptend - scriptstart - 8); | ||
130 | substring = substring.Trim(); | ||
131 | //Console.WriteLine("searching for script to add: " + substring); | ||
132 | |||
133 | ScriptFactory scriptFactory; | ||
134 | //Console.WriteLine("script string is " + substring); | ||
135 | if (substring.StartsWith("<ScriptEngine:")) | ||
136 | { | ||
137 | string substring1 = ""; | ||
138 | string script = ""; | ||
139 | // Console.WriteLine("searching for script engine"); | ||
140 | substring1 = substring.Remove(0, 14); | ||
141 | int dev = substring1.IndexOf(','); | ||
142 | string sEngine = substring1.Substring(0, dev); | ||
143 | substring1 = substring1.Remove(0, dev + 1); | ||
144 | int end = substring1.IndexOf('>'); | ||
145 | string sName = substring1.Substring(0, end); | ||
146 | //Console.WriteLine(" script info : " + sEngine + " , " + sName); | ||
147 | int startscript = substring.IndexOf('>'); | ||
148 | script = substring.Remove(0, startscript + 1); | ||
149 | // Console.WriteLine("script data is " + script); | ||
150 | if (this.scriptEngines.ContainsKey(sEngine)) | ||
151 | { | ||
152 | this.scriptEngines[sEngine].LoadScript(script, sName, entity.localid); | ||
153 | } | ||
154 | } | ||
155 | else if (this.m_scripts.TryGetValue(substring, out scriptFactory)) | ||
156 | { | ||
157 | //Console.WriteLine("added script"); | ||
158 | this.AddScript(entity, scriptFactory()); | ||
159 | } | ||
160 | } | ||
161 | catch (Exception e) | ||
162 | { | ||
163 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: AddScript() - Failed with exception " + e.ToString()); | ||
164 | } | ||
165 | } | ||
166 | |||
167 | #endregion | ||
168 | |||
169 | #region Update Methods | ||
170 | /// <summary> | ||
171 | /// Performs per-frame updates on the world, this should be the central world loop | ||
172 | /// </summary> | ||
173 | public override void Update() | ||
174 | { | ||
175 | updateLock.WaitOne(); | ||
176 | try | ||
177 | { | ||
178 | if (this.phyScene.IsThreaded) | ||
179 | { | ||
180 | this.phyScene.GetResults(); | ||
181 | |||
182 | } | ||
183 | |||
184 | foreach (libsecondlife.LLUUID UUID in Entities.Keys) | ||
185 | { | ||
186 | Entities[UUID].addForces(); | ||
187 | } | ||
188 | |||
189 | lock (this.LockPhysicsEngine) | ||
190 | { | ||
191 | this.phyScene.Simulate(timeStep); | ||
192 | } | ||
193 | |||
194 | foreach (libsecondlife.LLUUID UUID in Entities.Keys) | ||
195 | { | ||
196 | Entities[UUID].update(); | ||
197 | } | ||
198 | |||
199 | foreach (ScriptHandler scriptHandler in m_scriptHandlers.Values) | ||
200 | { | ||
201 | scriptHandler.OnFrame(); | ||
202 | } | ||
203 | foreach (IScriptEngine scripteng in this.scriptEngines.Values) | ||
204 | { | ||
205 | scripteng.OnFrame(); | ||
206 | } | ||
207 | //backup world data | ||
208 | this.storageCount++; | ||
209 | if (storageCount > 1200) //set to how often you want to backup | ||
210 | { | ||
211 | this.Backup(); | ||
212 | storageCount = 0; | ||
213 | } | ||
214 | } | ||
215 | catch (Exception e) | ||
216 | { | ||
217 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: Update() - Failed with exception " + e.ToString()); | ||
218 | } | ||
219 | updateLock.ReleaseMutex(); | ||
220 | } | ||
221 | |||
222 | public bool Backup() | ||
223 | { | ||
224 | try | ||
225 | { | ||
226 | // Terrain backup routines | ||
227 | if (Terrain.tainted > 0) | ||
228 | { | ||
229 | Terrain.tainted = 0; | ||
230 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: Backup() - Terrain tainted, saving."); | ||
231 | localStorage.SaveMap(Terrain.getHeights1D()); | ||
232 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: Backup() - Terrain saved, informing Physics."); | ||
233 | lock (this.LockPhysicsEngine) | ||
234 | { | ||
235 | phyScene.SetTerrain(Terrain.getHeights1D()); | ||
236 | } | ||
237 | } | ||
238 | |||
239 | // Primitive backup routines | ||
240 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: Backup() - Backing up Primitives"); | ||
241 | foreach (libsecondlife.LLUUID UUID in Entities.Keys) | ||
242 | { | ||
243 | Entities[UUID].BackUp(); | ||
244 | } | ||
245 | |||
246 | // Backup successful | ||
247 | return true; | ||
248 | } | ||
249 | catch (Exception e) | ||
250 | { | ||
251 | // Backup failed | ||
252 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "World.cs: Backup() - Backup Failed with exception " + e.ToString()); | ||
253 | return false; | ||
254 | } | ||
255 | } | ||
256 | #endregion | ||
257 | |||
258 | #region Setup Methods | ||
259 | /// <summary> | ||
260 | /// Loads a new storage subsystem from a named library | ||
261 | /// </summary> | ||
262 | /// <param name="dllName">Storage Library</param> | ||
263 | /// <returns>Successful or not</returns> | ||
264 | public bool LoadStorageDLL(string dllName) | ||
265 | { | ||
266 | try | ||
267 | { | ||
268 | Assembly pluginAssembly = Assembly.LoadFrom(dllName); | ||
269 | ILocalStorage store = null; | ||
270 | |||
271 | foreach (Type pluginType in pluginAssembly.GetTypes()) | ||
272 | { | ||
273 | if (pluginType.IsPublic) | ||
274 | { | ||
275 | if (!pluginType.IsAbstract) | ||
276 | { | ||
277 | Type typeInterface = pluginType.GetInterface("ILocalStorage", true); | ||
278 | |||
279 | if (typeInterface != null) | ||
280 | { | ||
281 | ILocalStorage plug = (ILocalStorage)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); | ||
282 | store = plug; | ||
283 | |||
284 | store.Initialise(this.m_datastore); | ||
285 | break; | ||
286 | } | ||
287 | |||
288 | typeInterface = null; | ||
289 | } | ||
290 | } | ||
291 | } | ||
292 | pluginAssembly = null; | ||
293 | this.localStorage = store; | ||
294 | return (store == null); | ||
295 | } | ||
296 | catch (Exception e) | ||
297 | { | ||
298 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: LoadStorageDLL() - Failed with exception " + e.ToString()); | ||
299 | return false; | ||
300 | } | ||
301 | } | ||
302 | |||
303 | public void SetDefaultScripts() | ||
304 | { | ||
305 | this.m_scripts.Add("FollowRandomAvatar", delegate() | ||
306 | { | ||
307 | return new OpenSim.RegionServer.world.scripting.FollowRandomAvatar(); | ||
308 | }); | ||
309 | } | ||
310 | |||
311 | #endregion | ||
312 | |||
313 | #region Regenerate Terrain | ||
314 | |||
315 | /// <summary> | ||
316 | /// Rebuilds the terrain using a procedural algorithm | ||
317 | /// </summary> | ||
318 | public void RegenerateTerrain() | ||
319 | { | ||
320 | try | ||
321 | { | ||
322 | Terrain.hills(); | ||
323 | |||
324 | lock (this.LockPhysicsEngine) | ||
325 | { | ||
326 | this.phyScene.SetTerrain(Terrain.getHeights1D()); | ||
327 | } | ||
328 | this.localStorage.SaveMap(this.Terrain.getHeights1D()); | ||
329 | |||
330 | foreach (ClientView client in m_clientThreads.Values) | ||
331 | { | ||
332 | this.SendLayerData(client); | ||
333 | } | ||
334 | |||
335 | foreach (libsecondlife.LLUUID UUID in Entities.Keys) | ||
336 | { | ||
337 | Entities[UUID].LandRenegerated(); | ||
338 | } | ||
339 | } | ||
340 | catch (Exception e) | ||
341 | { | ||
342 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: RegenerateTerrain() - Failed with exception " + e.ToString()); | ||
343 | } | ||
344 | } | ||
345 | |||
346 | /// <summary> | ||
347 | /// Rebuilds the terrain using a 2D float array | ||
348 | /// </summary> | ||
349 | /// <param name="newMap">256,256 float array containing heights</param> | ||
350 | public void RegenerateTerrain(float[,] newMap) | ||
351 | { | ||
352 | try | ||
353 | { | ||
354 | this.Terrain.setHeights2D(newMap); | ||
355 | lock (this.LockPhysicsEngine) | ||
356 | { | ||
357 | this.phyScene.SetTerrain(this.Terrain.getHeights1D()); | ||
358 | } | ||
359 | this.localStorage.SaveMap(this.Terrain.getHeights1D()); | ||
360 | |||
361 | foreach (ClientView client in m_clientThreads.Values) | ||
362 | { | ||
363 | this.SendLayerData(client); | ||
364 | } | ||
365 | |||
366 | foreach (libsecondlife.LLUUID UUID in Entities.Keys) | ||
367 | { | ||
368 | Entities[UUID].LandRenegerated(); | ||
369 | } | ||
370 | } | ||
371 | catch (Exception e) | ||
372 | { | ||
373 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: RegenerateTerrain() - Failed with exception " + e.ToString()); | ||
374 | } | ||
375 | } | ||
376 | |||
377 | /// <summary> | ||
378 | /// Rebuilds the terrain assuming changes occured at a specified point[?] | ||
379 | /// </summary> | ||
380 | /// <param name="changes">???</param> | ||
381 | /// <param name="pointx">???</param> | ||
382 | /// <param name="pointy">???</param> | ||
383 | public void RegenerateTerrain(bool changes, int pointx, int pointy) | ||
384 | { | ||
385 | try | ||
386 | { | ||
387 | if (changes) | ||
388 | { | ||
389 | /* Dont save here, rely on tainting system instead */ | ||
390 | |||
391 | foreach (ClientView client in m_clientThreads.Values) | ||
392 | { | ||
393 | this.SendLayerData(pointx, pointy, client); | ||
394 | } | ||
395 | } | ||
396 | } | ||
397 | catch (Exception e) | ||
398 | { | ||
399 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: RegenerateTerrain() - Failed with exception " + e.ToString()); | ||
400 | } | ||
401 | } | ||
402 | |||
403 | #endregion | ||
404 | |||
405 | #region Load Terrain | ||
406 | /// <summary> | ||
407 | /// Loads the World heightmap | ||
408 | /// </summary> | ||
409 | public override void LoadWorldMap() | ||
410 | { | ||
411 | try | ||
412 | { | ||
413 | float[] map = this.localStorage.LoadWorld(); | ||
414 | if (map == null) | ||
415 | { | ||
416 | Console.WriteLine("creating new terrain"); | ||
417 | this.Terrain.hills(); | ||
418 | |||
419 | this.localStorage.SaveMap(this.Terrain.getHeights1D()); | ||
420 | } | ||
421 | else | ||
422 | { | ||
423 | this.Terrain.setHeights1D(map); | ||
424 | } | ||
425 | } | ||
426 | catch (Exception e) | ||
427 | { | ||
428 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: LoadWorldMap() - Failed with exception " + e.ToString()); | ||
429 | } | ||
430 | } | ||
431 | #endregion | ||
432 | |||
433 | #region Primitives Methods | ||
434 | |||
435 | /// <summary> | ||
436 | /// Sends prims to a client | ||
437 | /// </summary> | ||
438 | /// <param name="RemoteClient">Client to send to</param> | ||
439 | public void GetInitialPrims(ClientView RemoteClient) | ||
440 | { | ||
441 | try | ||
442 | { | ||
443 | foreach (libsecondlife.LLUUID UUID in Entities.Keys) | ||
444 | { | ||
445 | if (Entities[UUID] is Primitive) | ||
446 | { | ||
447 | Primitive primitive = Entities[UUID] as Primitive; | ||
448 | primitive.UpdateClient(RemoteClient); | ||
449 | } | ||
450 | } | ||
451 | } | ||
452 | catch (Exception e) | ||
453 | { | ||
454 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: GetInitialPrims() - Failed with exception " + e.ToString()); | ||
455 | } | ||
456 | } | ||
457 | |||
458 | /// <summary> | ||
459 | /// Loads the World's objects | ||
460 | /// </summary> | ||
461 | public void LoadPrimsFromStorage() | ||
462 | { | ||
463 | try | ||
464 | { | ||
465 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: LoadPrimsFromStorage() - Loading primitives"); | ||
466 | this.localStorage.LoadPrimitives(this); | ||
467 | } | ||
468 | catch (Exception e) | ||
469 | { | ||
470 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: LoadPrimsFromStorage() - Failed with exception " + e.ToString()); | ||
471 | } | ||
472 | } | ||
473 | |||
474 | /// <summary> | ||
475 | /// Loads a specific object from storage | ||
476 | /// </summary> | ||
477 | /// <param name="prim">The object to load</param> | ||
478 | public void PrimFromStorage(PrimData prim) | ||
479 | { | ||
480 | try | ||
481 | { | ||
482 | if (prim.LocalID >= this._primCount) | ||
483 | { | ||
484 | _primCount = prim.LocalID + 1; | ||
485 | } | ||
486 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: PrimFromStorage() - Reloading prim (localId " + prim.LocalID + " ) from storage"); | ||
487 | Primitive nPrim = new Primitive(m_clientThreads, m_regionHandle, this); | ||
488 | nPrim.CreateFromStorage(prim); | ||
489 | this.Entities.Add(nPrim.uuid, nPrim); | ||
490 | } | ||
491 | catch (Exception e) | ||
492 | { | ||
493 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: PrimFromStorage() - Failed with exception " + e.ToString()); | ||
494 | } | ||
495 | } | ||
496 | |||
497 | public void AddNewPrim(Packet addPacket, ClientView agentClient) | ||
498 | { | ||
499 | AddNewPrim((ObjectAddPacket)addPacket, agentClient.AgentID); | ||
500 | } | ||
501 | |||
502 | public void AddNewPrim(ObjectAddPacket addPacket, LLUUID ownerID) | ||
503 | { | ||
504 | try | ||
505 | { | ||
506 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: AddNewPrim() - Creating new prim"); | ||
507 | Primitive prim = new Primitive(m_clientThreads, m_regionHandle, this); | ||
508 | prim.CreateFromPacket(addPacket, ownerID, this._primCount); | ||
509 | PhysicsVector pVec = new PhysicsVector(prim.Pos.X, prim.Pos.Y, prim.Pos.Z); | ||
510 | PhysicsVector pSize = new PhysicsVector(0.255f, 0.255f, 0.255f); | ||
511 | if (OpenSim.world.Avatar.PhysicsEngineFlying) | ||
512 | { | ||
513 | lock (this.LockPhysicsEngine) | ||
514 | { | ||
515 | prim.PhysActor = this.phyScene.AddPrim(pVec, pSize); | ||
516 | } | ||
517 | } | ||
518 | |||
519 | this.Entities.Add(prim.uuid, prim); | ||
520 | this._primCount++; | ||
521 | } | ||
522 | catch (Exception e) | ||
523 | { | ||
524 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: AddNewPrim() - Failed with exception " + e.ToString()); | ||
525 | } | ||
526 | } | ||
527 | |||
528 | #endregion | ||
529 | |||
530 | #region Add/Remove Avatar Methods | ||
531 | |||
532 | public override Avatar AddViewerAgent(ClientView agentClient) | ||
533 | { | ||
534 | //register for events | ||
535 | agentClient.OnChatFromViewer += new ChatFromViewer(this.SimChat); | ||
536 | agentClient.OnRezObject += new RezObject(this.RezObject); | ||
537 | agentClient.OnModifyTerrain += new ModifyTerrain(this.ModifyTerrain); | ||
538 | agentClient.OnRegionHandShakeReply += new ClientView.GenericCall(this.SendLayerData); | ||
539 | agentClient.OnRequestWearables += new ClientView.GenericCall(this.GetInitialPrims); | ||
540 | agentClient.OnRequestAvatarsData += new ClientView.GenericCall(this.SendAvatarsToClient); | ||
541 | agentClient.OnLinkObjects += new LinkObjects(this.LinkObjects); | ||
542 | agentClient.OnAddPrim += new ClientView.GenericCall4(this.AddNewPrim); | ||
543 | agentClient.OnUpdatePrimShape += new ClientView.UpdateShape(this.UpdatePrimShape); | ||
544 | agentClient.OnObjectSelect += new ClientView.ObjectSelect(this.SelectPrim); | ||
545 | agentClient.OnUpdatePrimFlags += new ClientView.UpdatePrimFlags(this.UpdatePrimFlags); | ||
546 | agentClient.OnUpdatePrimTexture += new ClientView.UpdatePrimTexture(this.UpdatePrimTexture); | ||
547 | agentClient.OnUpdatePrimPosition += new ClientView.UpdatePrimVector(this.UpdatePrimPosition); | ||
548 | agentClient.OnUpdatePrimRotation += new ClientView.UpdatePrimRotation(this.UpdatePrimRotation); | ||
549 | agentClient.OnUpdatePrimScale += new ClientView.UpdatePrimVector(this.UpdatePrimScale); | ||
550 | agentClient.OnDeRezObject += new ClientView.GenericCall4(this.DeRezObject); | ||
551 | |||
552 | Avatar newAvatar = null; | ||
553 | try | ||
554 | { | ||
555 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent"); | ||
556 | newAvatar = new Avatar(agentClient, this, m_regionName, m_clientThreads, m_regionHandle, true, 20); | ||
557 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Adding new avatar to world"); | ||
558 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Starting RegionHandshake "); | ||
559 | newAvatar.SendRegionHandshake(this); | ||
560 | //if (!agentClient.m_child) | ||
561 | //{ | ||
562 | |||
563 | PhysicsVector pVec = new PhysicsVector(newAvatar.Pos.X, newAvatar.Pos.Y, newAvatar.Pos.Z); | ||
564 | lock (this.LockPhysicsEngine) | ||
565 | { | ||
566 | newAvatar.PhysActor = this.phyScene.AddAvatar(pVec); | ||
567 | } | ||
568 | // } | ||
569 | lock (Entities) | ||
570 | { | ||
571 | if (!Entities.ContainsKey(agentClient.AgentID)) | ||
572 | { | ||
573 | this.Entities.Add(agentClient.AgentID, newAvatar); | ||
574 | } | ||
575 | else | ||
576 | { | ||
577 | Entities[agentClient.AgentID] = newAvatar; | ||
578 | } | ||
579 | } | ||
580 | lock (Avatars) | ||
581 | { | ||
582 | if (Avatars.ContainsKey(agentClient.AgentID)) | ||
583 | { | ||
584 | Avatars[agentClient.AgentID] = newAvatar; | ||
585 | } | ||
586 | else | ||
587 | { | ||
588 | this.Avatars.Add(agentClient.AgentID, newAvatar); | ||
589 | } | ||
590 | } | ||
591 | } | ||
592 | catch (Exception e) | ||
593 | { | ||
594 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: AddViewerAgent() - Failed with exception " + e.ToString()); | ||
595 | } | ||
596 | return newAvatar; | ||
597 | } | ||
598 | |||
599 | public override void RemoveViewerAgent(ClientView agentClient) | ||
600 | { | ||
601 | try | ||
602 | { | ||
603 | lock (Entities) | ||
604 | { | ||
605 | Entities.Remove(agentClient.AgentID); | ||
606 | } | ||
607 | lock (Avatars) | ||
608 | { | ||
609 | Avatars.Remove(agentClient.AgentID); | ||
610 | } | ||
611 | if (agentClient.ClientAvatar.PhysActor != null) | ||
612 | { | ||
613 | this.phyScene.RemoveAvatar(agentClient.ClientAvatar.PhysActor); | ||
614 | } | ||
615 | } | ||
616 | catch (Exception e) | ||
617 | { | ||
618 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: RemoveViewerAgent() - Failed with exception " + e.ToString()); | ||
619 | } | ||
620 | } | ||
621 | #endregion | ||
622 | |||
623 | #region Request Avatars List Methods | ||
624 | //The idea is to have a group of method that return a list of avatars meeting some requirement | ||
625 | // ie it could be all Avatars within a certain range of the calling prim/avatar. | ||
626 | |||
627 | public List<Avatar> RequestAvatarList() | ||
628 | { | ||
629 | List<Avatar> result = new List<Avatar>(); | ||
630 | |||
631 | foreach (Avatar avatar in Avatars.Values) | ||
632 | { | ||
633 | result.Add(avatar); | ||
634 | } | ||
635 | |||
636 | return result; | ||
637 | } | ||
638 | #endregion | ||
639 | |||
640 | #region ShutDown | ||
641 | /// <summary> | ||
642 | /// Tidy before shutdown | ||
643 | /// </summary> | ||
644 | public override void Close() | ||
645 | { | ||
646 | try | ||
647 | { | ||
648 | this.localStorage.ShutDown(); | ||
649 | } | ||
650 | catch (Exception e) | ||
651 | { | ||
652 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "World.cs: Close() - Failed with exception " + e.ToString()); | ||
653 | } | ||
654 | } | ||
655 | #endregion | ||
656 | |||
657 | } | ||
658 | } | ||
diff --git a/OpenSim/OpenSim.RegionServer/world/WorldBase.cs b/OpenSim/OpenSim.RegionServer/world/WorldBase.cs deleted file mode 100644 index ea71411..0000000 --- a/OpenSim/OpenSim.RegionServer/world/WorldBase.cs +++ /dev/null | |||
@@ -1,176 +0,0 @@ | |||
1 | using System; | ||
2 | using libsecondlife; | ||
3 | using libsecondlife.Packets; | ||
4 | using System.Collections.Generic; | ||
5 | using System.Text; | ||
6 | using System.Reflection; | ||
7 | using System.IO; | ||
8 | using System.Threading; | ||
9 | using OpenSim.Physics.Manager; | ||
10 | using OpenSim.Framework.Interfaces; | ||
11 | using OpenSim.Framework.Types; | ||
12 | using OpenSim.Framework.Terrain; | ||
13 | using OpenSim.Framework.Inventory; | ||
14 | using OpenSim.Assets; | ||
15 | using OpenSim.RegionServer.world.scripting; | ||
16 | using OpenSim.Terrain; | ||
17 | |||
18 | namespace OpenSim.world | ||
19 | { | ||
20 | public class WorldBase | ||
21 | { | ||
22 | public Dictionary<libsecondlife.LLUUID, Entity> Entities; | ||
23 | protected Dictionary<uint, ClientView> m_clientThreads; | ||
24 | protected ulong m_regionHandle; | ||
25 | protected string m_regionName; | ||
26 | protected InventoryCache _inventoryCache; | ||
27 | protected AssetCache _assetCache; | ||
28 | protected RegionInfo m_regInfo; | ||
29 | |||
30 | public TerrainEngine Terrain; //TODO: Replace TerrainManager with this. | ||
31 | protected libsecondlife.TerrainManager TerrainManager; // To be referenced via TerrainEngine | ||
32 | |||
33 | #region Properties | ||
34 | public InventoryCache InventoryCache | ||
35 | { | ||
36 | set | ||
37 | { | ||
38 | this._inventoryCache = value; | ||
39 | } | ||
40 | } | ||
41 | |||
42 | public AssetCache AssetCache | ||
43 | { | ||
44 | set | ||
45 | { | ||
46 | this._assetCache = value; | ||
47 | } | ||
48 | } | ||
49 | #endregion | ||
50 | |||
51 | #region Constructors | ||
52 | public WorldBase() | ||
53 | { | ||
54 | |||
55 | } | ||
56 | #endregion | ||
57 | |||
58 | #region Setup Methods | ||
59 | /// <summary> | ||
60 | /// Register Packet handler Methods with the packet server (which will register them with the SimClient) | ||
61 | /// </summary> | ||
62 | /// <param name="packetServer"></param> | ||
63 | public virtual void RegisterPacketHandlers(PacketServer packetServer) | ||
64 | { | ||
65 | |||
66 | } | ||
67 | #endregion | ||
68 | |||
69 | #region Update Methods | ||
70 | /// <summary> | ||
71 | /// Normally called once every frame/tick to let the world preform anything required (like running the physics simulation) | ||
72 | /// </summary> | ||
73 | public virtual void Update() | ||
74 | { | ||
75 | |||
76 | } | ||
77 | #endregion | ||
78 | |||
79 | #region Terrain Methods | ||
80 | |||
81 | /// <summary> | ||
82 | /// Loads the World heightmap | ||
83 | /// </summary> | ||
84 | public virtual void LoadWorldMap() | ||
85 | { | ||
86 | |||
87 | } | ||
88 | |||
89 | /// <summary> | ||
90 | /// Send the region heightmap to the client | ||
91 | /// </summary> | ||
92 | /// <param name="RemoteClient">Client to send to</param> | ||
93 | public virtual void SendLayerData(ClientView RemoteClient) | ||
94 | { | ||
95 | try | ||
96 | { | ||
97 | int[] patches = new int[4]; | ||
98 | |||
99 | for (int y = 0; y < 16; y++) | ||
100 | { | ||
101 | for (int x = 0; x < 16; x = x + 4) | ||
102 | { | ||
103 | patches[0] = x + 0 + y * 16; | ||
104 | patches[1] = x + 1 + y * 16; | ||
105 | patches[2] = x + 2 + y * 16; | ||
106 | patches[3] = x + 3 + y * 16; | ||
107 | |||
108 | Packet layerpack = TerrainManager.CreateLandPacket(Terrain.getHeights1D(), patches); | ||
109 | RemoteClient.OutPacket(layerpack); | ||
110 | } | ||
111 | } | ||
112 | } | ||
113 | catch (Exception e) | ||
114 | { | ||
115 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: SendLayerData() - Failed with exception " + e.ToString()); | ||
116 | } | ||
117 | } | ||
118 | |||
119 | /// <summary> | ||
120 | /// Sends a specified patch to a client | ||
121 | /// </summary> | ||
122 | /// <param name="px">Patch coordinate (x) 0..16</param> | ||
123 | /// <param name="py">Patch coordinate (y) 0..16</param> | ||
124 | /// <param name="RemoteClient">The client to send to</param> | ||
125 | public void SendLayerData(int px, int py, ClientView RemoteClient) | ||
126 | { | ||
127 | try | ||
128 | { | ||
129 | int[] patches = new int[1]; | ||
130 | int patchx, patchy; | ||
131 | patchx = px / 16; | ||
132 | patchy = py / 16; | ||
133 | |||
134 | patches[0] = patchx + 0 + patchy * 16; | ||
135 | |||
136 | Packet layerpack = TerrainManager.CreateLandPacket(Terrain.getHeights1D(), patches); | ||
137 | RemoteClient.OutPacket(layerpack); | ||
138 | } | ||
139 | catch (Exception e) | ||
140 | { | ||
141 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: SendLayerData() - Failed with exception " + e.ToString()); | ||
142 | } | ||
143 | } | ||
144 | #endregion | ||
145 | |||
146 | #region Add/Remove Agent/Avatar | ||
147 | /// <summary> | ||
148 | /// Add a new Agent's avatar | ||
149 | /// </summary> | ||
150 | /// <param name="agentClient"></param> | ||
151 | public virtual Avatar AddViewerAgent(ClientView agentClient) | ||
152 | { | ||
153 | return null; | ||
154 | } | ||
155 | |||
156 | /// <summary> | ||
157 | /// Remove a Agent's avatar | ||
158 | /// </summary> | ||
159 | /// <param name="agentClient"></param> | ||
160 | public virtual void RemoveViewerAgent(ClientView agentClient) | ||
161 | { | ||
162 | |||
163 | } | ||
164 | #endregion | ||
165 | |||
166 | #region Shutdown | ||
167 | /// <summary> | ||
168 | /// Tidy before shutdown | ||
169 | /// </summary> | ||
170 | public virtual void Close() | ||
171 | { | ||
172 | |||
173 | } | ||
174 | #endregion | ||
175 | } | ||
176 | } | ||
diff --git a/OpenSim/OpenSim.RegionServer/world/scripting/IScriptContext.cs b/OpenSim/OpenSim.RegionServer/world/scripting/IScriptContext.cs deleted file mode 100644 index 465c23b..0000000 --- a/OpenSim/OpenSim.RegionServer/world/scripting/IScriptContext.cs +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | using System; | ||
2 | using System.Collections.Generic; | ||
3 | using System.Text; | ||
4 | using libsecondlife; | ||
5 | |||
6 | namespace OpenSim.RegionServer.world.scripting | ||
7 | { | ||
8 | public interface IScriptContext | ||
9 | { | ||
10 | IScriptEntity Entity { get; } | ||
11 | bool TryGetRandomAvatar(out IScriptReadonlyEntity avatar); | ||
12 | } | ||
13 | } | ||
diff --git a/OpenSim/OpenSim.RegionServer/world/scripting/IScriptEntity.cs b/OpenSim/OpenSim.RegionServer/world/scripting/IScriptEntity.cs deleted file mode 100644 index 2ef16a4..0000000 --- a/OpenSim/OpenSim.RegionServer/world/scripting/IScriptEntity.cs +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | using System; | ||
2 | using System.Collections.Generic; | ||
3 | using System.Text; | ||
4 | using libsecondlife; | ||
5 | |||
6 | namespace OpenSim.RegionServer.world.scripting | ||
7 | { | ||
8 | public interface IScriptReadonlyEntity | ||
9 | { | ||
10 | LLVector3 Pos { get; } | ||
11 | string Name { get; } | ||
12 | } | ||
13 | |||
14 | public interface IScriptEntity | ||
15 | { | ||
16 | LLVector3 Pos { get; set; } | ||
17 | string Name { get; } | ||
18 | } | ||
19 | } | ||
diff --git a/OpenSim/OpenSim.RegionServer/world/scripting/IScriptHandler.cs b/OpenSim/OpenSim.RegionServer/world/scripting/IScriptHandler.cs deleted file mode 100644 index 15efc49..0000000 --- a/OpenSim/OpenSim.RegionServer/world/scripting/IScriptHandler.cs +++ /dev/null | |||
@@ -1,98 +0,0 @@ | |||
1 | using System; | ||
2 | using System.Collections.Generic; | ||
3 | using System.Text; | ||
4 | using libsecondlife; | ||
5 | using OpenSim.Physics.Manager; | ||
6 | using OpenSim.world; | ||
7 | using Avatar=OpenSim.world.Avatar; | ||
8 | using Primitive = OpenSim.world.Primitive; | ||
9 | |||
10 | namespace OpenSim.RegionServer.world.scripting | ||
11 | { | ||
12 | public delegate void ScriptEventHandler(IScriptContext context); | ||
13 | |||
14 | public class ScriptHandler : IScriptContext, IScriptEntity, IScriptReadonlyEntity | ||
15 | { | ||
16 | private World m_world; | ||
17 | private Script m_script; | ||
18 | private Entity m_entity; | ||
19 | |||
20 | public LLUUID ScriptId | ||
21 | { | ||
22 | get | ||
23 | { | ||
24 | return m_script.ScriptId; | ||
25 | } | ||
26 | } | ||
27 | |||
28 | public void OnFrame() | ||
29 | { | ||
30 | m_script.OnFrame(this); | ||
31 | } | ||
32 | |||
33 | public ScriptHandler(Script script, Entity entity, World world) | ||
34 | { | ||
35 | m_script = script; | ||
36 | m_entity = entity; | ||
37 | m_world = world; | ||
38 | } | ||
39 | |||
40 | #region IScriptContext Members | ||
41 | |||
42 | IScriptEntity IScriptContext.Entity | ||
43 | { | ||
44 | get | ||
45 | { | ||
46 | return this; | ||
47 | } | ||
48 | } | ||
49 | |||
50 | bool IScriptContext.TryGetRandomAvatar(out IScriptReadonlyEntity avatar) | ||
51 | { | ||
52 | foreach (Entity entity in m_world.Entities.Values ) | ||
53 | { | ||
54 | if( entity is Avatar ) | ||
55 | { | ||
56 | avatar = entity; | ||
57 | return true; | ||
58 | } | ||
59 | } | ||
60 | |||
61 | avatar = null; | ||
62 | return false; | ||
63 | } | ||
64 | |||
65 | #endregion | ||
66 | |||
67 | #region IScriptEntity and IScriptReadonlyEntity Members | ||
68 | |||
69 | public string Name | ||
70 | { | ||
71 | get | ||
72 | { | ||
73 | return m_entity.Name; | ||
74 | } | ||
75 | } | ||
76 | |||
77 | public LLVector3 Pos | ||
78 | { | ||
79 | get | ||
80 | { | ||
81 | return m_entity.Pos; | ||
82 | } | ||
83 | |||
84 | set | ||
85 | { | ||
86 | if (m_entity is Primitive) | ||
87 | { | ||
88 | Primitive prim = m_entity as Primitive; | ||
89 | // Of course, we really should have asked the physEngine if this is possible, and if not, returned false. | ||
90 | prim.UpdatePosition( value ); | ||
91 | } | ||
92 | } | ||
93 | } | ||
94 | |||
95 | #endregion | ||
96 | } | ||
97 | |||
98 | } | ||
diff --git a/OpenSim/OpenSim.RegionServer/world/scripting/Script.cs b/OpenSim/OpenSim.RegionServer/world/scripting/Script.cs deleted file mode 100644 index 48c18ff..0000000 --- a/OpenSim/OpenSim.RegionServer/world/scripting/Script.cs +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | using System; | ||
2 | using System.Collections.Generic; | ||
3 | using System.Text; | ||
4 | using libsecondlife; | ||
5 | |||
6 | namespace OpenSim.RegionServer.world.scripting | ||
7 | { | ||
8 | public class Script | ||
9 | { | ||
10 | private LLUUID m_scriptId; | ||
11 | public virtual LLUUID ScriptId | ||
12 | { | ||
13 | get | ||
14 | { | ||
15 | return m_scriptId; | ||
16 | } | ||
17 | } | ||
18 | |||
19 | public Script( LLUUID scriptId ) | ||
20 | { | ||
21 | m_scriptId = scriptId; | ||
22 | } | ||
23 | |||
24 | public ScriptEventHandler OnFrame; | ||
25 | } | ||
26 | } | ||
diff --git a/OpenSim/OpenSim.RegionServer/world/scripting/ScriptFactory.cs b/OpenSim/OpenSim.RegionServer/world/scripting/ScriptFactory.cs deleted file mode 100644 index 4c6d373..0000000 --- a/OpenSim/OpenSim.RegionServer/world/scripting/ScriptFactory.cs +++ /dev/null | |||
@@ -1,8 +0,0 @@ | |||
1 | using System; | ||
2 | using System.Collections.Generic; | ||
3 | using System.Text; | ||
4 | |||
5 | namespace OpenSim.RegionServer.world.scripting | ||
6 | { | ||
7 | public delegate Script ScriptFactory(); | ||
8 | } | ||
diff --git a/OpenSim/OpenSim.RegionServer/world/scripting/Scripts/FollowRandomAvatar.cs b/OpenSim/OpenSim.RegionServer/world/scripting/Scripts/FollowRandomAvatar.cs deleted file mode 100644 index 6a689ab..0000000 --- a/OpenSim/OpenSim.RegionServer/world/scripting/Scripts/FollowRandomAvatar.cs +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | using System; | ||
2 | using System.Collections.Generic; | ||
3 | using System.Text; | ||
4 | using libsecondlife; | ||
5 | |||
6 | namespace OpenSim.RegionServer.world.scripting | ||
7 | { | ||
8 | public class FollowRandomAvatar : Script | ||
9 | { | ||
10 | public FollowRandomAvatar() | ||
11 | : base(LLUUID.Random()) | ||
12 | { | ||
13 | OnFrame += MyOnFrame; | ||
14 | } | ||
15 | |||
16 | private void MyOnFrame(IScriptContext context) | ||
17 | { | ||
18 | LLVector3 pos = context.Entity.Pos; | ||
19 | |||
20 | IScriptReadonlyEntity avatar; | ||
21 | |||
22 | if (context.TryGetRandomAvatar(out avatar)) | ||
23 | { | ||
24 | LLVector3 avatarPos = avatar.Pos; | ||
25 | |||
26 | float x = pos.X + ((float)avatarPos.X.CompareTo(pos.X)) / 2; | ||
27 | float y = pos.Y + ((float)avatarPos.Y.CompareTo(pos.Y)) / 2; | ||
28 | |||
29 | LLVector3 newPos = new LLVector3(x, y, pos.Z); | ||
30 | |||
31 | context.Entity.Pos = newPos; | ||
32 | } | ||
33 | } | ||
34 | } | ||
35 | |||
36 | |||
37 | } | ||