krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Get rid of bigbars.png and smallbars.png

Browse source 
Changed loading bar colour to match vanilla
This commit is contained in:
scrawl 2014-04-27 09:14:14 +02:00
parent 3161647809
commit dac0b7090a
7 changed files with 53 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwgui/hud.cpp
View file

@ -625,7 +625,7 @@ namespace MWGui
if (mIsDrowning) if (mIsDrowning)
{ {
float intensity = (cos(mDrowningFlashTheta) + 1.0f) / 2.0f; float intensity = (cos(mDrowningFlashTheta) + 1.0f) / 2.0f;
mDrowningFlash->setColour(MyGUI::Colour(intensity, intensity, intensity)); mDrowningFlash->setColour(MyGUI::Colour(intensity, 0, 0));
} }
} }

2
files/mygui/CMakeLists.txt
View file

@ -4,7 +4,6 @@ set(SDIR ${CMAKE_CURRENT_SOURCE_DIR})
set(DDIR ${OpenMW_BINARY_DIR}/resources/mygui) set(DDIR ${OpenMW_BINARY_DIR}/resources/mygui)
set(MYGUI_FILES set(MYGUI_FILES
bigbars.png
black.png black.png
core.skin core.skin
core.xml core.xml
@ -81,7 +80,6 @@ set(MYGUI_FILES
openmw_companion_window.layout openmw_companion_window.layout
openmw_savegame_dialog.layout openmw_savegame_dialog.layout
openmw_recharge_dialog.layout openmw_recharge_dialog.layout
smallbars.png
DejaVuLGCSansMono.ttf DejaVuLGCSansMono.ttf
markers.png markers.png
../launcher/images/openmw.png ../launcher/images/openmw.png

BIN
files/mygui/bigbars.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 387 B

2
files/mygui/openmw_hud.layout
View file

@ -42,7 +42,7 @@
<Property key="TextShadow" value="true"/> <Property key="TextShadow" value="true"/>
<Property key="TextShadowColour" value="0 0 0"/> <Property key="TextShadowColour" value="0 0 0"/>
</Widget> </Widget>
<Widget type="ProgressBar" skin="MW_Progress_Loading" position="12 36 196 8" align="Center Top" name="Drowning"> <Widget type="ProgressBar" skin="MW_Progress_LightBlue" position="12 36 196 8" align="Center Top" name="Drowning">
<Property key="NeedMouse" value="false"/> <Property key="NeedMouse" value="false"/>
</Widget> </Widget>
<Widget type="Widget" skin="MW_Progress_Drowning" position="14 38 192 4" align="Center Top" name="Flash"/> <Widget type="Widget" skin="MW_Progress_Drowning" position="14 38 192 4" align="Center Top" name="Flash"/>

28
files/mygui/openmw_hud_energybar.skin.xml
View file

@ -19,24 +19,28 @@
</Skin> </Skin>
<!-- Progress bar track, various colors --> <!-- Progress bar track, various colors -->
<Skin name="MW_BarTrack_Red" size="4 8" texture="smallbars.png" > <Skin name="MW_BarTrack_Red" size="4 8" texture="textures\menu_bar_gray.dds" >
<BasisSkin type="MainSkin" offset="0 0 4 8" align="Stretch"> <Property key="Colour" value="0.8274 0.2431 0.129"/>
<State name="normal" offset="0 0 4 8"/> <BasisSkin type="MainSkin" offset="0 0 16 8" align="Stretch">
<State name="normal" offset="0 0 16 8"/>
</BasisSkin> </BasisSkin>
</Skin> </Skin>
<Skin name="MW_BarTrack_Green" size="4 8" texture="smallbars.png" > <Skin name="MW_BarTrack_Green" size="4 8" texture="textures\menu_bar_gray.dds" >
<BasisSkin type="MainSkin" offset="0 0 4 8" align="Stretch"> <Property key="Colour" value="0 0.6823 0.2745"/>
<State name="normal" offset="0 16 4 8"/> <BasisSkin type="MainSkin" offset="0 0 16 8" align="Stretch">
<State name="normal" offset="0 0 16 8"/>
</BasisSkin> </BasisSkin>
</Skin> </Skin>
<Skin name="MW_BarTrack_Blue" size="4 8" texture="smallbars.png" > <Skin name="MW_BarTrack_Blue" size="4 8" texture="textures\menu_bar_gray.dds" >
<BasisSkin type="MainSkin" offset="0 0 4 8" align="Stretch"> <Property key="Colour" value="0.2470 0.3176 0.7411"/>
<State name="normal" offset="0 8 4 8"/> <BasisSkin type="MainSkin" offset="0 0 16 8" align="Stretch">
<State name="normal" offset="0 0 16 8"/>
</BasisSkin> </BasisSkin>
</Skin> </Skin>
<Skin name="MW_BarTrack_Yellow" size="4 8" texture="smallbars.png" > <Skin name="MW_BarTrack_Yellow" size="4 8" texture="textures\menu_bar_gray.dds" >
<BasisSkin type="MainSkin" offset="0 0 4 8" align="Stretch"> <Property key="Colour" value="1 1 0"/>
<State name="normal" offset="0 32 4 8"/> <BasisSkin type="MainSkin" offset="0 0 16 8" align="Stretch">
<State name="normal" offset="0 0 16 8"/>
</BasisSkin> </BasisSkin>
</Skin> </Skin>

55
files/mygui/openmw_progress.skin.xml
View file

@ -2,35 +2,48 @@
<MyGUI type="Skin"> <MyGUI type="Skin">
<!-- Progress bar track, various colors --> <!-- Progress bar track, various colors -->
<Skin name="MW_BigTrack_Red" size="2 14" texture="bigbars.png" > <Skin name="MW_Track_Red" size="16 16" texture="textures\menu_bar_gray.dds" >
<BasisSkin type="MainSkin" offset="0 0 2 14" align="Stretch"> <Property key="Colour" value="0.8274 0.2431 0.129"/>
<State name="normal" offset="0 0 2 14"/> <BasisSkin type="MainSkin" offset="0 0 16 16" align="Stretch">
<State name="normal" offset="0 0 16 16"/>
</BasisSkin> </BasisSkin>
</Skin> </Skin>
<Skin name="MW_BigTrack_Blue" size="2 14" texture="bigbars.png" > <Skin name="MW_Track_Blue" size="2 14" texture="textures\menu_bar_gray.dds" >
<BasisSkin type="MainSkin" offset="0 0 2 14" align="Stretch"> <Property key="Colour" value="0.2470 0.3176 0.7411"/>
<State name="normal" offset="0 14 2 14"/> <BasisSkin type="MainSkin" offset="0 0 16 16" align="Stretch">
<State name="normal" offset="0 0 16 16"/>
</BasisSkin> </BasisSkin>
</Skin> </Skin>
<Skin name="MW_BigTrack_Green" size="2 14" texture="bigbars.png" > <Skin name="MW_Track_Green" size="2 14" texture="textures\menu_bar_gray.dds" >
<BasisSkin type="MainSkin" offset="0 0 2 14" align="Stretch"> <Property key="Colour" value="0 0.6823 0.2745"/>
<State name="normal" offset="0 28 2 14"/> <BasisSkin type="MainSkin" offset="0 0 16 16" align="Stretch">
<State name="normal" offset="0 0 16 16"/>
</BasisSkin> </BasisSkin>
</Skin> </Skin>
<Skin name="MW_BigTrack_Progress_Red_Small" size="2 6" texture="smallbars.png" > <!-- Lighter variants (only uses top half of the gradient) -->
<BasisSkin type="MainSkin" offset="0 0 2 6" align="Stretch"> <Skin name="MW_BigTrack_Progress_Red_Small" size="16 8" texture="textures\menu_bar_gray.dds" >
<State name="normal" offset="0 0 2 8"/> <Property key="Colour" value="1 0 0"/>
<BasisSkin type="MainSkin" offset="0 0 16 8" align="Stretch">
<State name="normal" offset="0 0 16 8"/>
</BasisSkin> </BasisSkin>
</Skin> </Skin>
<Skin name="MW_BigTrack_Progress_Blue_Small" size="2 6" texture="smallbars.png" > <Skin name="MW_BigTrack_Progress_Blue_Small" size="16 8" texture="textures\menu_bar_gray.dds" >
<BasisSkin type="MainSkin" offset="0 0 2 6" align="Stretch"> <Property key="Colour" value="0.3 0.3 1"/>
<State name="normal" offset="0 26 2 6"/> <BasisSkin type="MainSkin" offset="0 0 16 8" align="Stretch">
<State name="normal" offset="0 0 16 8"/>
</BasisSkin>
</Skin>
<Skin name="MW_BigTrack_Progress_Green_Small" size="16 8" texture="textures\menu_bar_gray.dds" >
<Property key="Colour" value="0.298 0.784 0.780"/>
<BasisSkin type="MainSkin" offset="0 0 16 8" align="Stretch">
<State name="normal" offset="0 0 16 8"/>
</BasisSkin> </BasisSkin>
</Skin> </Skin>
<Skin name="ProgressText" size="16 16"> <Skin name="ProgressText" size="16 16">
<Property key="FontName" value="Default"/> <Property key="FontName" value="Default"/>
<Property key="TextAlign" value="Center"/> <Property key="TextAlign" value="Top HCenter"/>
<Property key="TextColour" value="0.75 0.6 0.35"/> <Property key="TextColour" value="0.75 0.6 0.35"/>
<BasisSkin type="SimpleText" offset="0 0 16 16" align="Stretch"/> <BasisSkin type="SimpleText" offset="0 0 16 16" align="Stretch"/>
@ -39,7 +52,7 @@
<!-- Main energy bar widget definitions. There's one for each color.--> <!-- Main energy bar widget definitions. There's one for each color.-->
<Skin name="MW_Progress_Red" size="64 12"> <Skin name="MW_Progress_Red" size="64 12">
<Property key="TrackSkin" value="MW_BigTrack_Red"/> <Property key="TrackSkin" value="MW_Track_Red"/>
<Property key="TrackWidth" value="1"/> <Property key="TrackWidth" value="1"/>
<Child type="Widget" skin="MW_Box" offset="0 0 64 12" align="Stretch"/> <Child type="Widget" skin="MW_Box" offset="0 0 64 12" align="Stretch"/>
@ -47,7 +60,7 @@
</Skin> </Skin>
<Skin name="MW_Progress_Green" size="64 12"> <Skin name="MW_Progress_Green" size="64 12">
<Property key="TrackSkin" value="MW_BigTrack_Green"/> <Property key="TrackSkin" value="MW_Track_Green"/>
<Property key="TrackWidth" value="1"/> <Property key="TrackWidth" value="1"/>
<Child type="Widget" skin="MW_Box" offset="0 0 64 12" align="Stretch"/> <Child type="Widget" skin="MW_Box" offset="0 0 64 12" align="Stretch"/>
@ -55,14 +68,14 @@
</Skin> </Skin>
<Skin name="MW_Progress_Blue" size="64 12"> <Skin name="MW_Progress_Blue" size="64 12">
<Property key="TrackSkin" value="MW_BigTrack_Blue"/> <Property key="TrackSkin" value="MW_Track_Blue"/>
<Property key="TrackWidth" value="1"/> <Property key="TrackWidth" value="1"/>
<Child type="Widget" skin="MW_Box" offset="0 0 64 12" align="Stretch"/> <Child type="Widget" skin="MW_Box" offset="0 0 64 12" align="Stretch"/>
<Child type="Widget" skin="BlackBG" offset="2 2 60 8" align="Stretch" name="Client"/> <Child type="Widget" skin="BlackBG" offset="2 2 60 8" align="Stretch" name="Client"/>
</Skin> </Skin>
<Skin name="MW_Progress_Loading" size="64 6"> <Skin name="MW_Progress_LightBlue" size="64 6">
<Property key="TrackSkin" value="MW_BigTrack_Progress_Blue_Small"/> <Property key="TrackSkin" value="MW_BigTrack_Progress_Blue_Small"/>
<Property key="TrackWidth" value="1"/> <Property key="TrackWidth" value="1"/>
@ -82,7 +95,7 @@
<Property key="MoveToClick" value="false"/> <Property key="MoveToClick" value="false"/>
<Child type="Widget" skin="BlackBG" offset="2 2 60 2" align="Stretch" name="Client"/> <Child type="Widget" skin="BlackBG" offset="2 2 60 2" align="Stretch" name="Client"/>
<Child type="Button" skin="MW_BigTrack_Progress_Blue_Small" offset="0 0 1 6" align="Left VStretch" name="Track"/> <Child type="Button" skin="MW_BigTrack_Progress_Green_Small" offset="0 0 1 6" align="Left VStretch" name="Track"/>
<Child type="Widget" skin="MW_Box" offset="0 0 64 6" align="Stretch"/> <Child type="Widget" skin="MW_Box" offset="0 0 64 6" align="Stretch"/>
</Skin> </Skin>

BIN
files/mygui/smallbars.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2.9 KiB