diff options
author | lbsa71 | 2007-07-26 14:55:42 +0000 |
---|---|---|
committer | lbsa71 | 2007-07-26 14:55:42 +0000 |
commit | 39b64564dca0e5cb57a2a8e1b60979ccaaf11ef6 (patch) | |
tree | 81ab89a9749577c6fa1a3a19c1ed09c1942ec201 /OpenSim/Region/Environment/Scenes/Entity.cs | |
parent | Added the default shape to the OpenSim library. Now need to get the new ruth ... (diff) | |
download | opensim-SC-39b64564dca0e5cb57a2a8e1b60979ccaaf11ef6.zip opensim-SC-39b64564dca0e5cb57a2a8e1b60979ccaaf11ef6.tar.gz opensim-SC-39b64564dca0e5cb57a2a8e1b60979ccaaf11ef6.tar.bz2 opensim-SC-39b64564dca0e5cb57a2a8e1b60979ccaaf11ef6.tar.xz |
* Started renaming world to Scene
* Update and UpdateMovement now first stores array to avoid collection update exceptions
* Ignored some bins
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Entity.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Entity.cs | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Entity.cs b/OpenSim/Region/Environment/Scenes/Entity.cs index 2456a4e..204b68f 100644 --- a/OpenSim/Region/Environment/Scenes/Entity.cs +++ b/OpenSim/Region/Environment/Scenes/Entity.cs | |||
@@ -31,8 +31,8 @@ using OpenSim.Physics.Manager; | |||
31 | 31 | ||
32 | namespace OpenSim.Region.Environment.Scenes | 32 | namespace OpenSim.Region.Environment.Scenes |
33 | { | 33 | { |
34 | public abstract class Entity :EntityBase //this class (Entity) will be phased out | 34 | public abstract class Entity : EntityBase //this class (Entity) will be phased out |
35 | { | 35 | { |
36 | protected PhysicsActor _physActor; | 36 | protected PhysicsActor _physActor; |
37 | 37 | ||
38 | /// <summary> | 38 | /// <summary> |
@@ -42,7 +42,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
42 | { | 42 | { |
43 | get | 43 | get |
44 | { | 44 | { |
45 | if (this._physActor != null) | 45 | if (_physActor != null) |
46 | { | 46 | { |
47 | m_pos.X = _physActor.Position.X; | 47 | m_pos.X = _physActor.Position.X; |
48 | m_pos.Y = _physActor.Position.Y; | 48 | m_pos.Y = _physActor.Position.Y; |
@@ -53,14 +53,13 @@ namespace OpenSim.Region.Environment.Scenes | |||
53 | } | 53 | } |
54 | set | 54 | set |
55 | { | 55 | { |
56 | if (this._physActor != null) | 56 | if (_physActor != null) |
57 | { | 57 | { |
58 | try | 58 | try |
59 | { | 59 | { |
60 | lock (this.m_world.SyncRoot) | 60 | lock (m_scene.SyncRoot) |
61 | { | 61 | { |
62 | 62 | _physActor.Position = new PhysicsVector(value.X, value.Y, value.Z); | |
63 | this._physActor.Position = new PhysicsVector(value.X, value.Y, value.Z); | ||
64 | } | 63 | } |
65 | } | 64 | } |
66 | catch (Exception e) | 65 | catch (Exception e) |
@@ -73,7 +72,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
73 | } | 72 | } |
74 | } | 73 | } |
75 | 74 | ||
76 | 75 | ||
77 | /// <summary> | 76 | /// <summary> |
78 | /// | 77 | /// |
79 | /// </summary> | 78 | /// </summary> |
@@ -81,7 +80,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
81 | { | 80 | { |
82 | get | 81 | get |
83 | { | 82 | { |
84 | if (this._physActor != null) | 83 | if (_physActor != null) |
85 | { | 84 | { |
86 | m_velocity.X = _physActor.Velocity.X; | 85 | m_velocity.X = _physActor.Velocity.X; |
87 | m_velocity.Y = _physActor.Velocity.Y; | 86 | m_velocity.Y = _physActor.Velocity.Y; |
@@ -92,14 +91,13 @@ namespace OpenSim.Region.Environment.Scenes | |||
92 | } | 91 | } |
93 | set | 92 | set |
94 | { | 93 | { |
95 | if (this._physActor != null) | 94 | if (_physActor != null) |
96 | { | 95 | { |
97 | try | 96 | try |
98 | { | 97 | { |
99 | lock (this.m_world.SyncRoot) | 98 | lock (m_scene.SyncRoot) |
100 | { | 99 | { |
101 | 100 | _physActor.Velocity = new PhysicsVector(value.X, value.Y, value.Z); | |
102 | this._physActor.Velocity = new PhysicsVector(value.X, value.Y, value.Z); | ||
103 | } | 101 | } |
104 | } | 102 | } |
105 | catch (Exception e) | 103 | catch (Exception e) |
@@ -112,4 +110,4 @@ namespace OpenSim.Region.Environment.Scenes | |||
112 | } | 110 | } |
113 | } | 111 | } |
114 | } | 112 | } |
115 | } | 113 | } \ No newline at end of file |