Add logos to the loadscreen

OpenRA.Mods.Cnc/CncLoadScreen.cs

@@ -22,6 +22,8 @@ namespace OpenRA.Mods.Cnc
 		Dictionary<string,string> 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 );

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"
+   width="512"
-   height="256"
+   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:zoom="1"
-     inkscape:cx="191.88571"
+     inkscape:cx="251.37687"
-     inkscape:cy="64.277751"
+     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-x="61"
-     inkscape:window-y="162"
+     inkscape:window-y="22"
      inkscape:window-maximized="0"
      showguides="true"
      inkscape:guide-bbox="true" />
@@ -48,7 +48,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -56,9 +56,9 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-796.3622)">
+     transform="translate(0,-540.3622)">
     <g
-       transform="translate(0,2.0004485e-5)"
+       transform="translate(0,-255.99998)"
        id="layer1-3"
        inkscape:label="Layer 1">
       <rect
@@ -108,7 +108,7 @@
        width="63"
        height="63"
        x="0.5"
-       y="860.86218"
+       y="604.86218"
        inkscape:export-filename="/Users/paul/src/OpenRA/mods/cnc/uibits/rect3776.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
@@ -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" />
     <g
        id="g3052"
-       transform="translate(-128,0)">
+       transform="translate(-128,-256)">
       <path
          inkscape:connector-curvature="0"
          id="path5225"
@@ -299,7 +299,7 @@
          inkscape:connector-curvature="0" />
     </g>
     <g
-       transform="translate(128,1.0707092e-5)"
+       transform="translate(128,-255.99999)"
        id="layer1-9"
        inkscape:label="Layer 1"
        inkscape:export-filename="/Users/paul/src/OpenRA/mods/cnc/uibits/layer1-9.png"
@@ -321,7 +321,9 @@
          style="fill:none;stroke:#800000;stroke-width:2;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none" />
     </g>
     <g
-       id="g3280">
+       id="g3280"
+       transform="translate(0,-256)"
+       style="display:none">
       <text
          sodipodi:linespacing="125%"
          id="text3048"
@@ -422,5 +424,35 @@
            x="160.6004"
            y="989.86218">shellmapborder</tspan></text>
     </g>
+    <rect
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.99999988;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="rect4028"
+       width="511"
+       height="255"
+       x="0.5"
+       y="796.86224" />
+    <path
+       style="fill:#800000;fill-opacity:0.1254902;stroke:#000000;stroke-width:0.99999994;stroke-opacity:1"
+       d="m 157.08386,842.10029 74.88793,120.13335 -31.23668,44.68176 -145.771159,0 -31.236678,-44.68176 74.887932,-120.13335 z"
+       id="path3068"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       style="fill-opacity:1;stroke:#800000;stroke-width:0.99999994;stroke-opacity:0.16470588"
+       d="m 90.961979,990.22131 6.512879,-8.48626 8.998442,-7.76671 10.22953,-4.76089 7.15606,0.19577 7.31397,11.54776 3.11492,-1.98649 3.26388,-12.5467 3.92395,-7.13428 6.46556,-6.50956 8.71745,-4.60043 8.49526,9.27034 2.9461,-3.27059 -5.49468,-13.94576 -0.0889,-14.67484 1.47336,-1.41118 11.04088,-0.21404 0.31753,-4.5583 -16.70733,-9.60146 -6.79621,-10.59472 8.04326,-7.96267 -0.21448,-1.9865 -3.86433,2.33423 -19.82227,0 -9.62796,-6.29062 2.0794,-7.35731 -1.98431,-0.52821 -15.25207,14.46706 -9.4449,0.1974 -2.052806,-6.39801 -3.161633,1.395 -1.052724,13.72826 -8.696883,9.22384 -0.07865,3.41422 5.380334,3.31085 1.982215,11.25687 4.530808,9.93255 0,11.25692 -8.495255,9.60138 4.831161,-10.52506 -0.383298,-9.76831 -6.444319,-7.43792 -6.049743,-1.44441 -7.245276,-6.25045 -0.483399,-7.39747 1.857765,-4.98441 -0.54536,-7.32957 4.102273,-13.55083 8.661145,-6.79899 -0.566361,-9.60148 14.441926,-8.60819 17.2737,0.66215 10.26057,-2.7858 11.7098,1.34787 16.82463,12.69483 12.26538,4.03672 10.44313,12.23351 3.79226,8.40739 0.24923,10.82191 6.31279,10.1902 -0.26599,13.36044 -9.04443,19.57074 -3.66705,13.75185 -19.17888,14.39726 -19.40166,7.84903 -9.46208,8.05973 -13.66945,4.12673 -16.70734,0.331 z"
+       id="path3093"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc" />
+    <path
+       id="path5446"
+       style="fill:#000000;fill-opacity:1;stroke:#800000;stroke-width:0.99999994;stroke-opacity:0.24313725"
+       d="m 157.08386,842.10029 74.88793,120.13335 -31.23668,44.68176 -145.771159,0 -31.236678,-44.68176 74.887932,-120.13335 z m 7.60893,-14.04674 -73.686519,0 -83.2978069,134.18009 40.0470229,58.72856 160.188093,0 40.04702,-58.72856 z"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path6111"
+       style="fill:#c8b98d;fill-opacity:0.08860761;fill-rule:evenodd;stroke:#7c6c3c;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.12658231"
+       d="m 350.91976,886.3592 -16.53766,0.78287 -30.6411,-6.78638 c 2.17824,-4.04198 4.61773,-7.85508 7.3136,-11.40463 z m 23.99227,-12.26492 -9.55349,0.28995 -42.3932,-18.5176 c 1.82739,-1.65213 3.71453,-3.22311 5.58994,-4.76587 z m -32.9261,131.22512 C 304.77282,985.96029 286.40279,944.57782 294.49125,905.31013 l 56.10283,38.08292 11.29046,24.64584 10.71149,5.79899 2.60549,11.88796 -3.18449,5.21904 6.07949,16.81722 0.28949,-14.49759 20.26495,0.28998 14.47498,13.04781 -12.44849,-21.16643 -15.05395,-0.28998 -9.55349,-38.85343 44.58291,10.43826 5.21098,14.49756 -15.34347,2.89957 21.42296,0.28998 13.60648,-19.13682 -10.42199,-20.00714 -34.16091,-20.29653 43.71439,-20.00661 -103.98118,-51.5943 c 25.75821,-13.99095 57.72797,-15.29758 85.6659,-0.76362 44.65965,23.23301 62.2154,78.21842 39.16884,123.35181 -23.4335,45.18758 -78.6889,62.69188 -123.54898,39.35478 z m -4.69886,9.0606 c -49.85632,-25.9364 -69.27996,-87.44216 -43.38392,-137.37623 25.89604,-49.93408 87.30547,-69.38799 137.1618,-43.45159 49.63361,25.82056 69.14462,86.92993 43.53123,137.09005 -26.04336,50.22037 -87.45278,69.67407 -137.30911,43.73777 z"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccsccccccccccccccccccccccscsssscs" />
   </g>
 </svg>