diff --git a/OpenRA.FileFormats/Palette.cs b/OpenRA.FileFormats/Palette.cs index 9b96021f6f..be5bf5e6bf 100644 --- a/OpenRA.FileFormats/Palette.cs +++ b/OpenRA.FileFormats/Palette.cs @@ -39,6 +39,12 @@ namespace OpenRA.FileFormats get { return colors; } } + public void ApplyRemap(IPaletteRemap r) + { + for(int i = 0; i < 256; i++) + colors[i] = (uint)r.GetRemappedColor(Color.FromArgb((int)colors[i]),i).ToArgb(); + } + public Palette(Stream s, int[] remapShadow) { colors = new uint[256]; @@ -61,9 +67,8 @@ namespace OpenRA.FileFormats public Palette(Palette p, IPaletteRemap r) { - colors = new uint[256]; - for(int i = 0; i < 256; i++) - colors[i] = (uint)r.GetRemappedColor(Color.FromArgb((int)p.colors[i]),i).ToArgb(); + colors = (uint[])p.colors.Clone(); + ApplyRemap(r); } public Palette(Palette p) @@ -71,6 +76,13 @@ namespace OpenRA.FileFormats colors = (uint[])p.colors.Clone(); } + public Palette(uint[] data) + { + if (data.Length != 256) + throw new InvalidDataException("Attempting to create palette with incorrect array size"); + colors = (uint[])data.Clone(); + } + public ColorPalette AsSystemPalette() { ColorPalette pal; @@ -88,6 +100,21 @@ namespace OpenRA.FileFormats return pal; } + public Bitmap AsBitmap() + { + var b = new Bitmap(256, 1, PixelFormat.Format32bppArgb); + var data = b.LockBits(new Rectangle(0, 0, b.Width, b.Height), + ImageLockMode.WriteOnly, PixelFormat.Format32bppArgb); + unsafe + { + uint* c = (uint*)data.Scan0; + for (var x = 0; x < 256; x++) + *(c + x) = colors[x]; + } + b.UnlockBits(data); + return b; + } + public static Palette Load(string filename, int[] remap) { using(var s = File.OpenRead(filename)) diff --git a/OpenRA.Game/Actor.cs b/OpenRA.Game/Actor.cs index 3eea3d1ed0..9dfefe23a7 100755 --- a/OpenRA.Game/Actor.cs +++ b/OpenRA.Game/Actor.cs @@ -13,6 +13,7 @@ using System.Collections.Generic; using System.Drawing; using System.Linq; using OpenRA.FileFormats; +using OpenRA.Graphics; using OpenRA.Traits; namespace OpenRA @@ -73,7 +74,7 @@ namespace OpenRA AddTrait(trait.Create(init)); } - Move = Lazy.New( () => TraitOrDefault() ); + Move = Lazy.New(() => TraitOrDefault()); Size = Lazy.New(() => { @@ -81,27 +82,23 @@ namespace OpenRA if (si != null && si.Bounds != null) return new int2(si.Bounds[0], si.Bounds[1]); - // auto size from render - var firstSprite = TraitsImplementing().SelectMany(ApplyIRender).FirstOrDefault(); - if (firstSprite.Sprite == null) return int2.Zero; - return (firstSprite.Sprite.size * firstSprite.Scale).ToInt2(); + return TraitsImplementing().Select(x => x.SelectionSize(this)).FirstOrDefault(); }); - if(this.HasTrait()) + if (this.HasTrait()) { Sight = new Shroud.ActorVisibility { range = this.Trait().RevealRange, vis = Shroud.GetVisOrigins(this).ToArray() }; - } - - ApplyIRender = x => x.Render(this); - ApplyRenderModifier = (m, p) => p.ModifyRender(this, m); - Bounds = Cached.New( () => CalculateBounds(false) ); - ExtendedBounds = Cached.New( () => CalculateBounds(true) ); + ApplyIRender = (x, wr) => x.Render(this, wr); + ApplyRenderModifier = (m, p, wr) => p.ModifyRender(this, wr, m); + + Bounds = Cached.New(() => CalculateBounds(false)); + ExtendedBounds = Cached.New(() => CalculateBounds(true)); } public void Tick() @@ -109,7 +106,7 @@ namespace OpenRA Bounds.Invalidate(); ExtendedBounds.Invalidate(); - currentActivity = Util.RunActivity( this, currentActivity ); + currentActivity = Traits.Util.RunActivity( this, currentActivity ); } public void UpdateSight() @@ -125,13 +122,13 @@ namespace OpenRA OpenRA.FileFormats.Lazy Size; // note: these delegates are cached to avoid massive allocation. - Func> ApplyIRender; - Func, IRenderModifier, IEnumerable> ApplyRenderModifier; - public IEnumerable Render() + Func> ApplyIRender; + Func, IRenderModifier, WorldRenderer, IEnumerable> ApplyRenderModifier; + public IEnumerable Render(WorldRenderer wr) { var mods = TraitsImplementing(); - var sprites = TraitsImplementing().SelectMany(ApplyIRender); - return mods.Aggregate(sprites, ApplyRenderModifier); + var sprites = TraitsImplementing().SelectMany(x => ApplyIRender(x, wr)); + return mods.Aggregate(sprites, (m,p) => ApplyRenderModifier(m,p,wr)); } // When useAltitude = true, the bounding box is extended @@ -257,10 +254,15 @@ namespace OpenRA { World.AddFrameEndTask(w => { + var oldOwner = Owner; + // momentarily remove from world so the ownership queries don't get confused w.Remove(this); Owner = newOwner; w.Add(this); + + foreach (var t in this.TraitsImplementing()) + t.OnOwnerChanged(this, oldOwner, newOwner); }); } } diff --git a/OpenRA.Game/Effects/DelayedAction.cs b/OpenRA.Game/Effects/DelayedAction.cs index 64603bc9bf..609af16c4a 100755 --- a/OpenRA.Game/Effects/DelayedAction.cs +++ b/OpenRA.Game/Effects/DelayedAction.cs @@ -10,6 +10,7 @@ using System; using System.Collections.Generic; +using OpenRA.Graphics; using OpenRA.Traits; namespace OpenRA.Effects @@ -25,12 +26,12 @@ namespace OpenRA.Effects this.delay = delay; } - public void Tick( World world ) + public void Tick(World world) { if (--delay <= 0) world.AddFrameEndTask(w => { w.Remove(this); a(); }); } - public IEnumerable Render() { yield break; } + public IEnumerable Render(WorldRenderer wr) { yield break; } } } diff --git a/OpenRA.Game/Effects/FlashTarget.cs b/OpenRA.Game/Effects/FlashTarget.cs index 17b8fe42fd..c8c422d791 100755 --- a/OpenRA.Game/Effects/FlashTarget.cs +++ b/OpenRA.Game/Effects/FlashTarget.cs @@ -10,6 +10,7 @@ using System.Collections.Generic; using System.Linq; +using OpenRA.Graphics; using OpenRA.Traits; namespace OpenRA.Effects @@ -32,14 +33,14 @@ namespace OpenRA.Effects world.AddFrameEndTask(w => w.Remove(this)); } - public IEnumerable Render() + public IEnumerable Render(WorldRenderer wr) { if (!target.IsInWorld) yield break; if (remainingTicks % 2 == 0) - foreach (var r in target.Render()) - yield return r.WithPalette("highlight"); + foreach (var r in target.Render(wr)) + yield return r.WithPalette(wr.Palette("highlight")); } } } diff --git a/OpenRA.Game/Effects/IEffect.cs b/OpenRA.Game/Effects/IEffect.cs index be2f2fb988..5bab9cfcf3 100755 --- a/OpenRA.Game/Effects/IEffect.cs +++ b/OpenRA.Game/Effects/IEffect.cs @@ -9,13 +9,14 @@ #endregion using System.Collections.Generic; +using OpenRA.Graphics; using OpenRA.Traits; namespace OpenRA.Effects { public interface IEffect { - void Tick( World world ); - IEnumerable Render(); + void Tick(World world); + IEnumerable Render(WorldRenderer r); } } diff --git a/OpenRA.Game/Graphics/AnimationWithOffset.cs b/OpenRA.Game/Graphics/AnimationWithOffset.cs index c29c341688..c048f5c8fd 100644 --- a/OpenRA.Game/Graphics/AnimationWithOffset.cs +++ b/OpenRA.Game/Graphics/AnimationWithOffset.cs @@ -32,7 +32,7 @@ namespace OpenRA.Graphics this.DisableFunc = d; } - public Renderable Image(Actor self, string pal) + public Renderable Image(Actor self, PaletteReference pal) { var p = self.CenterLocation; var loc = p.ToFloat2() - 0.5f * Animation.Image.size diff --git a/OpenRA.Game/Graphics/CursorProvider.cs b/OpenRA.Game/Graphics/CursorProvider.cs index a0dc94b86d..823e231c41 100644 --- a/OpenRA.Game/Graphics/CursorProvider.cs +++ b/OpenRA.Game/Graphics/CursorProvider.cs @@ -19,6 +19,7 @@ namespace OpenRA.Graphics { public static class CursorProvider { + public static Dictionary Palettes { get; private set; } static Dictionary cursors; public static void Initialize(string[] sequenceFiles) @@ -28,13 +29,14 @@ namespace OpenRA.Graphics int[] ShadowIndex = { }; if (sequences.NodesDict.ContainsKey("ShadowIndex")) - { - Array.Resize(ref ShadowIndex, ShadowIndex.Length + 1); - ShadowIndex[ShadowIndex.Length - 1] = Convert.ToInt32(sequences.NodesDict["ShadowIndex"].Value); - } + { + Array.Resize(ref ShadowIndex, ShadowIndex.Length + 1); + ShadowIndex[ShadowIndex.Length - 1] = Convert.ToInt32(sequences.NodesDict["ShadowIndex"].Value); + } + Palettes = new Dictionary(); foreach (var s in sequences.NodesDict["Palettes"].Nodes) - Game.modData.Palette.AddPalette(s.Key, new Palette(FileSystem.Open(s.Value.Value), ShadowIndex)); + Palettes.Add(s.Key, new Palette(FileSystem.Open(s.Value.Value), ShadowIndex)); foreach (var s in sequences.NodesDict["Cursors"].Nodes) LoadSequencesForCursor(s.Key, s.Value); diff --git a/OpenRA.Game/Graphics/HardwarePalette.cs b/OpenRA.Game/Graphics/HardwarePalette.cs index fcda7438e3..98f486e2cf 100644 --- a/OpenRA.Game/Graphics/HardwarePalette.cs +++ b/OpenRA.Game/Graphics/HardwarePalette.cs @@ -25,11 +25,13 @@ namespace OpenRA.Graphics ITexture texture; Dictionary palettes; Dictionary indices; + Dictionary allowsMods; public HardwarePalette() { palettes = new Dictionary(); indices = new Dictionary(); + allowsMods = new Dictionary(); texture = Game.Renderer.Device.CreateTexture(); } @@ -49,22 +51,24 @@ namespace OpenRA.Graphics return ret; } - public void AddPalette(string name, Palette p) + public void AddPalette(string name, Palette p, bool allowModifiers) { if (palettes.ContainsKey(name)) throw new InvalidOperationException("Palette {0} has already been defined".F(name)); palettes.Add(name, p); indices.Add(name, allocated++); + allowsMods.Add(name, allowModifiers); } uint[,] data = new uint[MaxPalettes, 256]; public void Update(IEnumerable paletteMods) { var copy = palettes.ToDictionary(p => p.Key, p => new Palette(p.Value)); + var modifiable = copy.Where(p => allowsMods[p.Key]).ToDictionary(p => p.Key, p => p.Value); foreach (var mod in paletteMods) - mod.AdjustPalette(copy); + mod.AdjustPalette(modifiable); foreach (var pal in copy) { diff --git a/OpenRA.Game/Graphics/Renderer.cs b/OpenRA.Game/Graphics/Renderer.cs index 793a656725..e354698882 100644 --- a/OpenRA.Game/Graphics/Renderer.cs +++ b/OpenRA.Game/Graphics/Renderer.cs @@ -50,20 +50,20 @@ namespace OpenRA.Graphics TempBufferCount = Game.Settings.Graphics.NumTempBuffers; SheetSize = Game.Settings.Graphics.SheetSize; - WorldSpriteShader = device.CreateShader("world-shp"); - WorldLineShader = device.CreateShader("world-line"); - LineShader = device.CreateShader("chrome-line"); - RgbaSpriteShader = device.CreateShader("chrome-rgba"); - SpriteShader = device.CreateShader("chrome-shp"); + WorldSpriteShader = device.CreateShader("shp"); + WorldLineShader = device.CreateShader("line"); + LineShader = device.CreateShader("line"); + RgbaSpriteShader = device.CreateShader("rgba"); + SpriteShader = device.CreateShader("shp"); - WorldSpriteRenderer = new SpriteRenderer( this, WorldSpriteShader ); + WorldSpriteRenderer = new SpriteRenderer(this, WorldSpriteShader); WorldLineRenderer = new LineRenderer(this, WorldLineShader); LineRenderer = new LineRenderer(this, LineShader); - RgbaSpriteRenderer = new SpriteRenderer( this, RgbaSpriteShader ); - SpriteRenderer = new SpriteRenderer( this, SpriteShader ); + RgbaSpriteRenderer = new SpriteRenderer(this, RgbaSpriteShader); + SpriteRenderer = new SpriteRenderer(this, SpriteShader); - for( int i = 0 ; i < TempBufferCount ; i++ ) - tempBuffers.Enqueue( device.CreateVertexBuffer( TempBufferSize ) ); + for (int i = 0; i < TempBufferCount; i++) + tempBuffers.Enqueue(device.CreateVertexBuffer(TempBufferSize)); } public void InitializeFonts(Manifest m) @@ -80,22 +80,22 @@ namespace OpenRA.Graphics float2 r2 = new float2(-1, 1); var zr1 = zoom*r1; - SetShaderParams( WorldSpriteShader, zr1, r2, scroll ); - SetShaderParams( WorldLineShader, zr1, r2, scroll ); - SetShaderParams( LineShader, r1, r2, scroll ); - SetShaderParams( RgbaSpriteShader, r1, r2, scroll ); - SetShaderParams( SpriteShader, r1, r2, scroll ); + SetShaderParams(WorldSpriteShader, zr1, r2, scroll); + SetShaderParams(WorldLineShader, zr1, r2, scroll); + SetShaderParams(LineShader, r1, r2, float2.Zero); + SetShaderParams(RgbaSpriteShader, r1, r2, float2.Zero); + SetShaderParams(SpriteShader, r1, r2, float2.Zero); } - void SetShaderParams( IShader s, float2 r1, float2 r2, float2 scroll ) + void SetShaderParams(IShader s, float2 r1, float2 r2, float2 scroll) { - s.SetValue( "Palette", PaletteTexture ); - s.SetValue( "Scroll", (int) scroll.X, (int) scroll.Y ); - s.SetValue( "r1", r1.X, r1.Y ); - s.SetValue( "r2", r2.X, r2.Y ); + s.SetValue("Palette", PaletteTexture); + s.SetValue("Scroll", (int)scroll.X, (int)scroll.Y); + s.SetValue("r1", r1.X, r1.Y); + s.SetValue("r2", r2.X, r2.Y); } - public void EndFrame( IInputHandler inputHandler ) + public void EndFrame(IInputHandler inputHandler) { Flush(); device.PumpInput(inputHandler); @@ -129,17 +129,17 @@ namespace OpenRA.Graphics // which makes the window non-interactive in Windowed/Pseudofullscreen mode. static Screen FixOSX() { return Screen.PrimaryScreen; } - internal static void Initialize( WindowMode windowMode ) + internal static void Initialize(WindowMode windowMode) { if (Platform.CurrentPlatform == PlatformType.OSX) FixOSX(); - var resolution = GetResolution( windowMode ); + var resolution = GetResolution(windowMode); - string renderer = Game.Settings.Server.Dedicated?"Null":Game.Settings.Graphics.Renderer; - var rendererPath = Path.GetFullPath( "OpenRA.Renderer.{0}.dll".F(renderer) ); + string renderer = Game.Settings.Server.Dedicated ? "Null" : Game.Settings.Graphics.Renderer; + var rendererPath = Path.GetFullPath("OpenRA.Renderer.{0}.dll".F(renderer)); - device = CreateDevice( Assembly.LoadFile( rendererPath ), resolution.Width, resolution.Height, windowMode ); + device = CreateDevice(Assembly.LoadFile(rendererPath), resolution.Width, resolution.Height, windowMode); } static Size GetResolution(WindowMode windowmode) @@ -150,12 +150,12 @@ namespace OpenRA.Graphics return new Size(size.X, size.Y); } - static IGraphicsDevice CreateDevice( Assembly rendererDll, int width, int height, WindowMode window ) + static IGraphicsDevice CreateDevice(Assembly rendererDll, int width, int height, WindowMode window) { - foreach( RendererAttribute r in rendererDll.GetCustomAttributes( typeof( RendererAttribute ), false ) ) + foreach (RendererAttribute r in rendererDll.GetCustomAttributes(typeof(RendererAttribute), false)) { - var factory = (IDeviceFactory) r.Type.GetConstructor( Type.EmptyTypes ).Invoke( null ); - return factory.Create( new Size( width, height ), window ); + var factory = (IDeviceFactory)r.Type.GetConstructor(Type.EmptyTypes).Invoke(null); + return factory.Create(new Size(width, height), window); } throw new InvalidOperationException("Renderer DLL is missing RendererAttribute to tell us what type to use!"); @@ -164,7 +164,7 @@ namespace OpenRA.Graphics internal IVertexBuffer GetTempVertexBuffer() { var ret = tempBuffers.Dequeue(); - tempBuffers.Enqueue( ret ); + tempBuffers.Enqueue(ret); return ret; } @@ -176,8 +176,8 @@ namespace OpenRA.Graphics get { return currentBatchRenderer; } set { - if( currentBatchRenderer == value ) return; - if( currentBatchRenderer != null ) + if (currentBatchRenderer == value) return; + if (currentBatchRenderer != null) currentBatchRenderer.Flush(); currentBatchRenderer = value; } @@ -186,7 +186,7 @@ namespace OpenRA.Graphics public void EnableScissor(int left, int top, int width, int height) { Flush(); - Device.EnableScissor( left, top, width, height ); + Device.EnableScissor(left, top, width, height); } public void DisableScissor() diff --git a/OpenRA.Game/Graphics/ShroudRenderer.cs b/OpenRA.Game/Graphics/ShroudRenderer.cs index 4229bf9da9..4d467b67dd 100644 --- a/OpenRA.Game/Graphics/ShroudRenderer.cs +++ b/OpenRA.Game/Graphics/ShroudRenderer.cs @@ -105,8 +105,17 @@ namespace OpenRA.Graphics return shadowBits[SpecialShroudTiles[u ^ uSides][v]]; } - internal void Draw( WorldRenderer wr ) + bool initializePalettes = true; + PaletteReference fogPalette, shroudPalette; + internal void Draw(WorldRenderer wr) { + if (initializePalettes) + { + fogPalette = wr.Palette("fog"); + shroudPalette = wr.Palette("shroud"); + initializePalettes = false; + } + if (shroud != null && shroud.dirty) { shroud.dirty = false; @@ -120,14 +129,12 @@ namespace OpenRA.Graphics } var clipRect = Game.viewport.WorldBounds(wr.world); - DrawShroud( wr, clipRect, fogSprites, "fog" ); - DrawShroud( wr, clipRect, sprites, "shroud" ); + DrawShroud(wr, clipRect, fogSprites, fogPalette); + DrawShroud(wr, clipRect, sprites, shroudPalette); } - void DrawShroud( WorldRenderer wr, Rectangle clip, Sprite[,] s, string pal ) + void DrawShroud(WorldRenderer wr, Rectangle clip, Sprite[,] s, PaletteReference pal) { - var shroudPalette = wr.GetPaletteIndex(pal); - for (var j = clip.Top; j < clip.Bottom; j++) { var starti = clip.Left; @@ -142,14 +149,14 @@ namespace OpenRA.Graphics { s[starti, j].DrawAt( Game.CellSize * new float2(starti, j), - shroudPalette, + pal.Index, new float2(Game.CellSize * (i - starti), Game.CellSize)); starti = i + 1; } s[i, j].DrawAt( Game.CellSize * new float2(i, j), - shroudPalette); + pal.Index); starti = i + 1; last = s[i, j]; } @@ -157,7 +164,7 @@ namespace OpenRA.Graphics if (starti < clip.Right) s[starti, j].DrawAt( Game.CellSize * new float2(starti, j), - shroudPalette, + pal.Index, new float2(Game.CellSize * (clip.Right - starti), Game.CellSize)); } } diff --git a/OpenRA.Game/Graphics/SpriteRenderer.cs b/OpenRA.Game/Graphics/SpriteRenderer.cs index 957eb6f701..b1bba04e3a 100644 --- a/OpenRA.Game/Graphics/SpriteRenderer.cs +++ b/OpenRA.Game/Graphics/SpriteRenderer.cs @@ -49,12 +49,12 @@ namespace OpenRA.Graphics public void DrawSprite(Sprite s, float2 location, WorldRenderer wr, string palette) { - DrawSprite(s, location, wr.GetPaletteIndex(palette), s.size); + DrawSprite(s, location, wr.Palette(palette).Index, s.size); } public void DrawSprite(Sprite s, float2 location, WorldRenderer wr, string palette, float2 size) { - DrawSprite(s, location, wr.GetPaletteIndex(palette), size); + DrawSprite(s, location, wr.Palette(palette).Index, size); } public void DrawSprite(Sprite s, float2 location, int paletteIndex, float2 size) diff --git a/OpenRA.Game/Graphics/TerrainRenderer.cs b/OpenRA.Game/Graphics/TerrainRenderer.cs index 573d480cd1..317820217a 100644 --- a/OpenRA.Game/Graphics/TerrainRenderer.cs +++ b/OpenRA.Game/Graphics/TerrainRenderer.cs @@ -39,7 +39,7 @@ namespace OpenRA.Graphics int nv = 0; - var terrainPalette = Game.modData.Palette.GetPaletteIndex("terrain"); + var terrainPalette = wr.Palette("terrain").Index; for( int j = map.Bounds.Top; j < map.Bounds.Bottom; j++ ) for( int i = map.Bounds.Left; i < map.Bounds.Right; i++ ) diff --git a/OpenRA.Game/Graphics/Viewport.cs b/OpenRA.Game/Graphics/Viewport.cs index f5881d2e1e..4a15d081ac 100755 --- a/OpenRA.Game/Graphics/Viewport.cs +++ b/OpenRA.Game/Graphics/Viewport.cs @@ -133,7 +133,7 @@ namespace OpenRA.Graphics renderer.SpriteRenderer.DrawSprite(cursorSprite, Viewport.LastMousePos - cursorSequence.Hotspot, - Game.modData.Palette.GetPaletteIndex(cursorSequence.Palette), + wr.Palette(cursorSequence.Palette).Index, cursorSprite.size); } diff --git a/OpenRA.Game/Graphics/WorldRenderer.cs b/OpenRA.Game/Graphics/WorldRenderer.cs index ba662975a2..c590105a92 100644 --- a/OpenRA.Game/Graphics/WorldRenderer.cs +++ b/OpenRA.Game/Graphics/WorldRenderer.cs @@ -17,27 +17,56 @@ using OpenRA.Traits; namespace OpenRA.Graphics { + public class PaletteReference + { + public readonly string Name; + public readonly int Index; + public readonly Palette Palette; + public PaletteReference(string name, int index, Palette palette) + { + Name = name; + Index = index; + Palette = palette; + } + } + public class WorldRenderer { public readonly World world; internal readonly TerrainRenderer terrainRenderer; internal readonly ShroudRenderer shroudRenderer; internal readonly HardwarePalette palette; + internal Cache palettes; internal WorldRenderer(World world) { this.world = world; - this.palette = Game.modData.Palette; - foreach( var pal in world.traitDict.ActorsWithTraitMultiple( world ) ) + palette = new HardwarePalette(); + foreach (var p in CursorProvider.Palettes) + palette.AddPalette(p.Key, p.Value, false); + + palettes = new Cache(CreatePaletteReference); + foreach (var pal in world.traitDict.ActorsWithTraitMultiple(world)) pal.Trait.InitPalette( this ); + // Generate initial palette texture + palette.Update(new IPaletteModifier[] {}); + terrainRenderer = new TerrainRenderer(world, this); shroudRenderer = new ShroudRenderer(world); } - public int GetPaletteIndex(string name) { return palette.GetPaletteIndex(name); } - public Palette GetPalette(string name) { return palette.GetPalette(name); } - public void AddPalette(string name, Palette pal) { palette.AddPalette(name, pal); } + PaletteReference CreatePaletteReference(string name) + { + var pal = palette.GetPalette(name); + if (pal == null) + throw new InvalidOperationException("Palette `{0}` does not exist".F(name)); + + return new PaletteReference(name, palette.GetPaletteIndex(name), pal); + } + + public PaletteReference Palette(string name) { return palettes[name]; } + public void AddPalette(string name, Palette pal, bool allowModifiers) { palette.AddPalette(name, pal, allowModifiers); } class SpriteComparer : IComparer { @@ -57,10 +86,10 @@ namespace OpenRA.Graphics bounds.BottomRightAsCPos().ToPPos() ); - var renderables = actors.SelectMany(a => a.Render()) + var renderables = actors.SelectMany(a => a.Render(this)) .OrderBy(r => r, comparer); - var effects = world.Effects.SelectMany(e => e.Render()); + var effects = world.Effects.SelectMany(e => e.Render(this)); return renderables.Concat(effects); } @@ -77,8 +106,8 @@ namespace OpenRA.Graphics terrainRenderer.Draw(this, Game.viewport); foreach (var a in world.traitDict.ActorsWithTraitMultiple(world)) - foreach (var r in a.Trait.RenderAsTerrain(a.Actor)) - r.Sprite.DrawAt(r.Pos, this.GetPaletteIndex(r.Palette), r.Scale); + foreach (var r in a.Trait.RenderAsTerrain(this, a.Actor)) + r.Sprite.DrawAt(r.Pos, r.Palette.Index, r.Scale); foreach (var a in world.Selection.Actors) if (!a.Destroyed) @@ -91,7 +120,7 @@ namespace OpenRA.Graphics world.OrderGenerator.RenderBeforeWorld(this, world); foreach (var image in SpritesToRender()) - image.Sprite.DrawAt(image.Pos, this.GetPaletteIndex(image.Palette), image.Scale); + image.Sprite.DrawAt(image.Pos, image.Palette.Index, image.Scale); // added for contrails foreach (var a in world.ActorsWithTrait()) diff --git a/OpenRA.Game/ModData.cs b/OpenRA.Game/ModData.cs index c8770da6b5..c614d4604b 100755 --- a/OpenRA.Game/ModData.cs +++ b/OpenRA.Game/ModData.cs @@ -28,7 +28,6 @@ namespace OpenRA public ILoadScreen LoadScreen = null; public SheetBuilder SheetBuilder; public SpriteLoader SpriteLoader; - public HardwarePalette Palette { get; private set; } public ModData( params string[] mods ) { @@ -51,13 +50,11 @@ namespace OpenRA AvailableMaps = FindMaps(Manifest.Mods); - Palette = new HardwarePalette(); ChromeMetrics.Initialize(Manifest.ChromeMetrics); ChromeProvider.Initialize(Manifest.Chrome); SheetBuilder = new SheetBuilder(TextureChannel.Red); SpriteLoader = new SpriteLoader(new string[] { ".shp" }, SheetBuilder); CursorProvider.Initialize(Manifest.Cursors); - Palette.Update(new IPaletteModifier[] { }); } public Map PrepareMap(string uid) diff --git a/OpenRA.Game/Traits/Render/RenderSimple.cs b/OpenRA.Game/Traits/Render/RenderSimple.cs index 1b2d4ff6c7..34ec41c879 100755 --- a/OpenRA.Game/Traits/Render/RenderSimple.cs +++ b/OpenRA.Game/Traits/Render/RenderSimple.cs @@ -10,6 +10,7 @@ using System; using System.Collections.Generic; +using System.Linq; using OpenRA.Graphics; namespace OpenRA.Traits @@ -23,16 +24,16 @@ namespace OpenRA.Traits public virtual object Create(ActorInitializer init) { return new RenderSimple(init.self); } - public virtual IEnumerable RenderPreview(ActorInfo building, Player owner) + public virtual IEnumerable RenderPreview(ActorInfo building, PaletteReference pr) { var anim = new Animation(RenderSimple.GetImage(building), () => 0); anim.PlayRepeating("idle"); - yield return new Renderable(anim.Image, 0.5f * anim.Image.size * (1 - Scale), - Palette ?? (owner != null ? PlayerPalette + owner.InternalName : null), 0, Scale); + + yield return new Renderable(anim.Image, 0.5f * anim.Image.size * (1 - Scale), pr, 0, Scale); } } - public class RenderSimple : IRender, ITick + public class RenderSimple : IRender, IAutoSelectionSize, ITick, INotifyOwnerChanged { public Dictionary anims = new Dictionary(); @@ -55,7 +56,6 @@ namespace OpenRA.Traits return Info.Image ?? actor.Name; } - string cachedImage = null; public string GetImage(Actor self) { if (cachedImage != null) @@ -65,6 +65,9 @@ namespace OpenRA.Traits } RenderSimpleInfo Info; + string cachedImage = null; + bool initializePalette = true; + protected PaletteReference palette; public RenderSimple(Actor self, Func baseFacing) { @@ -77,20 +80,40 @@ namespace OpenRA.Traits anim.PlayRepeating("idle"); } - public string Palette(Player p) { return Info.Palette ?? Info.PlayerPalette + p.InternalName; } - - public virtual IEnumerable Render(Actor self) + protected virtual string PaletteName(Actor self) { + return Info.Palette ?? Info.PlayerPalette + self.Owner.InternalName; + } + + protected void UpdatePalette() { initializePalette = true; } + public void OnOwnerChanged(Actor self, Player oldOwner, Player newOwner) { UpdatePalette(); } + + public virtual IEnumerable Render(Actor self, WorldRenderer wr) + { + if (initializePalette) + { + palette = wr.Palette(PaletteName(self)); + initializePalette = false; + } + foreach (var a in anims.Values) if (a.DisableFunc == null || !a.DisableFunc()) { - Renderable ret = a.Image(self, Palette(self.Owner)); + Renderable ret = a.Image(self, palette); if (Info.Scale != 1f) ret = ret.WithScale(Info.Scale).WithPos(ret.Pos + 0.5f * ret.Sprite.size * (1 - Info.Scale)); yield return ret; } } + public int2 SelectionSize(Actor self) + { + return anims.Values.Where(b => (b.DisableFunc == null || !b.DisableFunc()) + && b.Animation.CurrentSequence != null) + .Select(a => (a.Animation.Image.size*Info.Scale).ToInt2()) + .FirstOrDefault(); + } + public virtual void Tick(Actor self) { foreach (var a in anims.Values) diff --git a/OpenRA.Game/Traits/TraitsInterfaces.cs b/OpenRA.Game/Traits/TraitsInterfaces.cs index 2380f474b9..4182ebf6a4 100755 --- a/OpenRA.Game/Traits/TraitsInterfaces.cs +++ b/OpenRA.Game/Traits/TraitsInterfaces.cs @@ -34,7 +34,8 @@ namespace OpenRA.Traits } public interface ITick { void Tick(Actor self); } - public interface IRender { IEnumerable Render(Actor self); } + public interface IRender { IEnumerable Render(Actor self, WorldRenderer wr); } + public interface IAutoSelectionSize { int2 SelectionSize(Actor self); } public interface IIssueOrder { @@ -62,6 +63,7 @@ namespace OpenRA.Traits public interface INotifyAppliedDamage { void AppliedDamage(Actor self, Actor damaged, AttackInfo e); } public interface INotifyBuildComplete { void BuildingComplete(Actor self); } public interface INotifyProduction { void UnitProduced(Actor self, Actor other, CPos exit); } + public interface INotifyOwnerChanged { void OnOwnerChanged(Actor self, Player oldOwner, Player newOwner); } public interface INotifyCapture { void OnCapture(Actor self, Actor captor, Player oldOwner, Player newOwner); } public interface INotifyOtherCaptured { void OnActorCaptured(Actor self, Actor captured, Actor captor, Player oldOwner, Player newOwner); } public interface IAcceptSpy { void OnInfiltrate(Actor self, Actor spy); } @@ -113,7 +115,7 @@ namespace OpenRA.Traits } public interface INotifyAttack { void Attacking(Actor self, Target target); } - public interface IRenderModifier { IEnumerable ModifyRender(Actor self, IEnumerable r); } + public interface IRenderModifier { IEnumerable ModifyRender(Actor self, WorldRenderer wr, IEnumerable r); } public interface IDamageModifier { float GetDamageModifier(Actor attacker, WarheadInfo warhead); } public interface ISpeedModifier { decimal GetSpeedModifier(); } public interface IFirepowerModifier { float GetFirepowerModifier(); } @@ -154,12 +156,12 @@ namespace OpenRA.Traits { public readonly Sprite Sprite; public readonly float2 Pos; - public readonly string Palette; + public readonly PaletteReference Palette; public readonly int Z; public readonly int ZOffset; public float Scale; - public Renderable(Sprite sprite, float2 pos, string palette, int z, int zOffset, float scale) + public Renderable(Sprite sprite, float2 pos, PaletteReference palette, int z, int zOffset, float scale) { Sprite = sprite; Pos = pos; @@ -169,14 +171,14 @@ namespace OpenRA.Traits Scale = scale; /* default */ } - public Renderable(Sprite sprite, float2 pos, string palette, int z) + public Renderable(Sprite sprite, float2 pos, PaletteReference palette, int z) : this(sprite, pos, palette, z, 0, 1f) { } - public Renderable(Sprite sprite, float2 pos, string palette, int z, float scale) + public Renderable(Sprite sprite, float2 pos, PaletteReference palette, int z, float scale) : this(sprite, pos, palette, z, 0, scale) { } public Renderable WithScale(float newScale) { return new Renderable(Sprite, Pos, Palette, Z, ZOffset, newScale); } - public Renderable WithPalette(string newPalette) { return new Renderable(Sprite, Pos, newPalette, Z, ZOffset, Scale); } + public Renderable WithPalette(PaletteReference newPalette) { return new Renderable(Sprite, Pos, newPalette, Z, ZOffset, Scale); } public Renderable WithZOffset(int newOffset) { return new Renderable(Sprite, Pos, Palette, Z, newOffset, Scale); } public Renderable WithPos(float2 newPos) { return new Renderable(Sprite, newPos, Palette, Z, ZOffset, Scale); } } @@ -208,7 +210,7 @@ namespace OpenRA.Traits public interface IPostRenderSelection { void RenderAfterWorld(WorldRenderer wr); } public interface IPreRenderSelection { void RenderBeforeWorld(WorldRenderer wr, Actor self); } - public interface IRenderAsTerrain { IEnumerable RenderAsTerrain(Actor self); } + public interface IRenderAsTerrain { IEnumerable RenderAsTerrain(WorldRenderer wr, Actor self); } public interface ITargetable { diff --git a/OpenRA.Game/Traits/World/PlayerColorPalette.cs b/OpenRA.Game/Traits/World/PlayerColorPalette.cs index bb3547aaea..0b35c05ddc 100644 --- a/OpenRA.Game/Traits/World/PlayerColorPalette.cs +++ b/OpenRA.Game/Traits/World/PlayerColorPalette.cs @@ -18,6 +18,7 @@ namespace OpenRA.Traits public readonly string BasePalette = null; public readonly string BaseName = "player"; public readonly int[] RemapIndex = {}; + public readonly bool AllowModifiers = true; public object Create( ActorInitializer init ) { return new PlayerColorPalette( init.self.Owner, this ); } } @@ -36,9 +37,9 @@ namespace OpenRA.Traits public void InitPalette( WorldRenderer wr ) { var paletteName = "{0}{1}".F( info.BaseName, owner.InternalName ); - var newpal = new Palette(wr.GetPalette(info.BasePalette), + var newpal = new Palette(wr.Palette(info.BasePalette).Palette, new PlayerColorRemap(info.RemapIndex, owner.ColorRamp)); - wr.AddPalette(paletteName, newpal); + wr.AddPalette(paletteName, newpal, info.AllowModifiers); } } } diff --git a/OpenRA.Game/Traits/World/ResourceLayer.cs b/OpenRA.Game/Traits/World/ResourceLayer.cs index 5c1c35ffcf..a9ab4f2bea 100644 --- a/OpenRA.Game/Traits/World/ResourceLayer.cs +++ b/OpenRA.Game/Traits/World/ResourceLayer.cs @@ -33,7 +33,7 @@ namespace OpenRA.Traits { hasSetupPalettes = true; foreach (var rt in world.WorldActor.TraitsImplementing()) - rt.info.PaletteIndex = wr.GetPaletteIndex(rt.info.Palette); + rt.info.PaletteRef = wr.Palette(rt.info.Palette); } var clip = Game.viewport.WorldBounds(world); @@ -47,7 +47,7 @@ namespace OpenRA.Traits if (c.image != null) c.image[c.density].DrawAt( new CPos(x, y).ToPPos().ToFloat2(), - c.type.info.PaletteIndex); + c.type.info.PaletteRef.Index); } } diff --git a/OpenRA.Game/Traits/World/ResourceType.cs b/OpenRA.Game/Traits/World/ResourceType.cs index c181fdcbcf..62167b1eda 100644 --- a/OpenRA.Game/Traits/World/ResourceType.cs +++ b/OpenRA.Game/Traits/World/ResourceType.cs @@ -26,7 +26,7 @@ namespace OpenRA.Traits public readonly bool AllowUnderActors = false; public Sprite[][] Sprites; - public int PaletteIndex; + public PaletteReference PaletteRef; public PipType PipColor = PipType.Yellow; diff --git a/OpenRA.Mods.Cnc/CncMenuPaletteEffect.cs b/OpenRA.Mods.Cnc/CncMenuPaletteEffect.cs index df198b1430..a351b80128 100644 --- a/OpenRA.Mods.Cnc/CncMenuPaletteEffect.cs +++ b/OpenRA.Mods.Cnc/CncMenuPaletteEffect.cs @@ -61,8 +61,6 @@ namespace OpenRA.Mods.Cnc } } - static Set excludePalettes = new Set("cursor", "chrome", "colorpicker", "shroud", "fog"); - public void AdjustPalette(Dictionary palettes) { if (to == EffectType.None && remainingFrames == 0) @@ -70,9 +68,6 @@ namespace OpenRA.Mods.Cnc foreach (var pal in palettes) { - if (excludePalettes.Contains(pal.Key)) - continue; - for (var x = 0; x < 256; x++) { var orig = pal.Value.GetColor(x); diff --git a/OpenRA.Mods.Cnc/Effects/IonCannon.cs b/OpenRA.Mods.Cnc/Effects/IonCannon.cs index 9d7543d9b9..df9ae17f00 100644 --- a/OpenRA.Mods.Cnc/Effects/IonCannon.cs +++ b/OpenRA.Mods.Cnc/Effects/IonCannon.cs @@ -32,11 +32,11 @@ namespace OpenRA.Mods.Cnc.Effects public void Tick(World world) { anim.Tick(); } - public IEnumerable Render() + public IEnumerable Render(WorldRenderer wr) { yield return new Renderable(anim.Image, target.CenterLocation.ToFloat2() - new float2(.5f * anim.Image.size.X, anim.Image.size.Y - Game.CellSize), - "effect", (int)target.CenterLocation.Y); + wr.Palette("effect"), (int)target.CenterLocation.Y); } void Finish( World world ) diff --git a/OpenRA.Mods.Cnc/RenderCargo.cs b/OpenRA.Mods.Cnc/RenderCargo.cs index 9e5101f41b..86b96d7e0b 100644 --- a/OpenRA.Mods.Cnc/RenderCargo.cs +++ b/OpenRA.Mods.Cnc/RenderCargo.cs @@ -11,6 +11,7 @@ using System.Collections.Generic; using System.Linq; using OpenRA.Mods.RA; +using OpenRA.Graphics; using OpenRA.Traits; namespace OpenRA.Mods.Cnc @@ -39,7 +40,7 @@ namespace OpenRA.Mods.Cnc Info = info; } - public IEnumerable ModifyRender(Actor self, IEnumerable r) + public IEnumerable ModifyRender(Actor self, WorldRenderer wr, IEnumerable r) { foreach (var c in cargo.Passengers) { @@ -55,7 +56,7 @@ namespace OpenRA.Mods.Cnc Info.PassengerTypes.Contains(p.Trait().info.CargoType)) : cargo.Passengers; - return r.Concat(visiblePassengers.SelectMany(a => a.Render()) + return r.Concat(visiblePassengers.SelectMany(a => a.Render(wr)) .Select(a => a.WithPos(a.Pos - new float2(0, Info.RelativeAltitude)) .WithZOffset(a.ZOffset + Info.RelativeAltitude))); } diff --git a/OpenRA.Mods.Cnc/Widgets/Logic/CncIngameMenuLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncIngameMenuLogic.cs index b83e0216d4..7d2776a00d 100644 --- a/OpenRA.Mods.Cnc/Widgets/Logic/CncIngameMenuLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncIngameMenuLogic.cs @@ -10,6 +10,7 @@ using System; using System.Linq; +using OpenRA.Graphics; using OpenRA.Traits; using OpenRA.Widgets; @@ -20,7 +21,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic Widget menu; [ObjectCreator.UseCtor] - public CncIngameMenuLogic(Widget widget, World world, Action onExit) + public CncIngameMenuLogic(Widget widget, World world, Action onExit, WorldRenderer worldRenderer) { var resumeDisabled = false; menu = widget.Get("INGAME_MENU"); @@ -72,6 +73,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic Ui.OpenWindow("SETTINGS_PANEL", new WidgetArgs() { { "world", world }, + { "worldRenderer", worldRenderer }, { "onExit", () => hideButtons = false }, }); }; diff --git a/OpenRA.Mods.Cnc/Widgets/Logic/CncMenuLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncMenuLogic.cs index dabf7b3cdc..64d2152b7c 100644 --- a/OpenRA.Mods.Cnc/Widgets/Logic/CncMenuLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncMenuLogic.cs @@ -85,9 +85,8 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic settingsMenu.Get("SETTINGS_BUTTON").OnClick = () => { Menu = MenuType.None; - Ui.OpenWindow("SETTINGS_PANEL", new WidgetArgs() + Game.OpenWindow("SETTINGS_PANEL", new WidgetArgs() { - { "world", world }, { "onExit", () => Menu = MenuType.Settings }, }); }; diff --git a/OpenRA.Mods.Cnc/Widgets/Logic/CncSettingsLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncSettingsLogic.cs index c8641f2b58..8d8fb13bc7 100644 --- a/OpenRA.Mods.Cnc/Widgets/Logic/CncSettingsLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncSettingsLogic.cs @@ -6,6 +6,7 @@ * as published by the Free Software Foundation. For more information, * see COPYING. */ + #endregion using System; @@ -17,6 +18,7 @@ using OpenRA.GameRules; using OpenRA.Mods.RA; using OpenRA.Mods.RA.Widgets.Logic; using OpenRA.Widgets; +using OpenRA.Mods.RA.Widgets; namespace OpenRA.Mods.Cnc.Widgets.Logic { @@ -25,7 +27,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic enum PanelType { General, Input } PanelType Settings = PanelType.General; - ColorPickerPaletteModifier playerPalettePreview; + ColorPreviewManagerWidget colorPreview; World world; [ObjectCreator.UseCtor] @@ -52,8 +54,8 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic var nameTextfield = generalPane.Get("NAME_TEXTFIELD"); nameTextfield.Text = playerSettings.Name; - playerPalettePreview = world.WorldActor.Trait(); - playerPalettePreview.Ramp = playerSettings.ColorRamp; + colorPreview = panel.Get("COLOR_MANAGER"); + colorPreview.Ramp = playerSettings.ColorRamp; var colorDropdown = generalPane.Get("COLOR"); colorDropdown.OnMouseDown = _ => ShowColorPicker(colorDropdown, playerSettings); @@ -153,8 +155,8 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic bool ShowColorPicker(DropDownButtonWidget color, PlayerSettings s) { - Action onSelect = c => { s.ColorRamp = c; color.RemovePanel(); }; - Action onChange = c => { playerPalettePreview.Ramp = c; }; + Action onSelect = c => {s.ColorRamp = c; color.RemovePanel();}; + Action onChange = c => {colorPreview.Ramp = c;}; var colorChooser = Game.LoadWidget(world, "COLOR_CHOOSER", null, new WidgetArgs() { diff --git a/OpenRA.Mods.RA/Air/EjectOnDeath.cs b/OpenRA.Mods.RA/Air/EjectOnDeath.cs index 20463555c9..d1ed8c28da 100644 --- a/OpenRA.Mods.RA/Air/EjectOnDeath.cs +++ b/OpenRA.Mods.RA/Air/EjectOnDeath.cs @@ -35,10 +35,8 @@ namespace OpenRA.Mods.RA if (IsSuitableCell(pilot, self.Location) && r > 100 - info.SuccessRate && aircraft.Altitude > 10 && self.Owner.WinState != WinState.Lost) { - self.World.AddFrameEndTask(w => w.Add( - new Parachute(pilot.Owner, - Util.CenterOfCell(self.CenterLocation.ToCPos()), - aircraft.Altitude, pilot))); + self.World.AddFrameEndTask(w => w.Add(new Parachute(pilot, + Util.CenterOfCell(self.CenterLocation.ToCPos()), aircraft.Altitude))); Sound.Play(info.ChuteSound, self.CenterLocation); } diff --git a/OpenRA.Mods.RA/BelowUnits.cs b/OpenRA.Mods.RA/BelowUnits.cs index c6336de911..4795bd7f0c 100644 --- a/OpenRA.Mods.RA/BelowUnits.cs +++ b/OpenRA.Mods.RA/BelowUnits.cs @@ -10,6 +10,7 @@ using System.Collections.Generic; using System.Linq; +using OpenRA.Graphics; using OpenRA.Traits; namespace OpenRA.Mods.RA @@ -18,7 +19,7 @@ namespace OpenRA.Mods.RA class BelowUnits : IRenderModifier { - public IEnumerable ModifyRender(Actor self, IEnumerable r) + public IEnumerable ModifyRender(Actor self, WorldRenderer wr, IEnumerable r) { return r.Select(a => a.WithZOffset((int) -a.Sprite.size.Y)); } diff --git a/OpenRA.Mods.RA/Bridge.cs b/OpenRA.Mods.RA/Bridge.cs index 67d84a569b..b98df7974f 100644 --- a/OpenRA.Mods.RA/Bridge.cs +++ b/OpenRA.Mods.RA/Bridge.cs @@ -135,10 +135,18 @@ namespace OpenRA.Mods.RA return bridges.GetBridge(self.Location + new CVec(offset[0], offset[1])); } - public IEnumerable RenderAsTerrain(Actor self) + bool initializePalettes = true; + PaletteReference terrainPalette; + public IEnumerable RenderAsTerrain(WorldRenderer wr, Actor self) { + if (initializePalettes) + { + terrainPalette = wr.Palette("terrain"); + initializePalettes = false; + } + foreach (var t in TileSprites[currentTemplate]) - yield return new Renderable(t.Value, t.Key.ToPPos().ToFloat2(), "terrain", Game.CellSize * t.Key.Y); + yield return new Renderable(t.Value, t.Key.ToPPos().ToFloat2(), terrainPalette, Game.CellSize * t.Key.Y); } bool IsIntact(Bridge b) diff --git a/OpenRA.Mods.RA/Buildings/RepairableBuilding.cs b/OpenRA.Mods.RA/Buildings/RepairableBuilding.cs index 1ddfc42628..67b1095630 100755 --- a/OpenRA.Mods.RA/Buildings/RepairableBuilding.cs +++ b/OpenRA.Mods.RA/Buildings/RepairableBuilding.cs @@ -19,6 +19,7 @@ namespace OpenRA.Mods.RA.Buildings public readonly int RepairPercent = 20; public readonly int RepairInterval = 24; public readonly int RepairStep = 7; + public readonly string IndicatorPalettePrefix = "player"; public object Create(ActorInitializer init) { return new RepairableBuilding(init.self, this); } } @@ -51,7 +52,7 @@ namespace OpenRA.Mods.RA.Buildings Sound.PlayNotification(Repairer, "Speech", "Repairing", self.Owner.Country.Race); self.World.AddFrameEndTask( - w => w.Add(new RepairIndicator(self, p))); + w => w.Add(new RepairIndicator(self, Info.IndicatorPalettePrefix, p))); } } } diff --git a/OpenRA.Mods.RA/ChronoshiftPaletteEffect.cs b/OpenRA.Mods.RA/ChronoshiftPaletteEffect.cs index 242f112c8e..419875c151 100644 --- a/OpenRA.Mods.RA/ChronoshiftPaletteEffect.cs +++ b/OpenRA.Mods.RA/ChronoshiftPaletteEffect.cs @@ -32,8 +32,6 @@ namespace OpenRA.Mods.RA if (remainingFrames > 0) remainingFrames--; } - - static List excludePalettes = new List{"cursor", "chrome", "colorpicker", "shroud", "fog"}; public void AdjustPalette(Dictionary palettes) { @@ -44,9 +42,6 @@ namespace OpenRA.Mods.RA foreach (var pal in palettes) { - if (excludePalettes.Contains(pal.Key)) - continue; - for (var x = 0; x < 256; x++) { var orig = pal.Value.GetColor(x); diff --git a/OpenRA.Mods.RA/Cloak.cs b/OpenRA.Mods.RA/Cloak.cs index e4924828d3..5a9e320db1 100644 --- a/OpenRA.Mods.RA/Cloak.cs +++ b/OpenRA.Mods.RA/Cloak.cs @@ -12,6 +12,7 @@ using System; using System.Collections.Generic; using System.Drawing; using System.Linq; +using OpenRA.Graphics; using OpenRA.Traits; namespace OpenRA.Mods.RA @@ -67,13 +68,13 @@ namespace OpenRA.Mods.RA static readonly Renderable[] Nothing = { }; - public IEnumerable ModifyRender(Actor self, IEnumerable rs) + public IEnumerable ModifyRender(Actor self, WorldRenderer wr, IEnumerable r) { if (remainingTime > 0) - return rs; + return r; if (Cloaked && IsVisible(self)) - return rs.Select(a => a.WithPalette(info.Palette)); + return r.Select(a => a.WithPalette(wr.Palette(info.Palette))); else return Nothing; } diff --git a/OpenRA.Mods.RA/ColorPickerPaletteModifier.cs b/OpenRA.Mods.RA/ColorPickerPaletteModifier.cs deleted file mode 100644 index ba343c9d53..0000000000 --- a/OpenRA.Mods.RA/ColorPickerPaletteModifier.cs +++ /dev/null @@ -1,47 +0,0 @@ -#region Copyright & License Information -/* - * Copyright 2007-2011 The OpenRA Developers (see AUTHORS) - * This file is part of OpenRA, which is free software. It is made - * available to you under the terms of the GNU General Public License - * as published by the Free Software Foundation. For more information, - * see COPYING. - */ -#endregion - -using System.Collections.Generic; -using System.Linq; -using OpenRA.FileFormats; -using OpenRA.Graphics; -using OpenRA.Traits; - -namespace OpenRA.Mods.RA -{ - public class ColorPickerPaletteModifierInfo : ITraitInfo - { - public string PlayerPalette = "player"; - public object Create( ActorInitializer init ) { return new ColorPickerPaletteModifier( this ); } - } - - public class ColorPickerPaletteModifier : IPalette, IPaletteModifier - { - ColorPickerPaletteModifierInfo Info; - int[] index; - public ColorRamp Ramp; - - public ColorPickerPaletteModifier(ColorPickerPaletteModifierInfo info) { Info = info; } - - public void InitPalette( WorldRenderer wr ) - { - var info = Rules.Info["player"].Traits.WithInterface() - .First(p => p.BaseName == Info.PlayerPalette); - index = info.RemapIndex; - wr.AddPalette("colorpicker", wr.GetPalette(info.BasePalette)); - } - - public void AdjustPalette(Dictionary palettes) - { - palettes["colorpicker"] = new Palette(palettes["colorpicker"], - new PlayerColorRemap(index, Ramp)); - } - } -} diff --git a/OpenRA.Mods.RA/CrushableInfantry.cs b/OpenRA.Mods.RA/CrushableInfantry.cs index 907e3148cb..3b625c056f 100644 --- a/OpenRA.Mods.RA/CrushableInfantry.cs +++ b/OpenRA.Mods.RA/CrushableInfantry.cs @@ -13,10 +13,11 @@ using System.Linq; using OpenRA.Traits; using OpenRA.Mods.RA.Effects; using OpenRA.Mods.RA.Move; +using OpenRA.Mods.RA.Render; namespace OpenRA.Mods.RA { - class CrushableInfantryInfo : ITraitInfo, Requires + class CrushableInfantryInfo : ITraitInfo, Requires, Requires { public readonly string CrushSound = "squish2.aud"; public readonly string CorpseSequence = "die-crushed"; @@ -29,11 +30,13 @@ namespace OpenRA.Mods.RA { readonly Actor self; readonly CrushableInfantryInfo Info; + readonly RenderInfantry ri; public CrushableInfantry(Actor self, CrushableInfantryInfo info) { this.self = self; this.Info = info; + ri = self.Trait(); } public void WarnCrush(Actor crusher) @@ -45,12 +48,7 @@ namespace OpenRA.Mods.RA public void OnCrush(Actor crusher) { Sound.Play(Info.CrushSound, crusher.CenterLocation); - self.World.AddFrameEndTask(w => - { - if (!self.Destroyed) - w.Add(new Corpse(self, Info.CorpseSequence)); - }); - + ri.SpawnCorpse(self, Info.CorpseSequence); self.Kill(crusher); } diff --git a/OpenRA.Mods.RA/Effects/Bullet.cs b/OpenRA.Mods.RA/Effects/Bullet.cs index dffa8b47bd..7820e840ea 100755 --- a/OpenRA.Mods.RA/Effects/Bullet.cs +++ b/OpenRA.Mods.RA/Effects/Bullet.cs @@ -144,7 +144,7 @@ namespace OpenRA.Mods.RA.Effects const float height = .1f; - public IEnumerable Render() + public IEnumerable Render(WorldRenderer wr) { if (anim != null) { @@ -158,15 +158,15 @@ namespace OpenRA.Mods.RA.Effects if (Info.High || Info.Angle > 0) { if (Info.Shadow) - yield return new Renderable(anim.Image, pos - .5f * anim.Image.size, "shadow", (int)pos.Y); + yield return new Renderable(anim.Image, pos - .5f * anim.Image.size, wr.Palette("shadow"), (int)pos.Y); var highPos = pos - new float2(0, GetAltitude()); - yield return new Renderable(anim.Image, highPos - .5f * anim.Image.size, "effect", (int)pos.Y); + yield return new Renderable(anim.Image, highPos - .5f * anim.Image.size, wr.Palette("effect"), (int)pos.Y); } else yield return new Renderable(anim.Image, pos - .5f * anim.Image.size, - Args.weapon.Underwater ? "shadow" : "effect", (int)pos.Y); + wr.Palette(Args.weapon.Underwater ? "shadow" : "effect"), (int)pos.Y); } } diff --git a/OpenRA.Mods.RA/Effects/CashTick.cs b/OpenRA.Mods.RA/Effects/CashTick.cs index 8c2195da9a..976885945b 100644 --- a/OpenRA.Mods.RA/Effects/CashTick.cs +++ b/OpenRA.Mods.RA/Effects/CashTick.cs @@ -49,7 +49,7 @@ namespace OpenRA.Mods.RA.Effects pos -= new PVecInt(0, velocity); } - public IEnumerable Render() + public IEnumerable Render(WorldRenderer wr) { font.DrawTextWithContrast(s, Game.viewport.Zoom*(pos.ToFloat2() - Game.viewport.Location) - offset, color, Color.Black,1); yield break; diff --git a/OpenRA.Mods.RA/Effects/Corpse.cs b/OpenRA.Mods.RA/Effects/Corpse.cs index 7a536b9ab8..383cc5dd26 100644 --- a/OpenRA.Mods.RA/Effects/Corpse.cs +++ b/OpenRA.Mods.RA/Effects/Corpse.cs @@ -19,24 +19,21 @@ namespace OpenRA.Mods.RA.Effects { readonly Animation anim; readonly float2 pos; - readonly string palette; + readonly string paletteName; - public Corpse(Actor fromActor, string sequence) + public Corpse(World world, float2 pos, string image, string sequence, string paletteName) { - var rs = fromActor.Trait(); - palette = rs.Palette(fromActor.Owner); - anim = new Animation(rs.GetImage(fromActor)); - anim.PlayThen(sequence, - () => fromActor.World.AddFrameEndTask(w => w.Remove(this))); - - pos = fromActor.CenterLocation.ToFloat2(); + this.pos = pos; + this.paletteName = paletteName; + anim = new Animation(image); + anim.PlayThen(sequence, () => world.AddFrameEndTask(w => w.Remove(this))); } - public void Tick( World world ) { anim.Tick(); } + public void Tick(World world) { anim.Tick(); } - public IEnumerable Render() + public IEnumerable Render(WorldRenderer wr) { - yield return new Renderable(anim.Image, pos - .5f * anim.Image.size, palette, (int)pos.Y); + yield return new Renderable(anim.Image, pos - .5f * anim.Image.size, wr.Palette(paletteName), (int)pos.Y); } } } diff --git a/OpenRA.Mods.RA/Effects/CrateEffect.cs b/OpenRA.Mods.RA/Effects/CrateEffect.cs index 7f0e7ab083..61b70dd326 100644 --- a/OpenRA.Mods.RA/Effects/CrateEffect.cs +++ b/OpenRA.Mods.RA/Effects/CrateEffect.cs @@ -39,11 +39,12 @@ namespace OpenRA.Mods.RA.Effects anim.Tick(); } - public IEnumerable Render() + public IEnumerable Render(WorldRenderer wr) { if (a.IsInWorld) yield return new Renderable(anim.Image, - a.CenterLocation.ToFloat2() - .5f * anim.Image.size + offset, "effect", (int)a.CenterLocation.Y); + a.CenterLocation.ToFloat2() - .5f * anim.Image.size + offset, + wr.Palette("effect"), (int)a.CenterLocation.Y); } } } diff --git a/OpenRA.Mods.RA/Effects/Explosion.cs b/OpenRA.Mods.RA/Effects/Explosion.cs index 646999ae2f..942abb9a0a 100644 --- a/OpenRA.Mods.RA/Effects/Explosion.cs +++ b/OpenRA.Mods.RA/Effects/Explosion.cs @@ -32,11 +32,11 @@ namespace OpenRA.Mods.RA.Effects public void Tick( World world ) { anim.Tick(); } - public IEnumerable Render() + public IEnumerable Render(WorldRenderer wr) { yield return new Renderable(anim.Image, pos.ToFloat2() - .5f * anim.Image.size - new int2(0,altitude), - "effect", (int)pos.Y - altitude); + wr.Palette("effect"), (int)pos.Y - altitude); } public Player Owner { get { return null; } } diff --git a/OpenRA.Mods.RA/Effects/GpsDot.cs b/OpenRA.Mods.RA/Effects/GpsDot.cs index 21f1413628..7b63f440dc 100644 --- a/OpenRA.Mods.RA/Effects/GpsDot.cs +++ b/OpenRA.Mods.RA/Effects/GpsDot.cs @@ -15,65 +15,76 @@ using OpenRA.Traits; namespace OpenRA.Mods.RA.Effects { - class GpsDotInfo : ITraitInfo, Requires + class GpsDotInfo : ITraitInfo { public readonly string String = "Infantry"; + public readonly string IndicatorPalettePrefix = "player"; + public object Create(ActorInitializer init) { - return new GpsDot(init, String); + return new GpsDot(init.self, this); } } class GpsDot : IEffect { Actor self; - GpsWatcher watcher; - RenderSimple rs; - bool show = false; + GpsDotInfo info; Animation anim; - public GpsDot(ActorInitializer init, string s) - { - anim = new Animation("gpsdot"); - anim.PlayRepeating(s); + GpsWatcher watcher; + HiddenUnderFog huf; + Spy spy; + bool show = false; + + public GpsDot(Actor self, GpsDotInfo info) + { + this.self = self; + this.info = info; + anim = new Animation("gpsdot"); + anim.PlayRepeating(info.String); - self = init.self; - rs = self.Trait(); self.World.AddFrameEndTask(w => w.Add(this)); - if(self.World.LocalPlayer != null) + if (self.World.LocalPlayer != null) watcher = self.World.LocalPlayer.PlayerActor.Trait(); } + bool firstTick = true; public void Tick(World world) { - show = false; - if (self.Destroyed) world.AddFrameEndTask(w => w.Remove(this)); - if (world.LocalPlayer == null) + if (world.LocalPlayer == null || !self.IsInWorld || self.Destroyed) return; - if ( - self.IsInWorld - && (watcher.Granted || watcher.GrantedAllies) - && !self.Trait().IsVisible(self.World.RenderedShroud, self) // WRONG - && (!self.HasTrait() || !self.Trait().Cloaked) - && (!self.HasTrait() || !self.Trait().Disguised) - ) + // Can be granted at runtime via a crate, so can't cache + var cloak = self.TraitOrDefault(); + + if (firstTick) { - show = true; + huf = self.TraitOrDefault(); + spy = self.TraitOrDefault(); + firstTick = false; } + + var hasGps = (watcher != null && (watcher.Granted || watcher.GrantedAllies)); + var hasDot = (huf != null && !huf.IsVisible(self.World.RenderedShroud, self)); // WRONG (why?) + var dotHidden = (cloak != null && cloak.Cloaked) || (spy != null && spy.Disguised); + + show = hasGps && hasDot && !dotHidden; } - public IEnumerable Render() + public IEnumerable Render(WorldRenderer wr) { - if (show && !self.Destroyed) - { - var p = self.CenterLocation; - yield return new Renderable(anim.Image, p.ToFloat2() - 0.5f * anim.Image.size, rs.Palette(self.Owner), p.Y) - .WithScale(1.5f); - } + if (!show || self.Destroyed) + yield break; + + var p = self.CenterLocation; + var palette = wr.Palette(info.IndicatorPalettePrefix+self.Owner.InternalName); + yield return new Renderable(anim.Image, p.ToFloat2() - 0.5f * anim.Image.size, palette, p.Y) + .WithScale(1.5f); + } } } diff --git a/OpenRA.Mods.RA/Effects/GpsSatellite.cs b/OpenRA.Mods.RA/Effects/GpsSatellite.cs index 30d0d63df3..be28c34cc5 100644 --- a/OpenRA.Mods.RA/Effects/GpsSatellite.cs +++ b/OpenRA.Mods.RA/Effects/GpsSatellite.cs @@ -36,9 +36,9 @@ namespace OpenRA.Mods.RA.Effects world.AddFrameEndTask(w => w.Remove(this)); } - public IEnumerable Render() + public IEnumerable Render(WorldRenderer wr) { - yield return new Renderable(anim.Image,offset, "effect", (int)offset.Y); + yield return new Renderable(anim.Image,offset, wr.Palette("effect"), (int)offset.Y); } } } diff --git a/OpenRA.Mods.RA/Effects/GravityBomb.cs b/OpenRA.Mods.RA/Effects/GravityBomb.cs index 36a142c7ab..090c776995 100755 --- a/OpenRA.Mods.RA/Effects/GravityBomb.cs +++ b/OpenRA.Mods.RA/Effects/GravityBomb.cs @@ -51,10 +51,10 @@ namespace OpenRA.Mods.RA.Effects anim.Tick(); } - public IEnumerable Render() + public IEnumerable Render(WorldRenderer wr) { - yield return new Renderable(anim.Image, - Args.dest.ToInt2() - new int2(0, altitude) - .5f * anim.Image.size, "effect", Args.dest.Y); + var pos = Args.dest.ToInt2() - new int2(0, altitude) - .5f * anim.Image.size; + yield return new Renderable(anim.Image, pos, wr.Palette("effect"), Args.dest.Y); } } } diff --git a/OpenRA.Mods.RA/Effects/InvulnEffect.cs b/OpenRA.Mods.RA/Effects/InvulnEffect.cs index 1e17098892..d16dd233a9 100644 --- a/OpenRA.Mods.RA/Effects/InvulnEffect.cs +++ b/OpenRA.Mods.RA/Effects/InvulnEffect.cs @@ -10,6 +10,7 @@ using System.Collections.Generic; using OpenRA.Effects; +using OpenRA.Graphics; using OpenRA.Traits; namespace OpenRA.Mods.RA.Effects @@ -31,13 +32,13 @@ namespace OpenRA.Mods.RA.Effects world.AddFrameEndTask(w => w.Remove(this)); } - public IEnumerable Render() + public IEnumerable Render(WorldRenderer wr) { if (a.Destroyed) // Tick will clean up yield break; - foreach (var r in a.Render()) - yield return r.WithPalette("invuln"); + foreach (var r in a.Render(wr)) + yield return r.WithPalette(wr.Palette("invuln")); } } } diff --git a/OpenRA.Mods.RA/Effects/LaserZap.cs b/OpenRA.Mods.RA/Effects/LaserZap.cs index bba07c0386..de0589ebd1 100755 --- a/OpenRA.Mods.RA/Effects/LaserZap.cs +++ b/OpenRA.Mods.RA/Effects/LaserZap.cs @@ -74,11 +74,11 @@ namespace OpenRA.Mods.RA.Effects world.AddFrameEndTask(w => w.Remove(this)); } - public IEnumerable Render() + public IEnumerable Render(WorldRenderer wr) { if (explosion != null) - yield return new Renderable(explosion.Image, - args.dest.ToFloat2() - .5f * explosion.Image.size, "effect", (int)args.dest.Y); + yield return new Renderable(explosion.Image, args.dest.ToFloat2() - .5f * explosion.Image.size, + wr.Palette("effect"), (int)args.dest.Y); if (ticks >= info.BeamDuration) yield break; diff --git a/OpenRA.Mods.RA/Effects/Missile.cs b/OpenRA.Mods.RA/Effects/Missile.cs index f6e84ae683..d273a087a9 100755 --- a/OpenRA.Mods.RA/Effects/Missile.cs +++ b/OpenRA.Mods.RA/Effects/Missile.cs @@ -152,11 +152,11 @@ namespace OpenRA.Mods.RA.Effects Combat.DoImpacts(Args); } - public IEnumerable Render() + public IEnumerable Render(WorldRenderer wr) { if (Args.firedBy.World.RenderedShroud.IsVisible(PxPosition.ToCPos())) yield return new Renderable(anim.Image, PxPosition.ToFloat2() - 0.5f * anim.Image.size - new float2(0, Altitude), - Args.weapon.Underwater ? "shadow" : "effect", PxPosition.Y); + wr.Palette(Args.weapon.Underwater ? "shadow" : "effect"), PxPosition.Y); if (Trail != null) Trail.Render(Args.firedBy); diff --git a/OpenRA.Mods.RA/Effects/NukeLaunch.cs b/OpenRA.Mods.RA/Effects/NukeLaunch.cs index 251370991f..8b52557bca 100755 --- a/OpenRA.Mods.RA/Effects/NukeLaunch.cs +++ b/OpenRA.Mods.RA/Effects/NukeLaunch.cs @@ -77,10 +77,10 @@ namespace OpenRA.Mods.RA.Effects a.Trait.Enable(); } - public IEnumerable Render() + public IEnumerable Render(WorldRenderer wr) { yield return new Renderable(anim.Image, pos.ToFloat2() - 0.5f * anim.Image.size - new float2(0, altitude), - "effect", (int)pos.Y); + wr.Palette("effect"), (int)pos.Y); } } } diff --git a/OpenRA.Mods.RA/Effects/Parachute.cs b/OpenRA.Mods.RA/Effects/Parachute.cs index eede52a569..9fdb71b549 100644 --- a/OpenRA.Mods.RA/Effects/Parachute.cs +++ b/OpenRA.Mods.RA/Effects/Parachute.cs @@ -9,6 +9,7 @@ #endregion using System.Collections.Generic; +using System.Linq; using OpenRA.Effects; using OpenRA.Graphics; using OpenRA.Traits; @@ -17,8 +18,6 @@ namespace OpenRA.Mods.RA.Effects { public class Parachute : IEffect { - readonly Animation anim; - readonly string palette; readonly Animation paraAnim; readonly PPos location; @@ -28,29 +27,19 @@ namespace OpenRA.Mods.RA.Effects float altitude; const float fallRate = .3f; - public Parachute(Player owner, PPos location, int altitude, Actor cargo) + public Parachute(Actor cargo, PPos location, int altitude) { this.location = location; this.altitude = altitude; this.cargo = cargo; - var rs = cargo.Trait(); - var image = rs.anim.Name; - palette = rs.Palette(owner); - - anim = new Animation(image); - if (anim.HasSequence("idle")) - anim.PlayFetchIndex("idle", () => 0); - else - anim.PlayFetchIndex("stand", () => 0); - anim.Tick(); - var pai = cargo.Info.Traits.GetOrDefault(); - paraAnim = new Animation(pai != null ? pai.ParachuteSprite : "parach"); paraAnim.PlayThen("open", () => paraAnim.PlayRepeating("idle")); if (pai != null) offset = pai.Offset; + + cargo.Trait().SetPxPosition(cargo, location); } public void Tick(World world) @@ -73,12 +62,18 @@ namespace OpenRA.Mods.RA.Effects }); } - public IEnumerable Render() + public IEnumerable Render(WorldRenderer wr) { + var rc = cargo.Render(wr).Select(a => a.WithPos(a.Pos - new float2(0, altitude)) + .WithZOffset(a.ZOffset + (int)altitude)); + foreach (var c in rc) + { + yield return c.WithPos(location.ToFloat2() - .5f * c.Sprite.size).WithPalette(wr.Palette("shadow")).WithZOffset(0); + yield return c.WithZOffset(2); + } + var pos = location.ToFloat2() - new float2(0, altitude); - yield return new Renderable(anim.Image, location.ToFloat2() - .5f * anim.Image.size, "shadow", 0); - yield return new Renderable(anim.Image, pos - .5f * anim.Image.size, palette, 2); - yield return new Renderable(paraAnim.Image, pos - .5f * paraAnim.Image.size + offset, palette, 3); + yield return new Renderable(paraAnim.Image, pos - .5f * paraAnim.Image.size + offset, rc.First().Palette, 3); } } } diff --git a/OpenRA.Mods.RA/Effects/PowerdownIndicator.cs b/OpenRA.Mods.RA/Effects/PowerdownIndicator.cs index 96b568c3d3..1605d9dfcd 100644 --- a/OpenRA.Mods.RA/Effects/PowerdownIndicator.cs +++ b/OpenRA.Mods.RA/Effects/PowerdownIndicator.cs @@ -34,11 +34,11 @@ namespace OpenRA.Mods.RA.Effects anim.Tick(); } - public IEnumerable Render() + public IEnumerable Render(WorldRenderer wr) { if (!a.Destroyed && (a.World.LocalPlayer == null || a.Owner.Stances[a.Owner.World.LocalPlayer] == Stance.Ally)) - yield return new Renderable(anim.Image, - a.CenterLocation.ToFloat2() - .5f * anim.Image.size, "chrome", (int)a.CenterLocation.Y); + yield return new Renderable(anim.Image, a.CenterLocation.ToFloat2() - .5f * anim.Image.size, + wr.Palette("chrome"), (int)a.CenterLocation.Y); } } } diff --git a/OpenRA.Mods.RA/Effects/RallyPoint.cs b/OpenRA.Mods.RA/Effects/RallyPoint.cs index bedd9a904e..555d597bd6 100755 --- a/OpenRA.Mods.RA/Effects/RallyPoint.cs +++ b/OpenRA.Mods.RA/Effects/RallyPoint.cs @@ -20,13 +20,15 @@ namespace OpenRA.Mods.RA.Effects { readonly Actor building; readonly RA.RallyPoint rp; + readonly string palettePrefix; public Animation flag = new Animation("rallypoint"); public Animation circles = new Animation("rallypoint"); - public RallyPoint(Actor building) + public RallyPoint(Actor building, string palettePrefix) { this.building = building; rp = building.Trait(); + this.palettePrefix = palettePrefix; flag.PlayRepeating("flag"); circles.Play("circles"); } @@ -46,13 +48,13 @@ namespace OpenRA.Mods.RA.Effects world.AddFrameEndTask(w => w.Remove(this)); } - public IEnumerable Render() + public IEnumerable Render(WorldRenderer wr) { if (building.IsInWorld && building.Owner == building.World.LocalPlayer && building.World.Selection.Actors.Contains(building)) { var pos = Traits.Util.CenterOfCell(rp.rallyPoint); - var palette = building.Trait().Palette(building.Owner); + var palette = wr.Palette(palettePrefix+building.Owner.InternalName); yield return new Renderable(circles.Image, pos.ToFloat2() - .5f * circles.Image.size, diff --git a/OpenRA.Mods.RA/Effects/RepairIndicator.cs b/OpenRA.Mods.RA/Effects/RepairIndicator.cs index e710e92534..302e07f991 100755 --- a/OpenRA.Mods.RA/Effects/RepairIndicator.cs +++ b/OpenRA.Mods.RA/Effects/RepairIndicator.cs @@ -20,34 +20,35 @@ namespace OpenRA.Mods.RA.Effects { Actor building; Player player; + string palettePrefix; Animation anim = new Animation("allyrepair"); + RepairableBuilding rb; - public RepairIndicator(Actor building, Player player) + public RepairIndicator(Actor building, string palettePrefix, Player player) { this.building = building; this.player = player; + this.palettePrefix = palettePrefix; + rb = building.Trait(); anim.PlayRepeating("repair"); } public void Tick(World world) { - if (!building.IsInWorld || - building.IsDead() || - building.Trait().Repairer == null || - building.Trait().Repairer != player) + if (!building.IsInWorld || building.IsDead() || + rb.Repairer == null || rb.Repairer != player) world.AddFrameEndTask(w => w.Remove(this)); anim.Tick(); } - public IEnumerable Render() + public IEnumerable Render(WorldRenderer wr) { if (!building.Destroyed) { - var palette = building.Trait().Palette(player); - yield return new Renderable(anim.Image, - building.CenterLocation.ToFloat2() - .5f * anim.Image.size, palette, (int)building.CenterLocation.Y); + building.CenterLocation.ToFloat2() - .5f * anim.Image.size, + wr.Palette(palettePrefix+player.InternalName), (int)building.CenterLocation.Y); } } } diff --git a/OpenRA.Mods.RA/Effects/SatelliteLaunch.cs b/OpenRA.Mods.RA/Effects/SatelliteLaunch.cs index 1934e6f3e0..047f27e5ba 100644 --- a/OpenRA.Mods.RA/Effects/SatelliteLaunch.cs +++ b/OpenRA.Mods.RA/Effects/SatelliteLaunch.cs @@ -40,9 +40,9 @@ namespace OpenRA.Mods.RA.Effects } } - public IEnumerable Render() + public IEnumerable Render(WorldRenderer wr) { - yield return new Renderable(doors.Image, pos, "effect", (int)doorOffset.Y); + yield return new Renderable(doors.Image, pos, wr.Palette("effect"), (int)doorOffset.Y); } } } diff --git a/OpenRA.Mods.RA/Effects/Smoke.cs b/OpenRA.Mods.RA/Effects/Smoke.cs index e966e9b355..f82f963296 100644 --- a/OpenRA.Mods.RA/Effects/Smoke.cs +++ b/OpenRA.Mods.RA/Effects/Smoke.cs @@ -33,9 +33,10 @@ namespace OpenRA.Mods.RA.Effects anim.Tick(); } - public IEnumerable Render() + public IEnumerable Render(WorldRenderer wr) { - yield return new Renderable(anim.Image, pos.ToFloat2() - .5f * anim.Image.size, "effect", (int)pos.Y); + yield return new Renderable(anim.Image, pos.ToFloat2() - .5f * anim.Image.size, + wr.Palette("effect"), (int)pos.Y); } } } diff --git a/OpenRA.Mods.RA/Effects/TeslaZap.cs b/OpenRA.Mods.RA/Effects/TeslaZap.cs index 4ef516e5d0..3d9a25c801 100755 --- a/OpenRA.Mods.RA/Effects/TeslaZap.cs +++ b/OpenRA.Mods.RA/Effects/TeslaZap.cs @@ -29,27 +29,35 @@ namespace OpenRA.Mods.RA.Effects class TeslaZap : IEffect { readonly ProjectileArgs Args; + readonly TeslaZapInfo Info; + IEnumerable renderables; int timeUntilRemove = 2; // # of frames bool doneDamage = false; - - readonly List renderables = new List(); + bool initialized = false; public TeslaZap(TeslaZapInfo info, ProjectileArgs args) { Args = args; - var bright = SequenceProvider.GetSequence(info.Image, "bright"); - var dim = SequenceProvider.GetSequence(info.Image, "dim"); - - for( var n = 0; n < info.DimZaps; n++ ) - renderables.AddRange(DrawZapWandering(args.src, args.dest, dim)); - for( var n = 0; n < info.BrightZaps; n++ ) - renderables.AddRange(DrawZapWandering(args.src, args.dest, bright)); + Info = info; } - public void Tick( World world ) + public IEnumerable GenerateRenderables(WorldRenderer wr) { - if( timeUntilRemove <= 0 ) - world.AddFrameEndTask( w => w.Remove( this ) ); + var bright = SequenceProvider.GetSequence(Info.Image, "bright"); + var dim = SequenceProvider.GetSequence(Info.Image, "dim"); + + for (var n = 0; n < Info.DimZaps; n++) + foreach (var z in DrawZapWandering(wr, Args.src, Args.dest, dim)) + yield return z; + for (var n = 0; n < Info.BrightZaps; n++) + foreach (var z in DrawZapWandering(wr, Args.src, Args.dest, bright)) + yield return z; + } + + public void Tick(World world) + { + if (timeUntilRemove <= 0) + world.AddFrameEndTask(w => w.Remove(this)); --timeUntilRemove; if (!doneDamage) @@ -62,9 +70,18 @@ namespace OpenRA.Mods.RA.Effects } } - public IEnumerable Render() { return renderables; } + public IEnumerable Render(WorldRenderer wr) + { + if (!initialized) + { + renderables = GenerateRenderables(wr); + initialized = true; + } - static IEnumerable DrawZapWandering(PPos from, PPos to, Sequence s) + return renderables; + } + + static IEnumerable DrawZapWandering(WorldRenderer wr, PPos from, PPos to, Sequence s) { var z = float2.Zero; /* hack */ var dist = to - from; @@ -76,22 +93,22 @@ namespace OpenRA.Mods.RA.Effects var p1 = from.ToFloat2() + (1 / 3f) * dist.ToFloat2() + Game.CosmeticRandom.Gauss1D(1) * .2f * dist.Length * norm; var p2 = from.ToFloat2() + (2 / 3f) * dist.ToFloat2() + Game.CosmeticRandom.Gauss1D(1) * .2f * dist.Length * norm; - renderables.AddRange(DrawZap(from.ToFloat2(), p1, s, out p1)); - renderables.AddRange(DrawZap(p1, p2, s, out p2)); - renderables.AddRange(DrawZap(p2, to.ToFloat2(), s, out z)); + renderables.AddRange(DrawZap(wr, from.ToFloat2(), p1, s, out p1)); + renderables.AddRange(DrawZap(wr, p1, p2, s, out p2)); + renderables.AddRange(DrawZap(wr, p2, to.ToFloat2(), s, out z)); } else { var p1 = from.ToFloat2() + (1 / 2f) * dist.ToFloat2() + Game.CosmeticRandom.Gauss1D(1) * .2f * dist.Length * norm; - renderables.AddRange(DrawZap(from.ToFloat2(), p1, s, out p1)); - renderables.AddRange(DrawZap(p1, to.ToFloat2(), s, out z)); + renderables.AddRange(DrawZap(wr, from.ToFloat2(), p1, s, out p1)); + renderables.AddRange(DrawZap(wr, p1, to.ToFloat2(), s, out z)); } return renderables; } - static IEnumerable DrawZap(float2 from, float2 to, Sequence s, out float2 p) + static IEnumerable DrawZap(WorldRenderer wr, float2 from, float2 to, Sequence s, out float2 p) { var dist = to - from; var q = new float2(-dist.Y, dist.X); @@ -104,7 +121,8 @@ namespace OpenRA.Mods.RA.Effects var step = steps.Where(t => (to - (z + new float2(t[0],t[1]))).LengthSquared < (to - z).LengthSquared ) .OrderBy(t => Math.Abs(float2.Dot(z + new float2(t[0], t[1]), q) + c)).First(); - rs.Add(new Renderable(s.GetSprite(step[4]), z + new float2(step[2], step[3]), "effect", (int)from.Y)); + rs.Add(new Renderable(s.GetSprite(step[4]), z + new float2(step[2], step[3]), + wr.Palette("effect"), (int)from.Y)); z += new float2(step[0], step[1]); if( rs.Count >= 1000 ) break; diff --git a/OpenRA.Mods.RA/FogPalette.cs b/OpenRA.Mods.RA/FogPalette.cs new file mode 100644 index 0000000000..642bb4e684 --- /dev/null +++ b/OpenRA.Mods.RA/FogPalette.cs @@ -0,0 +1,44 @@ +#region Copyright & License Information +/* + * Copyright 2007-2013 The OpenRA Developers (see AUTHORS) + * This file is part of OpenRA, which is free software. It is made + * available to you under the terms of the GNU General Public License + * as published by the Free Software Foundation. For more information, + * see COPYING. + */ +#endregion + +using System.Drawing; +using OpenRA.FileFormats; +using OpenRA.Graphics; +using OpenRA.Traits; + +namespace OpenRA.Mods.RA +{ + class FogPaletteInfo : ITraitInfo + { + public readonly string Name = "fog"; + public object Create(ActorInitializer init) { return new FogPalette(this); } + } + + class FogPalette : IPalette + { + readonly FogPaletteInfo info; + + public FogPalette(FogPaletteInfo info) { this.info = info; } + + public void InitPalette(WorldRenderer wr) + { + var c = new[] { + Color.Transparent, Color.Green, + Color.Blue, Color.Yellow, + Color.FromArgb(128,0,0,0), + Color.FromArgb(128,0,0,0), + Color.FromArgb(128,0,0,0), + Color.FromArgb(64,0,0,0) + }; + + wr.AddPalette(info.Name, new Palette(Exts.MakeArray(256, i => (uint)c[i % 8].ToArgb())), false); + } + } +} diff --git a/OpenRA.Mods.RA/GainsExperience.cs b/OpenRA.Mods.RA/GainsExperience.cs index a267df8ab9..022c78c208 100644 --- a/OpenRA.Mods.RA/GainsExperience.cs +++ b/OpenRA.Mods.RA/GainsExperience.cs @@ -97,23 +97,23 @@ namespace OpenRA.Mods.RA return Level > 0 ? Info.SpeedModifier[Level - 1] : 1m; } - public IEnumerable ModifyRender(Actor self, IEnumerable rs) + public IEnumerable ModifyRender(Actor self, WorldRenderer wr, IEnumerable r) { if (self.Owner == self.World.LocalPlayer && Level > 0) - return InnerModifyRender(self, rs); + return InnerModifyRender(self, wr, r); else - return rs; + return r; } - IEnumerable InnerModifyRender(Actor self, IEnumerable rs) + IEnumerable InnerModifyRender(Actor self, WorldRenderer wr, IEnumerable r) { - foreach (var r in rs) - yield return r; + foreach (var rs in r) + yield return rs; RankAnim.Tick(); // HACK var bounds = self.Bounds.Value; - yield return new Renderable(RankAnim.Image, - new float2(bounds.Right - 6, bounds.Bottom - 8), "effect", self.CenterLocation.Y); + yield return new Renderable(RankAnim.Image, new float2(bounds.Right - 6, bounds.Bottom - 8), + wr.Palette("effect"), self.CenterLocation.Y); } } diff --git a/OpenRA.Mods.RA/InvisibleToEnemy.cs b/OpenRA.Mods.RA/InvisibleToEnemy.cs index e3ff497308..248f7d7cd9 100644 --- a/OpenRA.Mods.RA/InvisibleToEnemy.cs +++ b/OpenRA.Mods.RA/InvisibleToEnemy.cs @@ -10,6 +10,7 @@ using System.Collections.Generic; using System.Drawing; +using OpenRA.Graphics; using OpenRA.Traits; namespace OpenRA.Mods.RA @@ -32,7 +33,7 @@ namespace OpenRA.Mods.RA static readonly Renderable[] Nothing = { }; - public IEnumerable ModifyRender(Actor self, IEnumerable r) + public IEnumerable ModifyRender(Actor self, WorldRenderer wr, IEnumerable r) { return IsVisible(self.Owner.Shroud, self) ? r : Nothing; } diff --git a/OpenRA.Mods.RA/LightPaletteRotator.cs b/OpenRA.Mods.RA/LightPaletteRotator.cs index d3e827b540..ec2e166a3f 100644 --- a/OpenRA.Mods.RA/LightPaletteRotator.cs +++ b/OpenRA.Mods.RA/LightPaletteRotator.cs @@ -24,15 +24,10 @@ namespace OpenRA.Mods.RA t += .5f; } - static readonly string[] ExcludePalettes = { "cursor", "chrome", "colorpicker", "terrain" }; - public void AdjustPalette(Dictionary palettes) { foreach (var pal in palettes) { - if (ExcludePalettes.Contains(pal.Key)) - continue; - var rotate = (int)t % 18; if (rotate > 9) rotate = 18 - rotate; diff --git a/OpenRA.Mods.RA/Missions/Allies04Script.cs b/OpenRA.Mods.RA/Missions/Allies04Script.cs index 67de7a0026..39f4c92f0b 100644 --- a/OpenRA.Mods.RA/Missions/Allies04Script.cs +++ b/OpenRA.Mods.RA/Missions/Allies04Script.cs @@ -17,6 +17,7 @@ using OpenRA.Mods.RA.Activities; using OpenRA.Mods.RA.Buildings; using OpenRA.Mods.RA.Move; using OpenRA.Mods.RA.Render; +using OpenRA.Graphics; using OpenRA.Traits; using OpenRA.Widgets; @@ -489,19 +490,21 @@ namespace OpenRA.Mods.RA.Missions public override object Create(ActorInitializer init) { return new Allies04RenderHijacked(init.self, this); } } - class Allies04RenderHijacked : RenderUnit, IRenderModifier + class Allies04RenderHijacked : RenderUnit { Allies04Hijackable hijackable; + Allies04RenderHijackedInfo info; public Allies04RenderHijacked(Actor self, Allies04RenderHijackedInfo info) : base(self) { + this.info = info; hijackable = self.Trait(); } - public IEnumerable ModifyRender(Actor self, IEnumerable r) + protected override string PaletteName(Actor self) { - return r.Select(a => a.WithPalette(Palette(hijackable.OldOwner))); + return info.Palette ?? info.PlayerPalette + hijackable.OldOwner.InternalName; } } diff --git a/OpenRA.Mods.RA/Modifiers/FrozenUnderFog.cs b/OpenRA.Mods.RA/Modifiers/FrozenUnderFog.cs index 9354c46672..c4f823be48 100644 --- a/OpenRA.Mods.RA/Modifiers/FrozenUnderFog.cs +++ b/OpenRA.Mods.RA/Modifiers/FrozenUnderFog.cs @@ -10,6 +10,7 @@ using System.Collections.Generic; using System.Linq; +using OpenRA.Graphics; using OpenRA.Traits; namespace OpenRA.Mods.RA @@ -24,7 +25,7 @@ namespace OpenRA.Mods.RA } Renderable[] cache = { }; - public IEnumerable ModifyRender(Actor self, IEnumerable r) + public IEnumerable ModifyRender(Actor self, WorldRenderer wr, IEnumerable r) { if (IsVisible(self.World.RenderedShroud, self)) cache = r.ToArray(); diff --git a/OpenRA.Mods.RA/Modifiers/HiddenUnderFog.cs b/OpenRA.Mods.RA/Modifiers/HiddenUnderFog.cs index 865cf7effb..cba548f4e4 100644 --- a/OpenRA.Mods.RA/Modifiers/HiddenUnderFog.cs +++ b/OpenRA.Mods.RA/Modifiers/HiddenUnderFog.cs @@ -10,6 +10,7 @@ using System.Collections.Generic; using System.Linq; +using OpenRA.Graphics; using OpenRA.Traits; namespace OpenRA.Mods.RA @@ -24,7 +25,7 @@ namespace OpenRA.Mods.RA } static Renderable[] Nothing = { }; - public IEnumerable ModifyRender(Actor self, IEnumerable r) + public IEnumerable ModifyRender(Actor self, WorldRenderer wr, IEnumerable r) { return IsVisible(self.World.RenderedShroud, self) ? r : Nothing; } diff --git a/OpenRA.Mods.RA/NukePaletteEffect.cs b/OpenRA.Mods.RA/NukePaletteEffect.cs index 3e463fdd11..21215ee546 100644 --- a/OpenRA.Mods.RA/NukePaletteEffect.cs +++ b/OpenRA.Mods.RA/NukePaletteEffect.cs @@ -32,8 +32,6 @@ namespace OpenRA.Mods.RA if (remainingFrames > 0) remainingFrames--; } - - static List excludePalettes = new List{ "cursor", "chrome", "colorpicker", "shroud", "fog" }; public void AdjustPalette(Dictionary palettes) { @@ -44,9 +42,6 @@ namespace OpenRA.Mods.RA foreach (var pal in palettes) { - if (excludePalettes.Contains(pal.Key)) - continue; - for (var x = 0; x < 256; x++) { var orig = pal.Value.GetColor(x); diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj index baed6d3c4d..353821fbd6 100644 --- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj +++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj @@ -169,7 +169,6 @@ - @@ -408,6 +407,8 @@ + + diff --git a/OpenRA.Mods.RA/Orders/PlaceBuildingOrderGenerator.cs b/OpenRA.Mods.RA/Orders/PlaceBuildingOrderGenerator.cs index 8864ae20ae..d630adba81 100755 --- a/OpenRA.Mods.RA/Orders/PlaceBuildingOrderGenerator.cs +++ b/OpenRA.Mods.RA/Orders/PlaceBuildingOrderGenerator.cs @@ -21,9 +21,10 @@ namespace OpenRA.Mods.RA.Orders { readonly Actor Producer; readonly string Building; - readonly IEnumerable Preview; readonly BuildingInfo BuildingInfo; + IEnumerable preview; Sprite buildOk, buildBlocked; + bool initialized = false; public PlaceBuildingOrderGenerator(Actor producer, string name) { @@ -31,9 +32,6 @@ namespace OpenRA.Mods.RA.Orders Building = name; BuildingInfo = Rules.Info[Building].Traits.Get(); - Preview = Rules.Info[Building].Traits.Get() - .RenderPreview(Rules.Info[Building], producer.Owner); - buildOk = SequenceProvider.GetSequence("overlay", "build-valid").GetSprite(0); buildBlocked = SequenceProvider.GetSequence("overlay", "build-invalid").GetSprite(0); } @@ -43,7 +41,7 @@ namespace OpenRA.Mods.RA.Orders if (mi.Button == MouseButton.Right) world.CancelInputMode(); - var ret = InnerOrder( world, xy, mi ).ToList(); + var ret = InnerOrder(world, xy, mi).ToList(); if (ret.Count > 0) world.CancelInputMode(); @@ -54,26 +52,26 @@ namespace OpenRA.Mods.RA.Orders { if (mi.Button == MouseButton.Left) { - var topLeft = xy - FootprintUtils.AdjustForBuildingSize( BuildingInfo ); - if (!world.CanPlaceBuilding( Building, BuildingInfo, topLeft, null) + var topLeft = xy - FootprintUtils.AdjustForBuildingSize(BuildingInfo); + if (!world.CanPlaceBuilding(Building, BuildingInfo, topLeft, null) || !BuildingInfo.IsCloseEnoughToBase(world, Producer.Owner, Building, topLeft)) { Sound.PlayNotification(Producer.Owner, "Speech", "BuildingCannotPlaceAudio", Producer.Owner.Country.Race); yield break; } - var isLineBuild = Rules.Info[ Building ].Traits.Contains(); + var isLineBuild = Rules.Info[Building].Traits.Contains(); yield return new Order(isLineBuild ? "LineBuild" : "PlaceBuilding", Producer.Owner.PlayerActor, false) { TargetLocation = topLeft, TargetString = Building }; } } - public void Tick( World world ) {} - public void RenderAfterWorld( WorldRenderer wr, World world ) {} - public void RenderBeforeWorld( WorldRenderer wr, World world ) + public void Tick(World world) {} + public void RenderAfterWorld(WorldRenderer wr, World world) {} + public void RenderBeforeWorld(WorldRenderer wr, World world) { var position = Game.viewport.ViewToWorld(Viewport.LastMousePos); - var topLeft = position - FootprintUtils.AdjustForBuildingSize( BuildingInfo ); + var topLeft = position - FootprintUtils.AdjustForBuildingSize(BuildingInfo); var actorInfo = Rules.Info[Building]; foreach (var dec in actorInfo.Traits.WithInterface()) @@ -84,24 +82,34 @@ namespace OpenRA.Mods.RA.Orders // Assumes a 1x1 footprint; weird things will happen for other footprints if (Rules.Info[Building].Traits.Contains()) { - foreach( var t in BuildingUtils.GetLineBuildCells( world, topLeft, Building, BuildingInfo ) ) - cells.Add( t, BuildingInfo.IsCloseEnoughToBase( world, world.LocalPlayer, Building, t ) ); + foreach (var t in BuildingUtils.GetLineBuildCells(world, topLeft, Building, BuildingInfo)) + cells.Add(t, BuildingInfo.IsCloseEnoughToBase(world, world.LocalPlayer, Building, t)); } else { - foreach (var r in Preview) + if (!initialized) + { + var rbi = Rules.Info[Building].Traits.Get(); + var palette = rbi.Palette ?? (Producer.Owner != null ? + rbi.PlayerPalette + Producer.Owner.InternalName : null); + + preview = rbi.RenderPreview(Rules.Info[Building], wr.Palette(palette)); + initialized = true; + } + + foreach (var r in preview) r.Sprite.DrawAt(topLeft.ToPPos().ToFloat2() + r.Pos, - wr.GetPaletteIndex(r.Palette), + r.Palette.Index, r.Scale*r.Sprite.size); var res = world.WorldActor.Trait(); var isCloseEnough = BuildingInfo.IsCloseEnoughToBase(world, world.LocalPlayer, Building, topLeft); foreach (var t in FootprintUtils.Tiles(Building, BuildingInfo, topLeft)) - cells.Add( t, isCloseEnough && world.IsCellBuildable(t, BuildingInfo) && res.GetResource(t) == null ); + cells.Add(t, isCloseEnough && world.IsCellBuildable(t, BuildingInfo) && res.GetResource(t) == null); } - foreach( var c in cells ) - ( c.Value ? buildOk : buildBlocked ).DrawAt(wr, c.Key.ToPPos().ToFloat2(), "terrain" ); + foreach (var c in cells) + (c.Value ? buildOk : buildBlocked).DrawAt(wr, c.Key.ToPPos().ToFloat2(), "terrain"); } public string GetCursor(World world, CPos xy, MouseInput mi) { return "default"; } diff --git a/OpenRA.Mods.RA/PaletteFromCurrentTileset.cs b/OpenRA.Mods.RA/PaletteFromCurrentTileset.cs index f98af6175c..8c045aef07 100644 --- a/OpenRA.Mods.RA/PaletteFromCurrentTileset.cs +++ b/OpenRA.Mods.RA/PaletteFromCurrentTileset.cs @@ -17,6 +17,7 @@ namespace OpenRA.Mods.RA { public readonly string Name = null; public readonly int[] ShadowIndex = { }; + public readonly bool AllowModifiers = true; public object Create(ActorInitializer init) { return new PaletteFromCurrentTileset(init.world, this); } } @@ -32,9 +33,9 @@ namespace OpenRA.Mods.RA this.info = info; } - public void InitPalette( OpenRA.Graphics.WorldRenderer wr ) + public void InitPalette(OpenRA.Graphics.WorldRenderer wr) { - wr.AddPalette( info.Name, new Palette( FileSystem.Open( world.TileSet.Palette ), info.ShadowIndex ) ); + wr.AddPalette(info.Name, new Palette(FileSystem.Open(world.TileSet.Palette), info.ShadowIndex), info.AllowModifiers); } } } diff --git a/OpenRA.Mods.RA/PaletteFromFile.cs b/OpenRA.Mods.RA/PaletteFromFile.cs index 94706ea61e..6a60aa8d67 100644 --- a/OpenRA.Mods.RA/PaletteFromFile.cs +++ b/OpenRA.Mods.RA/PaletteFromFile.cs @@ -20,6 +20,7 @@ namespace OpenRA.Mods.RA public readonly string Tileset = null; public readonly string Filename = null; public readonly int[] ShadowIndex = { }; + public readonly bool AllowModifiers = true; public object Create(ActorInitializer init) { return new PaletteFromFile(init.world, this); } } @@ -34,10 +35,10 @@ namespace OpenRA.Mods.RA this.info = info; } - public void InitPalette( WorldRenderer wr ) + public void InitPalette(WorldRenderer wr) { - if( info.Tileset == null || info.Tileset.ToLowerInvariant() == world.Map.Tileset.ToLowerInvariant() ) - wr.AddPalette( info.Name, new Palette( FileSystem.Open( info.Filename ), info.ShadowIndex ) ); + if (info.Tileset == null || info.Tileset.ToLowerInvariant() == world.Map.Tileset.ToLowerInvariant()) + wr.AddPalette(info.Name, new Palette(FileSystem.Open(info.Filename), info.ShadowIndex), info.AllowModifiers); } } } diff --git a/OpenRA.Mods.RA/PaletteFromRGBA.cs b/OpenRA.Mods.RA/PaletteFromRGBA.cs index 95ebef6905..4f8a33c14f 100644 --- a/OpenRA.Mods.RA/PaletteFromRGBA.cs +++ b/OpenRA.Mods.RA/PaletteFromRGBA.cs @@ -23,6 +23,7 @@ namespace OpenRA.Mods.RA public readonly int G = 0; public readonly int B = 0; public readonly int A = 255; + public readonly bool AllowModifiers = true; public object Create(ActorInitializer init) { return new PaletteFromRGBA(init.world, this); } } @@ -37,28 +38,14 @@ namespace OpenRA.Mods.RA this.info = info; } - public void InitPalette( WorldRenderer wr ) + public void InitPalette(WorldRenderer wr) { - if (info.Tileset == null || info.Tileset.ToLowerInvariant() == world.Map.Tileset.ToLowerInvariant()) - { - // TODO: This shouldn't rely on a base palette - var pal = wr.GetPalette("terrain"); - wr.AddPalette(info.Name, new Palette(pal, new SingleColorRemap(Color.FromArgb(info.A, info.R, info.G, info.B)))); - } - } - } + // Enable palette only for a specific tileset + if (info.Tileset != null && info.Tileset.ToLowerInvariant() != world.Map.Tileset.ToLowerInvariant()) + return; - class SingleColorRemap : IPaletteRemap - { - Color c; - public SingleColorRemap(Color c) - { - this.c = c; - } - - public Color GetRemappedColor(Color original, int index) - { - return original.A > 0 ? c : original; + var c = (uint)((info.A << 24) | (info.R << 16) | (info.G << 8) | info.B); + wr.AddPalette(info.Name, new Palette(Exts.MakeArray(256, i => (i == 0) ? 0 : c)), info.AllowModifiers); } } } diff --git a/OpenRA.Mods.RA/ParaDrop.cs b/OpenRA.Mods.RA/ParaDrop.cs index 1759c12cab..07788b529a 100644 --- a/OpenRA.Mods.RA/ParaDrop.cs +++ b/OpenRA.Mods.RA/ParaDrop.cs @@ -55,11 +55,9 @@ namespace OpenRA.Mods.RA var aircraft = self.Trait(); self.World.AddFrameEndTask(w => w.Add( - new Parachute( - self.Owner, + new Parachute(a, Util.CenterOfCell(self.CenterLocation.ToCPos()), - aircraft.Altitude, a - ) + aircraft.Altitude) )); Sound.Play(info.ChuteSound, self.CenterLocation); diff --git a/OpenRA.Mods.RA/PlayerPaletteFromCurrentTileset.cs b/OpenRA.Mods.RA/PlayerPaletteFromCurrentTileset.cs index 2315236f30..a28fac7522 100644 --- a/OpenRA.Mods.RA/PlayerPaletteFromCurrentTileset.cs +++ b/OpenRA.Mods.RA/PlayerPaletteFromCurrentTileset.cs @@ -17,6 +17,7 @@ namespace OpenRA.Mods.RA { public readonly string Name = null; public readonly int[] ShadowIndex = { }; + public readonly bool AllowModifiers = true; public object Create(ActorInitializer init) { return new PlayerPaletteFromCurrentTileset(init.world, this); } } @@ -35,7 +36,7 @@ namespace OpenRA.Mods.RA public void InitPalette (OpenRA.Graphics.WorldRenderer wr) { string Filename = world.TileSet.PlayerPalette == null ? world.TileSet.Palette : world.TileSet.PlayerPalette; - wr.AddPalette(info.Name, new Palette(FileSystem.Open(Filename), info.ShadowIndex)); + wr.AddPalette(info.Name, new Palette(FileSystem.Open(Filename), info.ShadowIndex), info.AllowModifiers); } } } diff --git a/OpenRA.Mods.RA/RallyPoint.cs b/OpenRA.Mods.RA/RallyPoint.cs index ba1c410200..7286f0eb1a 100755 --- a/OpenRA.Mods.RA/RallyPoint.cs +++ b/OpenRA.Mods.RA/RallyPoint.cs @@ -14,11 +14,12 @@ using OpenRA.Traits; namespace OpenRA.Mods.RA { - class RallyPointInfo : ITraitInfo, Requires + public class RallyPointInfo : ITraitInfo { public readonly int[] RallyPoint = { 1, 3 }; + public readonly string IndicatorPalettePrefix = "player"; - public object Create(ActorInitializer init) { return new RallyPoint(init.self); } + public object Create(ActorInitializer init) { return new RallyPoint(init.self, this); } } public class RallyPoint : IIssueOrder, IResolveOrder, ISync @@ -26,11 +27,10 @@ namespace OpenRA.Mods.RA [Sync] public CPos rallyPoint; public int nearEnough = 1; - public RallyPoint(Actor self) + public RallyPoint(Actor self, RallyPointInfo info) { - var info = self.Info.Traits.Get(); rallyPoint = self.Location + new CVec(info.RallyPoint[0], info.RallyPoint[1]); - self.World.AddFrameEndTask(w => w.Add(new Effects.RallyPoint(self))); + self.World.AddFrameEndTask(w => w.Add(new Effects.RallyPoint(self, info.IndicatorPalettePrefix))); } public IEnumerable Orders diff --git a/OpenRA.Mods.RA/Render/RenderBuilding.cs b/OpenRA.Mods.RA/Render/RenderBuilding.cs index 1977b314d1..ce7711bd7c 100755 --- a/OpenRA.Mods.RA/Render/RenderBuilding.cs +++ b/OpenRA.Mods.RA/Render/RenderBuilding.cs @@ -25,9 +25,9 @@ namespace OpenRA.Mods.RA.Render public readonly float2 Origin = float2.Zero; public override object Create(ActorInitializer init) { return new RenderBuilding(init, this);} - public override IEnumerable RenderPreview(ActorInfo building, Player owner) + public override IEnumerable RenderPreview(ActorInfo building, PaletteReference pr) { - return base.RenderPreview(building, owner) + return base.RenderPreview(building, pr) .Select(a => a.WithPos(a.Pos + building.Traits.Get().Origin)); } } @@ -54,7 +54,7 @@ namespace OpenRA.Mods.RA.Render self.QueueActivity(new CallFunc(() => Complete(self))); } - public IEnumerable ModifyRender(Actor self, IEnumerable r) + public IEnumerable ModifyRender(Actor self, WorldRenderer wr, IEnumerable r) { var disabled = self.IsDisabled(); foreach (var a in r) @@ -62,7 +62,7 @@ namespace OpenRA.Mods.RA.Render var ret = a.WithPos(a.Pos - Info.Origin); yield return ret; if (disabled) - yield return ret.WithPalette("disabled").WithZOffset(1); + yield return ret.WithPalette(wr.Palette("disabled")).WithZOffset(1); } } diff --git a/OpenRA.Mods.RA/Render/RenderBuildingWarFactory.cs b/OpenRA.Mods.RA/Render/RenderBuildingWarFactory.cs index 83a1d1e738..aba2eb45cb 100755 --- a/OpenRA.Mods.RA/Render/RenderBuildingWarFactory.cs +++ b/OpenRA.Mods.RA/Render/RenderBuildingWarFactory.cs @@ -20,21 +20,22 @@ namespace OpenRA.Mods.RA.Render public override object Create(ActorInitializer init) { return new RenderBuildingWarFactory( init, this ); } /* get around unverifiability */ - IEnumerable BaseBuildingPreview(ActorInfo building, Player owner) + IEnumerable BaseBuildingPreview(ActorInfo building, PaletteReference pr) { - return base.RenderPreview(building, owner); + return base.RenderPreview(building, pr); } - public override IEnumerable RenderPreview(ActorInfo building, Player owner) + public override IEnumerable RenderPreview(ActorInfo building, PaletteReference pr) { - var p = BaseBuildingPreview(building, owner); + var p = BaseBuildingPreview(building, pr); foreach (var r in p) yield return r; var anim = new Animation(RenderSimple.GetImage(building), () => 0); anim.PlayRepeating("idle-top"); var rb = building.Traits.Get(); - yield return new Renderable(anim.Image, rb.Origin + 0.5f*anim.Image.size*(1 - Scale), p.First().Palette, 0, Scale); + yield return new Renderable(anim.Image, rb.Origin + 0.5f*anim.Image.size*(1 - Scale), + pr, 0, Scale); } } diff --git a/OpenRA.Mods.RA/Render/RenderEditorOnly.cs b/OpenRA.Mods.RA/Render/RenderEditorOnly.cs index 9339f58d4c..4f2825fb8a 100644 --- a/OpenRA.Mods.RA/Render/RenderEditorOnly.cs +++ b/OpenRA.Mods.RA/Render/RenderEditorOnly.cs @@ -9,6 +9,7 @@ #endregion using System.Collections.Generic; +using OpenRA.Graphics; using OpenRA.Traits; namespace OpenRA.Mods.RA.Render @@ -23,6 +24,6 @@ namespace OpenRA.Mods.RA.Render public RenderEditorOnly(Actor self) : base(self, () => 0) { } static readonly Renderable[] Nothing = { }; - public override IEnumerable Render(Actor self) { return Nothing; } + public override IEnumerable Render(Actor self, WorldRenderer wr) { return Nothing; } } } diff --git a/OpenRA.Mods.RA/Render/RenderInfantry.cs b/OpenRA.Mods.RA/Render/RenderInfantry.cs index bba5c0a611..a0d7df1b9b 100644 --- a/OpenRA.Mods.RA/Render/RenderInfantry.cs +++ b/OpenRA.Mods.RA/Render/RenderInfantry.cs @@ -124,10 +124,16 @@ namespace OpenRA.Mods.RA.Render return; Sound.PlayVoice("Die", self, self.Owner.Country.Race); + SpawnCorpse(self, "die{0}".F(e.Warhead.InfDeath)); + } + + public void SpawnCorpse(Actor self, string sequence) + { self.World.AddFrameEndTask(w => { if (!self.Destroyed) - w.Add(new Corpse(self, "die{0}".F(e.Warhead.InfDeath))); + w.Add(new Corpse(w, self.CenterLocation.ToFloat2(), GetImage(self), + sequence, Info.PlayerPalette+self.Owner.InternalName)); }); } } diff --git a/OpenRA.Mods.RA/Render/RenderSpy.cs b/OpenRA.Mods.RA/Render/RenderSpy.cs index 80a571ae08..966401cd68 100755 --- a/OpenRA.Mods.RA/Render/RenderSpy.cs +++ b/OpenRA.Mods.RA/Render/RenderSpy.cs @@ -10,6 +10,7 @@ using System.Collections.Generic; using System.Linq; +using OpenRA.Graphics; using OpenRA.Traits; using OpenRA.Mods.RA.Orders; @@ -20,20 +21,23 @@ namespace OpenRA.Mods.RA.Render public override object Create(ActorInitializer init) { return new RenderSpy(init.self, this); } } - class RenderSpy : RenderInfantryProne, IRenderModifier + class RenderSpy : RenderInfantryProne { + RenderSpyInfo info; string disguisedAsSprite; Spy spy; public RenderSpy(Actor self, RenderSpyInfo info) : base(self, info) { + this.info = info; spy = self.Trait(); disguisedAsSprite = spy.disguisedAsSprite; } - public IEnumerable ModifyRender(Actor self, IEnumerable r) + protected override string PaletteName(Actor self) { - return spy.disguisedAsPlayer != null ? r.Select(a => a.WithPalette(Palette(spy.disguisedAsPlayer))) : r; + var player = spy.disguisedAsPlayer != null ? spy.disguisedAsPlayer : self.Owner; + return info.Palette ?? info.PlayerPalette + player.InternalName; } public override void Tick(Actor self) @@ -45,6 +49,7 @@ namespace OpenRA.Mods.RA.Render anim.ChangeImage(disguisedAsSprite, "stand"); else anim.ChangeImage(GetImage(self), "stand"); + UpdatePalette(); } base.Tick(self); } diff --git a/OpenRA.Mods.RA/Render/WithMuzzleFlash.cs b/OpenRA.Mods.RA/Render/WithMuzzleFlash.cs index aead118204..084b48156f 100644 --- a/OpenRA.Mods.RA/Render/WithMuzzleFlash.cs +++ b/OpenRA.Mods.RA/Render/WithMuzzleFlash.cs @@ -57,11 +57,11 @@ namespace OpenRA.Mods.RA.Render mf.Animation.PlayThen("muzzle", () => isShowing = false); } - public IEnumerable Render(Actor self) + public IEnumerable Render(Actor self, WorldRenderer wr) { foreach (var a in muzzleFlashes.Values) if (a.DisableFunc == null || !a.DisableFunc()) - yield return a.Image(self, "effect"); + yield return a.Image(self, wr.Palette("effect")); } public void Tick(Actor self) diff --git a/OpenRA.Mods.RA/Render/WithShadow.cs b/OpenRA.Mods.RA/Render/WithShadow.cs index 1419dd0d8a..76ddf84515 100644 --- a/OpenRA.Mods.RA/Render/WithShadow.cs +++ b/OpenRA.Mods.RA/Render/WithShadow.cs @@ -11,6 +11,7 @@ using System; using System.Collections.Generic; using System.Linq; +using OpenRA.Graphics; using OpenRA.Traits; using OpenRA.Mods.RA.Air; using OpenRA.Mods.RA.Move; @@ -21,7 +22,7 @@ namespace OpenRA.Mods.RA.Render class WithShadow : IRenderModifier { - public IEnumerable ModifyRender(Actor self, IEnumerable r) + public IEnumerable ModifyRender(Actor self, WorldRenderer wr, IEnumerable r) { var move = self.Trait(); @@ -29,7 +30,7 @@ namespace OpenRA.Mods.RA.Render var visualOffset = ((move is Helicopter || move is Mobile) && move.Altitude > 0) ? Math.Abs((self.ActorID + Game.LocalTick) / 5 % 4 - 1) - 1 : 0; - var shadowSprites = r.Select(a => a.WithPalette("shadow")); + var shadowSprites = r.Select(a => a.WithPalette(wr.Palette("shadow"))); var flyingSprites = (move.Altitude <= 0) ? r : r.Select(a => a.WithPos(a.Pos - new float2(0, move.Altitude + visualOffset)).WithZOffset(move.Altitude + a.ZOffset)); diff --git a/OpenRA.Mods.RA/ShroudPalette.cs b/OpenRA.Mods.RA/ShroudPalette.cs index f8015a979a..5437a1987f 100644 --- a/OpenRA.Mods.RA/ShroudPalette.cs +++ b/OpenRA.Mods.RA/ShroudPalette.cs @@ -18,8 +18,6 @@ namespace OpenRA.Mods.RA class ShroudPaletteInfo : ITraitInfo { public readonly string Name = "shroud"; - public readonly bool IsFog = false; - public object Create(ActorInitializer init) { return new ShroudPalette(this); } } @@ -27,38 +25,20 @@ namespace OpenRA.Mods.RA { readonly ShroudPaletteInfo info; - public ShroudPalette( ShroudPaletteInfo info ) { this.info = info; } + public ShroudPalette(ShroudPaletteInfo info) { this.info = info; } - public void InitPalette( WorldRenderer wr ) + public void InitPalette(WorldRenderer wr) { - var pal = wr.GetPalette( "terrain" ); - wr.AddPalette( info.Name, new Palette( pal, new ShroudPaletteRemap( info.IsFog ) ) ); - } - } + var c = new[] { + Color.Transparent, Color.Green, + Color.Blue, Color.Yellow, + Color.Black, + Color.FromArgb(128,0,0,0), + Color.Transparent, + Color.Transparent + }; - class ShroudPaletteRemap : IPaletteRemap - { - bool isFog; - - public ShroudPaletteRemap(bool isFog) { this.isFog = isFog; } - public Color GetRemappedColor(Color original, int index) - { - if (isFog) - return new[] { - Color.Transparent, Color.Green, - Color.Blue, Color.Yellow, - Color.FromArgb(128,0,0,0), - Color.FromArgb(128,0,0,0), - Color.FromArgb(128,0,0,0), - Color.FromArgb(64,0,0,0)}[index % 8]; - else - return new[] { - Color.Transparent, Color.Green, - Color.Blue, Color.Yellow, - Color.Black, - Color.FromArgb(128,0,0,0), - Color.Transparent, - Color.Transparent}[index % 8]; + wr.AddPalette(info.Name, new Palette(Exts.MakeArray(256, i => (uint)c[i % 8].ToArgb())), false); } } } diff --git a/OpenRA.Mods.RA/SupportPowers/ChronoshiftPower.cs b/OpenRA.Mods.RA/SupportPowers/ChronoshiftPower.cs index 2700551d8f..b4459b961b 100755 --- a/OpenRA.Mods.RA/SupportPowers/ChronoshiftPower.cs +++ b/OpenRA.Mods.RA/SupportPowers/ChronoshiftPower.cs @@ -243,9 +243,9 @@ namespace OpenRA.Mods.RA { if (manager.self.Owner.Shroud.IsTargetable(unit)) { var targetCell = unit.Location + (xy - sourceLocation); - foreach (var r in unit.Render()) + foreach (var r in unit.Render(wr)) r.Sprite.DrawAt(r.Pos - Traits.Util.CenterOfCell(unit.Location).ToFloat2() + Traits.Util.CenterOfCell(targetCell).ToFloat2(), - wr.GetPaletteIndex(r.Palette), + r.Palette.Index, r.Scale*r.Sprite.size); } } diff --git a/OpenRA.Mods.RA/WaterPaletteRotation.cs b/OpenRA.Mods.RA/WaterPaletteRotation.cs index 9a3aedf454..a8a24127c1 100644 --- a/OpenRA.Mods.RA/WaterPaletteRotation.cs +++ b/OpenRA.Mods.RA/WaterPaletteRotation.cs @@ -17,7 +17,7 @@ namespace OpenRA.Mods.RA { class WaterPaletteRotationInfo : ITraitInfo { - public readonly string[] ExcludePalettes = { "cursor", "chrome", "colorpicker", "player" }; + public readonly string[] ExcludePalettes = {}; public object Create(ActorInitializer init) { return new WaterPaletteRotation(init.world, this); } } diff --git a/OpenRA.Mods.RA/Widgets/ColorPreviewManagerWidget.cs b/OpenRA.Mods.RA/Widgets/ColorPreviewManagerWidget.cs new file mode 100755 index 0000000000..78562d1236 --- /dev/null +++ b/OpenRA.Mods.RA/Widgets/ColorPreviewManagerWidget.cs @@ -0,0 +1,54 @@ +#region Copyright & License Information +/* + * Copyright 2007-2011 The OpenRA Developers (see AUTHORS) + * This file is part of OpenRA, which is free software. It is made + * available to you under the terms of the GNU General Public License + * as published by the Free Software Foundation. For more information, + * see COPYING. + */ + +#endregion + +using System; +using System.Linq; +using OpenRA.FileFormats; +using OpenRA.Graphics; +using OpenRA.Traits; +using OpenRA.Widgets; + +namespace OpenRA.Mods.RA.Widgets +{ + public class ColorPreviewManagerWidget : Widget + { + public readonly string Palette = "colorpicker"; + public readonly int[] RemapIndices = {}; + public ColorRamp Ramp; + + ColorRamp cachedRamp; + WorldRenderer worldRenderer; + Palette preview; + + [ObjectCreator.UseCtor] + public ColorPreviewManagerWidget(WorldRenderer worldRenderer) + : base() + { + this.worldRenderer = worldRenderer; + } + + public override void Initialize(WidgetArgs args) + { + base.Initialize(args); + preview = worldRenderer.Palette(Palette).Palette; + } + + public override void Tick() + { + if (cachedRamp == Ramp) + return; + + preview.ApplyRemap(new PlayerColorRemap(RemapIndices, Ramp)); + cachedRamp = Ramp; + } + } +} + diff --git a/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs index 86e6814709..70428ef9f3 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/LobbyLogic.cs @@ -30,7 +30,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic string MapUid; Map Map; - ColorPickerPaletteModifier PlayerPalettePreview; + ColorPreviewManagerWidget colorPreview; readonly Action OnGameStart; readonly Action onExit; @@ -96,8 +96,6 @@ namespace OpenRA.Mods.RA.Widgets.Logic Game.ConnectionStateChanged += ConnectionStateChanged; UpdateCurrentMap(); - PlayerPalettePreview = world.WorldActor.Trait(); - PlayerPalettePreview.Ramp = Game.Settings.Player.ColorRamp; Players = lobby.Get("PLAYERS"); EditablePlayerTemplate = Players.Get("TEMPLATE_EDITABLE_PLAYER"); NonEditablePlayerTemplate = Players.Get("TEMPLATE_NONEDITABLE_PLAYER"); @@ -105,6 +103,8 @@ namespace OpenRA.Mods.RA.Widgets.Logic EditableSpectatorTemplate = Players.Get("TEMPLATE_EDITABLE_SPECTATOR"); NonEditableSpectatorTemplate = Players.Get("TEMPLATE_NONEDITABLE_SPECTATOR"); NewSpectatorTemplate = Players.Get("TEMPLATE_NEW_SPECTATOR"); + colorPreview = lobby.Get("COLOR_MANAGER"); + colorPreview.Ramp = Game.Settings.Player.ColorRamp; var mapPreview = lobby.Get("MAP_PREVIEW"); mapPreview.IsVisible = () => Map != null; @@ -364,7 +364,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic var color = template.Get("COLOR"); color.IsDisabled = () => slot.LockColor || ready; - color.OnMouseDown = _ => LobbyUtils.ShowColorDropDown(color, client, orderManager, PlayerPalettePreview); + color.OnMouseDown = _ => LobbyUtils.ShowColorDropDown(color, client, orderManager, colorPreview); var colorBlock = color.Get("COLORBLOCK"); colorBlock.GetColor = () => client.ColorRamp.GetColor(0); @@ -444,7 +444,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic var color = template.Get("COLOR"); color.IsDisabled = () => ready; - color.OnMouseDown = _ => LobbyUtils.ShowColorDropDown(color, c, orderManager, PlayerPalettePreview); + color.OnMouseDown = _ => LobbyUtils.ShowColorDropDown(color, c, orderManager, colorPreview); var colorBlock = color.Get("COLORBLOCK"); colorBlock.GetColor = () => c.ColorRamp.GetColor(0); diff --git a/OpenRA.Mods.RA/Widgets/Logic/LobbyUtils.cs b/OpenRA.Mods.RA/Widgets/Logic/LobbyUtils.cs index fd0ab270f2..d752b16959 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/LobbyUtils.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/LobbyUtils.cs @@ -121,7 +121,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic } public static void ShowColorDropDown(DropDownButtonWidget color, Session.Client client, - OrderManager orderManager, ColorPickerPaletteModifier preview) + OrderManager orderManager, ColorPreviewManagerWidget preview) { Action onSelect = c => { diff --git a/cg/chrome-line.fx b/cg/chrome-line.fx deleted file mode 100644 index ede4851f47..0000000000 --- a/cg/chrome-line.fx +++ /dev/null @@ -1,55 +0,0 @@ -// OpenRA gui lines shader -// Author: C. Forbes -//-------------------------------------------------------- - -float2 r1, r2; // matrix elements - -struct VertexIn { - float4 Position: POSITION; - float4 Color: TEXCOORD0; -}; - -struct VertexOut { - float4 Position: POSITION; - float4 Color: COLOR0; -}; - -VertexOut Simple_vp(VertexIn v) { - VertexOut o; - float2 p = v.Position.xy * r1 + r2; - o.Position = float4(p.x,p.y,0,1); - o.Color = v.Color; - return o; -} - -float4 Simple_fp(VertexOut f) : COLOR0 { - return f.Color; -} - -technique high_quality { - pass p0 { - BlendEnable = true; - DepthTestEnable = false; - //CullMode = None; - //FillMode = Wireframe; - VertexProgram = compile latest Simple_vp(); - FragmentProgram = compile latest Simple_fp(); - - BlendEquation = FuncAdd; - BlendFunc = int2( SrcAlpha, OneMinusSrcAlpha ); - } -} - -technique high_quality_cg21 { - pass p0 { - BlendEnable = true; - DepthTestEnable = false; - //CullMode = None; - //FillMode = Wireframe; - VertexProgram = compile arbvp1 Simple_vp(); - FragmentProgram = compile arbfp1 Simple_fp(); - - BlendEquation = FuncAdd; - BlendFunc = int2( SrcAlpha, OneMinusSrcAlpha ); - } -} \ No newline at end of file diff --git a/cg/chrome-shp.fx b/cg/chrome-shp.fx deleted file mode 100644 index 750d8c9a6c..0000000000 --- a/cg/chrome-shp.fx +++ /dev/null @@ -1,80 +0,0 @@ -// OpenRA test shader -// Author: C. Forbes -//-------------------------------------------------------- - -float2 Scroll; -float2 r1, r2; // matrix elements - -sampler2D DiffuseTexture = sampler_state { - MinFilter = Nearest; - MagFilter = Nearest; - WrapS = Repeat; - WrapT = Repeat; -}; - -sampler2D Palette = sampler_state { - MinFilter = Nearest; - MagFilter = Nearest; - WrapS = Repeat; - WrapT = Repeat; -}; - -struct VertexIn { - float4 Position: POSITION; - float4 Tex0: TEXCOORD0; -}; - -struct VertexOut { - float4 Position: POSITION; - float3 Tex0: TEXCOORD0; - float4 ChannelMask: TEXCOORD1; -}; - -float4 DecodeChannelMask( float x ) -{ - if (x > 0) - return (x > 0.5f) ? float4(1,0,0,0) : float4(0,1,0,0); - else - return (x <-0.5f) ? float4(0,0,0,1) : float4(0,0,1,0); -} - -VertexOut Simple_vp(VertexIn v) { - VertexOut o; - float2 p = v.Position.xy * r1 + r2; - o.Position = float4(p.x,p.y,0,1); - o.Tex0 = float3(v.Tex0.x, v.Tex0.y, v.Tex0.z); - o.ChannelMask = DecodeChannelMask( v.Tex0.w ); - return o; -} - -float4 Palette_fp(VertexOut f) : COLOR0 { - float4 x = tex2D(DiffuseTexture, f.Tex0.xy); - float2 p = float2( dot(x, f.ChannelMask), f.Tex0.z ); - return tex2D(Palette, p); -} - -technique low_quality { - pass p0 { - BlendEnable = true; - DepthTestEnable = false; - CullFaceEnable = false; - VertexProgram = compile latest Simple_vp(); - FragmentProgram = compile latest Palette_fp(); - - BlendEquation = FuncAdd; - BlendFunc = int2( SrcAlpha, OneMinusSrcAlpha ); - } -} - -technique low_quality_cg21 { - pass p0 { - BlendEnable = true; - DepthTestEnable = false; - CullFaceEnable = false; - VertexProgram = compile arbvp1 Simple_vp(); - FragmentProgram = compile arbfp1 Palette_fp(); - - BlendEquation = FuncAdd; - BlendFunc = int2( SrcAlpha, OneMinusSrcAlpha ); - } -} diff --git a/cg/world-line.fx b/cg/line.fx similarity index 100% rename from cg/world-line.fx rename to cg/line.fx diff --git a/cg/chrome-rgba.fx b/cg/rgba.fx similarity index 100% rename from cg/chrome-rgba.fx rename to cg/rgba.fx diff --git a/cg/world-shp.fx b/cg/shp.fx similarity index 100% rename from cg/world-shp.fx rename to cg/shp.fx diff --git a/glsl/chrome-line.vert b/glsl/chrome-line.vert deleted file mode 100644 index 8c1d357cc0..0000000000 --- a/glsl/chrome-line.vert +++ /dev/null @@ -1,7 +0,0 @@ -uniform vec2 r1, r2; // matrix elements -void main() -{ - vec2 p = gl_Vertex.xy*r1 + r2; - gl_Position = vec4(p.x,p.y,0,1); - gl_FrontColor = gl_MultiTexCoord0; -} diff --git a/glsl/chrome-shp.vert b/glsl/chrome-shp.vert deleted file mode 100644 index 8541b53f1e..0000000000 --- a/glsl/chrome-shp.vert +++ /dev/null @@ -1,17 +0,0 @@ -uniform vec2 r1,r2; // matrix elements - -vec4 DecodeChannelMask( float x ) -{ - if (x > 0.0) - return (x > 0.5) ? vec4(1,0,0,0) : vec4(0,1,0,0); - else - return (x < -0.5) ? vec4(0,0,0,1) : vec4(0,0,1,0); -} - -void main() -{ - vec2 p = gl_Vertex.xy*r1 + r2; - gl_Position = vec4(p.x,p.y,0,1); - gl_TexCoord[0] = gl_MultiTexCoord0; - gl_TexCoord[1] = DecodeChannelMask(gl_MultiTexCoord0.w); -} diff --git a/glsl/chrome-line.frag b/glsl/line.frag similarity index 100% rename from glsl/chrome-line.frag rename to glsl/line.frag diff --git a/glsl/world-line.vert b/glsl/line.vert similarity index 100% rename from glsl/world-line.vert rename to glsl/line.vert diff --git a/glsl/chrome-rgba.frag b/glsl/rgba.frag similarity index 100% rename from glsl/chrome-rgba.frag rename to glsl/rgba.frag diff --git a/glsl/chrome-rgba.vert b/glsl/rgba.vert similarity index 100% rename from glsl/chrome-rgba.vert rename to glsl/rgba.vert diff --git a/glsl/chrome-shp.frag b/glsl/shp.frag similarity index 100% rename from glsl/chrome-shp.frag rename to glsl/shp.frag diff --git a/glsl/world-shp.vert b/glsl/shp.vert similarity index 100% rename from glsl/world-shp.vert rename to glsl/shp.vert diff --git a/glsl/world-line.frag b/glsl/world-line.frag deleted file mode 100644 index 3f45d895ff..0000000000 --- a/glsl/world-line.frag +++ /dev/null @@ -1,4 +0,0 @@ -void main() -{ - gl_FragColor = gl_Color; -} \ No newline at end of file diff --git a/glsl/world-shp.frag b/glsl/world-shp.frag deleted file mode 100644 index dbabad7184..0000000000 --- a/glsl/world-shp.frag +++ /dev/null @@ -1,8 +0,0 @@ -uniform sampler2D DiffuseTexture, Palette; - -void main() -{ - vec4 x = texture2D(DiffuseTexture, gl_TexCoord[0].st); - vec2 p = vec2( dot(x, gl_TexCoord[1]), gl_TexCoord[0].p ); - gl_FragColor = texture2D(Palette,p); -} \ No newline at end of file diff --git a/mods/cnc/chrome/lobby.yaml b/mods/cnc/chrome/lobby.yaml index ae731e3584..ff2cb1bb77 100644 --- a/mods/cnc/chrome/lobby.yaml +++ b/mods/cnc/chrome/lobby.yaml @@ -5,6 +5,8 @@ Container@SERVER_LOBBY: Width:740 Height:535 Children: + ColorPreviewManager@COLOR_MANAGER: + RemapIndices: 176, 178, 180, 182, 184, 186, 189, 191, 177, 179, 181, 183, 185, 187, 188, 190 Label@TITLE: Width:740 Y:0-25 diff --git a/mods/cnc/chrome/settings.yaml b/mods/cnc/chrome/settings.yaml index 7b97795882..64c6adda52 100644 --- a/mods/cnc/chrome/settings.yaml +++ b/mods/cnc/chrome/settings.yaml @@ -5,6 +5,8 @@ Container@SETTINGS_PANEL: Width:740 Height:535 Children: + ColorPreviewManager@COLOR_MANAGER: + RemapIndices: 176, 178, 180, 182, 184, 186, 189, 191, 177, 179, 181, 183, 185, 187, 188, 190 Label@TITLE: Width:740 Y:0-25 diff --git a/mods/cnc/rules/system.yaml b/mods/cnc/rules/system.yaml index 07b00d814b..bff230f4ab 100644 --- a/mods/cnc/rules/system.yaml +++ b/mods/cnc/rules/system.yaml @@ -80,6 +80,11 @@ World: Name: effect Filename: temperat.pal ShadowIndex: 4 + PaletteFromFile@colorpicker: + Name: colorpicker + Filename: temperat.pal + ShadowIndex: 4 + AllowModifiers: false PaletteFromRGBA@shadow: Name: shadow R: 0 @@ -104,11 +109,8 @@ World: G: 0 B: 0 A: 180 - ColorPickerPaletteModifier: - ShroudPalette@shroud: - ShroudPalette@fog: - IsFog: yes - Name: fog + ShroudPalette: + FogPalette: Country@gdi: Name: GDI Race: gdi diff --git a/mods/d2k/chrome/lobby.yaml b/mods/d2k/chrome/lobby.yaml index 65d6c6fcee..3e96577e50 100644 --- a/mods/d2k/chrome/lobby.yaml +++ b/mods/d2k/chrome/lobby.yaml @@ -5,6 +5,8 @@ Background@SERVER_LOBBY: Width:800 Height:600 Children: + ColorPreviewManager@COLOR_MANAGER: + RemapIndices: 255, 254, 253, 252, 251, 250, 249, 248, 247, 246, 245, 244, 243, 242, 241, 240 Label@TITLE: X:0 Y:17 diff --git a/mods/d2k/rules/system.yaml b/mods/d2k/rules/system.yaml index e22bd4e6c4..8376d71d8f 100644 --- a/mods/d2k/rules/system.yaml +++ b/mods/d2k/rules/system.yaml @@ -269,6 +269,11 @@ World: Name: effect Filename: temperat.pal ShadowIndex: 4 + PaletteFromFile@colorpicker: + Name: colorpicker + Filename: d2k.pal + ShadowIndex: 4 + AllowModifiers: false PaletteFromRGBA@shadow: Name: shadow R: 0 @@ -299,11 +304,8 @@ World: G: 0 B: 0 A: 180 - ColorPickerPaletteModifier: - ShroudPalette@shroud: - ShroudPalette@fog: - IsFog: yes - Name: fog + ShroudPalette: + FogPalette: Country@Atreides: Name: Atreides Race: atreides diff --git a/mods/ra/chrome/lobby.yaml b/mods/ra/chrome/lobby.yaml index 1e91a0a9e1..a4a9978196 100644 --- a/mods/ra/chrome/lobby.yaml +++ b/mods/ra/chrome/lobby.yaml @@ -5,6 +5,8 @@ Background@SERVER_LOBBY: Width:800 Height:600 Children: + ColorPreviewManager@COLOR_MANAGER: + RemapIndices: 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95 Label@TITLE: X:0 Y:17 diff --git a/mods/ra/rules/system.yaml b/mods/ra/rules/system.yaml index d3245ddd48..e99790cfe0 100644 --- a/mods/ra/rules/system.yaml +++ b/mods/ra/rules/system.yaml @@ -224,6 +224,11 @@ World: Name: effect Filename: temperat.pal ShadowIndex: 4 + PaletteFromFile@colorpicker: + Name: colorpicker + Filename: temperat.pal + ShadowIndex: 4 + AllowModifiers: false PaletteFromRGBA@shadow: Name: shadow R: 0 @@ -254,11 +259,8 @@ World: G: 0 B: 0 A: 180 - ColorPickerPaletteModifier: - ShroudPalette@shroud: - ShroudPalette@fog: - IsFog: yes - Name: fog + ShroudPalette: + FogPalette: Country@0: Name: Allies Race: allies