Mise à jour terminée. Pour connaître les apports de la version 13.8.4 par rapport à notre ancienne version vous pouvez lire les "Release Notes" suivantes :
https://about.gitlab.com/releases/2021/02/11/security-release-gitlab-13-8-4-released/
https://about.gitlab.com/releases/2021/02/05/gitlab-13-8-3-released/

Commit 8151ec16 authored by Jussi Lindgren's avatar Jussi Lindgren

Everything: Ogre 1.9.0 and CEGUI 0.8.4 should work now

+ Enabled logging in some Ogre/CEGUI using parts
+ Moved some dox files around, removed one obsolete scenario
parent 8b79b275
<?xml version="1.0" ?>
<Imageset name="TaharezLook" imagefile="TaharezLook.tga" nativeHorzRes="800" nativeVertRes="600" autoScaled="true" version="2">
<Image name="ClientBrush" xPos="2" yPos="2" width="64" height="64" />
<Image name="GenericBrush" xPos="9" yPos="71" width="1" height="1" />
<Image name="WindowLeftEdge" xPos="6" yPos="95" width="1" height="22" xOffset="4" />
<Image name="WindowRightEdge" xPos="34" yPos="95" width="1" height="22" xOffset="-5" />
<Image name="WindowTopEdge" xPos="9" yPos="68" width="23" height="1" />
<Image name="WindowBottomEdge" xPos="9" yPos="143" width="23" height="1" />
<Image name="WindowTopLeft" xPos="2" yPos="68" width="5" height="24" />
<Image name="WindowTopRight" xPos="34" yPos="68" width="5" height="24" />
<Image name="WindowBottomLeft" xPos="2" yPos="120" width="5" height="24" />
<Image name="WindowBottomRight" xPos="34" yPos="120" width="5" height="24" />
<Image name="ButtonLeftNormal" xPos="68" yPos="20" width="12" height="16" />
<Image name="ButtonMiddleNormal" xPos="82" yPos="20" width="12" height="16" />
<Image name="ButtonRightNormal" xPos="96" yPos="20" width="12" height="16" />
<Image name="ButtonLeftPushed" xPos="68" yPos="38" width="12" height="16" />
<Image name="ButtonMiddlePushed" xPos="82" yPos="38" width="12" height="16" />
<Image name="ButtonRightPushed" xPos="96" yPos="38" width="12" height="16" />
<Image name="ButtonLeftHighlight" xPos="68" yPos="56" width="12" height="16" />
<Image name="ButtonMiddleHighlight" xPos="82" yPos="56" width="12" height="16" />
<Image name="ButtonRightHighlight" xPos="96" yPos="56" width="12" height="16" />
<Image name="CheckboxNormal" xPos="110" yPos="2" width="12" height="12" />
<Image name="CheckboxHover" xPos="110" yPos="30" width="12" height="12" />
<Image name="CheckboxMark" xPos="110" yPos="16" width="12" height="12" />
<Image name="RadioButtonNormal" xPos="124" yPos="2" width="12" height="12" />
<Image name="RadioButtonHover" xPos="124" yPos="30" width="12" height="12" />
<Image name="RadioButtonMark" xPos="124" yPos="16" width="12" height="12" />
<Image name="TitlebarLeft" xPos="68" yPos="2" width="8" height="16" />
<Image name="TitlebarMiddle" xPos="78" yPos="2" width="8" height="16" />
<Image name="TitlebarRight" xPos="88" yPos="2" width="8" height="16" />
<Image name="NewTitlebarLeft" xPos="61" yPos="127" width="13" height="16" />
<Image name="NewTitlebarMiddle" xPos="77" yPos="127" width="12" height="16" />
<Image name="NewTitlebarRight" xPos="92" yPos="127" width="12" height="16" />
<Image name="SysAreaMiddle" xPos="107" yPos="127" width="12" height="16" />
<Image name="SysAreaRight" xPos="122" yPos="127" width="13" height="16" />
<Image name="StaticLeft" xPos="41" yPos="89" width="6" height="6" />
<Image name="StaticRight" xPos="63" yPos="89" width="6" height="6" />
<Image name="StaticTop" xPos="52" yPos="78" width="6" height="6" />
<Image name="StaticBottom" xPos="52" yPos="100" width="6" height="6" />
<Image name="StaticTopLeft" xPos="41" yPos="78" width="6" height="6" />
<Image name="StaticTopRight" xPos="63" yPos="78" width="6" height="6" />
<Image name="StaticBottomLeft" xPos="41" yPos="100" width="6" height="6" />
<Image name="StaticBottomRight" xPos="63" yPos="100" width="6" height="6" />
<Image name="StaticBackdrop" xPos="52" yPos="89" width="6" height="6" />
<Image name="ProgressBarLeft" xPos="71" yPos="74" width="7" height="12" />
<Image name="ProgressBarMiddle" xPos="80" yPos="74" width="6" height="12" />
<Image name="ProgressBarRight" xPos="88" yPos="74" width="6" height="12" />
<Image name="ProgressBarDimSegment" xPos="96" yPos="74" width="8" height="12" />
<Image name="ProgressBarLitSegment" xPos="106" yPos="74" width="8" height="12" />
<Image name="EditBoxLeft" xPos="41" yPos="108" width="4" height="18" />
<Image name="EditBoxMiddle" xPos="47" yPos="108" width="4" height="18" />
<Image name="EditBoxRight" xPos="53" yPos="108" width="4" height="18" />
<Image name="EditBoxCaret" xPos="60" yPos="108" width="4" height="18" />
<Image name="SpinnerUpNormal" xPos="68" yPos="110" width="10" height="6" />
<Image name="SpinnerDownNormal" xPos="68" yPos="118" width="10" height="6" />
<Image name="SpinnerUpHover" xPos="82" yPos="110" width="10" height="6" />
<Image name="SpinnerDownHover" xPos="82" yPos="118" width="10" height="6" />
<Image name="TextSelectionBrush" xPos="8" yPos="70" width="16" height="16" />
<Image name="VertScrollTop" xPos="182" yPos="2" width="20" height="8" />
<Image name="VertScrollMiddle" xPos="182" yPos="12" width="20" height="8" />
<Image name="VertScrollBottom" xPos="182" yPos="22" width="20" height="8" />
<Image name="VertScrollBarSegment" xPos="206" yPos="2" width="4" height="10" />
<Image name="VertScrollThumbNormal" xPos="214" yPos="2" width="8" height="24" />
<Image name="VertScrollThumbHover" xPos="224" yPos="2" width="8" height="24" />
<Image name="VertScrollUpNormal" xPos="196" yPos="32" width="12" height="12" />
<Image name="VertScrollDownNormal" xPos="182" yPos="32" width="12" height="12" />
<Image name="VertScrollUpHover" xPos="196" yPos="46" width="12" height="12" />
<Image name="VertScrollDownHover" xPos="182" yPos="46" width="12" height="12" />
<Image name="MiniVertScrollBarSegment" xPos="207" yPos="60" width="4" height="10" />
<Image name="MiniVertScrollThumbNormal" xPos="214" yPos="59" width="7" height="22" />
<Image name="MiniVertScrollThumbTopNormal" xPos="214" yPos="59" width="7" height="5" />
<Image name="MiniVertScrollThumbMiddleNormal" xPos="214" yPos="65" width="7" height="5" />
<Image name="MiniVertScrollThumbBottomNormal" xPos="214" yPos="76" width="7" height="5" />
<Image name="MiniVertScrollThumbTopHover" xPos="223" yPos="59" width="7" height="5" />
<Image name="MiniVertScrollThumbMiddleHover" xPos="223" yPos="65" width="7" height="5" />
<Image name="MiniVertScrollThumbBottomHover" xPos="223" yPos="76" width="7" height="5" />
<Image name="MiniVertScrollThumbHover" xPos="223" yPos="59" width="7" height="22" />
<Image name="MiniVertScrollUpNormal" xPos="194" yPos="60" width="10" height="9" />
<Image name="MiniVertScrollDownNormal" xPos="182" yPos="59" width="10" height="9" />
<Image name="MiniVertScrollUpHover" xPos="194" yPos="70" width="10" height="9" />
<Image name="MiniVertScrollDownHover" xPos="182" yPos="69" width="10" height="9" />
<Image name="VertSliderBody" xPos="234" yPos="2" width="9" height="48" />
<Image name="VertSliderThumbNormal" xPos="217" yPos="28" width="15" height="6" />
<Image name="VertSliderThumbHover" xPos="217" yPos="36" width="15" height="6" />
<Image name="MiniHorzScrollBarSegment" xPos="244" yPos="80" width="10" height="4" />
<Image name="MiniHorzScrollThumbNormal" xPos="233" yPos="87" width="22" height="7" />
<Image name="MiniHorzScrollThumbLeftNormal" xPos="233" yPos="87" width="5" height="7" />
<Image name="MiniHorzScrollThumbMiddleNormal" xPos="239" yPos="87" width="5" height="7" />
<Image name="MiniHorzScrollThumbRightNormal" xPos="250" yPos="87" width="5" height="7" />
<Image name="MiniHorzScrollThumbHover" xPos="233" yPos="96" width="22" height="7" />
<Image name="MiniHorzScrollThumbLeftHover" xPos="233" yPos="96" width="5" height="7" />
<Image name="MiniHorzScrollThumbMiddleHover" xPos="239" yPos="96" width="5" height="7" />
<Image name="MiniHorzScrollThumbRightHover" xPos="250" yPos="96" width="5" height="7" />
<Image name="MiniHorzScrollLeftNormal" xPos="246" yPos="55" width="9" height="10" />
<Image name="MiniHorzScrollRightNormal" xPos="245" yPos="67" width="9" height="10" />
<Image name="MiniHorzScrollLeftHover" xPos="236" yPos="55" width="9" height="10" />
<Image name="MiniHorzScrollRightHover" xPos="235" yPos="67" width="9" height="10" />
<Image name="ListboxLeft" xPos="41" yPos="89" width="7" height="6" />
<Image name="ListboxRight" xPos="62" yPos="89" width="7" height="6" />
<Image name="ListboxTop" xPos="52" yPos="78" width="6" height="7" />
<Image name="ListboxBottom" xPos="52" yPos="99" width="6" height="7" />
<Image name="ListboxTopLeft" xPos="41" yPos="78" width="7" height="7" />
<Image name="ListboxTopRight" xPos="62" yPos="78" width="7" height="7" />
<Image name="ListboxBottomLeft" xPos="41" yPos="99" width="7" height="7" />
<Image name="ListboxBottomRight" xPos="62" yPos="99" width="7" height="7" />
<Image name="ListboxBackdrop" xPos="52" yPos="89" width="6" height="6" />
<Image name="ListboxSelectionBrush" xPos="8" yPos="70" width="16" height="16" />
<Image name="ComboboxEditLeft" xPos="138" yPos="2" width="8" height="16" />
<Image name="ComboboxEditMiddle" xPos="148" yPos="2" width="8" height="16" />
<Image name="ComboboxListButtonNormal" xPos="158" yPos="2" width="16" height="16" />
<Image name="ComboboxListButtonHover" xPos="158" yPos="20" width="16" height="16" />
<Image name="ComboboxListLeft" xPos="138" yPos="48" width="8" height="8" />
<Image name="ComboboxListRight" xPos="158" yPos="48" width="8" height="8" />
<Image name="ComboboxListTop" xPos="148" yPos="48" width="8" height="8" />
<Image name="ComboboxListBottom" xPos="148" yPos="58" width="8" height="8" />
<Image name="ComboboxListTopLeft" xPos="138" yPos="38" width="8" height="8" />
<Image name="ComboboxListTopRight" xPos="158" yPos="38" width="8" height="8" />
<Image name="ComboboxListBottomLeft" xPos="138" yPos="58" width="8" height="8" />
<Image name="ComboboxListBottomRight" xPos="158" yPos="58" width="8" height="8" />
<Image name="ComboboxListBackdrop" xPos="148" yPos="48" width="8" height="8" />
<Image name="ComboboxSelectionBrush" xPos="8" yPos="70" width="16" height="16" />
<Image name="ComboboxDividerLeft" xPos="138" yPos="68" width="14" height="1" />
<Image name="ComboboxDividerMiddle" xPos="154" yPos="68" width="8" height="1" />
<Image name="ComboboxDividerRight" xPos="164" yPos="68" width="14" height="1" />
<Image name="HeaderBarBackdropNormal" xPos="230" yPos="163" width="10" height="12" />
<Image name="HeaderBarBackdropHover" xPos="230" yPos="163" width="10" height="12" />
<Image name="HeaderBarSplitterNormal" xPos="225" yPos="92" width="3" height="16" />
<Image name="HeaderBarSplitterHover" xPos="200" yPos="92" width="3" height="16" />
<Image name="HeaderBarSortUp" xPos="233" yPos="178" width="8" height="8" />
<Image name="HeaderBarSortDown" xPos="244" yPos="178" width="8" height="8" />
<Image name="MultiListLeft" xPos="170" yPos="92" width="7" height="6" />
<Image name="MultiListRight" xPos="191" yPos="92" width="7" height="6" />
<Image name="MultiListTop" xPos="181" yPos="81" width="6" height="7" />
<Image name="MultiListBottom" xPos="181" yPos="102" width="6" height="7" />
<Image name="MultiListTopLeft" xPos="170" yPos="81" width="7" height="7" />
<Image name="MultiListTopRight" xPos="191" yPos="81" width="7" height="7" />
<Image name="MultiListBottomLeft" xPos="170" yPos="102" width="7" height="7" />
<Image name="MultiListBottomRight" xPos="191" yPos="102" width="7" height="7" />
<Image name="MultiListBackdrop" xPos="181" yPos="92" width="6" height="6" />
<Image name="MultiListSelectionBrush" xPos="9" yPos="71" width="14" height="14" />
<Image name="AltProgressLeft" xPos="71" yPos="88" width="8" height="12" />
<Image name="AltProgressMiddle" xPos="81" yPos="88" width="8" height="12" />
<Image name="AltProgressRight" xPos="91" yPos="88" width="8" height="12" />
<Image name="AltProgressQuarter" xPos="102" yPos="89" width="3" height="4" />
<Image name="AltProgressHalf" xPos="109" yPos="89" width="4" height="5" />
<Image name="AltProgressLight1" xPos="100" yPos="97" width="4" height="8" />
<Image name="AltProgressLight2" xPos="106" yPos="97" width="4" height="8" />
<Image name="AltProgressLight3" xPos="112" yPos="97" width="4" height="8" />
<Image name="AltProgressLight4" xPos="118" yPos="97" width="4" height="8" />
<Image name="AltProgressLight5" xPos="124" yPos="97" width="4" height="8" />
<Image name="AltProgressLight6" xPos="130" yPos="97" width="4" height="8" />
<Image name="AltProgressLight7" xPos="136" yPos="97" width="4" height="8" />
<Image name="AltProgressLight8" xPos="142" yPos="97" width="4" height="8" />
<Image name="AltProgressLight9" xPos="148" yPos="97" width="4" height="8" />
<Image name="AltProgressLight10" xPos="154" yPos="97" width="4" height="8" />
<Image name="CloseButtonNormal" xPos="41" yPos="128" width="16" height="16" />
<Image name="CloseButtonHover" xPos="41" yPos="146" width="16" height="16" />
<Image name="CloseButtonPressed" xPos="41" yPos="164" width="16" height="16" />
<Image name="NewCloseButtonNormal" xPos="90" yPos="146" width="10" height="10" />
<Image name="NewCloseButtonHover" xPos="90" yPos="146" width="10" height="10" />
<Image name="NewCloseButtonPressed" xPos="90" yPos="146" width="10" height="10" />
<Image name="MultiLineEditboxLeft" xPos="41" yPos="89" width="6" height="6" />
<Image name="MultiLineEditboxRight" xPos="63" yPos="89" width="6" height="6" />
<Image name="MultiLineEditboxTop" xPos="52" yPos="78" width="6" height="6" />
<Image name="MultiLineEditboxBottom" xPos="52" yPos="100" width="6" height="6" />
<Image name="MultiLineEditboxTopLeft" xPos="41" yPos="78" width="6" height="6" />
<Image name="MultiLineEditboxTopRight" xPos="63" yPos="78" width="6" height="6" />
<Image name="MultiLineEditboxBottomLeft" xPos="41" yPos="100" width="6" height="6" />
<Image name="MultiLineEditboxBottomRight" xPos="63" yPos="100" width="6" height="6" />
<Image name="MultiLineEditboxBackdrop" xPos="52" yPos="89" width="6" height="6" />
<Image name="MultiLineEditboxSelectionBrush" xPos="9" yPos="71" width="14" height="14" />
<Image name="MouseTarget" xPos="182" yPos="127" width="17" height="17" xOffset="-8" yOffset="-8" />
<Image name="MouseArrow" xPos="138" yPos="127" width="31" height="25" xOffset="0" yOffset="0" />
<Image name="MouseMoveCursor" xPos="201" yPos="127" width="18" height="18" xOffset="-8" yOffset="-8" />
<Image name="MouseNoSoCursor" xPos="221" yPos="127" width="8" height="18" xOffset="-3" yOffset="-8" />
<Image name="MouseEsWeCursor" xPos="182" yPos="150" width="18" height="8" xOffset="-8" yOffset="-3" />
<Image name="MouseNeSwCursor" xPos="201" yPos="147" width="14" height="14" xOffset="-7" yOffset="-7" />
<Image name="MouseNwSeCursor" xPos="230" yPos="126" width="14" height="14" xOffset="-7" yOffset="-7" />
<Image name="MouseTextBar" xPos="173" yPos="127" width="7" height="18" xOffset="-2" yOffset="-9" />
<Image name="TabHorizontalFiller" xPos="197" yPos="201" width="7" height="1" />
<Image name="TabContentPaneUpperLeft" xPos="41" yPos="78" width="7" height="7" />
<Image name="TabContentPaneUpper" xPos="52" yPos="78" width="6" height="7" />
<Image name="TabContentPaneUpperRight" xPos="62" yPos="78" width="7" height="7" />
<Image name="TabContentPaneLeft" xPos="41" yPos="89" width="7" height="6" />
<Image name="TabContentPaneRight" xPos="62" yPos="89" width="7" height="6" />
<Image name="TabContentPaneLower" xPos="52" yPos="99" width="6" height="7" />
<Image name="TabContentPaneLowerLeft" xPos="41" yPos="99" width="7" height="7" />
<Image name="TabContentPaneLowerRight" xPos="62" yPos="99" width="7" height="7" />
<Image name="TabContentPaneMiddle" xPos="52" yPos="89" width="6" height="6" />
<Image name="TabButtonScrollLeftNormal" xPos="97" yPos="108" width="16" height="17" />
<Image name="TabButtonScrollRightNormal" xPos="112" yPos="108" width="16" height="17" />
<Image name="TabButtonScrollLeftHover" xPos="127" yPos="108" width="16" height="17" />
<Image name="TabButtonScrollRightHover" xPos="142" yPos="108" width="16" height="17" />
<Image name="TabButtonLeftNormal" xPos="41" yPos="89" width="7" height="6" />
<Image name="TabButtonRightNormal" xPos="62" yPos="89" width="7" height="6" />
<Image name="TabButtonUpperNormal" xPos="52" yPos="78" width="6" height="7" />
<Image name="TabButtonLowerNormal" xPos="52" yPos="99" width="6" height="7" />
<Image name="TabButtonUpperLeftNormal" xPos="41" yPos="78" width="7" height="7" />
<Image name="TabButtonUpperLeft2Normal" xPos="186" yPos="164" width="7" height="7" />
<Image name="TabButtonUpperRightNormal" xPos="62" yPos="78" width="7" height="7" />
<Image name="TabButtonLowerLeftNormal" xPos="41" yPos="99" width="7" height="7" />
<Image name="TabButtonLowerRightNormal" xPos="62" yPos="99" width="7" height="7" />
<Image name="TabButtonLowerRight2Normal" xPos="187" yPos="195" width="7" height="7" />
<Image name="TabButtonMiddleNormal" xPos="52" yPos="89" width="6" height="6" />
<Image name="TabButtonLeftSelected" xPos="41" yPos="89" width="7" height="6" />
<Image name="TabButtonRightSelected" xPos="62" yPos="89" width="7" height="6" />
<Image name="TabButtonUpperSelected" xPos="52" yPos="78" width="6" height="7" />
<Image name="TabButtonLowerSelected" xPos="52" yPos="89" width="6" height="6" />
<Image name="TabButtonUpperLeftSelected" xPos="41" yPos="78" width="7" height="7" />
<Image name="TabButtonUpperRightSelected" xPos="62" yPos="78" width="7" height="7" />
<Image name="TabButtonLowerLeftSelected" xPos="41" yPos="99" width="7" height="7" />
<Image name="TabButtonLowerRightSelected" xPos="62" yPos="99" width="7" height="7" />
<Image name="TabButtonMiddleSelected" xPos="52" yPos="89" width="6" height="6" />
<Image name="TooltipTopLeft" xPos="61" yPos="160" width="4" height="4" />
<Image name="TooltipTopRight" xPos="85" yPos="160" width="5" height="4" />
<Image name="TooltipBottomLeft" xPos="61" yPos="184" width="4" height="5" />
<Image name="TooltipBottomRight" xPos="85" yPos="184" width="5" height="5" />
<Image name="TooltipLeftEdge" xPos="61" yPos="171" width="4" height="6" />
<Image name="TooltipRightEdge" xPos="85" yPos="171" width="5" height="6" />
<Image name="TooltipTopEdge" xPos="72" yPos="160" width="6" height="4" />
<Image name="TooltipBottomEdge" xPos="72" yPos="184" width="6" height="5" />
<Image name="TooltipMiddle" xPos="72" yPos="171" width="6" height="6" />
<Image name="MenuTopLeft" xPos="166" yPos="204" width="2" height="2" />
<Image name="MenuTopRight" xPos="175" yPos="204" width="3" height="2" />
<Image name="MenuBottomLeft" xPos="166" yPos="213" width="2" height="3" />
<Image name="MenuBottomRight" xPos="175" yPos="213" width="3" height="3" />
<Image name="MenuLeft" xPos="166" yPos="209" width="2" height="1" />
<Image name="MenuRight" xPos="175" yPos="209" width="3" height="1" />
<Image name="MenuTop" xPos="171" yPos="204" width="1" height="2" />
<Image name="MenuBottom" xPos="171" yPos="213" width="1" height="3" />
<Image name="MenuMiddle" xPos="171" yPos="209" width="1" height="1" />
<Image name="PopupMenuFrameTopLeft" xPos="186" yPos="204" width="2" height="2" />
<Image name="PopupMenuFrameTopRight" xPos="195" yPos="204" width="4" height="2" />
<Image name="PopupMenuFrameBottomLeft" xPos="186" yPos="213" width="2" height="4" />
<Image name="PopupMenuFrameBottomRight" xPos="195" yPos="213" width="4" height="4" />
<Image name="PopupMenuFrameLeft" xPos="186" yPos="209" width="2" height="1" />
<Image name="PopupMenuFrameRight" xPos="195" yPos="209" width="4" height="1" />
<Image name="PopupMenuFrameTop" xPos="191" yPos="204" width="1" height="2" />
<Image name="PopupMenuFrameBottom" xPos="191" yPos="213" width="1" height="4" />
<Image name="PopupMenuMiddle" xPos="191" yPos="209" width="1" height="1" />
<Image name="PopupMenuArrowRight" xPos="179" yPos="204" width="5" height="5" />
<Image name="PopupMenuArrowLeft" xPos="179" yPos="210" width="5" height="5" />
<Image name="TreeListClosed" xPos="175" yPos="111" width="7" height="11" xOffset="8" yOffset="2" />
<Image name="TreeListOpened" xPos="164" yPos="111" width="11" height="7" xOffset="8" yOffset="2"/>
</Imageset>
<?xml version="1.0" ?>
<GUIScheme version="5" name="TaharezLook">
<Imageset filename="TaharezLook-0.8.imageset" />
<Font filename="bluehighway-8-0.8.font" />
<Font filename="bluehighway-10-0.8.font" />
<Font filename="bluehighway-12-0.8.font" />
<Font filename="bluehighway-24-0.8.font" />
<LookNFeel filename="TaharezLook-0.8.looknfeel" />
<WindowRendererSet filename="CEGUICoreWindowRendererSet" />
<FalagardMapping windowType="TaharezLook/Button" targetType="CEGUI/PushButton" renderer="Core/Button" lookNFeel="TaharezLook/Button" />
<FalagardMapping windowType="TaharezLook/Checkbox" targetType="CEGUI/Checkbox" renderer="Core/ToggleButton" lookNFeel="TaharezLook/Checkbox" />
<FalagardMapping windowType="TaharezLook/ImageButton" targetType="CEGUI/PushButton" renderer="Core/Button" lookNFeel="TaharezLook/ImageButton" />
<FalagardMapping windowType="TaharezLook/RadioButton" targetType="CEGUI/RadioButton" renderer="Core/ToggleButton" lookNFeel="TaharezLook/RadioButton" />
<FalagardMapping windowType="TaharezLook/FrameWindow" targetType="CEGUI/FrameWindow" renderer="Core/FrameWindow" lookNFeel="TaharezLook/FrameWindow" />
<FalagardMapping windowType="TaharezLook/Titlebar" targetType="CEGUI/Titlebar" renderer="Core/Titlebar" lookNFeel="TaharezLook/Titlebar" />
<FalagardMapping windowType="TaharezLook/SystemButton" targetType="CEGUI/PushButton" renderer="Core/Button" lookNFeel="TaharezLook/Button" />
<FalagardMapping windowType="TaharezLook/Editbox" targetType="CEGUI/Editbox" renderer="Core/Editbox" lookNFeel="TaharezLook/Editbox" />
<FalagardMapping windowType="TaharezLook/MultiLineEditbox" targetType="CEGUI/MultiLineEditbox" renderer="Core/MultiLineEditbox" lookNFeel="TaharezLook/MultiLineEditbox" />
<FalagardMapping windowType="TaharezLook/Menubar" targetType="CEGUI/Menubar" renderer="Core/Menubar" lookNFeel="TaharezLook/Menubar" />
<FalagardMapping windowType="TaharezLook/PopupMenu" targetType="CEGUI/PopupMenu" renderer="Core/PopupMenu" lookNFeel="TaharezLook/PopupMenu" />
<FalagardMapping windowType="TaharezLook/MenuItem" targetType="CEGUI/MenuItem" renderer="Core/MenuItem" lookNFeel="TaharezLook/MenuItem" />
<FalagardMapping windowType="TaharezLook/AlternateProgressBar" targetType="CEGUI/ProgressBar" renderer="Core/ProgressBar" lookNFeel="TaharezLook/AltProgressBar" />
<FalagardMapping windowType="TaharezLook/ProgressBar" targetType="CEGUI/ProgressBar" renderer="Core/ProgressBar" lookNFeel="TaharezLook/ProgressBar" />
<FalagardMapping windowType="TaharezLook/VUMeter" targetType="CEGUI/ProgressBar" renderer="Core/ProgressBar" lookNFeel="TaharezLook/VUMeter" />
<FalagardMapping windowType="TaharezLook/VerticalScrollbar" targetType="CEGUI/Scrollbar" renderer="Core/Scrollbar" lookNFeel="TaharezLook/VerticalScrollbar" />
<FalagardMapping windowType="TaharezLook/HorizontalScrollbar" targetType="CEGUI/Scrollbar" renderer="Core/Scrollbar" lookNFeel="TaharezLook/HorizontalScrollbar" />
<FalagardMapping windowType="TaharezLook/VerticalScrollbarThumb" targetType="CEGUI/Thumb" renderer="Core/Button" lookNFeel="TaharezLook/VerticalScrollbarThumb" />
<FalagardMapping windowType="TaharezLook/HorizontalScrollbarThumb" targetType="CEGUI/Thumb" renderer="Core/Button" lookNFeel="TaharezLook/HorizontalScrollbarThumb" />
<FalagardMapping windowType="TaharezLook/LargeVerticalScrollbar" targetType="CEGUI/Scrollbar" renderer="Core/Scrollbar" lookNFeel="TaharezLook/LargeVerticalScrollbar" />
<FalagardMapping windowType="TaharezLook/LargeVerticalScrollbarThumb" targetType="CEGUI/Thumb" renderer="Core/Button" lookNFeel="TaharezLook/LargeVerticalScrollbarThumb" />
<FalagardMapping windowType="TaharezLook/TabButton" targetType="CEGUI/TabButton" renderer="Core/TabButton" lookNFeel="TaharezLook/TabButton" />
<FalagardMapping windowType="TaharezLook/TabControl" targetType="CEGUI/TabControl" renderer="Core/TabControl" lookNFeel="TaharezLook/TabControl" />
<FalagardMapping windowType="TaharezLook/TabContentPane" targetType="DefaultWindow" renderer="Core/Default" lookNFeel="TaharezLook/TabContentPane" />
<FalagardMapping windowType="TaharezLook/TabButtonPane" targetType="DefaultWindow" renderer="Core/Default" lookNFeel="TaharezLook/TabButtonPane" />
<FalagardMapping windowType="TaharezLook/ComboDropList" targetType="CEGUI/ComboDropList" renderer="Core/Listbox" lookNFeel="TaharezLook/ComboDropList" />
<FalagardMapping windowType="TaharezLook/ComboEditbox" targetType="CEGUI/Editbox" renderer="Core/Editbox" lookNFeel="TaharezLook/ComboEditbox" />
<FalagardMapping windowType="TaharezLook/Combobox" targetType="CEGUI/Combobox" renderer="Core/Default" lookNFeel="TaharezLook/Combobox" />
<FalagardMapping windowType="TaharezLook/Listbox" targetType="CEGUI/Listbox" renderer="Core/Listbox" lookNFeel="TaharezLook/Listbox" />
<FalagardMapping windowType="TaharezLook/ListHeader" targetType="CEGUI/ListHeader" renderer="Core/ListHeader" lookNFeel="TaharezLook/ListHeader" />
<FalagardMapping windowType="TaharezLook/ListHeaderSegment" targetType="CEGUI/ListHeaderSegment" renderer="Core/ListHeaderSegment" lookNFeel="TaharezLook/ListHeaderSegment" />
<FalagardMapping windowType="TaharezLook/MultiColumnList" targetType="CEGUI/MultiColumnList" renderer="Core/MultiColumnList" lookNFeel="TaharezLook/MultiColumnList" />
<FalagardMapping windowType="TaharezLook/Slider" targetType="CEGUI/Slider" renderer="Core/Slider" lookNFeel="TaharezLook/Slider" />
<FalagardMapping windowType="TaharezLook/SliderThumb" targetType="CEGUI/Thumb" renderer="Core/Button" lookNFeel="TaharezLook/SliderThumb" />
<FalagardMapping windowType="TaharezLook/ScrollablePane" targetType="CEGUI/ScrollablePane" renderer="Core/ScrollablePane" lookNFeel="TaharezLook/ScrollablePane" />
<FalagardMapping windowType="TaharezLook/Spinner" targetType="CEGUI/Spinner" renderer="Core/Default" lookNFeel="TaharezLook/Spinner" />
<FalagardMapping windowType="TaharezLook/Tooltip" targetType="CEGUI/Tooltip" renderer="Core/Tooltip" lookNFeel="TaharezLook/Tooltip" />
<FalagardMapping windowType="TaharezLook/StaticImage" targetType="DefaultWindow" renderer="Core/StaticImage" lookNFeel="TaharezLook/StaticImage" />
<FalagardMapping windowType="TaharezLook/StaticText" targetType="DefaultWindow" renderer="Core/StaticText" lookNFeel="TaharezLook/StaticText" />
<FalagardMapping windowType="TaharezLook/ItemListbox" targetType="CEGUI/ItemListbox" renderer="Core/ItemListbox" lookNFeel="TaharezLook/ItemListbox" />
<FalagardMapping windowType="TaharezLook/ListboxItem" targetType="CEGUI/ItemEntry" renderer="Core/ItemEntry" lookNFeel="TaharezLook/ListboxItem" />
<FalagardMapping windowType="TaharezLook/GroupBox" targetType="CEGUI/GroupBox" renderer="Core/Default" lookNFeel="TaharezLook/GroupBox" />
<FalagardMapping windowType="TaharezLook/Tree" targetType="CEGUI/Tree" renderer="Core/Tree" lookNFeel="TaharezLook/Tree" />
</GUIScheme>
<?xml version="1.0" ?>
<Font version="3" name="BlueHighway-10" filename="bluehigh.ttf" type="FreeType" size="10" nativeHorzRes="1024" nativeVertRes="768" autoScaled="false" antiAlias="true" />
<?xml version="1.0" ?>
<Font version="3" name="BlueHighway-12" filename="bluehigh.ttf" type="FreeType" size="12" nativeHorzRes="800" nativeVertRes="600" autoScaled="true"/>
<?xml version="1.0" ?>
<Font version="3" name="BlueHighway-24" filename="bluehigh.ttf" type="FreeType" size="24" nativeHorzRes="800" nativeVertRes="600" autoScaled="true"/>
<?xml version="1.0" ?>
<Font version="3" name="BlueHighway-8" filename="bluehigh.ttf" type="FreeType" size="8" nativeHorzRes="1024" nativeVertRes="768" autoScaled="true" antiAlias="true" />
......@@ -13,7 +13,7 @@ using namespace OpenViBE;
using namespace OpenViBE::Kernel;
using namespace OpenViBESSVEP;
#if !((CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR > 7))
#if !((CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR >= 8))
namespace CEGUI
{
typedef CEGUI::UVector2 USize;
......@@ -51,15 +51,16 @@ bool CShooterApplication::setup(OpenViBE::Kernel::IKernelContext* poKernelContex
m_poInstructionsReady->setPosition(CEGUI::UVector2(cegui_reldim(0.0f), cegui_reldim(0.0f)) );
m_poInstructionsReady->setSize(CEGUI::USize(CEGUI::UDim(0.0f, 640.f), CEGUI::UDim(0.0f, 32.f)));
#if (CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR > 7)
#if (CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR >= 8)
m_poSheet->addChild(m_poInstructionsReady);
CEGUI::ImageManager::getSingleton().addFromImageFile("InstructionsReady","InstructionText-Start.png");
m_poInstructionsReady->setProperty("Image","InstructionsReady");
#else
m_poSheet->addChildWindow(m_poInstructionsReady);
CEGUI::ImagesetManager::getSingleton().createFromImageFile("InstructionsReady", "InstructionText-Start.png");
m_poInstructionsReady->setProperty("Image", "set:InstructionsReady image:full_image");
#endif
m_poInstructionsReady->setProperty("Image","set:InstructionsReady image:full_image");
m_poInstructionsReady->setProperty("FrameEnabled","False");
m_poInstructionsReady->setProperty("BackgroundEnabled","False");
m_poInstructionsReady->setVisible(true);
......
......@@ -12,7 +12,7 @@ using namespace OpenViBE;
using namespace OpenViBE::Kernel;
using namespace OpenViBESSVEP;
#if !((CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR > 7))
#if !((CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR >= 8))
namespace CEGUI
{
typedef CEGUI::UVector2 USize;
......@@ -50,15 +50,17 @@ bool CTrainerApplication::setup(OpenViBE::Kernel::IKernelContext* poKernelContex
m_poInstructionsReady->setPosition(CEGUI::UVector2(cegui_reldim(0.0f), cegui_reldim(0.0f)) );
m_poInstructionsReady->setSize(CEGUI::USize(CEGUI::UDim(0.0f, 640.f), CEGUI::UDim(0.0f, 32.f)));
#if (CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR > 7)
#if (CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR >= 8)
m_poSheet->addChild(m_poInstructionsReady);
CEGUI::ImageManager::getSingleton().addFromImageFile("InstructionsReady","InstructionText-Start.png");
m_poInstructionsReady->setProperty("Image","InstructionsReady");
#else
m_poSheet->addChildWindow(m_poInstructionsReady);
CEGUI::ImagesetManager::getSingleton().createFromImageFile("InstructionsReady", "InstructionText-Start.png");
m_poInstructionsReady->setProperty("Image", "set:InstructionsReady image:full_image");
#endif
m_poInstructionsReady->setProperty("Image","set:InstructionsReady image:full_image");
m_poInstructionsReady->setProperty("FrameEnabled","False");
m_poInstructionsReady->setProperty("BackgroundEnabled","False");
m_poInstructionsReady->setVisible(true);
......
......@@ -210,8 +210,8 @@ void CApplication::initCEGUI(const char *logFilename)
m_roGUIRenderer = &(CEGUI::OgreRenderer::bootstrapSystem(*m_poWindow));
(*m_poLogManager) << LogLevel_Debug << "+ Creating CEGUI Scheme Manager\n";
#if (CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR > 7)
CEGUI::SchemeManager::getSingleton().createFromFile((CEGUI::utf8*)"TaharezLook-ov.scheme");
#if (CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR >= 8)
CEGUI::SchemeManager::getSingleton().createFromFile((CEGUI::utf8*)"TaharezLook-ov-0.8.scheme");
#else
CEGUI::SchemeManager::getSingleton().create((CEGUI::utf8*)"TaharezLook-ov.scheme");
#endif
......@@ -222,8 +222,8 @@ void CApplication::initCEGUI(const char *logFilename)
(*m_poLogManager) << LogLevel_Debug << "+ Setting CEGUI StyleSheet\n";
#if (CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR > 7)
// @FIXME
#if (CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR >= 8)
CEGUI::System::getSingleton().getDefaultGUIContext().setRootWindow(m_poSheet);
#else
CEGUI::System::getSingleton().setGUISheet(m_poSheet);
#endif
......
......@@ -9,7 +9,7 @@
#include <Ogre.h>
#include <vector>
#include <CEGUI.h>
#if (CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR > 7)
#if (CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR >= 8)
#include <CEGUI/RendererModules/Ogre/Renderer.h>
#else
#include <RendererModules/Ogre/CEGUIOgreRenderer.h>
......
......@@ -6,6 +6,7 @@
#if (OGRE_VERSION_MAJOR > 1) || ((OGRE_VERSION_MAJOR == 1) && (OGRE_VERSION_MINOR >= 9))
#include "Overlay/OgreOverlayManager.h"
#include "Overlay/OgreOverlaySystem.h"
#endif
using namespace Ogre;
......@@ -18,6 +19,12 @@ using namespace OpenViBE::Kernel;
{
m_oAABInf.setInfinite();
#if (OGRE_VERSION_MAJOR > 1) || ((OGRE_VERSION_MAJOR == 1) && (OGRE_VERSION_MINOR >= 9))
// on Ogre 1.9, overlay system needs to be manually created
Ogre::OverlaySystem* pOverlaySystem = OGRE_NEW Ogre::OverlaySystem();
m_poSceneManager->addRenderQueueListener(pOverlaySystem);
#endif
m_poOverlayManager = Ogre::OverlayManager::getSingletonPtr();
(m_poApplication->getLogManager()) << LogLevel_Debug << " + Creating OverlayManager\n";
......
<?xml version="1.0" ?>
<Imageset name="TaharezLook" imagefile="TaharezLook.tga" nativeHorzRes="800" nativeVertRes="600" autoScaled="true" version="2">
<Image name="ClientBrush" xPos="2" yPos="2" width="64" height="64" />
<Image name="GenericBrush" xPos="9" yPos="71" width="1" height="1" />
<Image name="WindowLeftEdge" xPos="6" yPos="95" width="1" height="22" xOffset="4" />
<Image name="WindowRightEdge" xPos="34" yPos="95" width="1" height="22" xOffset="-5" />
<Image name="WindowTopEdge" xPos="9" yPos="68" width="23" height="1" />
<Image name="WindowBottomEdge" xPos="9" yPos="143" width="23" height="1" />
<Image name="WindowTopLeft" xPos="2" yPos="68" width="5" height="24" />
<Image name="WindowTopRight" xPos="34" yPos="68" width="5" height="24" />
<Image name="WindowBottomLeft" xPos="2" yPos="120" width="5" height="24" />
<Image name="WindowBottomRight" xPos="34" yPos="120" width="5" height="24" />
<Image name="ButtonLeftNormal" xPos="68" yPos="20" width="12" height="16" />
<Image name="ButtonMiddleNormal" xPos="82" yPos="20" width="12" height="16" />
<Image name="ButtonRightNormal" xPos="96" yPos="20" width="12" height="16" />
<Image name="ButtonLeftPushed" xPos="68" yPos="38" width="12" height="16" />
<Image name="ButtonMiddlePushed" xPos="82" yPos="38" width="12" height="16" />
<Image name="ButtonRightPushed" xPos="96" yPos="38" width="12" height="16" />
<Image name="ButtonLeftHighlight" xPos="68" yPos="56" width="12" height="16" />
<Image name="ButtonMiddleHighlight" xPos="82" yPos="56" width="12" height="16" />
<Image name="ButtonRightHighlight" xPos="96" yPos="56" width="12" height="16" />
<Image name="CheckboxNormal" xPos="110" yPos="2" width="12" height="12" />
<Image name="CheckboxHover" xPos="110" yPos="30" width="12" height="12" />
<Image name="CheckboxMark" xPos="110" yPos="16" width="12" height="12" />
<Image name="RadioButtonNormal" xPos="124" yPos="2" width="12" height="12" />
<Image name="RadioButtonHover" xPos="124" yPos="30" width="12" height="12" />
<Image name="RadioButtonMark" xPos="124" yPos="16" width="12" height="12" />
<Image name="TitlebarLeft" xPos="68" yPos="2" width="8" height="16" />
<Image name="TitlebarMiddle" xPos="78" yPos="2" width="8" height="16" />
<Image name="TitlebarRight" xPos="88" yPos="2" width="8" height="16" />
<Image name="NewTitlebarLeft" xPos="61" yPos="127" width="13" height="16" />
<Image name="NewTitlebarMiddle" xPos="77" yPos="127" width="12" height="16" />
<Image name="NewTitlebarRight" xPos="92" yPos="127" width="12" height="16" />
<Image name="SysAreaMiddle" xPos="107" yPos="127" width="12" height="16" />
<Image name="SysAreaRight" xPos="122" yPos="127" width="13" height="16" />
<Image name="StaticLeft" xPos="41" yPos="89" width="6" height="6" />
<Image name="StaticRight" xPos="63" yPos="89" width="6" height="6" />
<Image name="StaticTop" xPos="52" yPos="78" width="6" height="6" />
<Image name="StaticBottom" xPos="52" yPos="100" width="6" height="6" />
<Image name="StaticTopLeft" xPos="41" yPos="78" width="6" height="6" />
<Image name="StaticTopRight" xPos="63" yPos="78" width="6" height="6" />
<Image name="StaticBottomLeft" xPos="41" yPos="100" width="6" height="6" />
<Image name="StaticBottomRight" xPos="63" yPos="100" width="6" height="6" />
<Image name="StaticBackdrop" xPos="52" yPos="89" width="6" height="6" />
<Image name="ProgressBarLeft" xPos="71" yPos="74" width="7" height="12" />
<Image name="ProgressBarMiddle" xPos="80" yPos="74" width="6" height="12" />
<Image name="ProgressBarRight" xPos="88" yPos="74" width="6" height="12" />
<Image name="ProgressBarDimSegment" xPos="96" yPos="74" width="8" height="12" />
<Image name="ProgressBarLitSegment" xPos="106" yPos="74" width="8" height="12" />
<Image name="EditBoxLeft" xPos="41" yPos="108" width="4" height="18" />
<Image name="EditBoxMiddle" xPos="47" yPos="108" width="4" height="18" />
<Image name="EditBoxRight" xPos="53" yPos="108" width="4" height="18" />
<Image name="EditBoxCaret" xPos="60" yPos="108" width="4" height="18" />
<Image name="SpinnerUpNormal" xPos="68" yPos="110" width="10" height="6" />
<Image name="SpinnerDownNormal" xPos="68" yPos="118" width="10" height="6" />
<Image name="SpinnerUpHover" xPos="82" yPos="110" width="10" height="6" />
<Image name="SpinnerDownHover" xPos="82" yPos="118" width="10" height="6" />
<Image name="TextSelectionBrush" xPos="8" yPos="70" width="16" height="16" />
<Image name="VertScrollTop" xPos="182" yPos="2" width="20" height="8" />
<Image name="VertScrollMiddle" xPos="182" yPos="12" width="20" height="8" />
<Image name="VertScrollBottom" xPos="182" yPos="22" width="20" height="8" />
<Image name="VertScrollBarSegment" xPos="206" yPos="2" width="4" height="10" />
<Image name="VertScrollThumbNormal" xPos="214" yPos="2" width="8" height="24" />
<Image name="VertScrollThumbHover" xPos="224" yPos="2" width="8" height="24" />
<Image name="VertScrollUpNormal" xPos="196" yPos="32" width="12" height="12" />
<Image name="VertScrollDownNormal" xPos="182" yPos="32" width="12" height="12" />
<Image name="VertScrollUpHover" xPos="196" yPos="46" width="12" height="12" />
<Image name="VertScrollDownHover" xPos="182" yPos="46" width="12" height="12" />
<Image name="MiniVertScrollBarSegment" xPos="207" yPos="60" width="4" height="10" />
<Image name="MiniVertScrollThumbNormal" xPos="214" yPos="59" width="7" height="22" />
<Image name="MiniVertScrollThumbTopNormal" xPos="214" yPos="59" width="7" height="5" />
<Image name="MiniVertScrollThumbMiddleNormal" xPos="214" yPos="65" width="7" height="5" />
<Image name="MiniVertScrollThumbBottomNormal" xPos="214" yPos="76" width="7" height="5" />
<Image name="MiniVertScrollThumbTopHover" xPos="223" yPos="59" width="7" height="5" />
<Image name="MiniVertScrollThumbMiddleHover" xPos="223" yPos="65" width="7" height="5" />
<Image name="MiniVertScrollThumbBottomHover" xPos="223" yPos="76" width="7" height="5" />
<Image name="MiniVertScrollThumbHover" xPos="223" yPos="59" width="7" height="22" />
<Image name="MiniVertScrollUpNormal" xPos="194" yPos="60" width="10" height="9" />
<Image name="MiniVertScrollDownNormal" xPos="182" yPos="59" width="10"