From 420f134654ec66155c8022f6abb9c80b4bdc1074 Mon Sep 17 00:00:00 2001 From: gered Date: Wed, 28 Aug 2013 23:26:02 -0400 Subject: [PATCH] type changes --- .../TileMap/Meshes/Json/JsonCubeTextures.cs | 12 ++++++------ .../TileMap/Meshes/Json/JsonTileDefinition.cs | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Blarg.GameFramework/TileMap/Meshes/Json/JsonCubeTextures.cs b/Blarg.GameFramework/TileMap/Meshes/Json/JsonCubeTextures.cs index a072a55..39830a2 100644 --- a/Blarg.GameFramework/TileMap/Meshes/Json/JsonCubeTextures.cs +++ b/Blarg.GameFramework/TileMap/Meshes/Json/JsonCubeTextures.cs @@ -4,12 +4,12 @@ namespace Blarg.GameFramework.TileMap.Meshes.Json { public class JsonCubeTextures { - public int Top; - public int Bottom; - public int Front; - public int Back; - public int Left; - public int Right; + public int? Top; + public int? Bottom; + public int? Front; + public int? Back; + public int? Left; + public int? Right; } } diff --git a/Blarg.GameFramework/TileMap/Meshes/Json/JsonTileDefinition.cs b/Blarg.GameFramework/TileMap/Meshes/Json/JsonTileDefinition.cs index 6bc88b6..296ff8a 100644 --- a/Blarg.GameFramework/TileMap/Meshes/Json/JsonTileDefinition.cs +++ b/Blarg.GameFramework/TileMap/Meshes/Json/JsonTileDefinition.cs @@ -8,20 +8,20 @@ namespace Blarg.GameFramework.TileMap.Meshes.Json { public bool Cube; public JsonCubeTextures Textures; - public int Texture; + public int? Texture; public List Faces; public string Model; public List Models; public string CollisionModel; public string CollisionShape; public List OpaqueSides; - public int Light; + public byte Light; public bool Alpha; public float Translucency; - public Color Color; - public Vector3 ScaleToSize; - public Vector3 PositionOffset; - public Vector3 CollisionPositionOffset; + public Color? Color; + public Vector3? ScaleToSize; + public Vector3? PositionOffset; + public Vector3? CollisionPositionOffset; } }