progtime/DangerousD
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

LastTestVersionOfAnimator

Browse source
This commit is contained in:
Timofey06 2023-08-14 18:13:46 +03:00
parent 6981ef36f1
commit b24cdd95a6
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
DangerousD.sln
View file

@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DangerousD", "DangerousD\Da
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AnimationsFileCreator", "AnimationsFileCreator\AnimationsFileCreator.csproj", "{CE9485FC-F4C6-4E0D-8B8E-1843AA20CEDE}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AnimationsFileCreator", "AnimationsFileCreator\AnimationsFileCreator.csproj", "{CE9485FC-F4C6-4E0D-8B8E-1843AA20CEDE}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonogameLibrary", "MonogameLibrary\MonogameLibrary.csproj", "{52ED99EF-9769-4587-8BD8-54D6B98E3E7E}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MonogameLibrary", "MonogameLibrary\MonogameLibrary.csproj", "{52ED99EF-9769-4587-8BD8-54D6B98E3E7E}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -19,6 +19,14 @@ Global
{1FC12F81-0E55-4142-83BD-23496EF29DC6}.Debug|Any CPU.Build.0 = Debug|Any CPU {1FC12F81-0E55-4142-83BD-23496EF29DC6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1FC12F81-0E55-4142-83BD-23496EF29DC6}.Release|Any CPU.ActiveCfg = Release|Any CPU {1FC12F81-0E55-4142-83BD-23496EF29DC6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1FC12F81-0E55-4142-83BD-23496EF29DC6}.Release|Any CPU.Build.0 = Release|Any CPU {1FC12F81-0E55-4142-83BD-23496EF29DC6}.Release|Any CPU.Build.0 = Release|Any CPU
{CE9485FC-F4C6-4E0D-8B8E-1843AA20CEDE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CE9485FC-F4C6-4E0D-8B8E-1843AA20CEDE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CE9485FC-F4C6-4E0D-8B8E-1843AA20CEDE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CE9485FC-F4C6-4E0D-8B8E-1843AA20CEDE}.Release|Any CPU.Build.0 = Release|Any CPU
{52ED99EF-9769-4587-8BD8-54D6B98E3E7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{52ED99EF-9769-4587-8BD8-54D6B98E3E7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{52ED99EF-9769-4587-8BD8-54D6B98E3E7E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{52ED99EF-9769-4587-8BD8-54D6B98E3E7E}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

6
DangerousD/GameCore/Graphics/GraphicsComponent.cs
View file

@ -26,7 +26,7 @@ namespace DangerousD.GameCore.Graphics
lastInterval = 1; lastInterval = 1;
lastAnimationId = null; lastAnimationId = null;
LoadAnimations(animationsId); LoadAnimations(animationsId);
LoadTextures();
} }
private void LoadAnimations(List<string> animationsId) private void LoadAnimations(List<string> animationsId)
@ -37,7 +37,7 @@ namespace DangerousD.GameCore.Graphics
animations.Add( GameManager.builder.animations.Find(x => x.Id == id)); animations.Add( GameManager.builder.animations.Find(x => x.Id == id));
} }
} }
private void LoadTextures() public void LoadContent(ContentManager content)
{ {
textures = new List<Texture2D>(); textures = new List<Texture2D>();
texturesNames = new List<string>(); texturesNames = new List<string>();
@ -47,7 +47,7 @@ namespace DangerousD.GameCore.Graphics
if (!texturesNames.Contains(animation.TextureName)) if (!texturesNames.Contains(animation.TextureName))
{ {
texturesNames.Add(animation.TextureName); texturesNames.Add(animation.TextureName);
textures.Add(TextureManager.GetTexture(animation.TextureName)); textures.Add(content.Load<Texture2D>(animation.TextureName));
} }
} }