From: FruitieX Date: Sun, 23 May 2010 18:40:57 +0000 (+0300) Subject: wickedhud_b2 sources X-Git-Tag: xonotic-v0.1.0preview~32^2~2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d83a8c2d42a9f2eda1e62699aa1ce5c416e43f83;p=xonotic%2Fmediasource.git wickedhud_b2 sources --- diff --git a/gfx/hud/wickedhud/ammo_bullets_raw.png b/gfx/hud/wickedhud/ammo_bullets_raw.png new file mode 100644 index 0000000..6db6bc0 Binary files /dev/null and b/gfx/hud/wickedhud/ammo_bullets_raw.png differ diff --git a/gfx/hud/wickedhud/ammo_cells_raw.png b/gfx/hud/wickedhud/ammo_cells_raw.png new file mode 100644 index 0000000..d1e8461 Binary files /dev/null and b/gfx/hud/wickedhud/ammo_cells_raw.png differ diff --git a/gfx/hud/wickedhud/ammo_current_bg.svg b/gfx/hud/wickedhud/ammo_current_bg.svg new file mode 100755 index 0000000..007f388 --- /dev/null +++ b/gfx/hud/wickedhud/ammo_current_bg.svg @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/gfx/hud/wickedhud/ammo_fuel_raw.png b/gfx/hud/wickedhud/ammo_fuel_raw.png new file mode 100644 index 0000000..c5d9277 Binary files /dev/null and b/gfx/hud/wickedhud/ammo_fuel_raw.png differ diff --git a/gfx/hud/wickedhud/ammo_rocket_raw.png b/gfx/hud/wickedhud/ammo_rocket_raw.png new file mode 100644 index 0000000..50e1e22 Binary files /dev/null and b/gfx/hud/wickedhud/ammo_rocket_raw.png differ diff --git a/gfx/hud/wickedhud/ammo_shells_raw.png b/gfx/hud/wickedhud/ammo_shells_raw.png new file mode 100644 index 0000000..a01b761 Binary files /dev/null and b/gfx/hud/wickedhud/ammo_shells_raw.png differ diff --git a/gfx/hud/wickedhud/armor_raw.png b/gfx/hud/wickedhud/armor_raw.png new file mode 100644 index 0000000..1d4345e Binary files /dev/null and b/gfx/hud/wickedhud/armor_raw.png differ diff --git a/gfx/hud/wickedhud/border.svg b/gfx/hud/wickedhud/border.svg index ba5eb47..1cc5e0c 100755 --- a/gfx/hud/wickedhud/border.svg +++ b/gfx/hud/wickedhud/border.svg @@ -22,13 +22,6 @@ inkscape:export-ydpi="90"> - - - - diff --git a/gfx/hud/wickedhud/border_healtharmor.svg b/gfx/hud/wickedhud/border_healtharmor.svg index feb0965..91b0d15 100755 --- a/gfx/hud/wickedhud/border_healtharmor.svg +++ b/gfx/hud/wickedhud/border_healtharmor.svg @@ -22,13 +22,6 @@ inkscape:export-ydpi="90"> - - - - diff --git a/gfx/hud/wickedhud/border_inventory.svg b/gfx/hud/wickedhud/border_inventory.svg index d8034a1..136896d 100755 --- a/gfx/hud/wickedhud/border_inventory.svg +++ b/gfx/hud/wickedhud/border_inventory.svg @@ -22,13 +22,6 @@ inkscape:export-ydpi="90"> - - - - diff --git a/gfx/hud/wickedhud/border_modicons.svg b/gfx/hud/wickedhud/border_modicons.svg index c9365c1..cb164b6 100755 --- a/gfx/hud/wickedhud/border_modicons.svg +++ b/gfx/hud/wickedhud/border_modicons.svg @@ -22,13 +22,6 @@ inkscape:export-ydpi="90"> - - - - diff --git a/gfx/hud/wickedhud/border_powerups.svg b/gfx/hud/wickedhud/border_powerups.svg index fe4d1be..18f5a50 100755 --- a/gfx/hud/wickedhud/border_powerups.svg +++ b/gfx/hud/wickedhud/border_powerups.svg @@ -22,13 +22,6 @@ inkscape:export-ydpi="90"> - - - - diff --git a/gfx/hud/wickedhud/border_radar.svg b/gfx/hud/wickedhud/border_radar.svg index 28fef61..9de0a0a 100755 --- a/gfx/hud/wickedhud/border_radar.svg +++ b/gfx/hud/wickedhud/border_radar.svg @@ -22,13 +22,6 @@ inkscape:export-ydpi="90"> - - - - diff --git a/gfx/hud/wickedhud/border_score.svg b/gfx/hud/wickedhud/border_score.svg index 1f346ec..0f08648 100755 --- a/gfx/hud/wickedhud/border_score.svg +++ b/gfx/hud/wickedhud/border_score.svg @@ -22,13 +22,6 @@ inkscape:export-ydpi="90"> - - - - diff --git a/gfx/hud/wickedhud/border_timer.svg b/gfx/hud/wickedhud/border_timer.svg index 1d8eb53..2fe9f6f 100755 --- a/gfx/hud/wickedhud/border_timer.svg +++ b/gfx/hud/wickedhud/border_timer.svg @@ -22,13 +22,6 @@ inkscape:export-ydpi="90"> - - - - diff --git a/gfx/hud/wickedhud/border_weaponicons.svg b/gfx/hud/wickedhud/border_weaponicons.svg index b38f875..f07f964 100755 --- a/gfx/hud/wickedhud/border_weaponicons.svg +++ b/gfx/hud/wickedhud/border_weaponicons.svg @@ -22,13 +22,6 @@ inkscape:export-ydpi="90"> - - - - diff --git a/gfx/hud/wickedhud/dock.svg b/gfx/hud/wickedhud/dock.svg index 5587c49..8a17214 100755 --- a/gfx/hud/wickedhud/dock.svg +++ b/gfx/hud/wickedhud/dock.svg @@ -22,13 +22,6 @@ inkscape:export-ydpi="90"> - @@ -193,7 +186,7 @@ inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:zoom="0.5" - inkscape:cx="676.43478" + inkscape:cx="1059" inkscape:cy="480.38474" inkscape:document-units="px" inkscape:current-layer="layer1" diff --git a/gfx/hud/wickedhud/dock_small.svg b/gfx/hud/wickedhud/dock_small.svg new file mode 100755 index 0000000..b284bd0 --- /dev/null +++ b/gfx/hud/wickedhud/dock_small.svg @@ -0,0 +1,221 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/gfx/hud/wickedhud/health_raw.png b/gfx/hud/wickedhud/health_raw.png new file mode 100644 index 0000000..8513709 Binary files /dev/null and b/gfx/hud/wickedhud/health_raw.png differ diff --git a/gfx/hud/wickedhud/num_leading_1.svg b/gfx/hud/wickedhud/num_leading_1.svg new file mode 100755 index 0000000..9f25e37 --- /dev/null +++ b/gfx/hud/wickedhud/num_leading_1.svg @@ -0,0 +1,102 @@ + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/gfx/hud/wickedhud/num_leading_2.svg b/gfx/hud/wickedhud/num_leading_2.svg new file mode 100644 index 0000000..12c6c76 --- /dev/null +++ b/gfx/hud/wickedhud/num_leading_2.svg @@ -0,0 +1,102 @@ + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/gfx/hud/wickedhud/num_leading_3.svg b/gfx/hud/wickedhud/num_leading_3.svg new file mode 100755 index 0000000..7ead31a --- /dev/null +++ b/gfx/hud/wickedhud/num_leading_3.svg @@ -0,0 +1,102 @@ + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/gfx/hud/wickedhud/statusbar.svg b/gfx/hud/wickedhud/statusbar.svg index 02d711b..9d8d0d4 100755 --- a/gfx/hud/wickedhud/statusbar.svg +++ b/gfx/hud/wickedhud/statusbar.svg @@ -39,7 +39,7 @@ inkscape:pageshadow="2" inkscape:zoom="1" inkscape:cx="101.47057" - inkscape:cy="159.19602" + inkscape:cy="118.90974" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -85,17 +85,17 @@ style="display:inline"> diff --git a/gfx/hud/wickedhud/weapon_accuracy.svg b/gfx/hud/wickedhud/weapon_accuracy.svg index d8184da..eb6c3cd 100755 --- a/gfx/hud/wickedhud/weapon_accuracy.svg +++ b/gfx/hud/wickedhud/weapon_accuracy.svg @@ -9,7 +9,7 @@ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="256" - height="64" + height="128" id="svg2" sodipodi:version="0.32" inkscape:version="0.46" @@ -17,24 +17,17 @@ sodipodi:docname="weapon_accuracy.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" inkscape:export-filename="/home/sev/.xonotic/data/gfx/hud/wickedhud/weapon_accuracy.png" - inkscape:export-xdpi="180" - inkscape:export-ydpi="180"> + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> - + id="filter3194"> + stdDeviation="0.88" + id="feGaussianBlur3196" /> + style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.37254903;filter:url(#filter3194)" + d="M 8,17 L 11,14 L 42,14 L 48,8 L 239,8 L 248,17 L 248,111 L 245,114 L 214,114 L 208,120 L 17,120 L 8,111 L 8,17 z" + id="path2387" /> + style="fill:#ffffff;fill-opacity:0.02745098;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="M 48 8 L 44 12 L 243 12 L 239 8 L 48 8 z M 8 20 L 8 28 L 248 28 L 248 20 L 8 20 z M 8 36 L 8 44 L 248 44 L 248 36 L 8 36 z M 8 52 L 8 60 L 248 60 L 248 52 L 8 52 z M 8 68 L 8 76 L 248 76 L 248 68 L 8 68 z M 8 84 L 8 92 L 248 92 L 248 84 L 8 84 z M 8 100 L 8 108 L 248 108 L 248 100 L 8 100 z M 13 116 L 17 120 L 208 120 L 212 116 L 13 116 z " + id="path3188" /> diff --git a/gfx/hud/wickedhud/weapon_current_bg.svg b/gfx/hud/wickedhud/weapon_current_bg.svg index 081ea8f..1b557c3 100755 --- a/gfx/hud/wickedhud/weapon_current_bg.svg +++ b/gfx/hud/wickedhud/weapon_current_bg.svg @@ -9,7 +9,7 @@ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="256" - height="64" + height="128" id="svg2" sodipodi:version="0.32" inkscape:version="0.46" @@ -17,33 +17,17 @@ sodipodi:docname="weapon_current_bg.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" inkscape:export-filename="/home/sev/.xonotic/data/gfx/hud/wickedhud/weapon_current_bg.png" - inkscape:export-xdpi="180" - inkscape:export-ydpi="180"> + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + id="filter3163"> - - - - - - + stdDeviation="1.88" + id="feGaussianBlur3165" /> + style="fill:#ffffff;fill-opacity:0.37254903;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="M 4,15 L 15,4 L 241,4 L 252,15 L 252,113 L 241,124 L 15,124 L 4,113 L 4,15 z" + id="path2385" + sodipodi:nodetypes="ccccccccc" /> + - + style="fill:#ffffff;fill-opacity:0.02745098;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="M 48 8 L 44 12 L 243 12 L 239 8 L 48 8 z M 8 20 L 8 28 L 248 28 L 248 20 L 8 20 z M 8 36 L 8 44 L 248 44 L 248 36 L 8 36 z M 8 52 L 8 60 L 248 60 L 248 52 L 8 52 z M 8 68 L 8 76 L 248 76 L 248 68 L 8 68 z M 8 84 L 8 92 L 248 92 L 248 84 L 8 84 z M 8 100 L 8 108 L 248 108 L 248 100 L 8 100 z M 13 116 L 17 120 L 208 120 L 212 116 L 13 116 z " + id="path3188" /> diff --git a/gfx/hud/wickedhud/weaponshotgun.svg b/gfx/hud/wickedhud/weaponshotgun.svg new file mode 100755 index 0000000..49c6146 --- /dev/null +++ b/gfx/hud/wickedhud/weaponshotgun.svg @@ -0,0 +1,77 @@ + + + + + + + + + + + image/svg+xml + + + + + + diff --git a/gfx/hud/wickedhud/whiteborder.scm b/gfx/hud/wickedhud/whiteborder.scm new file mode 100755 index 0000000..79879d7 --- /dev/null +++ b/gfx/hud/wickedhud/whiteborder.scm @@ -0,0 +1,49 @@ +;Adds a white border and a faint glow, based on the alpha channel +;Input: fileIn borderGrow borderFeather objectShrink objectFeather glowBlur + +(define (whiteborder fileIn glowBlur borderGrow borderFeather objectShrink objectFeather) + (let* + ( + (image (car (gimp-file-load 1 fileIn fileIn))) + (bottomLayer (car (gimp-image-get-active-layer image))) + (middleLayer (car (gimp-layer-new-from-drawable bottomLayer image))) + (topLayer (car (gimp-layer-new-from-drawable bottomLayer image))) + + (borderColor '(255 255 255)) + (borderGlow '(223 223 223)) + ) + + ;add layers + (gimp-image-add-layer image middleLayer -1) + (gimp-image-add-layer image topLayer -1) + + ;bottom layer: create extended glow siluette of the object + (gimp-context-set-foreground borderGlow) + (gimp-selection-layer-alpha bottomLayer) + (gimp-selection-grow image (- borderGrow 1)) + (gimp-selection-feather image borderFeather) + (gimp-edit-fill bottomLayer 0) + (gimp-selection-none image) + (plug-in-gauss-rle 1 image bottomLayer glowBlur 1 1) + + ;middle layer: create extended siluette of the object + (gimp-context-set-foreground borderColor) + (gimp-selection-layer-alpha middleLayer) + (gimp-selection-grow image borderGrow) + (gimp-selection-feather image borderFeather) + (gimp-edit-fill middleLayer 0) + + ;top layer: reduce border of the object on the top layer + (gimp-selection-layer-alpha topLayer) + (gimp-selection-shrink image objectShrink) + (gimp-selection-feather image objectFeather) + (gimp-selection-invert image) + (gimp-edit-clear topLayer) + + ;merge and save + (set! bottomLayer (car (gimp-image-merge-visible-layers image 1))) + (gimp-file-save 1 image bottomLayer fileIn fileIn) + (gimp-image-delete image) + ) +) + diff --git a/gfx/hud/wickedhud/whiteborder.sh b/gfx/hud/wickedhud/whiteborder.sh new file mode 100644 index 0000000..515b6df --- /dev/null +++ b/gfx/hud/wickedhud/whiteborder.sh @@ -0,0 +1,32 @@ +#!/bin/bash +#Requires Gimp and ~/.gimp*/scripts/whiteborder.scm +#Adds a white border and a faint glow to the specified images, based on their alpha channel. +#WARNING: Overwrites existing image files. + +gimp -d -f -i \ +-b '(whiteborder "ammo_bullets.png" 16 2 4 1 3)' \ +-b '(whiteborder "ammo_cells.png" 16 2 4 1 3)' \ +-b '(whiteborder "ammo_fuel.png" 16 2 4 1 3)' \ +-b '(whiteborder "ammo_rocket.png" 16 2 4 1 3)' \ +-b '(whiteborder "ammo_shells.png" 16 2 4 1 3)' \ +-b '(whiteborder "armor.png" 16 3 4 1 3)' \ +-b '(whiteborder "health.png" 16 3 4 1 3)' \ +-b '(whiteborder "weaponcampingrifle.tga" 16 2 4 1 3)' \ +-b '(whiteborder "weaponcrylink.tga" 16 2 4 1 3)' \ +-b '(whiteborder "weaponelectro.tga" 16 2 4 1 3)' \ +-b '(whiteborder "weaponfireball.tga" 16 2 4 1 3)' \ +-b '(whiteborder "weapongrenadelauncher.tga" 16 2 4 1 3)' \ +-b '(whiteborder "weaponhagar.tga" 16 2 4 1 3)' \ +-b '(whiteborder "weapon_hlacmod_renameit.tga" 16 2 4 1 3)' \ +-b '(whiteborder "weaponhlac.tga" 16 2 4 1 3)' \ +-b '(whiteborder "weaponhook.tga" 16 2 4 1 3)' \ +-b '(whiteborder "weaponlaser.tga" 16 2 4 1 3)' \ +-b '(whiteborder "weaponminstanex.tga" 16 2 4 1 3)' \ +-b '(whiteborder "weaponnex.tga" 16 2 4 1 3)' \ +-b '(whiteborder "weaponporto.tga" 16 2 4 1 3)' \ +-b '(whiteborder "weaponrocketlauncher.tga" 16 2 4 1 3)' \ +-b '(whiteborder "weaponseeker.tga" 16 2 4 1 3)' \ +-b '(whiteborder "weaponshotgun.tga" 16 2 4 1 3)' \ +-b '(whiteborder "weapontuba.tga" 16 2 4 1 3)' \ +-b '(whiteborder "weaponuzi.tga" 16 2 4 1 3)' \ +-b '(gimp-quit 0)'