From 18ec6d6380970c1aca9b4c0df22e3ed05197417b Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Mon, 26 Feb 2024 18:07:50 +0000 Subject: [PATCH] cosmetics --- .../Framework/Scenes/SceneObjectGroup.cs | 22 +----- .../Framework/Scenes/SceneObjectPart.cs | 15 +--- .../Shared/Api/Interface/IOSSL_Api.cs | 74 +++++++++---------- 3 files changed, 44 insertions(+), 67 deletions(-) diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index fa5f4d87c3..6a85c90507 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs @@ -4229,11 +4229,7 @@ namespace OpenSim.Region.Framework.Scenes return false; } - Vector3 newSize = RootPart.Scale; - newSize.X = (float)(newSize.X * fscale); - newSize.Y = (float)(newSize.Y * fscale); - newSize.Z = (float)(newSize.Z * fscale); - + Vector3 newSize = RootPart.Scale * (float)fscale; if(pa is not null) pa.Building = true; @@ -4243,20 +4239,10 @@ namespace OpenSim.Region.Framework.Scenes for (int i = 0; i < parts.Length; i++) { SceneObjectPart obPart = parts[i]; - - if (obPart.UUID != m_rootPart.UUID) + if (obPart != m_rootPart) { - currentpos = obPart.OffsetPosition; - currentpos.X = (float)(currentpos.X * fscale); - currentpos.Y = (float)(currentpos.Y * fscale); - currentpos.Z = (float)(currentpos.Z * fscale); - - newSize = obPart.Scale; - newSize.X = (float)(newSize.X * fscale); - newSize.Y = (float)(newSize.Y * fscale); - newSize.Z = (float)(newSize.Z * fscale); - - obPart.Scale = newSize; + obPart.Scale *= (float)fscale; + currentpos = obPart.OffsetPosition * (float)fscale; obPart.UpdateOffSet(currentpos); } } diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 2183f316f5..7ecd2625f0 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs @@ -1207,10 +1207,7 @@ namespace OpenSim.Region.Framework.Scenes { get { - if (_parentID == 0) - return GroupPosition; - - return GroupPosition + (m_offsetPosition * ParentGroup.RootPart.RotationOffset); + return _parentID == 0 ? GroupPosition : GroupPosition + m_offsetPosition * ParentGroup.RootPart.RotationOffset; } } @@ -4404,10 +4401,7 @@ namespace OpenSim.Region.Framework.Scenes public void UpdateGroupPosition(Vector3 newPos) { Vector3 oldPos = GroupPosition; - - if ((newPos.X != oldPos.X) || - (newPos.Y != oldPos.Y) || - (newPos.Z != oldPos.Z)) + if (oldPos.NotEqual(newPos)) { GroupPosition = newPos; ScheduleTerseUpdate(); @@ -4421,10 +4415,7 @@ namespace OpenSim.Region.Framework.Scenes public void UpdateOffSet(Vector3 newPos) { Vector3 oldPos = OffsetPosition; - - if ((newPos.X != oldPos.X) || - (newPos.Y != oldPos.Y) || - (newPos.Z != oldPos.Z)) + if (oldPos.NotEqual(newPos)) { if (ParentGroup.RootPart.GetStatusSandbox()) { diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs index d92f50c23f..251d6b37cc 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs @@ -544,52 +544,52 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces LSL_String osStringSubString(LSL_String src, LSL_Integer start); LSL_String osStringSubString(LSL_String src, LSL_Integer start, LSL_Integer length); - LSL_Integer osStringStartsWith(LSL_String src, LSL_String value, LSL_Integer ignorecase); - LSL_Integer osStringEndsWith(LSL_String src, LSL_String value, LSL_Integer ignorecase); - LSL_Integer osStringIndexOf(LSL_String src, LSL_String value, LSL_Integer ignorecase); - LSL_Integer osStringIndexOf(LSL_String src, LSL_String value, LSL_Integer start, LSL_Integer count, LSL_Integer ignorecase); - LSL_Integer osStringLastIndexOf(LSL_String src, LSL_String value, LSL_Integer ignorecase); - LSL_Integer osStringLastIndexOf(LSL_String src, LSL_String value, LSL_Integer start, LSL_Integer count, LSL_Integer ignorecase); + LSL_Integer osStringStartsWith(LSL_String src, LSL_String value, LSL_Integer ignorecase); + LSL_Integer osStringEndsWith(LSL_String src, LSL_String value, LSL_Integer ignorecase); + LSL_Integer osStringIndexOf(LSL_String src, LSL_String value, LSL_Integer ignorecase); + LSL_Integer osStringIndexOf(LSL_String src, LSL_String value, LSL_Integer start, LSL_Integer count, LSL_Integer ignorecase); + LSL_Integer osStringLastIndexOf(LSL_String src, LSL_String value, LSL_Integer ignorecase); + LSL_Integer osStringLastIndexOf(LSL_String src, LSL_String value, LSL_Integer start, LSL_Integer count, LSL_Integer ignorecase); LSL_String osStringRemove(LSL_String src, LSL_Integer start, LSL_Integer count); LSL_String osStringReplace(LSL_String src, LSL_String oldvalue, LSL_String newvalue); - LSL_Integer osApproxEquals(LSL_Float a, LSL_Float b); - LSL_Integer osApproxEquals(LSL_Float a, LSL_Float b, LSL_Float margin); - LSL_Integer osApproxEquals(vector va, vector vb); - LSL_Integer osApproxEquals(vector va, vector vb, LSL_Float margin); - LSL_Integer osApproxEquals(rotation ra, rotation rb); - LSL_Integer osApproxEquals(rotation ra, rotation rb, LSL_Float margin); + LSL_Integer osApproxEquals(LSL_Float a, LSL_Float b); + LSL_Integer osApproxEquals(LSL_Float a, LSL_Float b, LSL_Float margin); + LSL_Integer osApproxEquals(vector va, vector vb); + LSL_Integer osApproxEquals(vector va, vector vb, LSL_Float margin); + LSL_Integer osApproxEquals(rotation ra, rotation rb); + LSL_Integer osApproxEquals(rotation ra, rotation rb, LSL_Float margin); LSL_Key osGetInventoryLastOwner(LSL_String itemNameOrId); LSL_Key osGetInventoryItemKey(LSL_String name); LSL_Key osGetLinkInventoryKey(LSL_Integer linkNumber, LSL_String name); - LSL_String osGetInventoryName(LSL_Key itemId); - LSL_String osGetLinkInventoryName(LSL_Integer linkNumber, LSL_Key itemId); - LSL_String osGetInventoryDesc(LSL_String itemNameOrId); - LSL_String osGetLinkInventoryDesc(LSL_Integer linkNumber, LSL_String itemNameorid); - LSL_List osGetInventoryKeys(LSL_Integer type); - LSL_List osGetLinkInventoryKeys(LSL_Integer linkNumber, LSL_Integer type); - LSL_List osGetInventoryNames(LSL_Integer type); - LSL_List osGetLinkInventoryNames(LSL_Integer linkNumber, LSL_Integer type); - void osRemoveLinkInventory(LSL_Integer linkNumber, LSL_String name); - void osGiveLinkInventory(LSL_Integer linkNumber, LSL_Key destination, LSL_String inventory); - void osGiveLinkInventoryList(LSL_Integer linkNumber, LSL_Key destination, LSL_String category, LSL_List inventory); + LSL_String osGetInventoryName(LSL_Key itemId); + LSL_String osGetLinkInventoryName(LSL_Integer linkNumber, LSL_Key itemId); + LSL_String osGetInventoryDesc(LSL_String itemNameOrId); + LSL_String osGetLinkInventoryDesc(LSL_Integer linkNumber, LSL_String itemNameorid); + LSL_List osGetInventoryKeys(LSL_Integer type); + LSL_List osGetLinkInventoryKeys(LSL_Integer linkNumber, LSL_Integer type); + LSL_List osGetInventoryNames(LSL_Integer type); + LSL_List osGetLinkInventoryNames(LSL_Integer linkNumber, LSL_Integer type); + void osRemoveLinkInventory(LSL_Integer linkNumber, LSL_String name); + void osGiveLinkInventory(LSL_Integer linkNumber, LSL_Key destination, LSL_String inventory); + void osGiveLinkInventoryList(LSL_Integer linkNumber, LSL_Key destination, LSL_String category, LSL_List inventory); LSL_Key osGetLastChangedEventKey(); - LSL_Float osGetPSTWallclock(); - LSL_Rotation osSlerp(LSL_Rotation a, LSL_Rotation b, LSL_Float amount); - vector osSlerp(vector a, vector b, LSL_Float amount); + LSL_Float osGetPSTWallclock(); + LSL_Rotation osSlerp(LSL_Rotation a, LSL_Rotation b, LSL_Float amount); + vector osSlerp(vector a, vector b, LSL_Float amount); - void osResetAllScripts(LSL_Integer AllLinkset); - LSL_Integer osIsNotValidNumber(LSL_Float v); + void osResetAllScripts(LSL_Integer AllLinkset); + LSL_Integer osIsNotValidNumber(LSL_Float v); - void osSetSitActiveRange(LSL_Float v); - void osSetLinkSitActiveRange(LSL_Integer linkNumber, LSL_Float v); - LSL_Float osGetSitActiveRange(); - LSL_Float osGetLinkSitActiveRange(LSL_Integer linkNumber); - void osSetStandTarget(vector v); - void osSetLinkStandTarget(LSL_Integer linkNumber, vector v); - vector osGetStandTarget(); - vector osGetLinkStandTarget(LSL_Integer linkNumber); - LSL_Integer osClearObjectAnimations(); + void osSetSitActiveRange(LSL_Float v); + void osSetLinkSitActiveRange(LSL_Integer linkNumber, LSL_Float v); + LSL_Float osGetSitActiveRange(); + LSL_Float osGetLinkSitActiveRange(LSL_Integer linkNumber); + void osSetStandTarget(vector v); + void osSetLinkStandTarget(LSL_Integer linkNumber, vector v); + vector osGetStandTarget(); + vector osGetLinkStandTarget(LSL_Integer linkNumber); + LSL_Integer osClearObjectAnimations(); LSL_Float osGetApparentTime(); LSL_String osGetApparentTimeString(LSL_Integer format24);