* 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.csThreadPoolClientBranch
parent
e2f783789c
commit
bec71977ab
OpenSim/Region
Environment/Scenes
Physics/OdePlugin
ScriptEngine/Common
|
@ -59,7 +59,12 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
OutPacketsPerSecond = 18,
|
OutPacketsPerSecond = 18,
|
||||||
PendingDownloads = 19,
|
PendingDownloads = 19,
|
||||||
PendingUploads = 20,
|
PendingUploads = 20,
|
||||||
UnAckedBytes = 24
|
UnAckedBytes = 24,
|
||||||
|
|
||||||
|
// Havok4 related... May or may not be in upcoming LLclients
|
||||||
|
// (kelly added them sometime late in January 2008)
|
||||||
|
NumRCCSLODReduced = 25,
|
||||||
|
NumRCCSFixed = 26
|
||||||
}
|
}
|
||||||
|
|
||||||
// Sending a stats update every 3 seconds
|
// Sending a stats update every 3 seconds
|
||||||
|
|
|
@ -211,7 +211,7 @@ namespace OpenSim.Region.Physics.OdePlugin
|
||||||
|
|
||||||
while (d.SpaceLockQuery(space))
|
while (d.SpaceLockQuery(space))
|
||||||
{
|
{
|
||||||
int i = 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -2162,7 +2162,7 @@ namespace OpenSim.Region.ScriptEngine.Common
|
||||||
switch ((int)rules.Data[i])
|
switch ((int)rules.Data[i])
|
||||||
{
|
{
|
||||||
case (int)LSL_BaseClass.PSYS_PART_FLAGS:
|
case (int)LSL_BaseClass.PSYS_PART_FLAGS:
|
||||||
prules.PartFlags = (uint)Convert.ToInt32(rules.Data[i + 1].ToString());
|
prules.PartDataFlags = (Primitive.ParticleSystem.ParticleDataFlags)((uint)Convert.ToInt32(rules.Data[i + 1].ToString()));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case (int)LSL_BaseClass.PSYS_PART_START_COLOR:
|
case (int)LSL_BaseClass.PSYS_PART_START_COLOR:
|
||||||
|
@ -2204,8 +2204,8 @@ namespace OpenSim.Region.ScriptEngine.Common
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case (int)LSL_BaseClass.PSYS_PART_MAX_AGE:
|
case (int)LSL_BaseClass.PSYS_PART_MAX_AGE:
|
||||||
//tempf = (LSL_Types.LSLFloat)rules.Data[i + 1];
|
tempf = Convert.ToSingle(rules.Data[i + 1].ToString());
|
||||||
prules.MaxAge = 7;//(float)tempf;
|
prules.PartMaxAge = (float)tempf;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case (int)LSL_BaseClass.PSYS_SRC_ACCEL:
|
case (int)LSL_BaseClass.PSYS_SRC_ACCEL:
|
||||||
|
@ -2279,6 +2279,31 @@ namespace OpenSim.Region.ScriptEngine.Common
|
||||||
|
|
||||||
}
|
}
|
||||||
prules.CRC = 1;
|
prules.CRC = 1;
|
||||||
|
Console.WriteLine("----------ps----------\n");
|
||||||
|
Console.WriteLine(" AngularVelocity:" + prules.AngularVelocity.ToString() + "\n" +
|
||||||
|
" BurstPartCount:" + prules.BurstPartCount.ToString() + "\n" +
|
||||||
|
" BurstRadius:" + prules.BurstRadius.ToString() + "\n" +
|
||||||
|
" BurstRate:" + prules.BurstRate.ToString() + "\n" +
|
||||||
|
" BurstSpeedMax:" + prules.BurstSpeedMax.ToString() + "\n" +
|
||||||
|
" BurstSpeedMin:" + prules.BurstSpeedMin.ToString() + "\n" +
|
||||||
|
" CRC:" + prules.CRC.ToString() + "\n" +
|
||||||
|
" InnerAngle:" + prules.InnerAngle.ToString() + "\n" +
|
||||||
|
" MaxAge:" + prules.MaxAge.ToString() + "\n" +
|
||||||
|
" OuterAngle:" + prules.OuterAngle.ToString() + "\n" +
|
||||||
|
" PartAcceleration:" + prules.PartAcceleration.ToString() + "\n" +
|
||||||
|
" PartDataFlags:" + prules.PartDataFlags.ToString() + "\n" +
|
||||||
|
" PartEndColor:" + prules.PartEndColor.ToString() + "\n" +
|
||||||
|
" PartEndScaleX:" + prules.PartEndScaleX.ToString() + "\n" +
|
||||||
|
" PartEndScaleY:" + prules.PartEndScaleY.ToString() + "\n" +
|
||||||
|
" PartFlags:" + prules.PartFlags.ToString() + "\n" +
|
||||||
|
" PartMaxAge:" + prules.PartMaxAge.ToString() + "\n" +
|
||||||
|
" PartStartColor:" + prules.PartStartColor.ToString() + "\n" +
|
||||||
|
" PartStartScaleX:" + prules.PartStartScaleX.ToString() + "\n" +
|
||||||
|
" PartStartScaleY:" + prules.PartStartScaleY.ToString() + "\n" +
|
||||||
|
" Pattern:" + prules.Pattern.ToString() + "\n" +
|
||||||
|
" StartAge:" + prules.StartAge.ToString() + "\n" +
|
||||||
|
" Target:" + prules.Target.ToString() + "\n" +
|
||||||
|
" Texture:" + prules.Texture.ToString() + "");
|
||||||
OpenSim.Framework.Console.MainLog.Instance.Verbose("PARTICLE", "PS: " + prules.ToString());
|
OpenSim.Framework.Console.MainLog.Instance.Verbose("PARTICLE", "PS: " + prules.ToString());
|
||||||
m_host.AddNewParticleSystem(prules);
|
m_host.AddNewParticleSystem(prules);
|
||||||
m_host.SendFullUpdateToAllClients();
|
m_host.SendFullUpdateToAllClients();
|
||||||
|
|
Binary file not shown.
Loading…
Reference in New Issue