gered/Blarg.GameFramework
Archived
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

move texture atlas json deserializing classes into separate namespace

Browse source 
For consistency with how we laid out the json deserializing stuff for
tile mesh collections
This commit is contained in:
Gered 2013-08-28 23:42:52 -04:00
parent ff46db9d90
commit 7435ccfaed
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Blarg.GameFramework/Blarg.GameFramework.csproj
View file

@ -189,9 +189,6 @@
<Compile Include="Graphics\Atlas\AutoGridTextureAtlas.cs" />
<Compile Include="Graphics\Atlas\TextureAtlasAnimator.cs" />
<Compile Include="Graphics\Atlas\TextureAtlasTileAnimation.cs" />
<Compile Include="Graphics\Atlas\JsonTextureAtlasDefinition.cs" />
<Compile Include="Graphics\Atlas\JsonTextureAtlasTile.cs" />
<Compile Include="Graphics\Atlas\TextureAtlasLoader.cs" />
<Compile Include="ServiceLocatorException.cs" />
<Compile Include="ConfigFileException.cs" />
<Compile Include="Content\ContentManagementException.cs" />
@ -218,6 +215,9 @@
<Compile Include="TileMap\Meshes\Json\JsonTileMeshCollection.cs" />
<Compile Include="TileMap\Meshes\Json\JsonTileSubModel.cs" />
<Compile Include="TileMap\Meshes\Json\TileMeshCollectionLoader.cs" />
<Compile Include="Graphics\Atlas\Json\JsonTextureAtlasDefinition.cs" />
<Compile Include="Graphics\Atlas\Json\JsonTextureAtlasTile.cs" />
<Compile Include="Graphics\Atlas\Json\TextureAtlasLoader.cs" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
<ItemGroup>
@ -247,6 +247,7 @@
<Folder Include="TileMap\Lighting\" />
<Folder Include="TileMap\Prefabs\" />
<Folder Include="TileMap\Meshes\Json\" />
<Folder Include="Graphics\Atlas\Json\" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\Fonts\Vera.ttf" />

2
Blarg.GameFramework/Graphics/Atlas/JsonTextureAtlasDefinition.cs → Blarg.GameFramework/Graphics/Atlas/Json/JsonTextureAtlasDefinition.cs
View file

@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
namespace Blarg.GameFramework.Graphics.Atlas
namespace Blarg.GameFramework.Graphics.Atlas.Json
{
public class JsonTextureAtlasDefinition
{

2
Blarg.GameFramework/Graphics/Atlas/JsonTextureAtlasTile.cs → Blarg.GameFramework/Graphics/Atlas/Json/JsonTextureAtlasTile.cs
View file

@ -1,6 +1,6 @@
using System;
namespace Blarg.GameFramework.Graphics.Atlas
namespace Blarg.GameFramework.Graphics.Atlas.Json
{
public class JsonTextureAtlasTile
{

2
Blarg.GameFramework/Graphics/Atlas/TextureAtlasLoader.cs → Blarg.GameFramework/Graphics/Atlas/Json/TextureAtlasLoader.cs
View file

@ -4,7 +4,7 @@ using Newtonsoft.Json;
using Blarg.GameFramework.Content;
using Blarg.GameFramework.IO;
namespace Blarg.GameFramework.Graphics.Atlas
namespace Blarg.GameFramework.Graphics.Atlas.Json
{
public static class TextureAtlasLoader
{