rebeccanod1/SecondBot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update BakeLayer.cs

Browse source
This commit is contained in:
Madpeterz 2021-02-16 07:52:27 +00:00
parent 3f54072665
commit 0d6e7cba4d
1 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
LibreMetaverse/Imaging/BakeLayer.cs
View file

@ -30,7 +30,6 @@ using System.Collections.Generic;
using System.IO; using System.IO;
using System.Drawing; using System.Drawing;
using OpenMetaverse.Assets; using OpenMetaverse.Assets;
using log4net;
namespace OpenMetaverse.Imaging namespace OpenMetaverse.Imaging
{ {
@ -329,9 +328,9 @@ namespace OpenMetaverse.Imaging
DrawLayer(texture, false); DrawLayer(texture, false);
} }
} }
} }
// Apply any alpha wearable textures to make parts of the avatar disappear // Apply any alpha wearable textures to make parts of the avatar disappear
Logger.Log("[XBakes]: Number of alpha wearable textures: " + alphaWearableTextures.Count.ToString(), Helpers.LogLevel.Debug); Logger.Log("[XBakes]: Number of alpha wearable textures: " + alphaWearableTextures.Count.ToString(), Helpers.LogLevel.Debug);
foreach (ManagedImage img in alphaWearableTextures) foreach (ManagedImage img in alphaWearableTextures)
AddAlpha(bakedTexture.Image, img); AddAlpha(bakedTexture.Image, img);
@ -462,6 +461,8 @@ namespace OpenMetaverse.Imaging
{ {
for (int x = 0; x < bakeWidth; x++) for (int x = 0; x < bakeWidth; x++)
{ {
alpha = 0;
alphaInv = 0;
if (sourceHasAlpha) if (sourceHasAlpha)
{ {
if (sourceAlpha.Length > i) if (sourceAlpha.Length > i)
@ -486,14 +487,22 @@ namespace OpenMetaverse.Imaging
if (addSourceAlpha) if (addSourceAlpha)
{ {
if (sourceAlpha[i] < bakedAlpha[i]) if ((sourceAlpha.Length > i) && (bakedAlpha.Length > i))
{ {
bakedAlpha[i] = sourceAlpha[i]; if (sourceAlpha[i] < bakedAlpha[i])
{
bakedAlpha[i] = sourceAlpha[i];
}
} }
} }
if (sourceHasBump) if (sourceHasBump)
bakedBump[i] = sourceBump[i]; {
if (sourceBump.Length > i)
{
bakedBump[i] = sourceBump[i];
}
}
++i; ++i;
} }