mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-07-24 18:53:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Fixed invalid name bug that slipped in when I did a blind commit. (Minimap buttons aren't positioned right, but at least I've got some of them up.)

Browse Source 
* Split command backs into outer ring and inner bubble (so nested
add_color can be used to illuminate only the interior).
* Used nested add_color (when you have a new toy, you have to play with
it) to make only the icon of a tab illuminate, which looks a lot better.
* Removed garrison sprite definition, since that cell sheet is not long
for this world.

This was SVN commit r3662.
This commit is contained in:
Acumen
2006-03-18 06:58:16 +00:00
parent 7fc3d5cfac
commit 8315bcce96
4 changed files with 113 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
binaries/data/mods/official/art/textures/ui/session/icons/bkg/command.dds → binaries/data/mods/official/art/textures/ui/session/icons/bkg/command_inner.dds
View File
binaries/data/mods/official/art/textures/ui/session/icons/bkg/command_outer.dds
LFS
BIN
View File
Binary file not shown.
binaries/data/mods/official/gui/test/4_session.xml
+3 -3
View File
@@ -138,13 +138,13 @@
switch (loop)
{
case 1:
tempObject.cell_id = cellGroup["MiniMap"]["territories"].id;
tempObject.cell_id = cellGroup["Minimap"]["territories"].id;
break;
case 2:
tempObject.cell_id = cellGroup["MiniMap"]["terrain"].id;
tempObject.cell_id = cellGroup["Minimap"]["terrain"].id;
break;
case 3:
tempObject.cell_id = cellGroup["MiniMap"]["chat"].id;
tempObject.cell_id = cellGroup["Minimap"]["chat"].id;
break;
default:
break;
binaries/data/mods/official/gui/test/sprite1.xml
+107 -93
View File
@@ -796,19 +796,19 @@
<!-- Command (Disabled circle). -->
<sprite name="snIconCommand">
<image texture="session/icons/bkg/command.dds"
<image texture="session/icons/bkg/command_outer.dds"
size="0 0 100% 100%"
/>
</sprite>
<sprite name="snIconCommandOver">
<effect add_color="42 42 42 0"/>
<image texture="session/icons/bkg/command.dds"
<image texture="session/icons/bkg/command_outer.dds"
size="0 0 100% 100%"
/>
</sprite>
<sprite name="snIconCommandDisabled">
<effect grayscale=""/>
<image texture="session/icons/bkg/command.dds"
<image texture="session/icons/bkg/command_outer.dds"
size="0 0 100% 100%"
/>
</sprite>
@@ -1680,6 +1680,7 @@
/>
</sprite>
<sprite name="snIconSheetCommandOver">
<effect add_color="42 42 42 0"/>
<image texture="session/icons/sheets/command.dds"
cell_size="64 64"
size="0 0 100% 100%"
@@ -1694,16 +1695,10 @@
</sprite>
<sprite name="snIconSheetCommandButton">
<image texture="session/icons/bkg/command.dds"
<image texture="session/icons/bkg/command_outer.dds"
size="0 0 100% 100%"
/>
<image texture="session/icons/sheets/command.dds"
cell_size="64 64"
size="0 0 100% 100%"
/>
</sprite>
<sprite name="snIconSheetCommandButtonOver">
<image texture="session/icons/bkg/command.dds"
<image texture="session/icons/bkg/command_inner.dds"
size="0 0 100% 100%"
/>
<image texture="session/icons/sheets/command.dds"
@@ -1711,8 +1706,26 @@
size="0 0 100% 100%"
/>
</sprite>
<sprite name="snIconSheetCommandButtonOver">
<image texture="session/icons/bkg/command_outer.dds"
size="0 0 100% 100%"
/>
<image
texture="session/icons/bkg/command_inner.dds"
size="0 0 100% 100%"
>
<effect add_color="42 42 42 0"/>
</image>
<image texture="session/icons/sheets/command.dds"
cell_size="64 64"
size="0 0 100% 100%"
/>
</sprite>
<sprite name="snIconSheetCommandButtonDisabled">
<image texture="session/icons/bkg/command.dds"
<image texture="session/icons/bkg/command_outer.dds"
size="0 0 100% 100%"
/>
<image texture="session/icons/bkg/command_inner.dds"
size="0 0 100% 100%"
/>
<image texture="session/icons/sheets/command.dds"
@@ -1749,7 +1762,7 @@
</sprite>
<sprite name="snIconSheetFindButton">
<image texture="session/icons/bkg/command.dds"
<image texture="session/icons/bkg/minimap.dds"
size="0 0 100% 100%"
/>
<image texture="session/icons/sheets/find.dds"
@@ -1759,7 +1772,7 @@
</sprite>
<sprite name="snIconSheetFindButtonOver">
<effect add_color="42 42 42 0"/>
<image texture="session/icons/bkg/command.dds"
<image texture="session/icons/bkg/minimap.dds"
size="0 0 100% 100%"
/>
<image texture="session/icons/sheets/find.dds"
@@ -1769,7 +1782,7 @@
</sprite>
<sprite name="snIconSheetFindButtonDisabled">
<effect grayscale=""/>
<image texture="session/icons/bkg/command.dds"
<image texture="session/icons/bkg/minimap.dds"
size="0 0 100% 100%"
/>
<image texture="session/icons/sheets/find.dds"
@@ -1835,63 +1848,6 @@
/>
</sprite>
<!--
==========================================
SESSION GUI - ICON SHEETS - GARRISON
==========================================
-->
<sprite name="snIconSheetGarrison">
<image texture="session/icons/sheets/garrison.dds"
cell_size="64 64"
size="0 0 100% 100%"
/>
</sprite>
<sprite name="snIconSheetGarrisonOver">
<effect add_color="42 42 42 0"/>
<image texture="session/icons/sheets/garrison.dds"
cell_size="64 64"
size="0 0 100% 100%"
/>
</sprite>
<sprite name="snIconSheetGarrisonDisabled">
<effect grayscale=""/>
<image texture="session/icons/sheets/garrison.dds"
cell_size="64 64"
size="0 0 100% 100%"
/>
</sprite>
<sprite name="snIconSheetGarrisonButton">
<image texture="session/icons/bkg/command.dds"
size="0 0 100% 100%"
/>
<image texture="session/icons/sheets/garrison.dds"
cell_size="64 64"
size="0 0 100% 100%"
/>
</sprite>
<sprite name="snIconSheetGarrisonButtonOver">
<effect add_color="42 42 42 0"/>
<image texture="session/icons/bkg/command.dds"
size="0 0 100% 100%"
/>
<image texture="session/icons/sheets/garrison.dds"
cell_size="64 64"
size="0 0 100% 100%"
/>
</sprite>
<sprite name="snIconSheetGarrisonButtonDisabled">
<effect grayscale=""/>
<image texture="session/icons/bkg/command.dds"
size="0 0 100% 100%"
/>
<image texture="session/icons/sheets/garrison.dds"
cell_size="64 64"
size="0 0 100% 100%"
/>
</sprite>
<!--
==========================================
SESSION GUI - ICON SHEETS - GATHER
@@ -1920,19 +1876,28 @@
</sprite>
<sprite name="snIconSheetGatherButton">
<image texture="session/icons/bkg/command.dds"
<image texture="session/icons/bkg/command_outer.dds"
size="0 0 100% 100%"
/>
/>
<image
texture="session/icons/bkg/command_inner.dds"
size="0 0 100% 100%"
/>
<image texture="session/icons/sheets/gather.dds"
cell_size="64 64"
size="0 0 100% 100%"
/>
</sprite>
<sprite name="snIconSheetGatherButtonOver">
<effect add_color="42 42 42 0"/>
<image texture="session/icons/bkg/command.dds"
<image texture="session/icons/bkg/command_outer.dds"
size="0 0 100% 100%"
/>
<image
texture="session/icons/bkg/command_inner.dds"
size="0 0 100% 100%"
>
<effect add_color="42 42 42 0"/>
</image>
<image texture="session/icons/sheets/gather.dds"
cell_size="64 64"
size="0 0 100% 100%"
@@ -1940,9 +1905,13 @@
</sprite>
<sprite name="snIconSheetGatherButtonDisabled">
<effect grayscale=""/>
<image texture="session/icons/bkg/command.dds"
<image texture="session/icons/bkg/command_outer.dds"
size="0 0 100% 100%"
/>
<image
texture="session/icons/bkg/command_inner.dds"
size="0 0 100% 100%"
/>
<image texture="session/icons/sheets/gather.dds"
cell_size="64 64"
size="0 0 100% 100%"
@@ -2034,7 +2003,7 @@
</sprite>
<sprite name="snIconSheetMiniMapButton">
<image texture="session/icons/bkg/command.dds"
<image texture="session/icons/bkg/minimap.dds"
size="0 0 100% 100%"
/>
<image texture="session/icons/sheets/minimap.dds"
@@ -2044,7 +2013,7 @@
</sprite>
<sprite name="snIconSheetMiniMapButtonOver">
<effect add_color="42 42 42 0"/>
<image texture="session/icons/bkg/command.dds"
<image texture="session/icons/bkg/minimap.dds"
size="0 0 100% 100%"
/>
<image texture="session/icons/sheets/minimap.dds"
@@ -2054,7 +2023,7 @@
</sprite>
<sprite name="snIconSheetMiniMapButtonDisabled">
<effect grayscale=""/>
<image texture="session/icons/bkg/command.dds"
<image texture="session/icons/bkg/minimap.dds"
size="0 0 100% 100%"
/>
<image texture="session/icons/sheets/minimap.dds"
@@ -2091,19 +2060,28 @@
</sprite>
<sprite name="snIconSheetRankButton">
<image texture="session/icons/bkg/command.dds"
<image texture="session/icons/bkg/command_outer.dds"
size="0 0 100% 100%"
/>
/>
<image
texture="session/icons/bkg/command_inner.dds"
size="0 0 100% 100%"
/>
<image texture="session/icons/sheets/rank.dds"
cell_size="32 32"
size="0 0 100% 100%"
/>
</sprite>
<sprite name="snIconSheetRankButtonOver">
<effect add_color="42 42 42 0"/>
<image texture="session/icons/bkg/command.dds"
<image texture="session/icons/bkg/command_outer.dds"
size="0 0 100% 100%"
/>
<image
texture="session/icons/bkg/command_inner.dds"
size="0 0 100% 100%"
>
<effect add_color="42 42 42 0"/>
</image>
<image texture="session/icons/sheets/rank.dds"
cell_size="64 64"
size="0 0 100% 100%"
@@ -2111,9 +2089,13 @@
</sprite>
<sprite name="snIconSheetRankButtonDisabled">
<effect grayscale=""/>
<image texture="session/icons/bkg/command.dds"
<image texture="session/icons/bkg/command_outer.dds"
size="0 0 100% 100%"
/>
<image
texture="session/icons/bkg/command_inner.dds"
size="0 0 100% 100%"
/>
<image texture="session/icons/sheets/rank.dds"
cell_size="32 32"
size="0 0 100% 100%"
@@ -2378,21 +2360,23 @@
<sprite name="snIconSheetTabButton">
<image texture="session/icons/bkg/tab.dds"
size="0 0 100% 100%"
/>
/>
<image texture="session/icons/sheets/tab.dds"
cell_size="64 64"
size="0 0 100% 100%"
/>
</sprite>
<sprite name="snIconSheetTabButtonOver">
<effect add_color="42 42 42 0"/>
<image texture="session/icons/bkg/tab.dds"
size="0 0 100% 100%"
/>
<image texture="session/icons/sheets/tab.dds"
cell_size="64 64"
size="0 0 100% 100%"
/>
/>
<image
texture="session/icons/sheets/tab.dds"
cell_size="64 64"
size="0 0 100% 100%"
>
<effect add_color="42 42 42 0"/>
</image>
</sprite>
<sprite name="snIconSheetTabButtonDisabled">
<effect grayscale=""/>
@@ -2405,7 +2389,37 @@
/>
</sprite>
<sprite name="snIconSheetTabButton_H">
<image texture="session/icons/bkg/tab_h.dds"
size="0 0 100% 100%"
/>
<image texture="session/icons/sheets/tab.dds"
cell_size="64 64"
size="0 0 100% 100%"
/>
</sprite>
<sprite name="snIconSheetTabButton_HOver">
<image texture="session/icons/bkg/tab_h.dds"
size="0 0 100% 100%"
/>
<image
texture="session/icons/sheets/tab.dds"
cell_size="64 64"
size="0 0 100% 100%"
>
<effect add_color="42 42 42 0"/>
</image>
</sprite>
<sprite name="snIconSheetTabButton_HDisabled">
<effect grayscale=""/>
<image texture="session/icons/bkg/tab_h.dds"
size="0 0 100% 100%"
/>
<image texture="session/icons/sheets/tab.dds"
cell_size="64 64"
size="0 0 100% 100%"
/>
</sprite>