diff options
author | Robert Adams | 2015-09-08 04:54:16 -0700 |
---|---|---|
committer | Robert Adams | 2015-09-08 04:54:16 -0700 |
commit | e5367d822be9b05e74c859afe2d2956a3e95aa33 (patch) | |
tree | e904050a30715df587aa527d7f313755177726a7 /OpenSim/Region/PhysicsModules/SharedBase/NullPhysicsScene.cs | |
parent | add lost admin_reset_land method (diff) | |
parent | Deleted access control spec from [LoginService] section of standalone config.... (diff) | |
download | opensim-SC_OLD-e5367d822be9b05e74c859afe2d2956a3e95aa33.zip opensim-SC_OLD-e5367d822be9b05e74c859afe2d2956a3e95aa33.tar.gz opensim-SC_OLD-e5367d822be9b05e74c859afe2d2956a3e95aa33.tar.bz2 opensim-SC_OLD-e5367d822be9b05e74c859afe2d2956a3e95aa33.tar.xz |
Merge of ubitworkvarnew with opensim/master as of 20150905.
This integrates the OpenSim refactoring to make physics, etc into modules.
AVN physics hasn't been moved to new location.
Does not compile yet.
Merge branch 'osmaster' into mbworknew1
Diffstat (limited to 'OpenSim/Region/PhysicsModules/SharedBase/NullPhysicsScene.cs')
-rw-r--r-- | OpenSim/Region/PhysicsModules/SharedBase/NullPhysicsScene.cs | 117 |
1 files changed, 117 insertions, 0 deletions
diff --git a/OpenSim/Region/PhysicsModules/SharedBase/NullPhysicsScene.cs b/OpenSim/Region/PhysicsModules/SharedBase/NullPhysicsScene.cs new file mode 100644 index 0000000..432708c --- /dev/null +++ b/OpenSim/Region/PhysicsModules/SharedBase/NullPhysicsScene.cs | |||
@@ -0,0 +1,117 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System.Collections.Generic; | ||
29 | using System.Reflection; | ||
30 | using log4net; | ||
31 | using Nini.Config; | ||
32 | using OpenSim.Framework; | ||
33 | using OpenMetaverse; | ||
34 | |||
35 | namespace OpenSim.Region.PhysicsModules.SharedBase | ||
36 | { | ||
37 | class NullPhysicsScene : PhysicsScene | ||
38 | { | ||
39 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
40 | |||
41 | private static int m_workIndicator; | ||
42 | |||
43 | public override PhysicsActor AddAvatar( | ||
44 | string avName, Vector3 position, Vector3 velocity, Vector3 size, bool isFlying) | ||
45 | { | ||
46 | m_log.InfoFormat("[PHYSICS]: NullPhysicsScene : AddAvatar({0})", position); | ||
47 | return PhysicsActor.Null; | ||
48 | } | ||
49 | |||
50 | public override void RemoveAvatar(PhysicsActor actor) | ||
51 | { | ||
52 | } | ||
53 | |||
54 | public override void RemovePrim(PhysicsActor prim) | ||
55 | { | ||
56 | } | ||
57 | public override void SetWaterLevel(float baseheight) | ||
58 | { | ||
59 | |||
60 | } | ||
61 | |||
62 | /* | ||
63 | public override PhysicsActor AddPrim(Vector3 position, Vector3 size, Quaternion rotation) | ||
64 | { | ||
65 | m_log.InfoFormat("NullPhysicsScene : AddPrim({0},{1})", position, size); | ||
66 | return PhysicsActor.Null; | ||
67 | } | ||
68 | */ | ||
69 | |||
70 | public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position, | ||
71 | Vector3 size, Quaternion rotation, bool isPhysical, uint localid) | ||
72 | { | ||
73 | m_log.InfoFormat("[PHYSICS]: NullPhysicsScene : AddPrim({0},{1})", position, size); | ||
74 | return PhysicsActor.Null; | ||
75 | } | ||
76 | |||
77 | public override void AddPhysicsActorTaint(PhysicsActor prim) | ||
78 | { | ||
79 | } | ||
80 | |||
81 | public override float Simulate(float timeStep) | ||
82 | { | ||
83 | m_workIndicator = (m_workIndicator + 1) % 10; | ||
84 | |||
85 | return 0f; | ||
86 | } | ||
87 | |||
88 | public override void GetResults() | ||
89 | { | ||
90 | m_log.Info("[PHYSICS]: NullPhysicsScene : GetResults()"); | ||
91 | } | ||
92 | |||
93 | public override void SetTerrain(float[] heightMap) | ||
94 | { | ||
95 | m_log.InfoFormat("[PHYSICS]: NullPhysicsScene : SetTerrain({0} items)", heightMap.Length); | ||
96 | } | ||
97 | |||
98 | public override void DeleteTerrain() | ||
99 | { | ||
100 | } | ||
101 | |||
102 | public override bool IsThreaded | ||
103 | { | ||
104 | get { return false; } | ||
105 | } | ||
106 | |||
107 | public override void Dispose() | ||
108 | { | ||
109 | } | ||
110 | |||
111 | public override Dictionary<uint,float> GetTopColliders() | ||
112 | { | ||
113 | Dictionary<uint, float> returncolliders = new Dictionary<uint, float>(); | ||
114 | return returncolliders; | ||
115 | } | ||
116 | } | ||
117 | } \ No newline at end of file | ||