ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 03:45:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

== UUID.Zero is slow

Browse Source
This commit is contained in:
UbitUmarov
2022-01-09 00:33:16 +00:00
parent 357f20eb14
commit 7e0fc95c3a
26 changed files with 137 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
OpenSim/Region/OptionalModules/Materials/MaterialsModule.cs
View File

@@ -319,8 +319,8 @@ namespace OpenSim.Region.OptionalModules.Materials
if(fmat == null ||
( fmat.DiffuseAlphaMode == 1
&& fmat.NormalMapID == UUID.Zero
&& fmat.SpecularMapID == UUID.Zero))
&& fmat.NormalMapID.IsZero()
&& fmat.SpecularMapID.IsZero()))
continue;
fmat.ID = id;
@@ -383,7 +383,7 @@ namespace OpenSim.Region.OptionalModules.Materials
private bool GetStoredMaterialInFace(SceneObjectPart part, Primitive.TextureEntryFace face)
{
UUID id = face.MaterialID;
if (id == UUID.Zero)
if (id.IsZero())
return false;
OSDMap mat;
@@ -419,8 +419,8 @@ namespace OpenSim.Region.OptionalModules.Materials
if(fmat == null ||
(fmat.DiffuseAlphaMode == 1
&& fmat.NormalMapID == UUID.Zero
&& fmat.SpecularMapID == UUID.Zero))
&& fmat.NormalMapID.IsZero()
&& fmat.SpecularMapID.IsZero()))
{
face.MaterialID = UUID.Zero;
return true;
@@ -463,7 +463,7 @@ namespace OpenSim.Region.OptionalModules.Materials
private void RemoveMaterialInFace(Primitive.TextureEntryFace face)
{
UUID id = face.MaterialID;
if (id == UUID.Zero)
if (id.IsZero())
return;
lock (materialslock)
@@ -662,9 +662,8 @@ namespace OpenSim.Region.OptionalModules.Materials
{
newFaceMat = new FaceMaterial(mat);
if(newFaceMat.DiffuseAlphaMode == 1
&& newFaceMat.NormalMapID == UUID.Zero
&& newFaceMat.SpecularMapID == UUID.Zero
)
&& newFaceMat.NormalMapID.IsZero()
&& newFaceMat.SpecularMapID.IsZero())
id = UUID.Zero;
else
{
@@ -686,12 +685,12 @@ namespace OpenSim.Region.OptionalModules.Materials
sop.Shape.TextureEntry = te.GetBytes(9);
}
if(oldid != UUID.Zero)
if(!oldid.IsZero())
RemoveMaterial(oldid);
lock(materialslock)
{
if(id != UUID.Zero)
if(!id.IsZero())
{
if (m_Materials.ContainsKey(id))
m_MaterialsRefCount[id]++;
@@ -851,7 +850,7 @@ namespace OpenSim.Region.OptionalModules.Materials
public UUID AddNewMaterial(FaceMaterial fm)
{
if(fm.DiffuseAlphaMode == 1 && fm.NormalMapID == UUID.Zero && fm.SpecularMapID == UUID.Zero)
if(fm.DiffuseAlphaMode == 1 && fm.NormalMapID.IsZero() && fm.SpecularMapID.IsZero())
{
fm.ID = UUID.Zero;
return UUID.Zero;
@@ -875,7 +874,7 @@ namespace OpenSim.Region.OptionalModules.Materials
public void RemoveMaterial(UUID id)
{
if(id == UUID.Zero)
if(id.IsZero())
return;
lock(materialslock)