BTH/depthsbelow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into astar

Browse Source 
Conflicts:
	DepthsBelow/DepthsBelow/Core.cs
	DepthsBelow/DepthsBelow/MouseInput.cs
	DepthsBelow/DepthsBelowContent/maps/Cave.Level1.tmx
This commit is contained in:
Simon Holmberg
2012-09-29 00:45:30 +02:00
parent cf100c95f1 11b2af46ff
commit 2d71eb3e0a
8 changed files with 197 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DepthsBelow/DepthsBelowContentPipeline/MapProcessor.cs
+54 -6
View File
@@ -12,7 +12,7 @@ using TiledLib;
namespace DepthsBelowContentPipeline
{
// Each tile has a texture, source rect, and sprite effects.
[ContentSerializerRuntimeType("DepthsBelow.Tile, DepthsBelow")]
[ContentSerializerRuntimeType("DepthsBelow.MapTile, DepthsBelow")]
public class MapTileContent
{
public int LocalId;
@@ -21,15 +21,34 @@ namespace DepthsBelowContentPipeline
public SpriteEffects SpriteEffects;
}
[ContentSerializerRuntimeType("DepthsBelow.MapObject, DepthsBelow")]
public class MapObjectContent
{
//public MapObjectType ObjectType;
public string Name;
public string Type;
public Rectangle Bounds;
public List<Vector2> Points;
}
// For each layer, we store the size of the layer and the tiles.
[ContentSerializerRuntimeType("DepthsBelow.Layer, DepthsBelow")]
[ContentSerializerRuntimeType("DepthsBelow.MapLayer, DepthsBelow")]
public class MapLayerContent
{
public int Width;
public int Height;
public string Name;
}
[ContentSerializerRuntimeType("DepthsBelow.MapTileLayer, DepthsBelow")]
public class MapTileLayerContent : MapLayerContent
{
public MapTileContent[] Tiles;
}
[ContentSerializerRuntimeType("DepthsBelow.MapObjectLayer, DepthsBelow")]
public class MapObjectLayerContent : MapLayerContent
{
public MapObjectContent[] Objects;
}
// For the map itself, we just store the size, tile size, and a list of layers.
[ContentSerializerRuntimeType("DepthsBelow.Map, DepthsBelow")]
@@ -45,8 +64,6 @@ namespace DepthsBelowContentPipeline
{
public override MapContent Process(TiledLib.MapContent input, ContentProcessorContext context)
{
//System.Diagnostics.Debugger.Launch();
// build the textures
TiledHelpers.BuildTileSetTextures(input, context, "maps");
@@ -57,18 +74,49 @@ namespace DepthsBelowContentPipeline
MapContent output = new MapContent
{
TileWidth = input.TileWidth,
TileHeight = input.TileHeight
TileHeight = input.TileHeight,
};
// iterate all the layers of the input
foreach (LayerContent layer in input.Layers)
{
// Get layer objects
var molc = layer as TiledLib.MapObjectLayerContent;
if (molc != null)
{
//System.Diagnostics.Debugger.Launch();
// create the new layer
MapObjectLayerContent outLayer = new MapObjectLayerContent
{
Width = molc.Width,
Height = molc.Height,
Name = molc.Name
};
outLayer.Objects = new MapObjectContent[molc.Objects.Count];
for (int i = 0; i < molc.Objects.Count; i++)
{
var layerObject = molc.Objects[i];
outLayer.Objects[i] = new MapObjectContent
{
//ObjectType = layerObject.ObjectType,
Name = layerObject.Name,
Type = layerObject.Type,
Bounds = layerObject.Bounds,
Points = layerObject.Points
};
}
output.Layers.Add(outLayer);
}
// we only care about tile layers in our demo
TileLayerContent tlc = layer as TileLayerContent;
if (tlc != null)
{
// create the new layer
MapLayerContent outLayer = new MapLayerContent
MapTileLayerContent outLayer = new MapTileLayerContent
{
Width = tlc.Width,
Height = tlc.Height,