Ellpeck/MLEM
1
0
Fork 0
mirror of https://github.com/Ellpeck/MLEM.git synced 2024-11-26 06:28:35 +01:00
Code Issues Projects Releases Wiki Activity

cache UniformTextureAtlas texture straight away when checking for transparency

Browse source
This commit is contained in:
Ell 2022-05-27 11:19:29 +02:00
parent fdf04a7e77
commit 93a82bcf36
1 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
MLEM.Data/RuntimeTexturePacker.cs
View file

@ -71,7 +71,6 @@ namespace MLEM.Data {
/// <param name="ignoreTransparent">Whether completely transparent texture regions in the <paramref name="atlas"/> should be ignored. If this is true, they will not be part of the <paramref name="result"/> collection either.</param> /// <param name="ignoreTransparent">Whether completely transparent texture regions in the <paramref name="atlas"/> should be ignored. If this is true, they will not be part of the <paramref name="result"/> collection either.</param>
/// <exception cref="InvalidOperationException">Thrown when trying to add data to a packer that has already been packed, or when trying to add a texture width a width greater than the defined max width.</exception> /// <exception cref="InvalidOperationException">Thrown when trying to add data to a packer that has already been packed, or when trying to add a texture width a width greater than the defined max width.</exception>
public void Add(UniformTextureAtlas atlas, Action<Dictionary<Point, TextureRegion>> result, int padding = 0, bool padWithPixels = false, bool ignoreTransparent = false) { public void Add(UniformTextureAtlas atlas, Action<Dictionary<Point, TextureRegion>> result, int padding = 0, bool padWithPixels = false, bool ignoreTransparent = false) {
TextureData data = null;
var addedRegions = new List<TextureRegion>(); var addedRegions = new List<TextureRegion>();
var resultRegions = new Dictionary<Point, TextureRegion>(); var resultRegions = new Dictionary<Point, TextureRegion>();
for (var x = 0; x < atlas.RegionAmountX; x++) { for (var x = 0; x < atlas.RegionAmountX; x++) {
@ -80,9 +79,7 @@ namespace MLEM.Data {
var region = atlas[pos]; var region = atlas[pos];
if (ignoreTransparent) { if (ignoreTransparent) {
if (data == null) if (IsTransparent(region))
data = atlas.Texture.GetTextureData();
if (IsTransparent(region, data))
continue; continue;
} }
@ -255,13 +252,7 @@ namespace MLEM.Data {
} }
private void CopyRegion(TextureData destination, Request request) { private void CopyRegion(TextureData destination, Request request) {
// we cache texture data in case multiple requests use the same underlying texture var data = this.GetCachedTextureData(request.Texture.Texture);
// this collection doesn't need to be disposed since we don't actually edit these textures
if (!this.dataCache.TryGetValue(request.Texture.Texture, out var data)) {
data = request.Texture.Texture.GetTextureData();
this.dataCache.Add(request.Texture.Texture, data);
}
var location = request.PackedArea.Location + new Point(request.Padding); var location = request.PackedArea.Location + new Point(request.Padding);
for (var x = -request.Padding; x < request.Texture.Width + request.Padding; x++) { for (var x = -request.Padding; x < request.Texture.Width + request.Padding; x++) {
for (var y = -request.Padding; y < request.Texture.Height + request.Padding; y++) { for (var y = -request.Padding; y < request.Texture.Height + request.Padding; y++) {
@ -279,14 +270,18 @@ namespace MLEM.Data {
} }
} }
private static int ToPowerOfTwo(int value) { private TextureData GetCachedTextureData(Texture2D texture) {
var ret = 1; // we cache texture data in case multiple requests use the same underlying texture
while (ret < value) // this collection doesn't need to be disposed since we don't actually edit these textures
ret <<= 1; if (!this.dataCache.TryGetValue(texture, out var data)) {
return ret; data = texture.GetTextureData();
this.dataCache.Add(texture, data);
}
return data;
} }
private static bool IsTransparent(TextureRegion region, TextureData data) { private bool IsTransparent(TextureRegion region) {
var data = this.GetCachedTextureData(region.Texture);
for (var rX = 0; rX < region.Width; rX++) { for (var rX = 0; rX < region.Width; rX++) {
for (var rY = 0; rY < region.Height; rY++) { for (var rY = 0; rY < region.Height; rY++) {
if (data[region.U + rX, region.V + rY] != Color.Transparent) if (data[region.U + rX, region.V + rY] != Color.Transparent)
@ -296,6 +291,13 @@ namespace MLEM.Data {
return true; return true;
} }
private static int ToPowerOfTwo(int value) {
var ret = 1;
while (ret < value)
ret <<= 1;
return ret;
}
private class Request { private class Request {
public readonly TextureRegion Texture; public readonly TextureRegion Texture;