Merging
This commit is contained in:
commit
5bc9f4e3d7
@ -400,6 +400,16 @@ namespace Axios.Engine
|
||||
/// </summary>
|
||||
/// <param name="circleitem"></param>
|
||||
/// <returns></returns>
|
||||
public virtual bool LoadCircleItem(CircleItem circleitem)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
public virtual bool LoadPathItem(PathItem pathitem)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
#if WINDOWS
|
||||
// System.Drawing is NOT avaiable on WP7 or Xbox
|
||||
/*
|
||||
|
@ -23,13 +23,15 @@ namespace Axios.Engine.Gleed2D
|
||||
{
|
||||
}
|
||||
|
||||
public override void load(ContentManager cm, World world, ref Dictionary<string, Texture2D> cache)
|
||||
public override void load(AxiosGameScreen gameScreen, ref Dictionary<string, Texture2D> cache)
|
||||
{
|
||||
base.load(cm, world, ref cache);
|
||||
|
||||
_body = BodyFactory.CreateCircle(world, Radius, 1f);
|
||||
_body.Position = ConvertUnits.ToSimUnits(Position);
|
||||
_body.UserData = this;
|
||||
base.load(gameScreen, ref cache);
|
||||
if (gameScreen.LoadCircleItem(this))
|
||||
{
|
||||
_body = BodyFactory.CreateCircle(gameScreen.World, Radius, 1f);
|
||||
_body.Position = ConvertUnits.ToSimUnits(Position);
|
||||
_body.UserData = this;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -49,8 +49,9 @@ namespace Axios.Engine.Gleed2D
|
||||
/// Called by Level.FromFile(filename) on each Item after the deserialization process.
|
||||
/// Should be overriden and can be used to load anything needed by the Item (e.g. a texture).
|
||||
/// </summary>
|
||||
public virtual void load(ContentManager cm, World world, ref Dictionary<string, Texture2D> cache)
|
||||
public virtual void load(AxiosGameScreen gameScreen, ref Dictionary<string, Texture2D> cache)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public virtual void draw(SpriteBatch sb)
|
||||
|
@ -54,7 +54,7 @@ namespace Axios.Engine.Gleed2D
|
||||
_world = world;
|
||||
}
|
||||
|
||||
public static Level FromFile(string filename, ContentManager cm, World world)
|
||||
public static Level FromFile(string filename, AxiosGameScreen gameScreen)
|
||||
{
|
||||
Dictionary<string, Texture2D> cache = new Dictionary<string, Texture2D>();
|
||||
FileStream stream = System.IO.File.Open(filename, FileMode.Open);
|
||||
@ -67,14 +67,14 @@ namespace Axios.Engine.Gleed2D
|
||||
foreach (Item item in layer.Items)
|
||||
{
|
||||
item.CustomProperties.RestoreItemAssociations(level);
|
||||
item.load(cm, world, ref cache);
|
||||
item.load(gameScreen, ref cache);
|
||||
}
|
||||
}
|
||||
|
||||
return level;
|
||||
}
|
||||
|
||||
public static Level FromStream(FileStream stream, ContentManager cm, World world)
|
||||
public static Level FromStream(FileStream stream, AxiosGameScreen gameScreen)
|
||||
{
|
||||
Dictionary<string, Texture2D> cache = new Dictionary<string, Texture2D>();
|
||||
XmlSerializer serializer = new XmlSerializer(typeof(Level));
|
||||
@ -86,7 +86,7 @@ namespace Axios.Engine.Gleed2D
|
||||
foreach (Item item in layer.Items)
|
||||
{
|
||||
item.CustomProperties.RestoreItemAssociations(level);
|
||||
item.load(cm, world, ref cache);
|
||||
item.load(gameScreen, ref cache);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -26,17 +26,19 @@ namespace Axios.Engine.Gleed2D
|
||||
{
|
||||
}
|
||||
|
||||
public override void load(ContentManager cm, World world, ref Dictionary<string, Texture2D> cache)
|
||||
public override void load(AxiosGameScreen gameScreen, ref Dictionary<string, Texture2D> cache)
|
||||
{
|
||||
base.load(cm, world, ref cache);
|
||||
base.load(gameScreen, ref cache);
|
||||
if (gameScreen.LoadPathItem(this))
|
||||
{
|
||||
Vertices v = new Vertices(LocalPoints.Length);
|
||||
foreach (Vector2 vec in LocalPoints)
|
||||
v.Add(new Vector2(ConvertUnits.ToSimUnits(vec.X), ConvertUnits.ToSimUnits(vec.Y)));
|
||||
|
||||
Vertices v = new Vertices(LocalPoints.Length);
|
||||
foreach (Vector2 vec in LocalPoints)
|
||||
v.Add(new Vector2(ConvertUnits.ToSimUnits(vec.X), ConvertUnits.ToSimUnits(vec.Y)));
|
||||
|
||||
_body = BodyFactory.CreateLoopShape(world, v);
|
||||
_body.Position = ConvertUnits.ToSimUnits(this.Position);
|
||||
_body.UserData = this;
|
||||
_body = BodyFactory.CreateLoopShape(gameScreen.World, v);
|
||||
_body.Position = ConvertUnits.ToSimUnits(this.Position);
|
||||
_body.UserData = this;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -24,11 +24,11 @@ namespace Axios.Engine.Gleed2D
|
||||
{
|
||||
}
|
||||
|
||||
public override void load(ContentManager cm, World world, ref Dictionary<string, Texture2D> cache)
|
||||
public override void load(AxiosGameScreen gameScreen, ref Dictionary<string, Texture2D> cache)
|
||||
{
|
||||
base.load(cm, world, ref cache);
|
||||
base.load(gameScreen, ref cache);
|
||||
|
||||
_body = BodyFactory.CreateRectangle(world, ConvertUnits.ToSimUnits(Width), ConvertUnits.ToSimUnits(Height), 1f);
|
||||
_body = BodyFactory.CreateRectangle(gameScreen.World, ConvertUnits.ToSimUnits(Width), ConvertUnits.ToSimUnits(Height), 1f);
|
||||
_body.Position = ConvertUnits.ToSimUnits(Position) + new Vector2(ConvertUnits.ToSimUnits(Width)/2, ConvertUnits.ToSimUnits(Height)/2);
|
||||
_body.UserData = this;
|
||||
}
|
||||
|
@ -77,7 +77,7 @@ namespace Axios.Engine.Gleed2D
|
||||
/// You must provide your own implementation. However, you can rely on all public fields being
|
||||
/// filled by the level deserialization process.
|
||||
/// </summary>
|
||||
public override void load(ContentManager cm, World world, ref Dictionary<string, Texture2D> cache)
|
||||
public override void load(AxiosGameScreen gameScreen, ref Dictionary<string, Texture2D> cache)
|
||||
{
|
||||
//throw new NotImplementedException();
|
||||
|
||||
@ -87,7 +87,7 @@ namespace Axios.Engine.Gleed2D
|
||||
//or by using the Content Pipeline:
|
||||
if (!cache.ContainsKey(asset_name))
|
||||
{
|
||||
cache[asset_name] = cm.Load<Texture2D>(asset_name);
|
||||
cache[asset_name] = gameScreen.ScreenManager.Game.Content.Load<Texture2D>(asset_name);
|
||||
}
|
||||
this.texture = cache[asset_name];
|
||||
//this.texture = cm.Load<Texture2D>(asset_name);
|
||||
|
Loading…
Reference in New Issue
Block a user