amacocian/MonoGame.Extended
1
0
Fork 0
mirror of https://github.com/AlexMacocian/MonoGame.Extended.git synced 2026-07-21 01:39:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #746 from merthsoft/develop

Browse Source 
Resolve relative path of texture in TextureAtlasJsonConverter
This commit is contained in:
Lucas Girouard-Stranks
2021-09-09 21:23:13 -04:00
committed by GitHub
parent 2009adb168 214e960ebc
commit 1d8ea44edf
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cs/MonoGame.Extended/TextureAtlases/TextureAtlasJsonConverter.cs
+7 -5
View File
@@ -48,12 +48,14 @@ namespace MonoGame.Extended.TextureAtlases
// TODO: When we get to .NET Standard 2.1 it would be more robust to use // TODO: When we get to .NET Standard 2.1 it would be more robust to use
// [Path.GetRelativePath](https://docs.microsoft.com/en-us/dotnet/api/system.io.path.getrelativepath?view=netstandard-2.1) // [Path.GetRelativePath](https://docs.microsoft.com/en-us/dotnet/api/system.io.path.getrelativepath?view=netstandard-2.1)
var textureName = Path.GetFileNameWithoutExtension(metadata.Texture);
var textureDirectory = Path.GetDirectoryName(metadata.Texture);
var directory = Path.GetDirectoryName(_path); var directory = Path.GetDirectoryName(_path);
var relativeAssetName = Path.Combine(directory, metadata.Texture); var relativePath = Path.Combine(_contentManager.RootDirectory, directory, textureDirectory, textureName);
var assetName = Path.Combine(directory, Path.GetFileNameWithoutExtension(relativeAssetName)); var resolvedAssetName = Path.GetFullPath(relativePath);
var texture = _contentManager.Load<Texture2D>(assetName); var texture = _contentManager.Load<Texture2D>(resolvedAssetName);
return TextureAtlas.Create(assetName, texture, metadata.RegionWidth, metadata.RegionHeight); return TextureAtlas.Create(resolvedAssetName, texture, metadata.RegionWidth, metadata.RegionHeight);
} }
} }
@@ -68,4 +70,4 @@ namespace MonoGame.Extended.TextureAtlases
return objectType == typeof(TextureAtlas); return objectType == typeof(TextureAtlas);
} }
} }
} }