epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor RenderEditorOnly into RenderSpritesEditorOnly + WithSpriteBody

Browse Source
This commit is contained in:
reaperrr
2015-07-16 14:52:12 +02:00
parent fe346e5401
commit 2e9a4b78a3
7 changed files with 52 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
View File

@@ -404,7 +404,7 @@
<Compile Include="Traits\Render\RenderBuilding.cs" />
<Compile Include="Traits\Render\RenderBuildingCharge.cs" />
<Compile Include="Traits\Render\RenderBuildingTurreted.cs" />
<Compile Include="Traits\Render\RenderEditorOnly.cs" />
<Compile Include="Traits\Render\RenderSpritesEditorOnly.cs" />
<Compile Include="Traits\Render\RenderNameTag.cs" />
<Compile Include="Traits\Render\RenderSimple.cs" />
<Compile Include="Traits\Render\RenderSprites.cs" />

10
OpenRA.Mods.Common/Traits/Render/RenderEditorOnly.cs → OpenRA.Mods.Common/Traits/Render/RenderSpritesEditorOnly.cs
View File

@@ -14,15 +14,15 @@ using OpenRA.Graphics;
namespace OpenRA.Mods.Common.Traits
{
[Desc("Invisible during games.")]
class RenderEditorOnlyInfo : RenderSimpleInfo
class RenderSpritesEditorOnlyInfo : RenderSpritesInfo
{
public override object Create(ActorInitializer init) { return new RenderEditorOnly(init, this); }
public override object Create(ActorInitializer init) { return new RenderSpritesEditorOnly(init, this); }
}
class RenderEditorOnly : RenderSimple
class RenderSpritesEditorOnly : RenderSprites
{
public RenderEditorOnly(ActorInitializer init, RenderEditorOnlyInfo info)
: base(init, info, () => 0) { }
public RenderSpritesEditorOnly(ActorInitializer init, RenderSpritesEditorOnlyInfo info)
: base(init, info) { }
public override IEnumerable<IRenderable> Render(Actor self, WorldRenderer wr) { return SpriteRenderable.None; }
}

26
OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
View File

@@ -1637,6 +1637,32 @@ namespace OpenRA.Mods.Common.UtilityCommands
}
}
if (engineVersion < 20150720)
{
// Rename RenderEditorOnly to RenderSpritesEditorOnly
if (depth == 0)
{
var reo = node.Value.Nodes.FirstOrDefault(n => n.Key.StartsWith("RenderEditorOnly"));
if (reo != null)
{
reo.Key = "RenderSpritesEditorOnly";
var wsbNodes = reo.Value.Nodes.Where(n => n.Key == "Sequence").ToList();
if (wsbNodes.Any())
node.Value.Nodes.Add(new MiniYamlNode("WithSpriteBody", new MiniYaml("", wsbNodes)));
else
node.Value.Nodes.Add(new MiniYamlNode("WithSpriteBody", ""));
reo.Value.Nodes.RemoveAll(n => wsbNodes.Contains(n));
}
var rreo = node.Value.Nodes.FirstOrDefault(n => n.Key.StartsWith("-RenderEditorOnly"));
if (rreo != null)
rreo.Key = "-RenderSpritesEditorOnly";
}
}
UpgradeActorRules(engineVersion, ref node.Value.Nodes, node, depth + 1);
}
}