diff --git a/OpenRA.Mods.Cnc/CncLoadScreen.cs b/OpenRA.Mods.Cnc/CncLoadScreen.cs index b171805e8b..e4559571e6 100644 --- a/OpenRA.Mods.Cnc/CncLoadScreen.cs +++ b/OpenRA.Mods.Cnc/CncLoadScreen.cs @@ -22,6 +22,8 @@ namespace OpenRA.Mods.Cnc Dictionary Info; Stopwatch lastLoadScreen = new Stopwatch(); Sprite[] ss; + float2 nodPos, gdiPos; + Sprite nodLogo, gdiLogo; Rectangle Bounds; Renderer r; NullInputHandler nih = new NullInputHandler(); @@ -47,6 +49,10 @@ namespace OpenRA.Mods.Cnc new Sprite(s, new Rectangle(128,223,33,33), TextureChannel.Alpha), new Sprite(s, new Rectangle(223,223,33,33), TextureChannel.Alpha) }; + nodLogo = new Sprite(s, new Rectangle(0,256,256,256), TextureChannel.Alpha); + gdiLogo = new Sprite(s, new Rectangle(256,256,256,256), TextureChannel.Alpha); + nodPos = new float2(Renderer.Resolution.Width/3 - 256, Renderer.Resolution.Height/2 - 128); + gdiPos = new float2(Renderer.Resolution.Width*2/3, Renderer.Resolution.Height/2 - 128); } public void Display() @@ -63,6 +69,8 @@ namespace OpenRA.Mods.Cnc var textSize = font.Measure(text); r.BeginFrame(float2.Zero); + r.RgbaSpriteRenderer.DrawSprite(gdiLogo, gdiPos); + r.RgbaSpriteRenderer.DrawSprite(nodLogo, nodPos); DrawBorder(); font.DrawText(text, new float2((Renderer.Resolution.Width - textSize.X) / 2, (Renderer.Resolution.Height - textSize.Y) / 2), Color.White); r.EndFrame( nih ); diff --git a/artsrc/cnc/ui.svg b/artsrc/cnc/ui.svg index a0f0b89452..c766703357 100644 --- a/artsrc/cnc/ui.svg +++ b/artsrc/cnc/ui.svg @@ -9,8 +9,8 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="256" - height="256" + width="512" + height="512" id="svg2" version="1.1" inkscape:version="0.48.1 r9760" @@ -27,16 +27,16 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="2" - inkscape:cx="191.88571" - inkscape:cy="64.277751" + inkscape:zoom="1" + inkscape:cx="251.37687" + inkscape:cy="137.00729" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" inkscape:window-width="1626" inkscape:window-height="1006" - inkscape:window-x="58" - inkscape:window-y="162" + inkscape:window-x="61" + inkscape:window-y="22" inkscape:window-maximized="0" showguides="true" inkscape:guide-bbox="true" /> @@ -48,7 +48,7 @@ image/svg+xml - + @@ -56,9 +56,9 @@ inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" - transform="translate(0,-796.3622)"> + transform="translate(0,-540.3622)"> @@ -116,7 +116,7 @@ inkscape:export-ydpi="90" inkscape:export-xdpi="90" inkscape:export-filename="/Users/paul/src/OpenRA/mods/cnc/uibits/rect3776.png" - y="-859.86218" + y="-603.86218" x="64.5" height="63" width="63" @@ -130,13 +130,13 @@ width="63" height="63" x="64.5" - y="-923.86218" + y="-667.86218" inkscape:export-filename="/Users/paul/src/OpenRA/mods/cnc/uibits/rect3776.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" /> + transform="translate(-128,-256)"> + id="g3280" + transform="translate(0,-256)" + style="display:none"> shellmapborder + + + + + diff --git a/mods/cnc/uibits/chrome.png b/mods/cnc/uibits/chrome.png index fafbaf3bb5..2de102969d 100644 Binary files a/mods/cnc/uibits/chrome.png and b/mods/cnc/uibits/chrome.png differ