Module
/
OpenSimBirds
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change Bird prims to temporary as well as phantom to stop them persisting in the database

pull/1/merge
Jak Daniels 2015-01-03 12:52:46 +00:00
parent 51cb61fb29
commit 173e046aba
4 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Module/BirdsModule/FlockingModel.cs
View File

@ -48,9 +48,11 @@ namespace Flocking
public int Size { public int Size {
get {return m_flock.Count;} get {return m_flock.Count;}
set { set {
if( value < m_flock.Count ) { //if( value < m_flock.Count ) {
m_flock.RemoveRange( 0, m_flock.Count - value ); // m_flock.RemoveRange( 0, m_flock.Count - value );
} else while( value > m_flock.Count ) { //} else
m_flock = new List<Bird>();
while( value > m_flock.Count ) {
AddBird(m_name + m_flock.Count); AddBird(m_name + m_flock.Count);
} }
} }

19
Module/BirdsModule/FlockingModule.cs
View File

@ -136,7 +136,7 @@ namespace Flocking
m_model = new FlockingModel(m_name, m_maxSpeed, m_maxForce, m_neighbourDistance, m_desiredSeparation, m_tolerance, m_borderSize); m_model = new FlockingModel(m_name, m_maxSpeed, m_maxForce, m_neighbourDistance, m_desiredSeparation, m_tolerance, m_borderSize);
m_view = new FlockingView(m_name, m_scene); m_view = new FlockingView(m_name, m_scene);
m_view.BirdPrim = m_birdPrim; m_view.BirdPrim = m_birdPrim;
m_frame = 0; m_frame = 0;
FlockInitialise(); FlockInitialise();
@ -144,9 +144,9 @@ namespace Flocking
} }
public void RegionLoaded (Scene scene) public void RegionLoaded (Scene scene)
{ {
//m_scene = scene; if (m_enabled)
if (m_enabled) { {
// Mark Module Ready for duty // Mark Module Ready for duty
m_ready = true; m_ready = true;
} }
@ -191,8 +191,8 @@ namespace Flocking
// who is the owner for the flock in this region // who is the owner for the flock in this region
m_owner = m_scene.RegionInfo.EstateSettings.EstateOwner; m_owner = m_scene.RegionInfo.EstateSettings.EstateOwner;
m_view.PostInitialize(m_owner); m_view.PostInitialize(m_owner);
} }
#endregion #endregion
#region EventHandlers #region EventHandlers
@ -354,10 +354,11 @@ namespace Flocking
if (ShouldHandleCmd ()) { if (ShouldHandleCmd ()) {
lock( m_sync ) { lock( m_sync ) {
int newSize = Convert.ToInt32(args[1]); int newSize = Convert.ToInt32(args[1]);
if (newSize > m_maxFlockSize) newSize = m_maxFlockSize; if (newSize > m_maxFlockSize) newSize = m_maxFlockSize;
m_model.Size = newSize; m_view.Clear();
m_model.Size = newSize;
m_log.InfoFormat("[{0}]: Bird flock size is set to {1} in region {2}.", m_name, newSize, m_scene.RegionInfo.RegionName); m_log.InfoFormat("[{0}]: Bird flock size is set to {1} in region {2}.", m_name, newSize, m_scene.RegionInfo.RegionName);
m_view.Clear();
} }
} }
} }

8
Module/BirdsModule/FlockingView.cs
View File

@ -70,9 +70,9 @@ namespace Flocking
} }
m_sogMap.Clear(); m_sogMap.Clear();
m_scene.ForceClientUpdate(); m_scene.ForceClientUpdate();
} }
public void Render (List<Bird> birds) public void Render(List<Bird> birds)
{ {
foreach (Bird bird in birds) { foreach (Bird bird in birds) {
DrawBird (bird); DrawBird (bird);
@ -93,7 +93,7 @@ namespace Flocking
sog = CopyPrim (group, bird.Id); sog = CopyPrim (group, bird.Id);
rootPart = sog.RootPart; rootPart = sog.RootPart;
//set prim to phantom //set prim to phantom
sog.UpdatePrimFlags(rootPart.LocalId, false, false, true, false); sog.UpdatePrimFlags(rootPart.LocalId, false, true, true, false);
m_sogMap [bird.Id] = sog; m_sogMap [bird.Id] = sog;
m_scene.AddNewSceneObject (sog, false); m_scene.AddNewSceneObject (sog, false);
// Fire script on_rez // Fire script on_rez

11
Module/BirdsModule/FlowMap.cs
View File

@ -181,10 +181,13 @@ namespace Flocking
} }
public bool IsWithinObstacle( int x, int y, int z ) { public bool IsWithinObstacle( int x, int y, int z ) {
bool retVal = false; bool retVal = false;
if( x >= LengthX || y >= LengthY || z >= LengthZ ) { if (x >= LengthX || y >= LengthY || z >= LengthZ)
retVal = true; {
} else if( x < 0 || y < 0 || z < 0 ) { retVal = true;
}
else if (x < 0 || y < 0 || z < 0)
{
retVal = true; retVal = true;
} else if (m_flowMap[x,y,z] > 50f) { } else if (m_flowMap[x,y,z] > 50f) {
retVal = true; retVal = true;