Skip to content

Commit

Permalink
refactor: shared assets
Browse files Browse the repository at this point in the history
  • Loading branch information
@cherrynik
cherrynik committed Jul 6, 2024
1 parent 5f26fd8 commit 00a8794
Show file tree
Hide file tree
Showing 32 changed files with 42,154 additions and 222 deletions.
0 src/Apps/GameDesktop/Content/Content.mgcb → Content/Content.mgcb
View file
File renamed without changes.
0 ...GameDesktop/Content/Objects/Bush.aseprite → Content/Objects/Bush.aseprite
View file
File renamed without changes.
0 ...Apps/GameDesktop/Content/Objects/Bush.png → Content/Objects/Bush.png
View file
File renamed without changes
0 ...s/GameDesktop/Content/Objects/Objects.tsx → Content/Objects/Objects.tsx
View file
File renamed without changes.
0 ...esktop/Content/Objects/SmallBush.aseprite → Content/Objects/SmallBush.aseprite
View file
File renamed without changes.
0 ...GameDesktop/Content/Objects/SmallBush.png → Content/Objects/SmallBush.png
View file
File renamed without changes
0 ...ameDesktop/Content/Objects/Stump.aseprite → Content/Objects/Stump.aseprite
View file
File renamed without changes.
0 ...pps/GameDesktop/Content/Objects/Stump.png → Content/Objects/Stump.png
View file
File renamed without changes
0 ...GameDesktop/Content/Objects/Tree.aseprite → Content/Objects/Tree.aseprite
View file
File renamed without changes.
0 ...Apps/GameDesktop/Content/Objects/Tree.png → Content/Objects/Tree.png
View file
File renamed without changes
0 ...GameDesktop/Content/SpriteSheets/Main.png → Content/SpriteSheets/Main.png
View file
File renamed without changes
0 ...ktop/Content/SpriteSheets/Player.aseprite → Content/SpriteSheets/Player.aseprite
View file
File renamed without changes.
0 ...ps/GameDesktop/Content/TileMaps/Test.ldtk → Content/TileMaps/Test.ldtk
View file
File renamed without changes.
4,209 changes: 4,209 additions & 0 deletions .../TileMaps/Test/backups/78186310-25d0-11ef-a4b2-f58f8a399958_2024-07-03_00-01-36/Test.ldtk
View file

Large diffs are not rendered by default.

4,209 changes: 4,209 additions & 0 deletions .../TileMaps/Test/backups/78186310-25d0-11ef-a4b2-f58f8a399958_2024-07-03_00-01-48/Test.ldtk
View file

Large diffs are not rendered by default.

4,209 changes: 4,209 additions & 0 deletions .../TileMaps/Test/backups/78186310-25d0-11ef-a4b2-f58f8a399958_2024-07-03_23-24-11/Test.ldtk
View file

Large diffs are not rendered by default.

4,023 changes: 4,023 additions & 0 deletions .../TileMaps/Test/backups/78186310-25d0-11ef-a4b2-f58f8a399958_2024-07-03_23-26-06/Test.ldtk
View file

Large diffs are not rendered by default.

4,209 changes: 4,209 additions & 0 deletions .../TileMaps/Test/backups/78186310-25d0-11ef-a4b2-f58f8a399958_2024-07-03_23-26-08/Test.ldtk
View file

Large diffs are not rendered by default.

4,209 changes: 4,209 additions & 0 deletions .../TileMaps/Test/backups/78186310-25d0-11ef-a4b2-f58f8a399958_2024-07-03_23-26-16/Test.ldtk
View file

Large diffs are not rendered by default.

4,209 changes: 4,209 additions & 0 deletions .../TileMaps/Test/backups/78186310-25d0-11ef-a4b2-f58f8a399958_2024-07-03_23-33-04/Test.ldtk
View file

Large diffs are not rendered by default.

4,209 changes: 4,209 additions & 0 deletions .../TileMaps/Test/backups/78186310-25d0-11ef-a4b2-f58f8a399958_2024-07-03_23-37-01/Test.ldtk
View file

Large diffs are not rendered by default.

4,209 changes: 4,209 additions & 0 deletions .../TileMaps/Test/backups/78186310-25d0-11ef-a4b2-f58f8a399958_2024-07-03_23-37-18/Test.ldtk
View file

