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

bug fixes to rotation

stable0711
Jon Cundill 2011-07-09 17:39:29 +01:00
parent 0f3b9ef3dc
commit 7d6417d5fd
2 changed files with 6 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Flocking/FlockingModule.cs
View File

@ -146,19 +146,14 @@ namespace Flocking
protected void SimChatSent (Object x, OSChatMessage msg) protected void SimChatSent (Object x, OSChatMessage msg)
{ {
m_log.Info ("got msg"); if (m_scene.ConsoleScene () != m_scene || msg.Channel != m_chatChannel)
if (m_scene.ConsoleScene () != m_scene)
return; // not for us
m_log.Info ("got channel" + msg.Channel);
if (msg.Channel != m_chatChannel)
return; // not for us return; // not for us
// try and parse a valid cmd from this msg // try and parse a valid cmd from this msg
string cmd = msg.Message.ToLower (); string cmd = msg.Message.ToLower ();
m_log.Info ("got cmd " + cmd);
//stick ui in the args so we know to respond in world //stick ui in the args so we know to respond in world
//bit of a hack - but lets us us CommandDelegate inWorld
string[] args = (cmd + " <ui>").Split (" ".ToCharArray ()); string[] args = (cmd + " <ui>").Split (" ".ToCharArray ());
if (cmd.StartsWith ("stop")) { if (cmd.StartsWith ("stop")) {
@ -257,12 +252,9 @@ namespace Flocking
{ {
if (ShouldHandleCmd ()) { if (ShouldHandleCmd ()) {
lock( m_sync ) { lock( m_sync ) {
//m_enabled = false;
//m_log.Info( args );
int newSize = Convert.ToInt32(args[1]); int newSize = Convert.ToInt32(args[1]);
m_model.Size = newSize; m_model.Size = newSize;
m_view.Clear(); m_view.Clear();
//m_enabled = true;
} }
} }
} }
@ -278,7 +270,6 @@ namespace Flocking
public void HandleSetPrimCmd (string module, string[] args) public void HandleSetPrimCmd (string module, string[] args)
{ {
if (ShouldHandleCmd ()) { if (ShouldHandleCmd ()) {
//m_log.Info ("set prim not implemented yet");
string primName = args[1]; string primName = args[1];
lock(m_sync) { lock(m_sync) {
m_view.BoidPrim = primName; m_view.BoidPrim = primName;

18
Flocking/FlockingView.cs
View File

@ -34,8 +34,6 @@ namespace Flocking
{ {
public class FlockingView public class FlockingView
{ {
private const float DEG_TO_RAD = 0.01745329238f;
private Scene m_scene; private Scene m_scene;
private UUID m_owner; private UUID m_owner;
private String m_boidPrim; private String m_boidPrim;
@ -89,27 +87,19 @@ namespace Flocking
} }
Quaternion rotation = CalcRotationToEndpoint (sog, sog.AbsolutePosition, boid.Location); Quaternion rotation = CalcRotationToEndpoint (sog, sog.AbsolutePosition, boid.Location);
sog.UpdateGroupPosition(boid.Location); sog.UpdateGroupRotationPR( boid.Location, rotation);
sog.UpdateGroupRotationR (rotation);
} }
private static Quaternion CalcRotationToEndpoint (SceneObjectGroup copy, Vector3 sv, Vector3 ev) private static Quaternion CalcRotationToEndpoint (SceneObjectGroup copy, Vector3 sv, Vector3 ev)
{ {
//llSetRot(llRotBetween(<1,0,0>,llVecNorm(targetPosition - llGetPos())));
// boid wil fly x forwards and Z up
Vector3 currDirVec = Vector3.UnitX; Vector3 currDirVec = Vector3.UnitX;
float angle = 0f;
copy.GroupRotation.GetAxisAngle (out currDirVec, out angle);
currDirVec.Normalize ();
Vector3 desiredDirVec = Vector3.Subtract (ev, sv); Vector3 desiredDirVec = Vector3.Subtract (ev, sv);
desiredDirVec.Normalize (); desiredDirVec.Normalize ();
Quaternion rot = Vector3.RotationBetween (currDirVec, desiredDirVec); Quaternion rot = Vector3.RotationBetween (currDirVec, desiredDirVec);
//Quaternion x90 = Quaternion.CreateFromEulers (90f * DEG_TO_RAD, 0f, 0f);
//rot = rot * x90;
return rot; return rot;
} }