aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs34
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs33
2 files changed, 62 insertions, 5 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
index 682d566..40e225d 100644
--- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
@@ -423,10 +423,38 @@ namespace OpenSim.Region.ScriptEngine.Common
423 public LSL_Types.Quaternion llAxes2Rot(LSL_Types.Vector3 fwd, LSL_Types.Vector3 left, LSL_Types.Vector3 up) 423 public LSL_Types.Quaternion llAxes2Rot(LSL_Types.Vector3 fwd, LSL_Types.Vector3 left, LSL_Types.Vector3 up)
424 { 424 {
425 m_host.AddScriptLPS(1); 425 m_host.AddScriptLPS(1);
426 NotImplemented("llAxes2Rot"); 426 double x,y,z,s;
427 return new LSL_Types.Quaternion(); 427 int f=0;
428 // Important Note: q1=<x,y,z,s> is equal to q2=<-x,-y,-z,-s>
429 // Computing quaternion x,y,z,s values
430 x=((fwd.x-left.y-up.z+1)/4);
431 x*=x;
432 x=Math.Sqrt(Math.Sqrt(x));
433 y=((1-up.z)/2-x*x);
434 y*=y;
435 y=Math.Sqrt(Math.Sqrt(y));
436 z=((1-left.y)/2-x*x);
437 z*=z;
438 z=Math.Sqrt(Math.Sqrt(z));
439 s=(1-x*x-y*y-z*z);
440 s*=s;
441 s=Math.Sqrt(Math.Sqrt(s));
442
443 // Set f for signs detection
444 if (fwd.y+left.x >= 0){f+=1;}
445 if (fwd.z+up.x >= 0){f+=2;}
446 if (left.z-up.y >= 0){f+=4;}
447 // Set correct quaternion signs based on f value
448 if (f==0){x=-x;}
449 if (f==1){x=-x;y=-y;}
450 if (f==2){x=-x;z=-z;}
451 if (f==3){s=-s;}
452 if (f==4){x=-x;s=-s;}
453 if (f==5){z=-z;}
454 if (f==6){y=-y;}
455 return new LSL_Types.Quaternion(x, y, z, s);
428 } 456 }
429 457
430 public LSL_Types.Vector3 llRot2Fwd(LSL_Types.Quaternion r) 458 public LSL_Types.Vector3 llRot2Fwd(LSL_Types.Quaternion r)
431 { 459 {
432 m_host.AddScriptLPS(1); 460 m_host.AddScriptLPS(1);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index c3255b1..c597661 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -410,8 +410,37 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
410 public LSL_Types.Quaternion llAxes2Rot(LSL_Types.Vector3 fwd, LSL_Types.Vector3 left, LSL_Types.Vector3 up) 410 public LSL_Types.Quaternion llAxes2Rot(LSL_Types.Vector3 fwd, LSL_Types.Vector3 left, LSL_Types.Vector3 up)
411 { 411 {
412 m_host.AddScriptLPS(1); 412 m_host.AddScriptLPS(1);
413 NotImplemented("llAxes2Rot"); 413 double x,y,z,s;
414 return new LSL_Types.Quaternion(); 414 int f=0;
415 // Important Note: q1=<x,y,z,s> is equal to q2=<-x,-y,-z,-s>
416 // Computing quaternion x,y,z,s values
417 x=((fwd.x-left.y-up.z+1)/4);
418 x*=x;
419 x=Math.Sqrt(Math.Sqrt(x));
420 y=((1-up.z)/2-x*x);
421 y*=y;
422 y=Math.Sqrt(Math.Sqrt(y));
423 z=((1-left.y)/2-x*x);
424 z*=z;
425 z=Math.Sqrt(Math.Sqrt(z));
426 s=(1-x*x-y*y-z*z);
427 s*=s;
428 s=Math.Sqrt(Math.Sqrt(s));
429
430 // Set f for signs detection
431 if (fwd.y+left.x >= 0){f+=1;}
432 if (fwd.z+up.x >= 0){f+=2;}
433 if (left.z-up.y >= 0){f+=4;}
434 // Set correct quaternion signs based on f value
435 if (f==0){x=-x;}
436 if (f==1){x=-x;y=-y;}
437 if (f==2){x=-x;z=-z;}
438 if (f==3){s=-s;}
439 if (f==4){x=-x;s=-s;}
440 if (f==5){z=-z;}
441 if (f==6){y=-y;}
442 return new LSL_Types.Quaternion(x, y, z, s);
443
415 } 444 }
416 445
417 public LSL_Types.Vector3 llRot2Fwd(LSL_Types.Quaternion r) 446 public LSL_Types.Vector3 llRot2Fwd(LSL_Types.Quaternion r)