Large diffs are not rendered by default.

4,209 changes: 4,209 additions & 0 deletions .../TileMaps/Test/backups/78186310-25d0-11ef-a4b2-f58f8a399958_2024-07-03_23-37-32/Test.ldtk
View file

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions MonoGame.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UI", "src\Libs\UI\UI.csproj
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Monogame.ImGuiNet", "src\Libs\External\MonoGame.ImGuiNet\MonoGame.ImGuiNet\Monogame.ImGuiNet.csproj", "{62A786A2-BC48-453E-8185-01A403B15159}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CompositionRoots", "src\Libs\CompositionRoots\CompositionRoots.csproj", "{53310E88-636A-4CA2-A1C8-D1C3FF8B5A61}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -102,6 +104,10 @@ Global
{62A786A2-BC48-453E-8185-01A403B15159}.Debug|Any CPU.Build.0 = Debug|Any CPU
{62A786A2-BC48-453E-8185-01A403B15159}.Release|Any CPU.ActiveCfg = Release|Any CPU
{62A786A2-BC48-453E-8185-01A403B15159}.Release|Any CPU.Build.0 = Release|Any CPU
{53310E88-636A-4CA2-A1C8-D1C3FF8B5A61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{53310E88-636A-4CA2-A1C8-D1C3FF8B5A61}.Debug|Any CPU.Build.0 = Debug|Any CPU
{53310E88-636A-4CA2-A1C8-D1C3FF8B5A61}.Release|Any CPU.ActiveCfg = Release|Any CPU
{53310E88-636A-4CA2-A1C8-D1C3FF8B5A61}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{5E3B6238-A92E-4703-8527-1C2410D7906A} = {F5258F7E-B0BA-466D-8CF8-4DAB84722BE3}
Expand All @@ -120,5 +126,6 @@ Global
{57F0A75A-5AD6-4187-9DC6-3CBA44333061} = {FC0D63F3-9B01-46BD-9435-A7E26C905825}
{B7BAA8DC-A62F-4746-B6C4-9908C0AFD30A} = {7AE4DC46-59EB-4F69-9240-C7363F0778AA}
{62A786A2-BC48-453E-8185-01A403B15159} = {FE9CE932-6F98-4455-A80F-2A0CDB6DB46E}
{53310E88-636A-4CA2-A1C8-D1C3FF8B5A61} = {7AE4DC46-59EB-4F69-9240-C7363F0778AA}
EndGlobalSection
EndGlobal
2 changes: 1 addition & 1 deletion src/Apps/GameDesktop/CompositionRoots/Components/ComponentsCompositionRoot.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ namespace GameDesktop.CompositionRoots.Components;

internal class ComponentsCompositionRoot : ICompositionRoot
{
private static readonly string PlayerSpriteSheetPath = System.IO.Path.Join(
private static readonly string PlayerSpriteSheetPath = Path.Join(
Environment.GetEnvironmentVariable(EnvironmentVariable.AppBaseDirectory),
Resources.SpriteSheet.Player);

Expand Down
1 change: 1 addition & 0 deletions src/Apps/GameDesktop/Content
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../Content
44 changes: 0 additions & 44 deletions src/Apps/GameDesktop/Content/TileSets/LegacyOfThought.tsx
View file

This file was deleted.

125 changes: 35 additions & 90 deletions src/Apps/GameDesktop/GameDesktop.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@

<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<RollForward>Major</RollForward>
Expand All @@ -12,8 +11,8 @@
<ApplicationIcon>Icon.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>
<None Remove="Icon.ico" />
<None Remove="Icon.bmp" />
<None Remove="Icon.ico"/>
<None Remove="Icon.bmp"/>
<None Update="appsettings.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
Expand All @@ -23,61 +22,10 @@
<None Update="appsettings.Production.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="Content\SpriteSheets\Player.aseprite">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="Content\Tiled\Objects\Objects.tsx">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="Content\TileMaps\Test.tmx">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="Content\TileSets\LegacyOfThought.tsx">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="Content\TileSets\Objects\Objects.tsx">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="Content\SpriteSheets\Main.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="Content\Objects\Bush.aseprite">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="Content\Objects\Bush.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="Content\Objects\Objects.tsx">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="Content\Objects\SmallBush.aseprite">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="Content\Objects\SmallBush.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="Content\Objects\Stump.aseprite">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="Content\Objects\Stump.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="Content\Objects\Tree.aseprite">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="Content\Objects\Tree.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="Content\TileMaps\Test.ldtk">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="Content\SpriteSheets\Sprite.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Icon.ico" />
<EmbeddedResource Include="Icon.bmp" />
<EmbeddedResource Include="Icon.ico"/>
<EmbeddedResource Include="Icon.bmp"/>
<EmbeddedResource Update="Resources\SpriteSheet.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>SpriteSheets.Designer.cs</LastGenOutput>
Expand All @@ -90,51 +38,48 @@
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>EnvironmentVariable.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Update="Resources\Internal\Matcher.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Matcher.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<PackageReference Include="LDtkMonogame" Version="1.3.2" />
<PackageReference Include="LightInject" Version="6.6.4" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
<PackageReference Include="MonoGame.Aseprite" Version="5.1.1" />
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.1.303" />
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.1.303" />
<PackageReference Include="Myra" Version="1.5.3" />
<PackageReference Include="Scellecs.Morpeh" Version="2023.1.0" />
<PackageReference Include="Sentry" Version="3.41.0" />
<PackageReference Include="Sentry.Serilog" Version="3.41.0" />
<PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.0" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
<PackageReference Include="LDtkMonogame" Version="1.3.2"/>
<PackageReference Include="LightInject" Version="6.6.4"/>
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0"/>
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0"/>
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.0"/>
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0"/>
<PackageReference Include="MonoGame.Aseprite" Version="5.1.1"/>
<PackageReference Include="MonoGame.Framework.DesktopGL" Version="3.8.1.303"/>
<PackageReference Include="MonoGame.Content.Builder.Task" Version="3.8.1.303"/>
<PackageReference Include="Myra" Version="1.5.3"/>
<PackageReference Include="Scellecs.Morpeh" Version="2023.1.0"/>
<PackageReference Include="Sentry" Version="3.41.0"/>
<PackageReference Include="Sentry.Serilog" Version="3.41.0"/>
<PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0"/>
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.0"/>
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0"/>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Libs\Components\Components.csproj" />
<ProjectReference Include="..\..\Libs\External\MonoGame.ImGuiNet\MonoGame.ImGuiNet\Monogame.ImGuiNet.csproj" />
<ProjectReference Include="..\..\Libs\Features\Features.csproj" />
<ProjectReference Include="..\..\Libs\Services\Services.csproj" />
<ProjectReference Include="..\..\Libs\Systems.Debugging\Systems.Debugging.csproj" />
<ProjectReference Include="..\..\Libs\UI\UI.csproj" />
<ProjectReference Include="..\..\Libs\Components\Components.csproj"/>
<ProjectReference Include="..\..\Libs\External\MonoGame.ImGuiNet\MonoGame.ImGuiNet\Monogame.ImGuiNet.csproj"/>
<ProjectReference Include="..\..\Libs\Features\Features.csproj"/>
<ProjectReference Include="..\..\Libs\Services\Services.csproj"/>
<ProjectReference Include="..\..\Libs\Systems.Debugging\Systems.Debugging.csproj"/>
<ProjectReference Include="..\..\Libs\UI\UI.csproj"/>
</ItemGroup>
<ItemGroup>
<Compile Update="Resources\SpriteSheet.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>SpriteSheet.resx</DependentUpon>
</Compile>
<Compile Update="Resources\Internal\Matcher.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>Matcher.resx</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<Content Include="..\..\..\Content\**\*.*">
<Link>Content\%(RecursiveDir)%(FileName)%(Extension)</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
<Target Name="RestoreDotnetTools" BeforeTargets="Restore">
<Message Text="Restoring dotnet tools" Importance="High" />
<Exec Command="dotnet tool restore" />
<Message Text="Restoring dotnet tools" Importance="High"/>
<Exec Command="dotnet tool restore"/>
</Target>
</Project>
60 changes: 0 additions & 60 deletions src/Apps/GameDesktop/Resources/Internal/Matcher.Designer.cs
View file

This file was deleted.

27 changes: 0 additions & 27 deletions src/Apps/GameDesktop/Resources/Internal/Matcher.resx
View file

This file was deleted.

Loading

0 comments on commit 00a8794

Please sign in to comment.