Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Feb 21, 2018, 12:03:52 AM (6 years ago)
Author:
landauf
Message:

merged ogre1.9 (including cegui0.8) into new branch

Location:
code/branches/cegui0.8_ogre1.9
Files:
21 edited

Legend:

Unmodified
Added
Removed

  • code/branches/cegui0.8_ogre1.9

  • code/branches/cegui0.8_ogre1.9/data/gui/configs/CEGUIConfig.xsd

    r8079 r11795  
    11<?xml version="1.0"?>
    22<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
    3 
    43    <xsd:element name="CEGUIConfig" type="CEGUIConfigType"/>
    54
    6     <xsd:simpleType name="LogLevel">
     5    <xsd:complexType name="CEGUIConfigType">
     6        <xsd:sequence>
     7            <xsd:choice minOccurs="0" maxOccurs="unbounded">
     8                <xsd:element name="Logging" type="loggingType" />
     9                <xsd:element name="AutoLoad" type="autoLoadType" />
     10                <xsd:element name="ResourceDirectory" type="resourceDirectoryType" />
     11                <xsd:element name="DefaultResourceGroup" type="defaultResourceGroupType" />
     12                <xsd:element name="Scripting" type="scriptingType" />
     13                <xsd:element name="DefaultXMLParser" type="defaultObjectType" />
     14                <xsd:element name="DefaultImageCodec" type="defaultObjectType" />
     15                <xsd:element name="DefaultFont" type="defaultObjectType" />
     16                <xsd:element name="DefaultMouseCursor" type="defaultMouseCursorType" />
     17                <xsd:element name="DefaultTooltip" type="defaultObjectType" />
     18                <xsd:element name="DefaultGUISheet" type="defaultObjectType" />
     19            </xsd:choice>
     20        </xsd:sequence>
     21    </xsd:complexType>
     22
     23    <xsd:complexType name="loggingType">
     24        <xsd:simpleContent>
     25            <xsd:extension base="xsd:string">
     26                <xsd:attribute name="filename" type="xsd:string" use="optional" default="CEGUI.log" />
     27                <xsd:attribute name="level" type="logLevel" use="optional" default="Standard" />
     28            </xsd:extension>
     29        </xsd:simpleContent>
     30    </xsd:complexType>
     31
     32    <xsd:complexType name="autoLoadType">
     33        <xsd:simpleContent>
     34            <xsd:extension base="xsd:string">
     35                <xsd:attribute name="type" type="resourceType" use="required" />
     36                <xsd:attribute name="group" type="xsd:string" use="optional" default="" />
     37                <xsd:attribute name="pattern" type="xsd:string" use="optional" default="*" />
     38            </xsd:extension>
     39        </xsd:simpleContent>
     40    </xsd:complexType>
     41
     42    <xsd:complexType name="resourceDirectoryType">
     43        <xsd:simpleContent>
     44            <xsd:extension base="xsd:string">
     45                <xsd:attribute name="group" type="xsd:string" use="required" />
     46                <xsd:attribute name="directory" type="xsd:string" use="required" />
     47            </xsd:extension>
     48        </xsd:simpleContent>
     49    </xsd:complexType>
     50
     51    <xsd:complexType name="defaultResourceGroupType">
     52        <xsd:simpleContent>
     53            <xsd:extension base="xsd:string">
     54                <xsd:attribute name="type" type="resourceType" use="optional" default="Default" />
     55                <xsd:attribute name="group" type="xsd:string" use="required" />
     56            </xsd:extension>
     57        </xsd:simpleContent>
     58    </xsd:complexType>
     59
     60    <xsd:complexType name="scriptingType">
     61        <xsd:simpleContent>
     62            <xsd:extension base="xsd:string">
     63                <xsd:attribute name="initScript" type="xsd:string" use="optional" default="" />
     64                <xsd:attribute name="terminateScript" type="xsd:string" use="optional" default="" />
     65            </xsd:extension>
     66        </xsd:simpleContent>
     67    </xsd:complexType>
     68
     69    <xsd:complexType name="defaultObjectType">
     70        <xsd:simpleContent>
     71            <xsd:extension base="xsd:string">
     72                <xsd:attribute name="name" type="xsd:string" use="required" />
     73            </xsd:extension>
     74        </xsd:simpleContent>
     75    </xsd:complexType>
     76
     77    <xsd:complexType name="defaultMouseCursorType">
     78        <xsd:simpleContent>
     79            <xsd:extension base="xsd:string">
     80                <xsd:attribute name="imageset" type="xsd:string" use="required" />
     81                <xsd:attribute name="image" type="xsd:string" use="required" />
     82            </xsd:extension>
     83        </xsd:simpleContent>
     84    </xsd:complexType>
     85
     86    <xsd:simpleType name="logLevel">
    787        <xsd:restriction base="xsd:string">
    888            <xsd:enumeration value="Errors"/>
    … …  
    1393    </xsd:simpleType>
    1494
    15     <xsd:complexType name="CEGUIConfigType">
    16         <xsd:attribute name="Logfile" type="xsd:string" use="optional" default=""/>
    17         <xsd:attribute name="Scheme" type="xsd:string" use="optional" default=""/>
    18         <xsd:attribute name="DefaultFont" type="xsd:string" use="optional" default=""/>
    19         <xsd:attribute name="Layout" type="xsd:string" use="optional" default=""/>
    20         <xsd:attribute name="InitScript" type="xsd:string" use="optional" default=""/>
    21         <xsd:attribute name="TerminateScript" type="xsd:string" use="optional" default=""/>
    22         <xsd:attribute name="DefaultResourceGroup" type="xsd:string" use="optional"  default="" />
    23         <xsd:attribute name="LoggingLevel" type="LogLevel" use="optional"  default="Standard" />
    24     </xsd:complexType>
     95    <xsd:simpleType name="resourceType">
     96        <xsd:restriction base="xsd:string">
     97            <xsd:enumeration value="Imageset"/>
     98            <xsd:enumeration value="Font"/>
     99            <xsd:enumeration value="Scheme"/>
     100            <xsd:enumeration value="LookNFeel"/>
     101            <xsd:enumeration value="Layout"/>
     102            <xsd:enumeration value="Script"/>
     103            <xsd:enumeration value="XMLSchema"/>
     104            <xsd:enumeration value="Default"/>
     105        </xsd:restriction>
     106    </xsd:simpleType>
    25107
    26108</xsd:schema>
    27 
    28 

  • code/branches/cegui0.8_ogre1.9/data/gui/layouts/ChatBox-inputonly.layout

    r11793 r11795  
    11<?xml version='1.0' encoding='utf-8'?>
    22<GUILayout version="4">
    3     <Window name="Root" type="DefaultWindow">
     3    <Window name="ChatBox-inputonly" type="DefaultWindow">
    44        <Property name="InheritsAlpha" value="False" />
    55        <Property name="MaxSize" value="{{1,0},{1,0}}" />

  • code/branches/cegui0.8_ogre1.9/data/gui/layouts/ChatBox.layout

    r11793 r11795  
    11<?xml version='1.0' encoding='utf-8'?>
    22<GUILayout version="4">
    3     <Window name="Root" type="DefaultWindow">
     3    <Window name="ChatBox" type="DefaultWindow">
    44        <Property name="InheritsAlpha" value="False" />
    55        <Property name="MaxSize" value="{{1,0},{1,0}}" />
    66        <Property name="Area" value="{{0,0},{0,0},{1,0},{1,0}}" />
    7         <Window name="ChatBox" type="MenuWidgets/FrameWindow">
     7        <Window name="frame" type="MenuWidgets/FrameWindow">
    88            <Property name="Text" value="Chat" />
    99            <Property name="InheritsAlpha" value="False" />

  • code/branches/cegui0.8_ogre1.9/data/gui/layouts/GUILayout.xsd

    r9348 r11795  
    22<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
    33
    4     <xsd:element name="GUILayout" type="GUILayoutType"/>
     4        <xsd:element name="GUILayout" type="GUILayoutType"/>
     5       
     6        <xsd:complexType name="GUILayoutType">
     7                <xsd:sequence>
     8                        <xsd:element name="Window" type="WindowType" />
     9                </xsd:sequence>
     10                <xsd:attribute name="version" type="xsd:nonNegativeInteger" use="optional" default="0" />
     11        </xsd:complexType>
     12       
     13        <xsd:complexType name="WindowType">
     14                <xsd:sequence>
     15                        <xsd:element name="LayoutImport" type="LayoutImportType"  minOccurs="0" maxOccurs="unbounded" />
     16                        <xsd:element name="Property" type="PropertyType"  minOccurs="0" maxOccurs="unbounded" />
     17                        <xsd:element name="Event" type="EventType"  minOccurs="0" maxOccurs="unbounded" />
     18                        <xsd:choice minOccurs="0" maxOccurs="unbounded">
     19                                <xsd:element name="Window" type="WindowType" />
     20                                <xsd:element name="AutoWindow" type="AutoWindowType" />
     21                        </xsd:choice>
     22                        <xsd:element name="Property" type="PropertyType"  minOccurs="0" maxOccurs="unbounded" />
     23                        <xsd:element name="UserString" type="UserStringType"  minOccurs="0" maxOccurs="unbounded" />
     24                </xsd:sequence>
     25                <xsd:attribute name="type" type="xsd:string" use="required"/>
     26                <xsd:attribute name="name" type="xsd:string" use="optional" default="" />
     27        </xsd:complexType>
    528
    6     <xsd:complexType name="GUILayoutType">
    7         <xsd:sequence>
    8             <xsd:element name="Window" type="WindowType" />
    9         </xsd:sequence>
    10         <xsd:attribute name="Parent" type="xsd:string" use="optional" default=""/>
    11     </xsd:complexType>
     29        <xsd:complexType name="AutoWindowType">
     30                <xsd:sequence>
     31                        <xsd:element name="LayoutImport" type="LayoutImportType"  minOccurs="0" maxOccurs="unbounded" />
     32                        <xsd:element name="Property" type="PropertyType"  minOccurs="0" maxOccurs="unbounded" />
     33                        <xsd:element name="Event" type="EventType"  minOccurs="0" maxOccurs="unbounded" />
     34                        <xsd:choice minOccurs="0" maxOccurs="unbounded">
     35                                <xsd:element name="Window" type="WindowType" />
     36                                <xsd:element name="AutoWindow" type="AutoWindowType" />
     37                        </xsd:choice>
     38                        <xsd:element name="Property" type="PropertyType"  minOccurs="0" maxOccurs="unbounded" />
     39                </xsd:sequence>
     40                <xsd:attribute name="namePath" type="xsd:string" use="required"/>
     41        </xsd:complexType>
    1242
    13     <xsd:complexType name="WindowType">
    14         <xsd:sequence>
    15             <xsd:element name="LayoutImport" type="LayoutImportType"  minOccurs="0" maxOccurs="unbounded" />
    16             <xsd:element name="Property" type="PropertyType"  minOccurs="0" maxOccurs="unbounded" />
    17             <xsd:element name="Event" type="EventType"  minOccurs="0" maxOccurs="unbounded" />
    18             <xsd:choice minOccurs="0" maxOccurs="unbounded">
    19                 <xsd:element name="Window" type="WindowType" />
    20                 <xsd:element name="AutoWindow" type="AutoWindowType" />
    21             </xsd:choice>
    22             <xsd:element name="Property" type="PropertyType"  minOccurs="0" maxOccurs="unbounded" />
    23         </xsd:sequence>
    24         <xsd:attribute name="Type" type="xsd:string" use="required"/>
    25         <xsd:attribute name="Name" type="xsd:string" use="optional" default="" />
    26     </xsd:complexType>
     43        <xsd:complexType name="PropertyType">
     44                <xsd:simpleContent>
     45                        <xsd:extension base="xsd:string">
     46                                <xsd:attribute name="name" type="xsd:string" use="required"/>
     47                                <xsd:attribute name="value" type="xsd:string" use="optional"/>
     48                        </xsd:extension>
     49                </xsd:simpleContent>
     50        </xsd:complexType>
     51       
     52        <xsd:complexType name="UserStringType">
     53                <xsd:simpleContent>
     54                        <xsd:extension base="xsd:string">
     55                                <xsd:attribute name="name" type="xsd:string" use="required"/>
     56                                <xsd:attribute name="value" type="xsd:string" use="optional"/>
     57                        </xsd:extension>
     58                </xsd:simpleContent>
     59        </xsd:complexType>
     60       
     61        <xsd:complexType name="LayoutImportType">
     62                <xsd:attribute name="filename" type="xsd:string" use="required"/>
     63                <xsd:attribute name="resourceGroup" type="xsd:string" use="optional"  default="" />
     64        </xsd:complexType>
    2765
    28     <xsd:complexType name="AutoWindowType">
    29         <xsd:sequence>
    30             <xsd:element name="LayoutImport" type="LayoutImportType"  minOccurs="0" maxOccurs="unbounded" />
    31             <xsd:element name="Property" type="PropertyType"  minOccurs="0" maxOccurs="unbounded" />
    32             <xsd:element name="Event" type="EventType"  minOccurs="0" maxOccurs="unbounded" />
    33             <xsd:choice minOccurs="0" maxOccurs="unbounded">
    34                 <xsd:element name="Window" type="WindowType" />
    35                 <xsd:element name="AutoWindow" type="AutoWindowType" />
    36             </xsd:choice>
    37             <xsd:element name="Property" type="PropertyType"  minOccurs="0" maxOccurs="unbounded" />
    38         </xsd:sequence>
    39         <xsd:attribute name="NameSuffix" type="xsd:string" use="required"/>
    40     </xsd:complexType>
    41 
    42     <xsd:complexType name="PropertyType">
    43         <xsd:simpleContent>
    44             <xsd:extension base="xsd:string">
    45                 <xsd:attribute name="Name" type="xsd:string" use="required"/>
    46                 <xsd:attribute name="Value" type="xsd:string" use="optional"/>
    47             </xsd:extension>
    48         </xsd:simpleContent>
    49     </xsd:complexType>
    50 
    51     <xsd:complexType name="LayoutImportType">
    52         <xsd:attribute name="Filename" type="xsd:string" use="required"/>
    53         <xsd:attribute name="Prefix" type="xsd:string" use="optional" default="" />
    54         <xsd:attribute name="ResourceGroup" type="xsd:string" use="optional"  default="" />
    55     </xsd:complexType>
    56 
    57     <xsd:complexType name="EventType">
    58         <xsd:attribute name="Name" type="xsd:string" use="required"/>
    59         <xsd:attribute name="Function" type="xsd:string" use="required"/>
    60     </xsd:complexType>
     66        <xsd:complexType name="EventType">
     67                <xsd:attribute name="name" type="xsd:string" use="required"/>
     68                <xsd:attribute name="function" type="xsd:string" use="required"/>
     69        </xsd:complexType>
    6170
    6271</xsd:schema>

  • code/branches/cegui0.8_ogre1.9/data/gui/schemes/GUIScheme.xsd

    r8079 r11795  
    11<?xml version="1.0" ?>
    22<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
    3     <xsd:element name="GUIScheme" type="SchemeType" />
    4     <xsd:complexType name="SchemeType">
     3        <xsd:element name="GUIScheme" type="SchemeType" />
     4        <xsd:complexType name="SchemeType">
    55        <xsd:choice minOccurs="0" maxOccurs="unbounded">
    6             <xsd:element name="Imageset" type="NamedDataType" />
     6                        <xsd:element name="Imageset" type="NamedDataType" />
    77            <xsd:element name="ImagesetFromImage" type="NamedDataType" />
    8             <xsd:element name="Font" type="NamedDataType" />
     8                        <xsd:element name="Font" type="NamedDataType" />
    99            <xsd:element name="LookNFeel" type="FileDataType" />
    10             <xsd:element name="WindowSet" type="WindowSetType" />
    11             <xsd:element name="WindowRendererSet" type="WindowRendererSetType" />
    12             <xsd:element name="WindowAlias" type="WindowAliasType" />
     10                        <xsd:element name="WindowSet" type="WindowSetType" />
     11                        <xsd:element name="WindowRendererSet" type="WindowRendererSetType" />
     12                        <xsd:element name="WindowAlias" type="WindowAliasType" />
    1313            <xsd:element name="FalagardMapping" type="FalagardMapType" />
    14         </xsd:choice>
    15         <xsd:attribute name="Name" type="xsd:string" use="required" />
     14                </xsd:choice>
     15                <xsd:attribute name="name" type="xsd:string" use="required" />
     16                <xsd:attribute name="version" type="xsd:nonNegativeInteger" use="optional" default="0" />
     17        </xsd:complexType>
     18        <xsd:complexType name="WindowSetType">
     19                <xsd:sequence>
     20            <xsd:element name="WindowFactory" type="WindowFactoryType" minOccurs="0" maxOccurs="unbounded" />
     21                </xsd:sequence>
     22                <xsd:attribute name="filename" type="xsd:string" use="required" />
     23        </xsd:complexType>
     24        <xsd:complexType name="WindowRendererSetType">
     25                <xsd:sequence>
     26            <xsd:element name="WindowRendererFactory" type="WindowRendererFactoryType" minOccurs="0" maxOccurs="unbounded" />
     27                </xsd:sequence>
     28                <xsd:attribute name="filename" type="xsd:string" use="required" />
     29        </xsd:complexType>
     30    <xsd:complexType name="FileDataType">
     31        <xsd:attribute name="filename" type="xsd:string" use="required" />
     32        <xsd:attribute name="resourceGroup" type="xsd:string" use="optional"  default="" />
    1633    </xsd:complexType>
    17     <xsd:complexType name="WindowSetType">
    18         <xsd:sequence>
    19             <xsd:element name="WindowFactory" type="WindowFactoryType" minOccurs="0" maxOccurs="unbounded" />
    20         </xsd:sequence>
    21         <xsd:attribute name="Filename" type="xsd:string" use="required" />
    22     </xsd:complexType>
    23     <xsd:complexType name="WindowRendererSetType">
    24         <xsd:sequence>
    25             <xsd:element name="WindowRendererFactory" type="WindowRendererFactoryType" minOccurs="0" maxOccurs="unbounded" />
    26         </xsd:sequence>
    27         <xsd:attribute name="Filename" type="xsd:string" use="required" />
    28     </xsd:complexType>
    29     <xsd:complexType name="FileDataType">
    30         <xsd:attribute name="Filename" type="xsd:string" use="required" />
    31         <xsd:attribute name="ResourceGroup" type="xsd:string" use="optional"  default="" />
    32     </xsd:complexType>
    33     <xsd:complexType name="NamedDataType">
    34         <xsd:attribute name="Name" type="xsd:string" use="required" />
    35         <xsd:attribute name="Filename" type="xsd:string" use="required" />
    36         <xsd:attribute name="ResourceGroup" type="xsd:string" use="optional"  default="" />
    37     </xsd:complexType>
    38     <xsd:complexType name="WindowFactoryType">
    39         <xsd:attribute name="Name" type="xsd:string" use="required" />
    40     </xsd:complexType>
    41     <xsd:complexType name="WindowRendererFactoryType">
    42         <xsd:attribute name="Name" type="xsd:string" use="required" />
    43     </xsd:complexType>
    44     <xsd:complexType name="WindowAliasType">
    45         <xsd:attribute name="Alias" type="xsd:string" use="required" />
    46         <xsd:attribute name="Target" type="xsd:string" use="required" />
    47     </xsd:complexType>
     34        <xsd:complexType name="NamedDataType">
     35                <xsd:attribute name="name" type="xsd:string" use="optional" default="" />
     36                <xsd:attribute name="filename" type="xsd:string" use="required" />
     37                <xsd:attribute name="resourceGroup" type="xsd:string" use="optional"  default="" />
     38        </xsd:complexType>
     39        <xsd:complexType name="WindowFactoryType">
     40                <xsd:attribute name="name" type="xsd:string" use="required" />
     41        </xsd:complexType>
     42        <xsd:complexType name="WindowRendererFactoryType">
     43                <xsd:attribute name="name" type="xsd:string" use="required" />
     44        </xsd:complexType>
     45        <xsd:complexType name="WindowAliasType">
     46                <xsd:attribute name="alias" type="xsd:string" use="required" />
     47                <xsd:attribute name="target" type="xsd:string" use="required" />
     48        </xsd:complexType>
    4849    <xsd:complexType name="FalagardMapType">
    49         <xsd:attribute name="WindowType" type="xsd:string" use="required" />
    50         <xsd:attribute name="TargetType" type="xsd:string" use="required" />
    51         <xsd:attribute name="Renderer" type="xsd:string" use="required" />
    52         <xsd:attribute name="LookNFeel" type="xsd:string" use="required" />
     50        <xsd:attribute name="windowType" type="xsd:string" use="required" />
     51        <xsd:attribute name="targetType" type="xsd:string" use="required" />
     52                <xsd:attribute name="renderer" type="xsd:string" use="required" />
     53        <xsd:attribute name="lookNFeel" type="xsd:string" use="required" />
     54        <xsd:attribute name="renderEffect" type="xsd:string" use="optional" default="" />
    5355    </xsd:complexType>
    5456</xsd:schema>

  • code/branches/cegui0.8_ogre1.9/data/gui/scripts/AudioMenu.lua

    r9348 r11795  
    3737    for k,v in pairs(themeList) do
    3838        item = CEGUI.createListboxTextItem(v)
    39         item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
     39        item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
    4040        CEGUI.toListbox(listboxwindow):addItem(item)
    4141    end

  • code/branches/cegui0.8_ogre1.9/data/gui/scripts/DockingDialog.lua

    r8706 r11795  
    4242    for k in pairs(P.docks) do
    4343        local item = CEGUI.createListboxTextItem("Dock " .. k)
    44         item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
     44        item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
    4545        listbox:addItem(item)
    4646        if k == 1 then

  • code/branches/cegui0.8_ogre1.9/data/gui/scripts/GUISheet.lua

    r8862 r11795  
    6666function P:load()
    6767    -- Load the layout that describes the sheet
    68     self.window = winMgr:loadWindowLayout(self.name .. ".layout")
     68    self.window = winMgr:loadLayoutFromFile(self.name .. ".layout")
    6969    if self.window == nil then
    7070        error("Could not load layout file for GUI sheet '"..self.name.."'")

  • code/branches/cegui0.8_ogre1.9/data/gui/scripts/GameplayMenu.lua

    r8858 r11795  
    1111    for k,v in pairs(themeList) do
    1212        item = CEGUI.createListboxTextItem(v)
    13         item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
     13        item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
    1414        CEGUI.toCombobox(dropdown):addItem(item)
    1515    end

  • code/branches/cegui0.8_ogre1.9/data/gui/scripts/GraphicsMenu.lua

    r9051 r11795  
    3939    for k,v in pairs(P.resolutionList) do
    4040        local item = CEGUI.createListboxTextItem(v)
    41         item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
     41        item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
    4242        resolutionCombobox:addItem(item)
    4343    end
    … …  
    4949    for k,v in pairs(P.schemeList) do
    5050        local item = CEGUI.createListboxTextItem(v)
    51         item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
     51        item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
    5252        themeCombobox:addItem(item)
    5353    end
    … …  
    5959    for k,v in pairs(P.fsaaList) do
    6060        local item = CEGUI.createListboxTextItem(v)
    61         item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
     61        item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
    6262        fsaaCombobox:addItem(item)
    6363    end
    … …  
    6969    for k,v in pairs(P.particleLodList) do
    7070        local item = CEGUI.createListboxTextItem(v)
    71         item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
     71        item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
    7272        particleLodCombobox:addItem(item)
    7373    end

  • code/branches/cegui0.8_ogre1.9/data/gui/scripts/HostMenu.lua

    r8079 r11795  
    7373    for k,v in pairs(P.levelList) do
    7474        local item = CEGUI.createListboxTextItem(v:getName())
    75         item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
     75        item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
    7676        listbox:addItem(item)
    7777        if v:getXMLFilename() == preselect then

  • code/branches/cegui0.8_ogre1.9/data/gui/scripts/InitialiseGUI.lua

    r8351 r11795  
    88-- Load all required skins
    99--schemeMgr:create("TaharezGreenLook.scheme")
    10 schemeMgr:create(scheme .. "Look.scheme")
     10schemeMgr:createFromFile(scheme .. "Look.scheme")
    1111--schemeMgr:create("TaharezLook.scheme")
    1212--schemeMgr:create("WindowsLook.scheme")
    … …  
    2121--schemeMgr:create("TaharezGreenHUDWidgets.scheme")
    2222--hudImageSet = "TaharezGreenLook"
    23 schemeMgr:create(scheme .. "MenuWidgets.scheme")
     23schemeMgr:createFromFile(scheme .. "MenuWidgets.scheme")
    2424menuImageSet = scheme .. "Look"
    25 schemeMgr:create(scheme .. "HUDWidgets.scheme")
     25schemeMgr:createFromFile(scheme .. "HUDWidgets.scheme")
    2626hudImageSet = scheme .. "Look"
    2727
    2828-- Just a remaining test hack
    29 schemeMgr:create("OrxonoxGUIScheme.scheme")
     29schemeMgr:createFromFile("OrxonoxGUIScheme.scheme")
    3030
    31 local system = CEGUI.System:getSingleton()
    32 system:setDefaultMouseCursor(menuImageSet, "MouseArrow")
     31local system = CEGUI.System:getSingleton():getDefaultGUIContext()
     32system:getMouseCursor():setDefaultImage(menuImageSet .. "/MouseArrow")
    3333system:setDefaultFont("BlueHighway-12")
    34 system:setDefaultTooltip("MenuWidgets/Tooltip")
     34system:setDefaultTooltipType("MenuWidgets/Tooltip")
    3535
    3636-- Convenience function and additional tools

  • code/branches/cegui0.8_ogre1.9/data/gui/scripts/MainMenu.lua

    r11356 r11795  
    77    --buttons are arranged in a 6x1 Matrix (list)
    88    P:setButton(1, 1, {
    9             ["button"] = winMgr:getWindow("orxonox/QuickGameTestButton"),
     9            ["button"] = P.window:getChild("QuickGameTestButton"),
    1010            ["callback"]  = P.QuickGameTestButton_clicked
    1111    })
    1212
    1313    P:setButton(2, 1, {
    14             ["button"] = winMgr:getWindow("orxonox/SingleplayerButton"),
     14            ["button"] = P.window:getChild("SingleplayerButton"),
    1515            ["callback"]  = P.SingleplayerButton_clicked
    1616    })
    1717
    1818    P:setButton(3, 1, {
    19             ["button"] = winMgr:getWindow("orxonox/MultiplayerButton"),
     19            ["button"] = P.window:getChild("MultiplayerButton"),
    2020            ["callback"]  = P.MultiplayerButton_clicked
    2121    })
    2222
    2323    P:setButton(4, 1, {
    24             ["button"] = winMgr:getWindow("orxonox/HighscoreButton"),
     24            ["button"] = P.window:getChild("HighscoreButton"),
    2525            ["callback"]  = P.MultiplayerButton_clicked
    2626    })
    2727
    2828    P:setButton(5, 1, {
    29             ["button"] = winMgr:getWindow("orxonox/SettingsButton"),
     29            ["button"] = P.window:getChild("SettingsButton"),
    3030            ["callback"]  = P.SettingsButton_clicked
    3131    })
    3232
    3333    P:setButton(6, 1, {
    34             ["button"] = winMgr:getWindow("orxonox/CreditsButton"),
     34            ["button"] = P.window:getChild("CreditsButton"),
    3535            ["callback"]  = P.CreditsButton_clicked
    3636    })
    3737
    3838    P:setButton(7, 1, {
    39             ["button"] = winMgr:getWindow("orxonox/ExitButton"),
     39            ["button"] = P.window:getChild("ExitButton"),
    4040            ["callback"]  = P.ExitButton_clicked
    4141    })

  • code/branches/cegui0.8_ogre1.9/data/gui/scripts/MultiplayerMenu.lua

    r10622 r11795  
    115115            item:setID(index)
    116116            index = index + 1
    117             item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
     117            item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
    118118            CEGUI.toListbox(listbox):addItem(item)
    119119        end
    … …  
    152152            item:setID(index)
    153153            index = index + 1
    154             item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
     154            item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
    155155            CEGUI.toListbox(listbox):addItem(item)
    156156        end

  • code/branches/cegui0.8_ogre1.9/data/gui/scripts/PickupInventory.lua

    r11710 r11795  
    115115
    116116    local image = winMgr:createWindow("MenuWidgets/StaticImage", name .. "/Image")
    117     image:setProperty("Image", "set:PickupInventory image:" .. representation:getInventoryRepresentation())
     117    image:setProperty("Image", "PickupInventory/" .. representation:getInventoryRepresentation())
    118118    image:setProperty("BackgroundEnabled", "set:False")
    119119    image:setProperty("FrameEnabled", "set:True")
    … …  
    215215   
    216216    local image = winMgr:createWindow("MenuWidgets/StaticImage", name .. "/Image")
    217     image:setProperty("Image", "set:PickupInventory image:" .. representation:getInventoryRepresentation())
     217    image:setProperty("Image", "PickupInventory/" .. representation:getInventoryRepresentation())
    218218    image:setProperty("BackgroundEnabled", "set:False")
    219219    image:setProperty("FrameEnabled", "set:True")

  • code/branches/cegui0.8_ogre1.9/data/gui/scripts/QuestGUI.lua

    r8891 r11795  
    104104    if P.showActive == quest:isActive(P.player) then
    105105        local item = CEGUI.createListboxTextItem(P.questManager:getDescription(quest):getTitle())
    106         item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
     106        item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
    107107        list:addItem(item)
    108108        table.insert(P.quests, quest)
    … …  
    141141            local quest = P.questManager:getSubQuest(quest, P.player, i)
    142142            local item = CEGUI.createListboxTextItem(P.questManager:getDescription(quest):getTitle())
    143             item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
     143            item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
    144144            list:addItem(item)
    145145            table.insert(P.subquests, quest)

  • code/branches/cegui0.8_ogre1.9/data/gui/scripts/SheetManager.lua

    r11052 r11795  
    11-- SheetManager.lua
    22
    3 local cursor = CEGUI.MouseCursor:getSingleton()
     3local cursor = CEGUI.System:getSingleton():getDefaultGUIContext():getMouseCursor()
     4--local cursor = CEGUI.MouseCursor:getSingleton()
    45local loadedSheets = {}
    56local activeMenuSheets = {size = 0, topSheetTuple = nil}
    … …  
    107108
    108109    -- Add sheet to the root window
    109     menuSheetsRoot:addChildWindow(menuSheet.window)
     110    menuSheetsRoot:addChild(menuSheet.window)
    110111
    111112    -- If sheet is the MainMenu
    … …  
    177178
    178179    -- Remove sheet with its tuple from the table
    179     menuSheetsRoot:removeChildWindow(sheetTuple.sheet.window)
     180    menuSheetsRoot:removeChild(sheetTuple.sheet.window)
    180181    table.remove(activeMenuSheets, table.findIndex(activeMenuSheets, sheetTuple))
    181182    activeMenuSheets[name] = nil

  • code/branches/cegui0.8_ogre1.9/data/gui/scripts/ShipSelectionMenu.lua

    r9348 r11795  
    3434        --if tag == nil or v:hasStartingShip(tag) then
    3535            local item = CEGUI.createListboxTextItem(v)
    36             item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
     36            item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
    3737            listbox:addItem(item)
    3838            table.insert(tabIndexes, k)
    … …  
    8888        --local imageName = selectedlevel:getScreenshot()
    8989        -- set the screenshot and the description for the selected level
    90         --levelImage:setProperty("Image", "set:"..levelXMLFilename..imageName.." image:full_image")
     90        --levelImage:setProperty("Image", levelXMLFilename..imageName.."/full_image")
    9191        --levelDescription:setText(level:getDescription())
    9292        -- only enable config button for "gametype" levels

  • code/branches/cegui0.8_ogre1.9/data/gui/scripts/SingleplayerMenu.lua

    r11359 r11795  
    8787        if tag == nil or v:hasTag(tag) then
    8888            local item = CEGUI.createListboxTextItem(v:getName())
    89             item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
     89            item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
    9090            listbox:addItem(item)
    9191            table.insert(tabIndexes, k)
    … …  
    130130        local imageName = level:getScreenshot()
    131131        -- set the screenshot and the description for the selected level
    132         levelImage:setProperty("Image", "set:"..levelXMLFilename..imageName.." image:full_image")
     132        levelImage:setProperty("Image", levelXMLFilename..imageName.."/full_image")
    133133        levelDescription:setText(level:getDescription())
    134134        -- only enable config button for "gametype" levels

  • code/branches/cegui0.8_ogre1.9/data/gui/scripts/UndockingDialog.lua

    r9943 r11795  
    4242    for k in pairs(P.docks) do
    4343        local item = CEGUI.createListboxTextItem("Dock " .. k)
    44         item:setSelectionBrushImage(menuImageSet, "MultiListSelectionBrush")
     44        item:setSelectionBrushImage(menuImageSet .. "/MultiListSelectionBrush")
    4545        listbox:addItem(item)
    4646        if k == 1 then
Note: See TracChangeset for help on using the changeset viewer.