From 07d5f913251d55e53e8ead2a0be00f732ddf1b72 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sun, 8 May 2011 20:56:57 +1200 Subject: [PATCH] Add scanlines --- artsrc/cnc/panel.svg | 182 ++++++++++++++++++++++++++++++-- mods/cnc/chrome-ingame.yaml | 158 +++++++++++++++++++++++++++ mods/cnc/chrome.yaml | 162 ++-------------------------- mods/cnc/chrome/ingamemenu.yaml | 3 +- mods/cnc/chrome/mainmenu.yaml | 4 + mods/cnc/mod.yaml | 3 +- mods/cnc/uibits/panel.png | Bin 542 -> 1244 bytes 7 files changed, 348 insertions(+), 164 deletions(-) create mode 100644 mods/cnc/chrome-ingame.yaml diff --git a/artsrc/cnc/panel.svg b/artsrc/cnc/panel.svg index 9d8cc6962a..b1cf46f8a4 100644 --- a/artsrc/cnc/panel.svg +++ b/artsrc/cnc/panel.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="128" - height="128" + width="256" + height="256" id="svg2" version="1.1" inkscape:version="0.48.1 r9760" @@ -28,8 +28,8 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="5.6568542" - inkscape:cx="92.770301" - inkscape:cy="82.207477" + inkscape:cx="165.42552" + inkscape:cy="255.09508" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -54,14 +54,14 @@ inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" - transform="translate(0,-924.3622)"> + transform="translate(0,-796.3622)"> @@ -69,17 +69,17 @@ inkscape:export-ydpi="90" inkscape:export-xdpi="90" inkscape:export-filename="/Users/paul/src/OpenRA/mods/cnc/uibits/rect3776.png" - y="924.86218" + y="796.86218" x="0.5" height="63" width="63" id="rect3759" - style="fill:#560000;fill-opacity:0.87843138;stroke:#c00000;stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:#560000;fill-opacity:0.87843137;stroke:#c00000;stroke-width:1;stroke-linecap:square;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mods/cnc/chrome-ingame.yaml b/mods/cnc/chrome-ingame.yaml new file mode 100644 index 0000000000..58844b970c --- /dev/null +++ b/mods/cnc/chrome-ingame.yaml @@ -0,0 +1,158 @@ +chrome-gdi: chrome-gdi.png + specialbin-top: 0,0,30,51 + specialbin-middle: 0,51,30,51 + specialbin-bottom: 0,153,30,39 + moneybin: 192,0,320,32 + tooltip-bg: 0,288,272,136 + +radar-gdi: chrome-gdi.png + left: 297,31,9,192 + right: 498,31,9,192 + bottom: 297,223,210,30 + bg: 306,31,192,192 + power-indicator: 187,4,4,7 + +power-gdi: chrome-gdi.png + power-indicator: 187,4,4,7 + +palette-gdi: chrome-gdi.png + top: 297,288,201,9 + dock-top: 498,274,14,23 + bottom: 297,489,201,9 + dock-bottom: 498,489,14,23 + bg-0: 297,297,201,48 + dock-0: 498,297,14,48 + bg-1: 297,345,201,48 + dock-1: 498,345,14,48 + bg-2: 297,393,201,48 + dock-2: 498,393,14,48 + bg-3: 297,441,201,48 + dock-3: 498,441,14,48 + +digits-gdi: chrome-gdi.png + 0: 32,0,13,17 + 1: 45,0,13,17 + 2: 58,0,13,17 + 3: 71,0,13,17 + 4: 84,0,13,17 + 5: 97,0,13,17 + 6: 110,0,13,17 + 7: 123,0,13,17 + 8: 136,0,13,17 + 9: 149,0,13,17 + +chrome-nod: chrome-nod.png + specialbin-top: 0,0,30,51 + specialbin-middle: 0,51,30,51 + specialbin-bottom: 0,153,30,39 + moneybin: 192,0,320,32 + tooltip-bg: 0,288,272,136 + +radar-nod: chrome-nod.png + left: 297,31,9,192 + right: 498,31,9,192 + bottom: 297,223,210,30 + bg: 306,31,192,192 + power-indicator: 187,4,4,7 + +power-nod: chrome-nod.png + power-indicator: 187,4,4,7 + +palette-nod: chrome-nod.png + top: 297,288,201,9 + dock-top: 498,274,14,23 + bottom: 297,489,201,9 + dock-bottom: 498,489,14,23 + bg-0: 297,297,201,48 + dock-0: 498,297,14,48 + bg-1: 297,345,201,48 + dock-1: 498,345,14,48 + bg-2: 297,393,201,48 + dock-2: 498,393,14,48 + bg-3: 297,441,201,48 + dock-3: 498,441,14,48 + +digits-nod: chrome-nod.png + 0: 32,0,13,17 + 1: 45,0,13,17 + 2: 58,0,13,17 + 3: 71,0,13,17 + 4: 84,0,13,17 + 5: 97,0,13,17 + 6: 110,0,13,17 + 7: 123,0,13,17 + 8: 136,0,13,17 + 9: 149,0,13,17 + +tabs-selected: tabs.png + gdi-Building: 0,0,27,41 + gdi-Defense: 0,40,27,41 + gdi-Infantry: 0,80,27,41 + gdi-Vehicle: 0,120,27,41 + gdi-Plane: 0,160,27,41 + gdi-Ship: 0,200,27,41 + nod-Building: 80,0,27,41 + nod-Defense: 80,40,27,41 + nod-Infantry: 80,80,27,41 + nod-Vehicle: 80,120,27,41 + nod-Plane: 80,160,27,41 + nod-Ship: 80,200,27,41 + +tabs-ready: tabs.png + gdi-Building: 27,0,27,41 + gdi-Defense: 27,40,27,41 + gdi-Infantry: 27,80,27,41 + gdi-Vehicle: 27,120,27,41 + gdi-Plane: 27,160,27,41 + gdi-Ship: 27,200,27,41 + nod-Building: 107,0,27,41 + nod-Defense: 107,40,27,41 + nod-Infantry: 107,80,27,41 + nod-Vehicle: 107,120,27,41 + nod-Plane: 107,160,27,41 + nod-Ship: 107,200,27,41 + +tabs-normal: tabs.png + gdi-Building: 54,0,27,41 + gdi-Defense: 54,40,27,41 + gdi-Infantry: 54,80,27,41 + gdi-Vehicle: 54,120,27,41 + gdi-Plane: 54,160,27,41 + gdi-Ship: 54,200,27,41 + nod-Building: 134,0,27,41 + nod-Defense: 134,40,27,41 + nod-Infantry: 134,80,27,41 + nod-Vehicle: 134,120,27,41 + nod-Plane: 134,160,27,41 + nod-Ship: 134,200,27,41 + +spawnpoints: spawnpoints.png + unowned: 16,0,16,16 + owned: 0,0,16,16 + +sell-button: buttons.png + normal: 0,0,34,28 + pressed: 34,0,34,28 + disabled: 68,0,34,28 + +repair-button: buttons.png + normal: 0,28,34,28 + pressed: 34,28,34,28 + disabled: 68,28,34,28 + +power-button: buttons.png + normal: 0,56,34,28 + pressed: 34,56,34,28 + disabled: 68,56,34,28 + +flags: buttons.png + gdi: 30,84,30,15 + nod: 0,84,30,15 + random: 60,84,30,15 + +strategic: strategic.png + unowned: 0,0,32,32 + critical_unowned: 0,32,32,32 + enemy_owned: 32,32,32,32 + player_owned: 96,0,32,32 + diff --git a/mods/cnc/chrome.yaml b/mods/cnc/chrome.yaml index e14bb9efed..7b971841d4 100644 --- a/mods/cnc/chrome.yaml +++ b/mods/cnc/chrome.yaml @@ -2,133 +2,6 @@ shellmap: reticle.png reticle: 0,0,512,512 logo: logo.png logo:0,0,128,128 -chrome-gdi: chrome-gdi.png - specialbin-top: 0,0,30,51 - specialbin-middle: 0,51,30,51 - specialbin-bottom: 0,153,30,39 - moneybin: 192,0,320,32 - tooltip-bg: 0,288,272,136 - -radar-gdi: chrome-gdi.png - left: 297,31,9,192 - right: 498,31,9,192 - bottom: 297,223,210,30 - bg: 306,31,192,192 - power-indicator: 187,4,4,7 - -power-gdi: chrome-gdi.png - power-indicator: 187,4,4,7 - -palette-gdi: chrome-gdi.png - top: 297,288,201,9 - dock-top: 498,274,14,23 - bottom: 297,489,201,9 - dock-bottom: 498,489,14,23 - bg-0: 297,297,201,48 - dock-0: 498,297,14,48 - bg-1: 297,345,201,48 - dock-1: 498,345,14,48 - bg-2: 297,393,201,48 - dock-2: 498,393,14,48 - bg-3: 297,441,201,48 - dock-3: 498,441,14,48 - -digits-gdi: chrome-gdi.png - 0: 32,0,13,17 - 1: 45,0,13,17 - 2: 58,0,13,17 - 3: 71,0,13,17 - 4: 84,0,13,17 - 5: 97,0,13,17 - 6: 110,0,13,17 - 7: 123,0,13,17 - 8: 136,0,13,17 - 9: 149,0,13,17 - -chrome-nod: chrome-nod.png - specialbin-top: 0,0,30,51 - specialbin-middle: 0,51,30,51 - specialbin-bottom: 0,153,30,39 - moneybin: 192,0,320,32 - tooltip-bg: 0,288,272,136 - -radar-nod: chrome-nod.png - left: 297,31,9,192 - right: 498,31,9,192 - bottom: 297,223,210,30 - bg: 306,31,192,192 - power-indicator: 187,4,4,7 - -power-nod: chrome-nod.png - power-indicator: 187,4,4,7 - -palette-nod: chrome-nod.png - top: 297,288,201,9 - dock-top: 498,274,14,23 - bottom: 297,489,201,9 - dock-bottom: 498,489,14,23 - bg-0: 297,297,201,48 - dock-0: 498,297,14,48 - bg-1: 297,345,201,48 - dock-1: 498,345,14,48 - bg-2: 297,393,201,48 - dock-2: 498,393,14,48 - bg-3: 297,441,201,48 - dock-3: 498,441,14,48 - -digits-nod: chrome-nod.png - 0: 32,0,13,17 - 1: 45,0,13,17 - 2: 58,0,13,17 - 3: 71,0,13,17 - 4: 84,0,13,17 - 5: 97,0,13,17 - 6: 110,0,13,17 - 7: 123,0,13,17 - 8: 136,0,13,17 - 9: 149,0,13,17 - -tabs-selected: tabs.png - gdi-Building: 0,0,27,41 - gdi-Defense: 0,40,27,41 - gdi-Infantry: 0,80,27,41 - gdi-Vehicle: 0,120,27,41 - gdi-Plane: 0,160,27,41 - gdi-Ship: 0,200,27,41 - nod-Building: 80,0,27,41 - nod-Defense: 80,40,27,41 - nod-Infantry: 80,80,27,41 - nod-Vehicle: 80,120,27,41 - nod-Plane: 80,160,27,41 - nod-Ship: 80,200,27,41 - -tabs-ready: tabs.png - gdi-Building: 27,0,27,41 - gdi-Defense: 27,40,27,41 - gdi-Infantry: 27,80,27,41 - gdi-Vehicle: 27,120,27,41 - gdi-Plane: 27,160,27,41 - gdi-Ship: 27,200,27,41 - nod-Building: 107,0,27,41 - nod-Defense: 107,40,27,41 - nod-Infantry: 107,80,27,41 - nod-Vehicle: 107,120,27,41 - nod-Plane: 107,160,27,41 - nod-Ship: 107,200,27,41 - -tabs-normal: tabs.png - gdi-Building: 54,0,27,41 - gdi-Defense: 54,40,27,41 - gdi-Infantry: 54,80,27,41 - gdi-Vehicle: 54,120,27,41 - gdi-Plane: 54,160,27,41 - gdi-Ship: 54,200,27,41 - nod-Building: 134,0,27,41 - nod-Defense: 134,40,27,41 - nod-Infantry: 134,80,27,41 - nod-Vehicle: 134,120,27,41 - nod-Plane: 134,160,27,41 - nod-Ship: 134,200,27,41 dialog: uibuttons.png background: 2,2,60,60 @@ -240,6 +113,17 @@ panel-gray: panel.png corner-bl: 64,126,2,2 corner-br: 126,126,2,2 +panel-scanline: panel.png + background: 130,2,60,60 + border-r: 190,2,2,60 + border-l: 128,2,2,60 + border-b: 130,62,60,2 + border-t: 130,0,60,2 + corner-tl: 128,0,2,2 + corner-tr: 190,0,2,2 + corner-bl: 128,62,2,2 + corner-br: 190,62,2,2 + dialog4: dialog4.png border-t: 5,0,52,6 border-b: 5,58,52,6 @@ -262,30 +146,6 @@ shellmapborder: shellmap-border.png corner-br: 95,95,33,33 background: 33,33,62,62 -spawnpoints: spawnpoints.png - unowned: 16,0,16,16 - owned: 0,0,16,16 - -sell-button: buttons.png - normal: 0,0,34,28 - pressed: 34,0,34,28 - disabled: 68,0,34,28 - -repair-button: buttons.png - normal: 0,28,34,28 - pressed: 34,28,34,28 - disabled: 68,28,34,28 - -power-button: buttons.png - normal: 0,56,34,28 - pressed: 34,56,34,28 - disabled: 68,56,34,28 - -flags: buttons.png - gdi: 30,84,30,15 - nod: 0,84,30,15 - random: 60,84,30,15 - music: musicplayer.png pause: 0,0,25,25 stop: 28,0,25,25 diff --git a/mods/cnc/chrome/ingamemenu.yaml b/mods/cnc/chrome/ingamemenu.yaml index 5128c2f4a1..2e091e1b3f 100644 --- a/mods/cnc/chrome/ingamemenu.yaml +++ b/mods/cnc/chrome/ingamemenu.yaml @@ -11,9 +11,10 @@ Container@INGAME_MENU: Height:512 ImageCollection:shellmap ImageName:reticle - ScanLine: + Background@SCANLINES: Width:WINDOW_RIGHT Height:WINDOW_BOTTOM + Background:panel-scanline Background@BORDER: Width:WINDOW_RIGHT Height:WINDOW_BOTTOM diff --git a/mods/cnc/chrome/mainmenu.yaml b/mods/cnc/chrome/mainmenu.yaml index 5bd068cc48..04f1c2be81 100644 --- a/mods/cnc/chrome/mainmenu.yaml +++ b/mods/cnc/chrome/mainmenu.yaml @@ -11,6 +11,10 @@ Container@MENU_BACKGROUND: Height:512 ImageCollection:shellmap ImageName:reticle + Background@SCANLINES: + Width:WINDOW_RIGHT + Height:WINDOW_BOTTOM + Background:panel-scanline Background@BORDER: Width:WINDOW_RIGHT Height:WINDOW_BOTTOM diff --git a/mods/cnc/mod.yaml b/mods/cnc/mod.yaml index c82aac65de..ec9ac68c20 100644 --- a/mods/cnc/mod.yaml +++ b/mods/cnc/mod.yaml @@ -53,6 +53,7 @@ Cursors: Chrome: mods/cnc/chrome.yaml + mods/cnc/chrome-ingame.yaml Assemblies: mods/ra/OpenRA.Mods.RA.dll @@ -97,4 +98,4 @@ ServerTraits: MasterServerPinger ChromeMetrics: - mods/cnc/metrics.yaml \ No newline at end of file + mods/cnc/metrics.yaml diff --git a/mods/cnc/uibits/panel.png b/mods/cnc/uibits/panel.png index 56e7c85b374a1dc2af7ad5b5791f1cb2876449cc..1e2e10a5e59efdb1374b984275999b6f6d9ef444 100644 GIT binary patch literal 1244 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|G$6%N?Bp530R%N1DIGvQXMsm# zF;M+=5N34Jm|X!Blq_+LC<)F_D=AMbN@XZ7FW1Y=%Pvk%EJ)SMFG`>N&PEDoP^71e zV@SoEx7Qs*Wdj9VFIGj~XSX=$q$b$NwXeJ5go==q`hq1B1DiK*Z!&*T9rkr++B?qO z+vGRA+4;92^?U97x8^xjXU_bY`}1DiiMH=Er_Y@E{LJ%D!C^M(_g*otsLru(h=(b`&#iVb)+M{K|NR(_s$x0$B&fj@A4N{1_g^ zFuY~pa)_yAC}k3O&XmC(!0-rYoN$AMxPx^AlR&t9$^pozGGWF!C@5H$D7*{rc^1 z(l@?l|7JWO$Jk&n)X;{{b9Qc*KRB=dx83dhg!4P|f46JxXAn>uMFSK9-2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4Bef9L;-?ne~{gSag zcKh4n-?p|-TKeBs-p;%I_`?+CyxXrYzZ9IK+F-$Wgj2zfp^&LV*kKOCBNhSm0Ti0P z`}@bt>%U*J%9P&Sw*Kw+FB63CZGWEoyRNcw&b^{Tx6hwnEj?%)3k@;7?Qh?I;W+n` ZeVwq7