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

set pbs shape acording to mesh number of (material) faces

melanie
UbitUmarov 2016-12-15 15:14:12 +00:00
parent 94a36396b1
commit 48efbeb8d3
3 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
View File

@ -994,7 +994,6 @@ namespace OpenSim.Region.ClientStack.Linden
pbs.TextureEntry = textureEntry.GetBytes(); pbs.TextureEntry = textureEntry.GetBytes();
bool hasmesh = false;
if (inner_instance_list.ContainsKey("mesh")) // seems to happen always but ... if (inner_instance_list.ContainsKey("mesh")) // seems to happen always but ...
{ {
int meshindx = inner_instance_list["mesh"].AsInteger(); int meshindx = inner_instance_list["mesh"].AsInteger();
@ -1004,10 +1003,34 @@ namespace OpenSim.Region.ClientStack.Linden
pbs.SculptType = (byte)SculptType.Mesh; pbs.SculptType = (byte)SculptType.Mesh;
pbs.SculptTexture = meshAssets[meshindx]; // actual asset UUID after meshs suport introduction pbs.SculptTexture = meshAssets[meshindx]; // actual asset UUID after meshs suport introduction
// data will be requested from asset on rez (i hope) // data will be requested from asset on rez (i hope)
hasmesh = true;
} }
} }
// faces number to pbs shape
switch(face_list.Count)
{
case 1:
case 2:
pbs.ProfileCurve = (byte)ProfileCurve.Circle;
pbs.PathCurve = (byte)PathCurve.Circle;
break;
case 3:
case 4:
pbs.ProfileCurve = (byte)ProfileCurve.Circle;
pbs.PathCurve = (byte)PathCurve.Line;
break;
case 5:
pbs.ProfileCurve = (byte)ProfileCurve.EqualTriangle;
pbs.PathCurve = (byte)PathCurve.Line;
break;
default:
pbs.ProfileCurve = (byte)ProfileCurve.Square;
pbs.PathCurve = (byte)PathCurve.Line;
break;
}
Vector3 position = inner_instance_list["position"].AsVector3(); Vector3 position = inner_instance_list["position"].AsVector3();
Quaternion rotation = inner_instance_list["rotation"].AsQuaternion(); Quaternion rotation = inner_instance_list["rotation"].AsQuaternion();
@ -1018,23 +1041,6 @@ namespace OpenSim.Region.ClientStack.Linden
// int material = inner_instance_list["material"].AsInteger(); // int material = inner_instance_list["material"].AsInteger();
byte material = (byte)Material.Wood; byte material = (byte)Material.Wood;
// no longer used - begin ------------------------
// int mesh = inner_instance_list["mesh"].AsInteger();
// OSDMap permissions = (OSDMap)inner_instance_list["permissions"];
// int base_mask = permissions["base_mask"].AsInteger();
// int everyone_mask = permissions["everyone_mask"].AsInteger();
// UUID creator_id = permissions["creator_id"].AsUUID();
// UUID group_id = permissions["group_id"].AsUUID();
// int group_mask = permissions["group_mask"].AsInteger();
// bool is_owner_group = permissions["is_owner_group"].AsBoolean();
// UUID last_owner_id = permissions["last_owner_id"].AsUUID();
// int next_owner_mask = permissions["next_owner_mask"].AsInteger();
// UUID owner_id = permissions["owner_id"].AsUUID();
// int owner_mask = permissions["owner_mask"].AsInteger();
// no longer used - end ------------------------
SceneObjectPart prim SceneObjectPart prim
= new SceneObjectPart(owner_id, pbs, position, Quaternion.Identity, Vector3.Zero); = new SceneObjectPart(owner_id, pbs, position, Quaternion.Identity, Vector3.Zero);

2
bin/OpenSim.ini.example
View File

@ -1160,7 +1160,7 @@
;; ProfileServiceURL = ${Const|BaseURL}:${Const|PublicPort} ;; ProfileServiceURL = ${Const|BaseURL}:${Const|PublicPort}
;# {AllowUserProfileWebURLs} {} {allow user profiles web urls} {true false} true ;# {AllowUserProfileWebURLs} {} {allow user profiles web urls} {true false} true
;; set this to false to prevent your users to be sent to unkown ;; set this to false to prevent your users to be sent to unknown
;; web sites by other users on their profiles ;; web sites by other users on their profiles
; AllowUserProfileWebURLs = true ; AllowUserProfileWebURLs = true

2
bin/OpenSimDefaults.ini
View File

@ -542,7 +542,7 @@
;; ;;
; ProfileURL = http://127.0.0.1:9000 ; ProfileURL = http://127.0.0.1:9000
;; set this to false to prevent your users to be sent to unkown ;; set this to false to prevent your users to be sent to unknown
;; web sites by other users on their profiles ;; web sites by other users on their profiles
; AllowUserProfileWebURLs = true ; AllowUserProfileWebURLs = true