diff options
author | Teravus Ovares | 2008-02-01 04:22:20 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-02-01 04:22:20 +0000 |
commit | bec71977ab28770f3e635f40231b8b53d3c5a1cc (patch) | |
tree | 04d531efb9f0dfc2c7b5a590a5d8c10966ae5233 /OpenSim/Region/ScriptEngine/Common | |
parent | * Adding limited support for LLParticleSystem. (diff) | |
download | opensim-SC_OLD-bec71977ab28770f3e635f40231b8b53d3c5a1cc.zip opensim-SC_OLD-bec71977ab28770f3e635f40231b8b53d3c5a1cc.tar.gz opensim-SC_OLD-bec71977ab28770f3e635f40231b8b53d3c5a1cc.tar.bz2 opensim-SC_OLD-bec71977ab28770f3e635f40231b8b53d3c5a1cc.tar.xz |
* Added more supported feature to particlesystems. While this appears to have a libsl update... it's really a fix to the libsl version we're already using because of a bug in the particlesystem implementation
* Added two new simstat counters in the simstat enum for the RCCS. (I'll find something cool to put in them)
* fixed a time waster in ODEPlugin.cs
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | 31 |
1 files changed, 28 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs index b11ad05..9167632 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | |||
@@ -2162,7 +2162,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
2162 | switch ((int)rules.Data[i]) | 2162 | switch ((int)rules.Data[i]) |
2163 | { | 2163 | { |
2164 | case (int)LSL_BaseClass.PSYS_PART_FLAGS: | 2164 | case (int)LSL_BaseClass.PSYS_PART_FLAGS: |
2165 | prules.PartFlags = (uint)Convert.ToInt32(rules.Data[i + 1].ToString()); | 2165 | prules.PartDataFlags = (Primitive.ParticleSystem.ParticleDataFlags)((uint)Convert.ToInt32(rules.Data[i + 1].ToString())); |
2166 | break; | 2166 | break; |
2167 | 2167 | ||
2168 | case (int)LSL_BaseClass.PSYS_PART_START_COLOR: | 2168 | case (int)LSL_BaseClass.PSYS_PART_START_COLOR: |
@@ -2204,8 +2204,8 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
2204 | break; | 2204 | break; |
2205 | 2205 | ||
2206 | case (int)LSL_BaseClass.PSYS_PART_MAX_AGE: | 2206 | case (int)LSL_BaseClass.PSYS_PART_MAX_AGE: |
2207 | //tempf = (LSL_Types.LSLFloat)rules.Data[i + 1]; | 2207 | tempf = Convert.ToSingle(rules.Data[i + 1].ToString()); |
2208 | prules.MaxAge = 7;//(float)tempf; | 2208 | prules.PartMaxAge = (float)tempf; |
2209 | break; | 2209 | break; |
2210 | 2210 | ||
2211 | case (int)LSL_BaseClass.PSYS_SRC_ACCEL: | 2211 | case (int)LSL_BaseClass.PSYS_SRC_ACCEL: |
@@ -2279,6 +2279,31 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
2279 | 2279 | ||
2280 | } | 2280 | } |
2281 | prules.CRC = 1; | 2281 | prules.CRC = 1; |
2282 | Console.WriteLine("----------ps----------\n"); | ||
2283 | Console.WriteLine(" AngularVelocity:" + prules.AngularVelocity.ToString() + "\n" + | ||
2284 | " BurstPartCount:" + prules.BurstPartCount.ToString() + "\n" + | ||
2285 | " BurstRadius:" + prules.BurstRadius.ToString() + "\n" + | ||
2286 | " BurstRate:" + prules.BurstRate.ToString() + "\n" + | ||
2287 | " BurstSpeedMax:" + prules.BurstSpeedMax.ToString() + "\n" + | ||
2288 | " BurstSpeedMin:" + prules.BurstSpeedMin.ToString() + "\n" + | ||
2289 | " CRC:" + prules.CRC.ToString() + "\n" + | ||
2290 | " InnerAngle:" + prules.InnerAngle.ToString() + "\n" + | ||
2291 | " MaxAge:" + prules.MaxAge.ToString() + "\n" + | ||
2292 | " OuterAngle:" + prules.OuterAngle.ToString() + "\n" + | ||
2293 | " PartAcceleration:" + prules.PartAcceleration.ToString() + "\n" + | ||
2294 | " PartDataFlags:" + prules.PartDataFlags.ToString() + "\n" + | ||
2295 | " PartEndColor:" + prules.PartEndColor.ToString() + "\n" + | ||
2296 | " PartEndScaleX:" + prules.PartEndScaleX.ToString() + "\n" + | ||
2297 | " PartEndScaleY:" + prules.PartEndScaleY.ToString() + "\n" + | ||
2298 | " PartFlags:" + prules.PartFlags.ToString() + "\n" + | ||
2299 | " PartMaxAge:" + prules.PartMaxAge.ToString() + "\n" + | ||
2300 | " PartStartColor:" + prules.PartStartColor.ToString() + "\n" + | ||
2301 | " PartStartScaleX:" + prules.PartStartScaleX.ToString() + "\n" + | ||
2302 | " PartStartScaleY:" + prules.PartStartScaleY.ToString() + "\n" + | ||
2303 | " Pattern:" + prules.Pattern.ToString() + "\n" + | ||
2304 | " StartAge:" + prules.StartAge.ToString() + "\n" + | ||
2305 | " Target:" + prules.Target.ToString() + "\n" + | ||
2306 | " Texture:" + prules.Texture.ToString() + ""); | ||
2282 | OpenSim.Framework.Console.MainLog.Instance.Verbose("PARTICLE", "PS: " + prules.ToString()); | 2307 | OpenSim.Framework.Console.MainLog.Instance.Verbose("PARTICLE", "PS: " + prules.ToString()); |
2283 | m_host.AddNewParticleSystem(prules); | 2308 | m_host.AddNewParticleSystem(prules); |
2284 | m_host.SendFullUpdateToAllClients(); | 2309 | m_host.SendFullUpdateToAllClients(); |