OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Add the second version of the experimental ObjectAdd Cap. It will handle both versions currently.

0.6.3-post-fixes
Teravus Ovares 2009-02-05 13:43:36 +00:00
parent 8f31210432
commit 2a998d6cd7
1 changed files with 145 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

182
OpenSim/Region/Environment/Modules/Avatar/ObjectCaps/ObjectAdd.cs
View File

@ -62,7 +62,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.ObjectCaps
{ {
UUID capuuid = UUID.Random(); UUID capuuid = UUID.Random();
//m_log.InfoFormat("[OBJECTADD]: {0}", "/CAPS/OA/" + capuuid + "/"); m_log.InfoFormat("[OBJECTADD]: {0}", "/CAPS/OA/" + capuuid + "/");
caps.RegisterHandler("ObjectAdd", caps.RegisterHandler("ObjectAdd",
new RestHTTPHandler("POST", "/CAPS/OA/" + capuuid + "/", new RestHTTPHandler("POST", "/CAPS/OA/" + capuuid + "/",
@ -92,7 +92,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.ObjectCaps
uint group_mask = 0; uint group_mask = 0;
uint next_owner_mask = 0; uint next_owner_mask = 0;
uint flags = 0; uint flags = 0;
UUID group_id; UUID group_id = UUID.Zero;
int hollow = 0; int hollow = 0;
int material = 0; int material = 0;
int p_code = 0; int p_code = 0;
@ -126,42 +126,150 @@ namespace OpenSim.Region.Environment.Modules.Avatar.ObjectCaps
OSDMap rm = (OSDMap)r; OSDMap rm = (OSDMap)r;
bypass_raycast = rm["bypass_raycast"].AsBoolean(); if (rm.ContainsKey("ObjectData")) //v2
{
if (rm["ObjectData"].Type != OSDType.Map)
{
responsedata["str_response_string"] = "Has ObjectData key, but data not in expected format";
return responsedata;
}
everyone_mask = readuintval(rm["everyone_mask"]); OSDMap ObjMap = (OSDMap) rm["ObjectData"];
flags = readuintval(rm["flags"]);
group_id = rm["group_id"].AsUUID(); bypass_raycast = ObjMap["BypassRaycast"].AsBoolean();
group_mask = readuintval(rm["group_mask"]); everyone_mask = readuintval(ObjMap["EveryoneMask"]);
hollow = rm["hollow"].AsInteger(); flags = readuintval(ObjMap["Flags"]);
material = rm["material"].AsInteger(); group_mask = readuintval(ObjMap["GroupMask"]);
next_owner_mask = readuintval(rm["next_owner_mask"]); material = ObjMap["Material"].AsInteger();
hollow = rm["hollow"].AsInteger(); next_owner_mask = readuintval(ObjMap["NextOwnerMask"]);
p_code= rm["p_code"].AsInteger(); p_code = ObjMap["PCode"].AsInteger();
path_begin = rm["path_begin"].AsInteger();
path_curve = rm["path_curve"].AsInteger(); if (ObjMap.ContainsKey("Path"))
path_end = rm["path_end"].AsInteger(); {
path_radius_offset = rm["path_radius_offset"].AsInteger(); if (ObjMap["Path"].Type != OSDType.Map)
path_revolutions = rm["path_revolutions"].AsInteger(); {
path_scale_x = rm["path_scale_x"].AsInteger(); responsedata["str_response_string"] = "Has Path key, but data not in expected format";
path_scale_y = rm["path_scale_y"].AsInteger(); return responsedata;
path_shear_x = rm["path_shear_x"].AsInteger(); }
path_shear_y = rm["path_shear_y"].AsInteger();
path_skew = rm["path_skew"].AsInteger(); OSDMap PathMap = (OSDMap)ObjMap["Path"];
path_taper_x = rm["path_taper_x"].AsInteger(); path_begin = PathMap["Begin"].AsInteger();
path_taper_y = rm["path_taper_y"].AsInteger(); path_curve = PathMap["Curve"].AsInteger();
path_twist = rm["path_twist"].AsInteger(); path_end = PathMap["End"].AsInteger();
path_twist_begin = rm["path_twist_begin"].AsInteger(); path_radius_offset = PathMap["RadiusOffset"].AsInteger();
profile_begin = rm["profile_begin"].AsInteger(); path_revolutions = PathMap["Revolutions"].AsInteger();
profile_curve = rm["profile_curve"].AsInteger(); path_scale_x = PathMap["ScaleX"].AsInteger();
profile_end = rm["profile_end"].AsInteger(); path_scale_y = PathMap["ScaleY"].AsInteger();
ray_end = ((OSDArray) rm["ray_end"]).AsVector3(); path_shear_x = PathMap["ShearX"].AsInteger();
ray_end_is_intersection = rm["ray_end_is_intersection"].AsBoolean(); path_shear_y = PathMap["ShearY"].AsInteger();
ray_start = ((OSDArray) rm["ray_start"]).AsVector3(); path_skew = PathMap["Skew"].AsInteger();
ray_target_id = rm["ray_target_id"].AsUUID(); path_taper_x = PathMap["TaperX"].AsInteger();
rotation = ((OSDArray) rm["rotation"]).AsQuaternion(); path_taper_y = PathMap["TaperY"].AsInteger();
scale = ((OSDArray)rm["scale"]).AsVector3(); path_twist = PathMap["Twist"].AsInteger();
session_id = rm["session_id"].AsUUID(); path_twist_begin = PathMap["TwistBegin"].AsInteger();
state = rm["state"].AsInteger();
}
if (ObjMap.ContainsKey("Profile"))
{
if (ObjMap["Profile"].Type != OSDType.Map)
{
responsedata["str_response_string"] = "Has Profile key, but data not in expected format";
return responsedata;
}
OSDMap ProfileMap = (OSDMap)ObjMap["Profile"];
profile_begin = ProfileMap["Begin"].AsInteger();
profile_curve = ProfileMap["Curve"].AsInteger();
profile_end = ProfileMap["End"].AsInteger();
hollow = ProfileMap["Hollow"].AsInteger();
}
ray_end_is_intersection = ObjMap["RayEndIsIntersection"].AsBoolean();
ray_target_id = ObjMap["RayTargetId"].AsUUID();
state = ObjMap["State"].AsInteger();
try
{
ray_end = ((OSDArray) ObjMap["RayEnd"]).AsVector3();
ray_start = ((OSDArray) ObjMap["RayStart"]).AsVector3();
scale = ((OSDArray) ObjMap["Scale"]).AsVector3();
rotation = ((OSDArray)ObjMap["Rotation"]).AsQuaternion();
}
catch (Exception)
{
responsedata["str_response_string"] = "RayEnd, RayStart, Scale or Rotation wasn't in the expected format";
return responsedata;
}
if (rm.ContainsKey("AgentData"))
{
if (rm["AgentData"].Type != OSDType.Map)
{
responsedata["str_response_string"] = "Has AgentData key, but data not in expected format";
return responsedata;
}
OSDMap AgentDataMap = (OSDMap) rm["AgentData"];
session_id = AgentDataMap["SessionId"].AsUUID();
group_id = AgentDataMap["GroupId"].AsUUID();
}
}
else
{ //v1
bypass_raycast = rm["bypass_raycast"].AsBoolean();
everyone_mask = readuintval(rm["everyone_mask"]);
flags = readuintval(rm["flags"]);
group_id = rm["group_id"].AsUUID();
group_mask = readuintval(rm["group_mask"]);
hollow = rm["hollow"].AsInteger();
material = rm["material"].AsInteger();
next_owner_mask = readuintval(rm["next_owner_mask"]);
hollow = rm["hollow"].AsInteger();
p_code = rm["p_code"].AsInteger();
path_begin = rm["path_begin"].AsInteger();
path_curve = rm["path_curve"].AsInteger();
path_end = rm["path_end"].AsInteger();
path_radius_offset = rm["path_radius_offset"].AsInteger();
path_revolutions = rm["path_revolutions"].AsInteger();
path_scale_x = rm["path_scale_x"].AsInteger();
path_scale_y = rm["path_scale_y"].AsInteger();
path_shear_x = rm["path_shear_x"].AsInteger();
path_shear_y = rm["path_shear_y"].AsInteger();
path_skew = rm["path_skew"].AsInteger();
path_taper_x = rm["path_taper_x"].AsInteger();
path_taper_y = rm["path_taper_y"].AsInteger();
path_twist = rm["path_twist"].AsInteger();
path_twist_begin = rm["path_twist_begin"].AsInteger();
profile_begin = rm["profile_begin"].AsInteger();
profile_curve = rm["profile_curve"].AsInteger();
profile_end = rm["profile_end"].AsInteger();
ray_end_is_intersection = rm["ray_end_is_intersection"].AsBoolean();
ray_target_id = rm["ray_target_id"].AsUUID();
session_id = rm["session_id"].AsUUID();
state = rm["state"].AsInteger();
try
{
ray_end = ((OSDArray)rm["ray_end"]).AsVector3();
ray_start = ((OSDArray)rm["ray_start"]).AsVector3();
rotation = ((OSDArray)rm["rotation"]).AsQuaternion();
scale = ((OSDArray)rm["scale"]).AsVector3();
}
catch (Exception)
{
responsedata["str_response_string"] = "RayEnd, RayStart, Scale or Rotation wasn't in the expected format";
return responsedata;
}
}
Vector3 pos = m_scene.GetNewRezLocation(ray_start, ray_end, ray_target_id, rotation, (bypass_raycast) ? (byte)1 : (byte)0, (ray_end_is_intersection) ? (byte)1 : (byte)0, true, scale, false); Vector3 pos = m_scene.GetNewRezLocation(ray_start, ray_end, ray_target_id, rotation, (bypass_raycast) ? (byte)1 : (byte)0, (ray_end_is_intersection) ? (byte)1 : (byte)0, true, scale, false);