diff options
author | Jeff Ames | 2008-09-09 01:26:48 +0000 |
---|---|---|
committer | Jeff Ames | 2008-09-09 01:26:48 +0000 |
commit | fae34bb10cfa10702faf5c19d8c8517faa018cb5 (patch) | |
tree | 2001f24703b010957254dbb49ef5e222ff30b84d /OpenSim/Region/Environment/Modules/ContentManagementSystem/AuraMetaEntity.cs | |
parent | Fix state xxx within state xxx itself triggering a state "change" to (diff) | |
download | opensim-SC-fae34bb10cfa10702faf5c19d8c8517faa018cb5.zip opensim-SC-fae34bb10cfa10702faf5c19d8c8517faa018cb5.tar.gz opensim-SC-fae34bb10cfa10702faf5c19d8c8517faa018cb5.tar.bz2 opensim-SC-fae34bb10cfa10702faf5c19d8c8517faa018cb5.tar.xz |
Update svn properties, formatting cleanup.
Diffstat (limited to 'OpenSim/Region/Environment/Modules/ContentManagementSystem/AuraMetaEntity.cs')
-rw-r--r-- | OpenSim/Region/Environment/Modules/ContentManagementSystem/AuraMetaEntity.cs | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/OpenSim/Region/Environment/Modules/ContentManagementSystem/AuraMetaEntity.cs b/OpenSim/Region/Environment/Modules/ContentManagementSystem/AuraMetaEntity.cs index dd592dd..aab863a 100644 --- a/OpenSim/Region/Environment/Modules/ContentManagementSystem/AuraMetaEntity.cs +++ b/OpenSim/Region/Environment/Modules/ContentManagementSystem/AuraMetaEntity.cs | |||
@@ -90,7 +90,7 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement | |||
90 | public void SetAura(Vector3 color, float radius) | 90 | public void SetAura(Vector3 color, float radius) |
91 | { | 91 | { |
92 | SceneObjectPart From = m_Entity.RootPart; | 92 | SceneObjectPart From = m_Entity.RootPart; |
93 | 93 | ||
94 | //m_log.Debug("[META ENTITY] BEFORE: radius = " + radius); | 94 | //m_log.Debug("[META ENTITY] BEFORE: radius = " + radius); |
95 | float burstRadius = 0.1f; | 95 | float burstRadius = 0.1f; |
96 | Primitive.ParticleSystem.SourcePattern patternFlags = Primitive.ParticleSystem.SourcePattern.None; | 96 | Primitive.ParticleSystem.SourcePattern patternFlags = Primitive.ParticleSystem.SourcePattern.None; |
@@ -98,12 +98,12 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement | |||
98 | float burstRate = 0.4f; | 98 | float burstRate = 0.4f; |
99 | if (radius >= 8.0f) | 99 | if (radius >= 8.0f) |
100 | { | 100 | { |
101 | //float sizeOfObject = radius / 2.0f; | 101 | //float sizeOfObject = radius / 2.0f; |
102 | burstRadius = (radius - 8.0f)/3f; | 102 | burstRadius = (radius - 8.0f)/3f; |
103 | burstRate = 1.5f; | 103 | burstRate = 1.5f; |
104 | radius = 7.99f; | 104 | radius = 7.99f; |
105 | patternFlags = Primitive.ParticleSystem.SourcePattern.Explode; | 105 | patternFlags = Primitive.ParticleSystem.SourcePattern.Explode; |
106 | age = 4.0f; | 106 | age = 4.0f; |
107 | } | 107 | } |
108 | SetAura(From, color, radius, burstRadius, age, burstRate, patternFlags); | 108 | SetAura(From, color, radius, burstRadius, age, burstRate, patternFlags); |
109 | } | 109 | } |
@@ -111,48 +111,48 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement | |||
111 | public void SetAura(SceneObjectPart From, Vector3 color, float radius, float burstRadius, float age, float burstRate, Primitive.ParticleSystem.SourcePattern patternFlags) | 111 | public void SetAura(SceneObjectPart From, Vector3 color, float radius, float burstRadius, float age, float burstRate, Primitive.ParticleSystem.SourcePattern patternFlags) |
112 | { | 112 | { |
113 | Primitive.ParticleSystem prules = new Primitive.ParticleSystem(); | 113 | Primitive.ParticleSystem prules = new Primitive.ParticleSystem(); |
114 | //prules.PartDataFlags = Primitive.ParticleSystem.ParticleDataFlags.Emissive | | 114 | //prules.PartDataFlags = Primitive.ParticleSystem.ParticleDataFlags.Emissive | |
115 | // Primitive.ParticleSystem.ParticleDataFlags.FollowSrc; //PSYS_PART_FLAGS | 115 | // Primitive.ParticleSystem.ParticleDataFlags.FollowSrc; //PSYS_PART_FLAGS |
116 | //prules.PartDataFlags = Primitive.ParticleSystem.ParticleDataFlags.Beam | | 116 | //prules.PartDataFlags = Primitive.ParticleSystem.ParticleDataFlags.Beam | |
117 | // Primitive.ParticleSystem.ParticleDataFlags.TargetPos; | 117 | // Primitive.ParticleSystem.ParticleDataFlags.TargetPos; |
118 | prules.PartStartColor.R = color.X; //PSYS_PART_START_COLOR | 118 | prules.PartStartColor.R = color.X; //PSYS_PART_START_COLOR |
119 | prules.PartStartColor.G = color.Y; | 119 | prules.PartStartColor.G = color.Y; |
120 | prules.PartStartColor.B = color.Z; | 120 | prules.PartStartColor.B = color.Z; |
121 | prules.PartStartColor.A = 0.5f; //PSYS_PART_START_ALPHA, transparency | 121 | prules.PartStartColor.A = 0.5f; //PSYS_PART_START_ALPHA, transparency |
122 | prules.PartEndColor.R = color.X; //PSYS_PART_END_COLOR | 122 | prules.PartEndColor.R = color.X; //PSYS_PART_END_COLOR |
123 | prules.PartEndColor.G = color.Y; | 123 | prules.PartEndColor.G = color.Y; |
124 | prules.PartEndColor.B = color.Z; | 124 | prules.PartEndColor.B = color.Z; |
125 | prules.PartEndColor.A = 0.5f; //PSYS_PART_END_ALPHA, transparency | 125 | prules.PartEndColor.A = 0.5f; //PSYS_PART_END_ALPHA, transparency |
126 | /*prules.PartStartScaleX = 0.5f; //PSYS_PART_START_SCALE | 126 | /*prules.PartStartScaleX = 0.5f; //PSYS_PART_START_SCALE |
127 | prules.PartStartScaleY = 0.5f; | 127 | prules.PartStartScaleY = 0.5f; |
128 | prules.PartEndScaleX = 0.5f; //PSYS_PART_END_SCALE | 128 | prules.PartEndScaleX = 0.5f; //PSYS_PART_END_SCALE |
129 | prules.PartEndScaleY = 0.5f; | 129 | prules.PartEndScaleY = 0.5f; |
130 | */ | 130 | */ |
131 | prules.PartStartScaleX = radius; //PSYS_PART_START_SCALE | 131 | prules.PartStartScaleX = radius; //PSYS_PART_START_SCALE |
132 | prules.PartStartScaleY = radius; | 132 | prules.PartStartScaleY = radius; |
133 | prules.PartEndScaleX = radius; //PSYS_PART_END_SCALE | 133 | prules.PartEndScaleX = radius; //PSYS_PART_END_SCALE |
134 | prules.PartEndScaleY = radius; | 134 | prules.PartEndScaleY = radius; |
135 | prules.PartMaxAge = age; //PSYS_PART_MAX_AGE | 135 | prules.PartMaxAge = age; //PSYS_PART_MAX_AGE |
136 | prules.PartAcceleration.X = 0.0f; //PSYS_SRC_ACCEL | 136 | prules.PartAcceleration.X = 0.0f; //PSYS_SRC_ACCEL |
137 | prules.PartAcceleration.Y = 0.0f; | 137 | prules.PartAcceleration.Y = 0.0f; |
138 | prules.PartAcceleration.Z = 0.0f; | 138 | prules.PartAcceleration.Z = 0.0f; |
139 | prules.Pattern = patternFlags; //PSYS_SRC_PATTERN | 139 | prules.Pattern = patternFlags; //PSYS_SRC_PATTERN |
140 | //prules.Texture = UUID.Zero;//= UUID //PSYS_SRC_TEXTURE, default used if blank | 140 | //prules.Texture = UUID.Zero;//= UUID //PSYS_SRC_TEXTURE, default used if blank |
141 | prules.BurstRate = burstRate; //PSYS_SRC_BURST_RATE | 141 | prules.BurstRate = burstRate; //PSYS_SRC_BURST_RATE |
142 | prules.BurstPartCount = 2; //PSYS_SRC_BURST_PART_COUNT | 142 | prules.BurstPartCount = 2; //PSYS_SRC_BURST_PART_COUNT |
143 | //prules.BurstRadius = radius; //PSYS_SRC_BURST_RADIUS | 143 | //prules.BurstRadius = radius; //PSYS_SRC_BURST_RADIUS |
144 | prules.BurstRadius = burstRadius; //PSYS_SRC_BURST_RADIUS | 144 | prules.BurstRadius = burstRadius; //PSYS_SRC_BURST_RADIUS |
145 | prules.BurstSpeedMin = 0.001f; //PSYS_SRC_BURST_SPEED_MIN | 145 | prules.BurstSpeedMin = 0.001f; //PSYS_SRC_BURST_SPEED_MIN |
146 | prules.BurstSpeedMax = 0.001f; //PSYS_SRC_BURST_SPEED_MAX | 146 | prules.BurstSpeedMax = 0.001f; //PSYS_SRC_BURST_SPEED_MAX |
147 | prules.MaxAge = 0.0f; //PSYS_SRC_MAX_AGE | 147 | prules.MaxAge = 0.0f; //PSYS_SRC_MAX_AGE |
148 | //prules.Target = To; //PSYS_SRC_TARGET_KEY | 148 | //prules.Target = To; //PSYS_SRC_TARGET_KEY |
149 | prules.AngularVelocity.X = 0.0f; //PSYS_SRC_OMEGA | 149 | prules.AngularVelocity.X = 0.0f; //PSYS_SRC_OMEGA |
150 | prules.AngularVelocity.Y = 0.0f; | 150 | prules.AngularVelocity.Y = 0.0f; |
151 | prules.AngularVelocity.Z = 0.0f; | 151 | prules.AngularVelocity.Z = 0.0f; |
152 | prules.InnerAngle = 0.0f; //PSYS_SRC_ANGLE_BEGIN | 152 | prules.InnerAngle = 0.0f; //PSYS_SRC_ANGLE_BEGIN |
153 | prules.OuterAngle = 0.0f; //PSYS_SRC_ANGLE_END | 153 | prules.OuterAngle = 0.0f; //PSYS_SRC_ANGLE_END |
154 | 154 | ||
155 | prules.CRC = 1; //activates the particle system?? | 155 | prules.CRC = 1; //activates the particle system?? |
156 | From.AddNewParticleSystem(prules); | 156 | From.AddNewParticleSystem(prules); |
157 | } | 157 | } |
158 | 158 | ||