ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 00:46:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

* A bit of spice from here, a pinch of salt from there, some brains that attracts zombies.. a recipe for llRezObject

Browse Source 
* Original patch by YZh Thanks YZH!!!!
* object_rez event patch by Melanie, Thanks Melanie!!!
* Some fixups, some missing things(velocity,rotation)
* script delay
* Recoil
* Standard error messages
* Standard silent failures
* Easter egg management
This commit is contained in:
Teravus Ovares
2008-05-05 00:03:30 +00:00
parent 7b446aba91
commit 1130c3067c
6 changed files with 133 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs
View File

@@ -697,9 +697,9 @@ namespace OpenSim.Region.ScriptEngine.Common
m_LSL_Functions.llMakeFire();
}
public void llRezObject(string inventory, vector pos, rotation rot, int param)
public void llRezObject(string inventory, vector pos, vector vel, rotation rot, int param)
{
m_LSL_Functions.llRezObject(inventory, pos, rot, param);
m_LSL_Functions.llRezObject(inventory, pos, vel, rot, param);
}
public void llLookAt(vector target, double strength, double damping)

56
OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
View File

@@ -1839,10 +1839,62 @@ namespace OpenSim.Region.ScriptEngine.Common
NotImplemented("llMakeFire");
}
public void llRezObject(string inventory, LSL_Types.Vector3 pos, LSL_Types.Quaternion rot, int param)
public void llRezObject(string inventory, LSL_Types.Vector3 pos, LSL_Types.Vector3 vel, LSL_Types.Quaternion rot, int param)
{
m_host.AddScriptLPS(1);
NotImplemented("llRezObject");
//NotImplemented("llRezObject");
bool found = false;
// Instead of using return;, I'm using continue; because in our TaskInventory implementation
// it's possible to have two items with the same task inventory name.
// this is an easter egg of sorts.
foreach (KeyValuePair<LLUUID, TaskInventoryItem> inv in m_host.TaskInventory)
{
if (inv.Value.Name == inventory)
{
// make sure we're an object.
if (inv.Value.InvType != (int)InventoryType.Object)
{
llSay(0, "Unable to create requested object. Object is missing from database.");
continue;
}
LLVector3 llpos = new LLVector3((float)pos.x, (float)pos.y, (float)pos.z);
// test if we're further away then 10m
if (Util.GetDistanceTo(llpos, m_host.AbsolutePosition) > 10)
return; // wiki says, if it's further away then 10m, silently fail.
LLVector3 llvel = new LLVector3((float)vel.x, (float)vel.y, (float)vel.z);
// need the magnitude later
float velmag = (float)Util.GetMagnitude(llvel);
SceneObjectGroup new_group = World.RezObject(inv.Value, llpos, new LLQuaternion((float)rot.x, (float)rot.y, (float)rot.z, (float)rot.s), llvel, param);
// If either of these are null, then there was an unknown error.
if (new_group == null)
continue;
if (new_group.RootPart == null)
continue;
// objects rezzed with this method are die_at_edge by default.
new_group.RootPart.SetDieAtEdge(true);
m_ScriptEngine.m_EventQueueManager.AddToScriptQueue(m_localID, m_itemID, "object_rez", EventQueueManager.llDetectNull, new Object[] { new LSL_Types.LSLString(new_group.RootPart.UUID.ToString()) });
float groupmass = new_group.GetMass();
//Recoil.
llApplyImpulse(new LSL_Types.Vector3(llvel.X * groupmass, llvel.Y * groupmass, llvel.Z * groupmass), 0);
found = true;
//script delay
System.Threading.Thread.Sleep((int)((groupmass * velmag) / 10));
break;
}
}
if (!found)
llSay(0, "Could not find object " + inventory);
}
public void llLookAt(LSL_Types.Vector3 target, double strength, double damping)

2
OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands_Interface.cs
View File

@@ -190,7 +190,7 @@ namespace OpenSim.Region.ScriptEngine.Common
//wiki: (deprecated)
void llMakeFire();
//wiki: llRezObject(string inventory, vector pos, vector rel, rotation rot, integer param)
void llRezObject(string inventory, LSL_Types.Vector3 pos, LSL_Types.Quaternion rot, int param);
void llRezObject(string inventory, LSL_Types.Vector3 pos, LSL_Types.Vector3 vel, LSL_Types.Quaternion rot, int param);
//wiki: llLookAt(vector target, double strength, double damping)
void llLookAt(LSL_Types.Vector3 target, double strength, double damping);
//wiki: llStopLookAt()