mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 09:35:28 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'zini/master' into animation2

Browse Source
This commit is contained in:
Chris Robinson 2013-02-24 15:30:46 -08:00
commit 000236ba80
7 changed files with 73 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/openmw/mwsound/ffmpeg_decoder.cpp
View File

@ -153,6 +153,10 @@ void FFmpeg_Decoder::open(const std::string &fname)
try
{
for(size_t j = 0;j < mFormatCtx->nb_streams;j++)
if(mFormatCtx->streams[j]->codec->codec_type == AVMEDIA_TYPE_AUDIO)
mFormatCtx->streams[j]->codec->request_sample_fmt = AV_SAMPLE_FMT_S16;
if(avformat_find_stream_info(mFormatCtx, NULL) < 0)
fail("Failed to find stream info in "+fname);

8
cmake/FindFFmpeg.cmake
View File

@ -68,6 +68,7 @@ macro(find_component _component _pkgconfig _library _header)
find_path(${_component}_INCLUDE_DIRS ${_header}
HINTS
${FFMPEGSDK_INC}
${PC_LIB${_component}_INCLUDEDIR}
${PC_LIB${_component}_INCLUDE_DIRS}
PATH_SUFFIXES
@ -76,6 +77,7 @@ macro(find_component _component _pkgconfig _library _header)
find_library(${_component}_LIBRARIES NAMES ${_library}
HINTS
${FFMPEGSDK_LIB}
${PC_LIB${_component}_LIBDIR}
${PC_LIB${_component}_LIBRARY_DIRS}
)
@ -97,6 +99,12 @@ endmacro()
# Check for cached results. If there are skip the costly part.
if (NOT FFMPEG_LIBRARIES)
set (FFMPEGSDK ENV${FFMPEG_HOME})
if (FFMPEGSDK)
set (FFMPEGSDK_INC "${FFMPEGSDK}/include")
set (FFMPEGSDK_LIB "${FFMPEGSDK}/lib")
endif ()
# Check for all possible component.
find_component(AVCODEC libavcodec avcodec libavcodec/avcodec.h)
find_component(AVFORMAT libavformat avformat libavformat/avformat.h)

1
credits.txt
View File

@ -29,6 +29,7 @@ Jannik Heller (scrawl)
Jason Hooks (jhooks)
Joel Graff (graffy)
Karl-Felix Glatzer (k1ll)
Lars Söderberg (Lazaroth)
lazydev
Leon Saunders (emoose)
Lukasz Gromanowski (lgro)

88
files/mygui/openmw_hud_box.skin.xml
View File

@ -2,76 +2,78 @@
<MyGUI type="Skin">
<!-- The 'box' frame that surrounds various HUD items and other elements -->
<Skin name="HUD_Box" size="40 40" texture="textures\menu_icon_equip.dds">
<BasisSkin type="TileRect" offset="0 0 40 2" align="ALIGN_TOP ALIGN_HSTRETCH">
<State name="normal" offset="2 2 40 2">
<Skin name="HUD_Box" size="40 40" texture="mwgui.png">
<BasisSkin type="TileRect" offset="0 0 39 2" align="ALIGN_TOP ALIGN_HSTRETCH">
<State name="normal" offset="4 2 38 2">
<Property key="TileSize" value="40 2"/>
<Property key="TileH" value="true"/>
<Property key="TileV" value="true"/>
</State>
</BasisSkin>
<BasisSkin type="TileRect" offset="0 38 40 2" align="ALIGN_BOTTOM ALIGN_HSTRETCH">
<State name="normal" offset="2 40 40 2">
<BasisSkin type="TileRect" offset="0 1 2 37" align="ALIGN_LEFT ALIGN_VSTRETCH">
<State name="normal" offset="2 26 2 36">
<Property key="TileSize" value="2 40"/>
<Property key="TileH" value="true"/>
<Property key="TileV" value="true"/>
</State>
</BasisSkin>
<BasisSkin type="TileRect" offset="38 0 2 40" align="ALIGN_RIGHT ALIGN_VSTRETCH">
<State name="normal" offset="16 26 2 38">
<Property key="TileSize" value="2 40"/>
<Property key="TileH" value="true"/>
<Property key="TileV" value="true"/>
</State>
</BasisSkin>
<BasisSkin type="TileRect" offset="0 38 39 2" align="ALIGN_BOTTOM ALIGN_HSTRETCH">
<State name="normal" offset="4 20 40 2">
<Property key="TileSize" value="40 2"/>
<Property key="TileH" value="true"/>
<Property key="TileV" value="true"/>
</State>
</BasisSkin>
<BasisSkin type="TileRect" offset="0 2 2 36" align="ALIGN_LEFT ALIGN_VSTRETCH">
<State name="normal" offset="2 4 2 36">
<Property key="TileSize" value="2 36"/>
<Property key="TileH" value="true"/>
<Property key="TileV" value="true"/>
</State>
</BasisSkin>
<BasisSkin type="TileRect" offset="38 2 2 36" align="ALIGN_RIGHT ALIGN_VSTRETCH">
<State name="normal" offset="40 4 2 36">
<Property key="TileSize" value="2 36"/>
<Property key="TileH" value="true"/>
<Property key="TileV" value="true"/>
</State>
</BasisSkin>
<!-- The interior of the box -->
<Child type="Widget" skin="BlackBG" offset="2 2 36 36" align="ALIGN_STRETCH" name="Client"/>
</Skin>
<Skin name="HUD_Box_NoTransp" size="40 40" texture="textures\menu_icon_equip.dds">
<BasisSkin type="TileRect" offset="0 0 40 2" align="ALIGN_TOP ALIGN_HSTRETCH">
<State name="normal" offset="2 2 40 2">
<Skin name="HUD_Box_NoTransp" size="40 40" texture="mwgui.png">
<BasisSkin type="TileRect" offset="0 0 39 2" align="ALIGN_TOP ALIGN_HSTRETCH">
<State name="normal" offset="4 2 38 2">
<Property key="TileSize" value="40 2"/>
<Property key="TileH" value="true"/>
<Property key="TileV" value="true"/>
</State>
</BasisSkin>
<BasisSkin type="TileRect" offset="0 38 40 2" align="ALIGN_BOTTOM ALIGN_HSTRETCH">
<State name="normal" offset="2 40 40 2">
<BasisSkin type="TileRect" offset="0 1 2 37" align="ALIGN_LEFT ALIGN_VSTRETCH">
<State name="normal" offset="2 26 2 36">
<Property key="TileSize" value="2 40"/>
<Property key="TileH" value="true"/>
<Property key="TileV" value="true"/>
</State>
</BasisSkin>
<BasisSkin type="TileRect" offset="38 0 2 40" align="ALIGN_RIGHT ALIGN_VSTRETCH">
<State name="normal" offset="16 26 2 38">
<Property key="TileSize" value="2 40"/>
<Property key="TileH" value="true"/>
<Property key="TileV" value="true"/>
</State>
</BasisSkin>
<BasisSkin type="TileRect" offset="0 38 39 2" align="ALIGN_BOTTOM ALIGN_HSTRETCH">
<State name="normal" offset="4 20 40 2">
<Property key="TileSize" value="40 2"/>
<Property key="TileH" value="true"/>
<Property key="TileV" value="true"/>
</State>
</BasisSkin>
<BasisSkin type="TileRect" offset="0 2 2 36" align="ALIGN_LEFT ALIGN_VSTRETCH">
<State name="normal" offset="2 4 2 36">
<Property key="TileSize" value="2 36"/>
<Property key="TileH" value="true"/>
<Property key="TileV" value="true"/>
</State>
</BasisSkin>
<BasisSkin type="TileRect" offset="38 2 2 36" align="ALIGN_RIGHT ALIGN_VSTRETCH">
<State name="normal" offset="40 4 2 36">
<Property key="TileSize" value="2 36"/>
<Property key="TileH" value="true"/>
<Property key="TileV" value="true"/>
</State>
</BasisSkin>
<!-- The interior of the box -->
<Child type="Widget" skin="DialogBG" offset="2 2 36 36" align="ALIGN_STRETCH" name="Client"/>
</Skin>

4
files/mygui/openmw_loading_screen.layout
View File

@ -6,12 +6,12 @@
<Widget type="ImageBox" skin="ImageBox" position="0 0 300 300" align="Stretch" name="BackgroundImage">
<Widget type="Widget" skin="HUD_Box" position="0 200 300 70" align="Bottom HCenter">
<Widget type="Widget" skin="HUD_Box" position="0 200 300 60" align="Bottom HCenter">
<Widget type="AutoSizedTextBox" skin="SandText" position="20 12 260 24" name="LoadingText">
</Widget>
<Widget type="ProgressBar" skin="MW_Progress_Blue" position="20 38 260 24" name="ProgressBar">
<Widget type="ProgressBar" skin="MW_Progress_Loading" position="20 36 260 8" name="ProgressBar">
<Property key="Range" value="1000"/>
</Widget>

13
files/mygui/openmw_progress.skin.xml
View File

@ -17,6 +17,11 @@
<State name="normal" offset = "0 28 2 14"/>
</BasisSkin>
</Skin>
<Skin name = "MW_BigTrack_Progress_Blue_Small" size = "2 6" texture = "smallbars.png" >
<BasisSkin type="MainSkin" offset = "0 0 2 6" align = "ALIGN_STRETCH">
<State name="normal" offset = "0 26 2 6"/>
</BasisSkin>
</Skin>
<Skin name = "ProgressText" size = "16 16">
<Property key="FontName" value = "Default"/>
@ -51,4 +56,12 @@
<Child type="Widget" skin="MW_Box" offset="0 0 64 12" align="ALIGN_STRETCH"/>
<Child type="Widget" skin="BlackBG" offset = "2 2 60 8" align = "ALIGN_STRETCH" name="Client"/>
</Skin>
<Skin name="MW_Progress_Loading" size="64 6">
<Property key="TrackSkin" value = "MW_BigTrack_Progress_Blue_Small" />
<Property key="TrackWidth" value = "1" />
<Child type="Widget" skin="MW_Box" offset="0 0 64 6" align="ALIGN_STRETCH"/>
<Child type="Widget" skin="BlackBG" offset = "2 2 60 2" align = "ALIGN_STRETCH" name="Client"/>
</Skin>
</MyGUI>

BIN
files/mygui/smallbars.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 246 B

After

Width:  |  Height:  |  Size: 3.1 KiB