diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/EntityBase.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/EntityBase.cs | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/OpenSim/Region/Framework/Scenes/EntityBase.cs b/OpenSim/Region/Framework/Scenes/EntityBase.cs index 00c99c5..27a0785 100644 --- a/OpenSim/Region/Framework/Scenes/EntityBase.cs +++ b/OpenSim/Region/Framework/Scenes/EntityBase.cs | |||
@@ -94,7 +94,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
94 | set { m_velocity = value; } | 94 | set { m_velocity = value; } |
95 | } | 95 | } |
96 | 96 | ||
97 | protected Quaternion m_rotation = new Quaternion(0f, 0f, 1f, 0f); | 97 | protected Quaternion m_rotation; |
98 | 98 | ||
99 | public virtual Quaternion Rotation | 99 | public virtual Quaternion Rotation |
100 | { | 100 | { |
@@ -102,6 +102,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
102 | set { m_rotation = value; } | 102 | set { m_rotation = value; } |
103 | } | 103 | } |
104 | 104 | ||
105 | protected Vector3 m_scale; | ||
106 | |||
107 | public virtual Vector3 Scale | ||
108 | { | ||
109 | get { return m_scale; } | ||
110 | set { m_scale = value; } | ||
111 | } | ||
112 | |||
105 | protected uint m_localId; | 113 | protected uint m_localId; |
106 | 114 | ||
107 | public virtual uint LocalId | 115 | public virtual uint LocalId |
@@ -115,13 +123,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
115 | /// </summary> | 123 | /// </summary> |
116 | public EntityBase() | 124 | public EntityBase() |
117 | { | 125 | { |
118 | m_uuid = UUID.Zero; | 126 | m_rotation = Quaternion.Identity; |
119 | 127 | m_scale = Vector3.One; | |
120 | m_pos = Vector3.Zero; | ||
121 | m_velocity = Vector3.Zero; | ||
122 | Rotation = Quaternion.Identity; | ||
123 | m_name = "(basic entity)"; | 128 | m_name = "(basic entity)"; |
124 | m_rotationalvelocity = Vector3.Zero; | ||
125 | } | 129 | } |
126 | 130 | ||
127 | /// <summary> | 131 | /// <summary> |
@@ -130,7 +134,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
130 | public abstract void UpdateMovement(); | 134 | public abstract void UpdateMovement(); |
131 | 135 | ||
132 | /// <summary> | 136 | /// <summary> |
133 | /// Performs any updates that need to be done at each frame, as opposed to immediately. | 137 | /// Performs any updates that need to be done at each frame, as opposed to immediately. |
134 | /// These included scheduled updates and updates that occur due to physics processing. | 138 | /// These included scheduled updates and updates that occur due to physics processing. |
135 | /// </summary> | 139 | /// </summary> |
136 | public abstract void Update(); | 140 | public abstract void Update(); |