Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 11795 for code


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

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

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

Legend:

Unmodified
Added
Removed

  • code/branches/cegui0.8_ogre1.9

  • code/branches/cegui0.8_ogre1.9/cmake/tools/FindCEGUI.cmake

    r11117 r11795  
    3939
    4040# Find CEGUI headers
    41 COMPARE_VERSION_STRINGS("${CEGUI_VERSION}" "0.8" _version_0_8_compare TRUE)
     41COMPARE_VERSION_STRINGS("${CEGUI_VERSION}" "0.8" _version_0_8_compare)
    4242# Version 0.8 introduced a new directory and file naming convention
    4343IF(_version_0_8_compare GREATER -1)

  • code/branches/cegui0.8_ogre1.9/cmake/tools/FindOGRE.cmake

    r8351 r11795  
    3838# Inspect OgrePrerquisites.h for the version number
    3939DETERMINE_VERSION(OGRE ${OGRE_INCLUDE_DIR}/OgrePrerequisites.h)
     40COMPARE_VERSION_STRINGS("${OGRE_VERSION}" "1.9" _version_1_9_compare TRUE)
     41# Version 1.9 moved overlays into a separate component (which means we must find and link to another library)
     42IF(_version_1_9_compare GREATER -1)
     43  FIND_LIBRARY(OGRE_OVERLAY_LIBRARY_OPTIMIZED
     44    NAMES OgreOverlay
     45    PATHS $ENV{OGRE_HOME}
     46    PATH_SUFFIXES lib bin/Release bin/release Release release
     47  )
     48  FIND_LIBRARY(OGRE_OVERLAY_LIBRARY_DEBUG
     49    NAMES OgreOverlayd OgreOverlay_d OgreOverlayD OgreOverlay_D
     50    PATHS $ENV{OGRE_HOME}
     51    PATH_SUFFIXES lib bin/Debug bin/debug Debug debug
     52  )
     53  SET(OGRE_REQUIRED_VARIABLES
     54    OGRE_OVERLAY_LIBRARY_OPTIMIZED
     55  )
     56ENDIF()
    4057
    4158# Handle the REQUIRED argument and set OGRE_FOUND
    … …  
    4461  OGRE_LIBRARY_OPTIMIZED
    4562  OGRE_INCLUDE_DIR
     63  ${OGRE_REQUIRED_VARIABLES}
    4664)
    4765
    4866# Collect optimized and debug libraries
    4967HANDLE_LIBRARY_TYPES(OGRE)
     68HANDLE_LIBRARY_TYPES(OGRE_OVERLAY)
    5069
    5170MARK_AS_ADVANCED(
    … …  
    5372  OGRE_LIBRARY_OPTIMIZED
    5473  OGRE_LIBRARY_DEBUG
     74  OGRE_OVERLAY_LIBRARY_OPTIMIZED
     75  OGRE_OVERLAY_LIBRARY_DEBUG
    5576)

  • 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

  • code/branches/cegui0.8_ogre1.9/data/levels/asteroidField.oxw

    r9939 r11795  
    6666
    6767    <!-- Planet close to spawn point -->
    68     <Planet
     68    <MovableEntity
    6969      position="15000,0,0"
    7070      scale="5000"
    … …  
    7474      mass="10000000"
    7575      pitch="0"
    76       mesh="planets/muunilinst.mesh"
    77       atmosphere="atmosphere1"
    7876      rotationaxis="1,0,0"
    7977      rotationrate="1.0"
    80       atmospheresize="80.0f"
    81       imagesize="1024.0f"
    8278      collisiondamage = 2
    8379      enablecollisiondamage = true
    8480    >
    8581      <attached>
    86         <ForceField position="5000,0,0" mode="sphere" diameter="10000" velocity="-50" />
     82        <Planet
     83          mesh="planets/muunilinst.mesh"
     84          atmosphere="atmosphere1"
     85          atmospheresize="80.0f"
     86          imagesize="1024.0f"
     87        >
     88          <attached>
     89            <ForceField position="5000,0,0" mode="sphere" diameter="10000" velocity="-50" />
     90          </attached>
     91        </Planet>
    8792      </attached>
    8893      <collisionShapes>
    8994        <SphereCollisionShape radius="5000" position="0,0,0" />
    9095      </collisionShapes>
    91     </Planet>
     96    </MovableEntity>
    9297
    9398

  • code/branches/cegui0.8_ogre1.9/data/levels/dockingToASpaceStation.oxw

    r11104 r11795  
    153153    ?>
    154154
    155     <Planet
     155    <MovableEntity
    156156      position="15000,0,-1000"
    157157      scale="5000"
    … …  
    161161      mass="10000000"
    162162      pitch="0"
    163       mesh="planets/ganymede.mesh"
    164       atmosphere="atmosphere1"
    165163      rotationaxis="1,0,0"
    166164      rotationrate="1.0"
    167       atmospheresize="80.0f"
    168       imagesize="1024.0f"
    169165      collisiondamage = 2
    170166      enablecollisiondamage = true
    171167    >
    172168      <attached>
    173         <ForceField position="5000,0,0" mode="sphere" diameter="10000" velocity="-50" />
     169        <Planet
     170          mesh="planets/ganymede.mesh"
     171          atmosphere="atmosphere1"
     172          atmospheresize="80.0f"
     173          imagesize="1024.0f"
     174        >
     175          <attached>
     176            <ForceField position="5000,0,0" mode="sphere" diameter="10000" velocity="-50" />
     177          </attached>
     178        </Planet>
    174179      </attached>
    175180      <collisionShapes>
    176181        <SphereCollisionShape radius="5000" position="0,0,0" />
    177182      </collisionShapes>
    178     </Planet>
     183    </MovableEntity>
    179184
    180185  </Scene>

  • code/branches/cegui0.8_ogre1.9/data/levels/dynamicMatch.oxw

    r9939 r11795  
    3333
    3434<!-- ------------------Planet needs gravity----------------- -->
    35 <Planet position="0,0,0" scale=500 pitch=-90 mesh="iceplanet.mesh" atmosphere="atmosphere1" rotationaxis="8,1,0" rotationrate="1" atmospheresize=224.0f imagesize=1024.0f />
    36 <StaticEntity position="0,0,0" collisionType=static>
     35    <MovableEntity position="0,0,0" scale=500 pitch=-90 rotationaxis="8,1,0" rotationrate="1">
     36      <attached>
     37        <Planet mesh="iceplanet.mesh" atmosphere="atmosphere1" atmospheresize=224.0f imagesize=1024.0f />
     38      </attached>
     39    </MovableEntity>
     40    <StaticEntity position="0,0,0" collisionType=static>
    3741      <collisionShapes>
    3842        <SphereCollisionShape radius="499" />

  • code/branches/cegui0.8_ogre1.9/data/levels/earth.oxw

    r9016 r11795  
    5656
    5757    <!-- This is a model of Earth: mass=EarthMass/1000 and radius=EarthRadius[km]*10 -->
    58     <Planet
     58    <MovableEntity
    5959      position="0,0,0"
    6060      scale="63000"
     61      pitch="0"
    6162      collisionType="dynamic"
    6263      linearDamping="0.8"
    6364      angularDamping="0"
    6465      mass="5.9e21"
    65       pitch="0"
    66       mesh="planets/earth.mesh"
    67       atmosphere="atmosphere1"
    6866      rotationaxis="0,1,0"
    6967      rotationrate="0.2"
    70       atmospheresize="80.0f"
    71       imagesize="1024.0f"
    7268      collisiondamage = 2
    7369      enablecollisiondamage = true
    7470    >
    7571      <attached>
    76         <ForceField position="0,0,0" mode="newtonianGravity" diameter="140000" massDiameter="126000" mass="5.9e21" />
     72        <Planet
     73          mesh="planets/earth.mesh"
     74          atmosphere="atmosphere1"
     75          atmospheresize="80.0f"
     76          imagesize="1024.0f"
     77        >
     78          <attached>
     79            <ForceField position="0,0,0" mode="newtonianGravity" diameter="140000" massDiameter="126000" mass="5.9e21" />
     80          </attached>
     81        </Planet>
    7782      </attached>
    7883      <collisionShapes>
    7984        <SphereCollisionShape radius="63000" position="0,0,0" />
    8085      </collisionShapes>
    81     </Planet>
     86    </MovableEntity>
    8287
    8388    <!-- This is a model of our Moon: mass=MoonMass/1000 and radius=MoonRadius[km]*10 and position=DistanceFromEarth[km]*10 -->
    84     <Planet
     89    <MovableEntity
    8590      position="3625700,0,0"
    8691      scale="17370"
     92      pitch="0"
    8793      collisionType="dynamic"
    8894      linearDamping="0.8"
    8995      angularDamping="0"
    9096      mass="7.36e19"
    91       pitch="0"
    92       mesh="planets/moon.mesh"
    93       atmosphere="atmosphere1"
    9497      rotationaxis="0,1,0"
    9598      rotationrate="0.2"
    96       atmospheresize="80.0f"
    97       imagesize="1024.0f"
    9899      collisiondamage = 2
    99100      enablecollisiondamage = true
    100101    >
    101102      <attached>
    102         <ForceField position="0,0,0" mode="newtonianGravity" diameter="40000" massDiameter="34740" mass="7.36e19" />
     103        <Planet
     104          mesh="planets/moon.mesh"
     105          atmosphere="atmosphere1"
     106          atmospheresize="80.0f"
     107          imagesize="1024.0f"
     108        >
     109          <attached>
     110            <ForceField position="0,0,0" mode="newtonianGravity" diameter="40000" massDiameter="34740" mass="7.36e19" />
     111          </attached>
     112        </Planet>
    103113      </attached>
    104114      <collisionShapes>
    105115        <SphereCollisionShape radius="17370" position="0,0,0" />
    106116      </collisionShapes>
    107     </Planet>
     117    </MovableEntity>
    108118    <PortalEndPoint position="3603330,100,0" id="2" distance="40" target="MobileEntity" design="PortalDefault"/>
    109119

  • code/branches/cegui0.8_ogre1.9/data/levels/expeditionSector.oxw

    r11104 r11795  
    588588    <!-- Planets -->
    589589
    590    <Planet
     590    <MovableEntity
    591591        position="<?lua printC(cPlanet1) ?>"
    592592        scale="3000"
    … …  
    596596        mass="5000000"
    597597        pitch="0"
    598         mesh="planets/muunilinst.mesh"
    599         atmosphere="atmosphere1"
    600598        rotationaxis="1,0,0"
    601599        rotationrate="1.0"
    602         atmospheresize="80.0f"
    603         imagesize="1024.0f"
    604600        collisiondamage=2
    605601        enablecollisiondamage=true
    606               visible=true
    607               active=ture
    608       >
     602    >
    609603      <attached>
    610         <ForceField position="0,0,0" mode="sphere" diameter="6000" velocity="-500" />
    611         </attached>
    612           <collisionShapes>
    613             <SphereCollisionShape radius="3000" position="0,0,0" />
     604        <Planet
     605            mesh="planets/muunilinst.mesh"
     606            atmosphere="atmosphere1"
     607            atmospheresize="80.0f"
     608            imagesize="1024.0f"
     609            visible=true
     610            active=ture
     611        >
     612          <attached>
     613            <ForceField position="0,0,0" mode="sphere" diameter="6000" velocity="-500" />
     614          </attached>
     615        </Planet>
     616      </attached>
     617      <collisionShapes>
     618        <SphereCollisionShape radius="3000" position="0,0,0" />
    614619      </collisionShapes>
    615     </Planet>
     620    </MovableEntity>
    616621
    617622    <?lua
    … …  
    620625    ?>
    621626
    622     <Planet
     627    <MovableEntity
    623628        position="<?lua printC(cPlanet2) ?>"
    624629        scale="2000"
    … …  
    628633        mass="5000000"
    629634        pitch="0"
    630         mesh="planets/ganymede.mesh"
    631         atmosphere="atmosphere1"
    632635        rotationaxis="1,0,0"
    633636        rotationrate="1.0"
    634         atmospheresize="80.0f"
    635         imagesize="1024.0f"
    636637        collisiondamage=2
    637638        enablecollisiondamage=true
    638               visible=true
    639               active=true
    640       >
     639    >
    641640      <attached>
    642         <ForceField position="0,0,0" mode="sphere" diameter="4000" velocity="-500" />
    643         </attached>
    644           <collisionShapes>
    645             <SphereCollisionShape radius="2000" position="0,0,0" />
     641          <Planet
     642            mesh="planets/ganymede.mesh"
     643            atmosphere="atmosphere1"
     644            atmospheresize="80.0f"
     645            imagesize="1024.0f"
     646            visible=true
     647            active=true
     648          >
     649            <attached>
     650              <ForceField position="0,0,0" mode="sphere" diameter="4000" velocity="-500" />
     651            </attached>
     652          </Planet>
     653      </attached>
     654      <collisionShapes>
     655        <SphereCollisionShape radius="2000" position="0,0,0" />
    646656      </collisionShapes>
    647     </Planet>
     657    </MovableEntity>
    648658
    649659    <?lua
    … …  
    654664    <!-- EnemyPlanet(s) -->
    655665
    656     <Planet
     666    <MovableEntity
    657667        position="<?lua printC(cEnemyBasePlanet) ?>"
    658668        scale="5000"
    … …  
    662672        mass="5000000"
    663673        pitch="0"
    664         mesh="planets/jupiter.mesh"
    665         atmosphere="atmosphere1"
    666674        rotationaxis="1,0,0"
    667675        rotationrate="1.0"
    668         atmospheresize="80.0f"
    669         imagesize="1024.0f"
    670676        collisiondamage=2
    671677        enablecollisiondamage=true
    672               visible=false
    673               active=false
    674       >
     678    >
    675679      <attached>
    676         <ForceField position="0,0,0" mode="sphere" diameter="10000" velocity="-500" />
    677         </attached>
    678           <collisionShapes>
    679             <SphereCollisionShape radius="5000" position="0,0,0" />
     680        <Planet
     681            mesh="planets/jupiter.mesh"
     682            atmosphere="atmosphere1"
     683            atmospheresize="80.0f"
     684            imagesize="1024.0f"
     685            visible=false
     686            active=false
     687          >
     688          <attached>
     689            <ForceField position="0,0,0" mode="sphere" diameter="10000" velocity="-500" />
     690          </attached>
     691        </Planet>
     692      </attached>
     693      <collisionShapes>
     694        <SphereCollisionShape radius="5000" position="0,0,0" />
    680695      </collisionShapes>
    681     </Planet>
     696    </MovableEntity>
    682697
    683698    <?lua

  • code/branches/cegui0.8_ogre1.9/data/levels/iiJohnVane_Area51UnderFire.oxw

    r9992 r11795  
    20042004
    20052005    <!-- PLANETS -->
    2006       <Planet
    2007             position="2000,-250,9000"
    2008             scale=5000
    2009             pitch=1
     2006    <MovableEntity
     2007        position="2000,-250,9000"
     2008        scale=5000
     2009        pitch=1
     2010        rotationaxis="1,1,0"
     2011        rotationrate="0.5"
     2012        mass="10000000"
     2013        angularDamping=0
     2014        collisiondamage=2
     2015        enablecollisiondamage=true
     2016        collisionType="dynamic"
     2017    >
     2018      <attached>
     2019        <Planet
    20102020            mesh="iceplanet.mesh"
    20112021            atmosphere="atmosphere1"
    2012             rotationaxis="1,1,0"
    2013             rotationrate="0.5"
    20142022            atmospheresize=224.0f
    2015             imagesize=1024.0f
    2016             mass="10000000"
    2017             angularDamping=0
    2018             collisiondamage=2
    2019             enablecollisiondamage=true
    2020             collisionType="dynamic" />
     2023            imagesize=1024.0f />
     2024      </attached>
     2025    </MovableEntity>
    20212026
    20222027<!--  PICKUPS to make travelling faster  -->

  • code/branches/cegui0.8_ogre1.9/data/levels/iiiJohnVane_EscapeTheBastards.oxw

    r11052 r11795  
    778778
    779779<!--Planet sun-->
    780     <Planet position="15000,0,0" scale=1500 pitch=-90 mesh="planets/sol.mesh" atmosphere="atmosphere1" rotationaxis="8,1,0" rotationrate="1" atmospheresize=0 imagesize=1024.0f />
     780    <MovableEntity position="15000,0,0" scale=1500 pitch=-90 rotationaxis="8,1,0" rotationrate="1">
     781      <attached>
     782        <Planet mesh="planets/sol.mesh" atmosphere="atmosphere1" atmospheresize=0 imagesize=1024.0f />
     783      </attached>
     784    </MovableEntity>
    781785    <StaticEntity position="2600,0,0" collisionType=static>
    782786        <collisionShapes>
    … …  
    790794
    791795<!--Planet with Ally-->
    792     <Planet
     796    <MovableEntity
    793797      position="0,0,0"
    794798      scale="100"
    … …  
    798802      mass="5000000"
    799803      pitch="0"
    800       mesh="iceplanet.mesh"
    801       atmosphere="atmosphere1"
    802804      rotationaxis="1,0,0"
    803805      rotationrate="1.0"
    804       atmospheresize="80.0f"
    805       imagesize="1024.0f"
    806806    >
    807807      <attached>
    808         <ForceField position="0,0,0" mode="sphere" diameter="1000" velocity="-500" />
    809                     <ParticleEmitter position="0,0,0" source="Orxonox/fire3" />
     808        <Planet
     809          mesh="iceplanet.mesh"
     810          atmosphere="atmosphere1"
     811          atmospheresize="80.0f"
     812          imagesize="1024.0f"
     813        >
     814          <attached>
     815            <ForceField position="0,0,0" mode="sphere" diameter="1000" velocity="-500" />
     816                        <ParticleEmitter position="0,0,0" source="Orxonox/fire3" />
     817          </attached>
     818        </Planet>
    810819      </attached>
    811820      <collisionShapes>
    812821        <SphereCollisionShape radius="100" position="0,0,0" />
    813822      </collisionShapes>
    814     </Planet>
     823    </MovableEntity>
    815824<!-- Planet with Ally END-->
    816825
    817826
    818827<!-- Homeplanet -->
    819     <Planet
     828    <MovableEntity
    820829      position="-3000,12000,-10000"
    821830      scale="3000"
    … …  
    825834      mass="5000000000000"
    826835      pitch="0"
    827       mesh="planets/muunilinst.mesh"
    828       atmosphere="atmosphere1"
    829836      rotationaxis="0,0,0"
    830837      rotationrate="0.0"
    831       atmospheresize="80.0f"
    832       imagesize="1024.0f"
    833838    >
    834839      <attached>
    835         <ForceField position="0,0,0" mode="sphere" diameter="10000" velocity="-900" />
     840        <Planet
     841          mesh="planets/muunilinst.mesh"
     842          atmosphere="atmosphere1"
     843          atmospheresize="80.0f"
     844          imagesize="1024.0f"
     845        >
     846          <attached>
     847            <ForceField position="0,0,0" mode="sphere" diameter="10000" velocity="-900" />
     848          </attached>
     849        </Planet>
    836850      </attached>
    837851      <collisionShapes>
    838852        <SphereCollisionShape radius="3000" position="0,0,0" />
    839853      </collisionShapes>
    840     </Planet>
     854    </MovableEntity>
    841855<!-- Homeplanet  END-->
    842856
    843857<!-- Planet around the cave-->
    844858
    845 <Planet position="-43500,-30000,31900" scale=5000 pitch=-90 mesh="planets/moon.mesh" atmosphere="atmosphere1" rotationaxis="8,1,0" rotationrate="1" atmospheresize=0 imagesize=1024.0f />
     859    <MovableEntity position="-43500,-30000,31900" scale=5000 pitch=-90 rotationaxis="8,1,0" rotationrate="1">
     860      <attached>
     861        <Planet mesh="planets/moon.mesh" atmosphere="atmosphere1" atmospheresize=0 imagesize=1024.0f />
     862      </attached>
     863    </MovableEntity>
    846864
    847865<!-- Planet around the cave END-->
    848866
    849867<!-- Anotherplanet -->
    850     <Planet
     868    <MovableEntity
    851869      position="-20000,6000,7000"
    852870      scale="3000"
    … …  
    856874      mass="5000000000000"
    857875      pitch="0"
    858       mesh="planets/ganymede.mesh"
    859       atmosphere="atmosphere1"
    860876      rotationaxis="0,0,0"
    861877      rotationrate="0.0"
    862       atmospheresize="80.0f"
    863       imagesize="1024.0f"
    864878    >
     879      <attached>
     880        <Planet
     881          mesh="planets/ganymede.mesh"
     882          atmosphere="atmosphere1"
     883          atmospheresize="80.0f"
     884          imagesize="1024.0f"
     885        />
     886      </attached>
    865887      <collisionShapes>
    866888        <SphereCollisionShape radius="3000" position="0,0,0" />
    867889      </collisionShapes>
    868     </Planet>
     890    </MovableEntity>
    869891<!-- LAAAGS :-(
    870892

  • code/branches/cegui0.8_ogre1.9/data/levels/kecks.oxw

    r11052 r11795  
    423423           
    424424        <!--Heimatplanet-->
     425    <MovableEntity
     426      position="0,100000,0"
     427      scale="10000"
     428      collisionType="dynamic"
     429      linearDamping="0.8"
     430      angularDamping="0"
     431      mass="5000000"
     432      pitch="180"
     433      yaw="0"
     434      roll="0"
     435      rotationaxis="0,0,1"
     436      rotationrate="5.0"
     437      collisiondamage = 1
     438      enablecollisiondamage = true
     439    >
     440      <attached>
    425441                <Planet
    426                   position="0,100000,0"
    427                   scale="10000"
    428                   collisionType="dynamic"
    429                   linearDamping="0.8"
    430                   angularDamping="0"
    431                   mass="5000000"
    432                   pitch="180"
    433                   yaw="0"
    434                   roll="0"
    435442                  mesh="planets/earth.mesh"
    436443                  atmosphere="atmosphere1"
    437                   rotationaxis="0,0,1"
    438                   rotationrate="5.0"
    439444                  atmospheresize="80.0f"
    440445                  imagesize="1024.0f"
    441                   collisiondamage = 1
    442                   enablecollisiondamage = true
    443446                  >
    444447                  <attached>
    445                           <ForceField position="0,0,0" mode="sphere" diameter="1000" velocity="-500" />
    446                         </attached>
    447                         <collisionShapes>
    448                           <SphereCollisionShape radius="10000" position="0,0,0" />
    449                         </collisionShapes>
    450                   </Planet>     
     448                        <ForceField position="0,0,0" mode="sphere" diameter="1000" velocity="-500" />
     449                  </attached>
     450                </Planet>       
     451      </attached>
     452      <collisionShapes>
     453        <SphereCollisionShape radius="10000" position="0,0,0" />
     454      </collisionShapes>
     455    </MovableEntity>
    451456        <!--ENDE Heimatplanet-->       
    452457

  • code/branches/cegui0.8_ogre1.9/data/levels/levelTry.oxw

    r11104 r11795  
    149149    ?>
    150150
    151     <Planet
     151    <MovableEntity
    152152      position="15000,0,-1000"
    153153      scale="5000"
    … …  
    157157      mass="10000000"
    158158      pitch="0"
    159       mesh="planets/ganymede.mesh"
    160       atmosphere="atmosphere1"
    161159      rotationaxis="1,0,0"
    162160      rotationrate="1.0"
    163       atmospheresize="80.0f"
    164       imagesize="1024.0f"
    165161      collisiondamage = 2
    166162      enablecollisiondamage = true
    167163    >
    168164      <attached>
    169         <ForceField position="5000,0,0" mode="sphere" diameter="10000" velocity="-50" />
     165        <Planet
     166          mesh="planets/ganymede.mesh"
     167          atmosphere="atmosphere1"
     168          atmospheresize="80.0f"
     169          imagesize="1024.0f"
     170        >
     171          <attached>
     172            <ForceField position="5000,0,0" mode="sphere" diameter="10000" velocity="-50" />
     173          </attached>
     174        </Planet>
    170175      </attached>
    171176      <collisionShapes>
    172177        <SphereCollisionShape radius="5000" position="0,0,0" />
    173178      </collisionShapes>
    174     </Planet>
     179    </MovableEntity>
    175180
    176181  </Scene>

  • code/branches/cegui0.8_ogre1.9/data/levels/missionOne.oxw

    r11052 r11795  
    12051205
    12061206<!-- @Objects: planet && spaceboundaries  -->
    1207     <Planet
     1207    <MovableEntity
    12081208      position="-44000,0,0"
    12091209      scale="2500"
    … …  
    12131213      mass="10000000"
    12141214      pitch="0"
    1215       mesh="planets/muunilinst.mesh"
    1216       atmosphere="atmosphere1"
    12171215      rotationaxis="1,0,0"
    12181216      rotationrate="1.0"
    1219       atmospheresize="80.0f"
    1220       imagesize="1024.0f"
    12211217      collisiondamage = "2"
    12221218      enablecollisiondamage = "false"
    12231219    >
    1224       <!--attached>
    1225         <ForceField position="0,0,0" mode="sphere" diameter="10000" velocity="-50" />
    1226       </attached-->  <!-- Forcefield kills HYDROGEN FARMER-->
     1220      <attached>
     1221        <Planet
     1222          mesh="planets/muunilinst.mesh"
     1223          atmosphere="atmosphere1"
     1224          atmospheresize="80.0f"
     1225          imagesize="1024.0f"
     1226        >
     1227          <!--attached>
     1228            <ForceField position="0,0,0" mode="sphere" diameter="10000" velocity="-50" />
     1229          </attached-->  <!-- Forcefield kills HYDROGEN FARMER-->
     1230        </Planet>
     1231      </attached>
    12271232      <collisionShapes>
    12281233        <SphereCollisionShape radius="2500" position="0,0,0" />
    12291234      </collisionShapes>
    1230     </Planet>
     1235    </MovableEntity>
    12311236
    12321237

  • code/branches/cegui0.8_ogre1.9/data/levels/planets.oxw

    r9348 r11795  
    4545    />
    4646
    47     <Planet
     47    <MovableEntity
    4848      position="0,0,0"
    4949      scale="1000"
    … …  
    5353      mass="10000000"
    5454      pitch="0"
    55       mesh="planets/muunilinst.mesh"
    56       atmosphere="atmosphere1"
    5755      rotationaxis="1,0,0"
    5856      rotationrate="1.0"
    59       atmospheresize="80.0f"
    60       imagesize="1024.0f"
    6157      collisiondamage = 2
    6258      enablecollisiondamage = true
    6359    >
    6460      <attached>
    65         <ForceField position="0,0,0" mode="sphere" diameter="10000" velocity="-50" />
     61        <Planet
     62          mesh="planets/muunilinst.mesh"
     63          atmosphere="atmosphere1"
     64          atmospheresize="80.0f"
     65          imagesize="1024.0f"
     66        >
     67          <attached>
     68            <ForceField position="0,0,0" mode="sphere" diameter="10000" velocity="-50" />
     69          </attached>
     70        </Planet>
    6671      </attached>
    6772      <collisionShapes>
    6873        <SphereCollisionShape radius="1000" position="0,0,0" />
    6974      </collisionShapes>
    70     </Planet>
     75    </MovableEntity>
    7176
    72     <Planet
     77    <MovableEntity
    7378      position="10000,0,0"
    7479      scale="100"
    … …  
    7883      mass="5000000"
    7984      pitch="0"
    80       mesh="planets/muunilinst.mesh"
    81       atmosphere="atmosphere1"
    8285      rotationaxis="1,0,0"
    8386      rotationrate="1.0"
    84       atmospheresize="80.0f"
    85       imagesize="1024.0f"
    8687      collisiondamage = 2
    8788      enablecollisiondamage = true
    8889    >
    8990      <attached>
    90         <ForceField position="0,0,0" mode="sphere" diameter="1000" velocity="-500" />
     91        <Planet
     92          mesh="planets/muunilinst.mesh"
     93          atmosphere="atmosphere1"
     94          atmospheresize="80.0f"
     95          imagesize="1024.0f"
     96        >
     97          <attached>
     98            <ForceField position="0,0,0" mode="sphere" diameter="1000" velocity="-500" />
     99          </attached>
     100        </Planet>
    91101      </attached>
    92102      <collisionShapes>
    93103        <SphereCollisionShape radius="100" position="0,0,0" />
    94104      </collisionShapes>
    95     </Planet>
     105    </MovableEntity>
    96106  </Scene>
    97107</Level>

  • code/branches/cegui0.8_ogre1.9/data/levels/presentation09.oxw

    r9348 r11795  
    5757    <?lua end ?>
    5858   
    59     <Planet position="0,0,0" scale=10000 pitch=-90 mesh="iceplanet.mesh" atmosphere="atmosphere1" rotationaxis="1,1,0" rotationrate="1" atmospheresize=224.0f imagesize=1024.0f />
     59    <MovableEntity position="0,0,0" scale=10000 pitch=-90 rotationaxis="1,1,0" rotationrate="1">
     60      <attached>
     61        <Planet mesh="iceplanet.mesh" atmosphere="atmosphere1" atmospheresize=224.0f imagesize=1024.0f />
     62      </attached>
     63    </MovableEntity>
    6064
    6165  </Scene>

  • code/branches/cegui0.8_ogre1.9/data/levels/presentationFS11.oxw

    r9939 r11795  
    111111
    112112    <!-- EARTH -->
    113     <Planet
     113    <MovableEntity
    114114      position="80500,0,0"
    115115      scale="63000"
    … …  
    120120      pitch="-90"
    121121      yaw="50"
    122       mesh="planets/earth.mesh"
    123       atmosphere="atmosphere1"
    124122      rotationaxis="0,1,0"
    125123      rotationrate="0.2"
    126       atmospheresize="80.0f"
    127       imagesize="1024.0f"
    128124      collisiondamage = 2
    129125      enablecollisiondamage = true
    130126    >
    131127      <attached>
    132         <ForceField position="0,0,0" mode="newtonianGravity" diameter="140000" massDiameter="126000" mass="5.9e21" />
     128        <Planet
     129          mesh="planets/earth.mesh"
     130          atmosphere="atmosphere1"
     131          atmospheresize="80.0f"
     132          imagesize="1024.0f"
     133        >
     134          <attached>
     135            <ForceField position="0,0,0" mode="newtonianGravity" diameter="140000" massDiameter="126000" mass="5.9e21" />
     136          </attached>
     137        </Planet>
    133138      </attached>
    134139      <collisionShapes>
    135140        <SphereCollisionShape radius="63000" position="0,0,0" />
    136141      </collisionShapes>
    137     </Planet>
     142    </MovableEntity>
    138143
    139144    <!-- PARTICLE EFFECT -->
    … …  
    329334   
    330335    <!-- MOON -->
    331     <Planet
     336    <MovableEntity
    332337      position="-80000,0,0"
    333338      scale="4000"
    … …  
    337342      mass="7.36e19"
    338343      pitch="0"
    339       mesh="planets/moon.mesh"
    340       atmosphere="atmosphere1"
    341344      rotationaxis="0,1,0"
    342345      rotationrate="0.2"
    343       atmospheresize="0.0f"
    344       imagesize="1024.0f"
    345346      collisiondamage = 2
    346347      enablecollisiondamage = true
    347348    >
    348349      <attached>
    349         <ForceField position="0,0,0" mode="newtonianGravity" diameter="40000" massDiameter="34740" mass="7.36e19" />
     350        <Planet
     351          mesh="planets/moon.mesh"
     352          atmosphere="atmosphere1"
     353          atmospheresize="0.0f"
     354          imagesize="1024.0f"
     355        >
     356          <attached>
     357            <ForceField position="0,0,0" mode="newtonianGravity" diameter="40000" massDiameter="34740" mass="7.36e19" />
     358          </attached>
     359        </Planet>
    350360      </attached>
    351361      <collisionShapes>
    352362        <SphereCollisionShape radius="4000" position="0,0,0" />
    353363      </collisionShapes>
    354     </Planet>
     364    </MovableEntity>
    355365
    356366    <SimpleNotification message="Hydrogen farmer/space station by Hans" >

  • code/branches/cegui0.8_ogre1.9/data/levels/presentationHS09.oxw

    r9348 r11795  
    393393      </MovableEntity>
    394394    <?lua end ?>
    395    
    396 <!--
    397     <Planet position="1000,0,0" mass=900000 scale=1000 pitch=-90 mesh="iceplanet.mesh" atmosphere="atmosphere1" rotationaxis="1,1,0" rotationrate="1" atmospheresize=224.0f imagesize=1024.0f />
    398 -->
    399395
    400396  </Scene>

  • code/branches/cegui0.8_ogre1.9/data/levels/presentationHS12.oxw

    r10624 r11795  
    353353    ?>
    354354
    355     <Planet
     355    <MovableEntity
    356356      position="15000,0,-1000"
    357357      scale="5000"
    … …  
    361361      mass="10000000"
    362362      pitch="0"
    363       mesh="planets/ganymede.mesh"
    364       atmosphere="atmosphere1"
    365363      rotationaxis="1,0,0"
    366364      rotationrate="1.0"
    367       atmospheresize="80.0f"
    368       imagesize="1024.0f"
    369365      collisiondamage = 2
    370366      enablecollisiondamage = true
    371367    >
    372368      <attached>
    373         <ForceField position="5000,0,0" mode="sphere" diameter="10000" velocity="-50" />
     369        <Planet
     370          mesh="planets/ganymede.mesh"
     371          atmosphere="atmosphere1"
     372          atmospheresize="80.0f"
     373          imagesize="1024.0f"
     374        >
     375          <attached>
     376            <ForceField position="5000,0,0" mode="sphere" diameter="10000" velocity="-50" />
     377          </attached>
     378        </Planet>
    374379      </attached>
    375380      <collisionShapes>
    376381        <SphereCollisionShape radius="5000" position="0,0,0" />
    377382      </collisionShapes>
    378     </Planet>
     383    </MovableEntity>
    379384
    380385<StaticEntity position="6750,-750,2000" yaw=0 pitch=0>

  • code/branches/cegui0.8_ogre1.9/data/levels/shadertest.oxw

    r11080 r11795  
    7878    <!-- Planet close to spawn point -->
    7979
    80     <Planet
     80    <MovableEntity
    8181      position="15000,0,-1000"
    8282      scale="5000"
    … …  
    8686      mass="10000000"
    8787      pitch="0"
    88       mesh="planets/muunilinst.mesh"
    89       atmosphere="atmosphere1"
    9088      rotationaxis="1,0,0"
    9189      rotationrate="1.0"
    92       atmospheresize="80.0f"
    93       imagesize="1024.0f"
    9490      collisiondamage = 2
    9591      enablecollisiondamage = true
    9692    >
    9793      <attached>
    98         <ForceField position="5000,0,0" mode="sphere" diameter="10000" velocity="-50" />
     94        <Planet
     95          mesh="planets/muunilinst.mesh"
     96          atmosphere="atmosphere1"
     97          atmospheresize="80.0f"
     98          imagesize="1024.0f"
     99        >
     100          <attached>
     101            <ForceField position="5000,0,0" mode="sphere" diameter="10000" velocity="-50" />
     102          </attached>
     103        </Planet>
    99104      </attached>
    100105      <collisionShapes>
    101106        <SphereCollisionShape radius="5000" position="0,0,0" />
    102107      </collisionShapes>
    103     </Planet>
     108    </MovableEntity>
    104109
    105110

  • code/branches/cegui0.8_ogre1.9/data/levels/shuttleAttack.oxw

    r11104 r11795  
    930930    ?>
    931931
    932     <Planet
     932    <MovableEntity
    933933        position="<?lua printC(cPlanet1) ?>"
    934934        scale="2000"
    … …  
    938938        mass="5000000"
    939939        pitch="0"
    940         mesh="planets/muunilinst.mesh"
    941         atmosphere="atmosphere1"
    942940        rotationaxis="1,0,0"
    943941        rotationrate="1.0"
    944         atmospheresize="80.0f"
    945         imagesize="1024.0f"
    946942        collisiondamage = 2
    947943        enablecollisiondamage = true
    948       >
     944    >
    949945      <attached>
    950         <ForceField position="0,0,0" mode="sphere" diameter="4000" velocity="-500" />
    951         </attached>
    952           <collisionShapes>
    953             <SphereCollisionShape radius="2000" position="0,0,0" />
     946        <Planet
     947            mesh="planets/muunilinst.mesh"
     948            atmosphere="atmosphere1"
     949            atmospheresize="80.0f"
     950            imagesize="1024.0f"
     951        >
     952          <attached>
     953            <ForceField position="0,0,0" mode="sphere" diameter="4000" velocity="-500" />
     954          </attached>
     955        </Planet>
     956      </attached>
     957      <collisionShapes>
     958        <SphereCollisionShape radius="2000" position="0,0,0" />
    954959      </collisionShapes>
    955     </Planet>
     960    </MovableEntity>
    956961
    957962    <?lua
    … …  
    960965    ?>
    961966
    962     <Planet
     967    <MovableEntity
    963968        position="<?lua printC(cPlanet2) ?>"
    964969        scale="3000"
    … …  
    968973        mass="5000000"
    969974        pitch="0"
    970         mesh="planets/planet3.mesh"
    971         atmosphere="atmosphere1"
    972975        rotationaxis="1,0,0"
    973976        rotationrate="1.0"
    974         atmospheresize="80.0f"
    975         imagesize="1024.0f"
    976977        collisiondamage = 2
    977978        enablecollisiondamage = true
    978       >
     979    >
    979980      <attached>
    980         <ForceField position="0,0,0" mode="sphere" diameter="6000" velocity="-500" />
    981         </attached>
    982           <collisionShapes>
    983             <SphereCollisionShape radius="3000" position="0,0,0" />
     981        <Planet
     982            mesh="planets/planet3.mesh"
     983            atmosphere="atmosphere1"
     984            atmospheresize="80.0f"
     985            imagesize="1024.0f"
     986          >
     987          <attached>
     988            <ForceField position="0,0,0" mode="sphere" diameter="6000" velocity="-500" />
     989          </attached>
     990        </Planet>
     991      </attached>
     992      <collisionShapes>
     993        <SphereCollisionShape radius="3000" position="0,0,0" />
    984994      </collisionShapes>
    985     </Planet>
     995    </MovableEntity>
    986996
    987997    <?lua

  • code/branches/cegui0.8_ogre1.9/data/levels/shuttleRetaliation.oxw

    r11104 r11795  
    880880    <!-- Planets -->
    881881
    882    <Planet
     882    <MovableEntity
    883883        position="<?lua printC(cPlanet1) ?>"
    884884        scale="3000"
    … …  
    888888        mass="5000000"
    889889        pitch="0"
    890         mesh="planets/muunilinst.mesh"
    891         atmosphere="atmosphere1"
    892890        rotationaxis="1,0,0"
    893891        rotationrate="1.0"
    894         atmospheresize="80.0f"
    895         imagesize="1024.0f"
    896892        collisiondamage = 2
    897893        enablecollisiondamage = true
    898     visible=true
    899     active=true
    900       >
     894    >
    901895      <attached>
    902         <ForceField position="0,0,0" mode="sphere" diameter="6000" velocity="-500" />
    903         </attached>
    904         <collisionShapes>
    905             <SphereCollisionShape radius="3000" position="0,0,0" />
     896        <Planet
     897            mesh="planets/muunilinst.mesh"
     898            atmosphere="atmosphere1"
     899            atmospheresize="80.0f"
     900            imagesize="1024.0f"
     901            visible=true
     902            active=true
     903        >
     904          <attached>
     905            <ForceField position="0,0,0" mode="sphere" diameter="6000" velocity="-500" />
     906          </attached>
     907        </Planet>
     908      </attached>
     909      <collisionShapes>
     910        <SphereCollisionShape radius="3000" position="0,0,0" />
    906911      </collisionShapes>
    907     </Planet>
     912    </MovableEntity>
    908913
    909914    <?lua
    … …  
    912917    ?>
    913918
    914     <Planet
     919    <MovableEntity
    915920        position="<?lua printC(cPlanet2) ?>"
    916921        scale="2000"
    … …  
    920925        mass="5000000"
    921926        pitch="0"
    922         mesh="planets/ganymede.mesh"
    923         atmosphere="atmosphere1"
    924927        rotationaxis="1,0,0"
    925928        rotationrate="1.0"
    926         atmospheresize="80.0f"
    927         imagesize="1024.0f"
    928929        collisiondamage = 2
    929930        enablecollisiondamage = true
    930         visible=true
    931         active=true
    932       >
     931    >
    933932      <attached>
    934         <ForceField position="0,0,0" mode="sphere" diameter="4000" velocity="-500" />
    935         </attached>
    936           <collisionShapes>
    937             <SphereCollisionShape radius="2000" position="0,0,0" />
     933        <Planet
     934            mesh="planets/ganymede.mesh"
     935            atmosphere="atmosphere1"
     936            atmospheresize="80.0f"
     937            imagesize="1024.0f"
     938            visible=true
     939            active=true
     940        >
     941          <attached>
     942            <ForceField position="0,0,0" mode="sphere" diameter="4000" velocity="-500" />
     943          </attached>
     944        </Planet>
     945      </attached>
     946      <collisionShapes>
     947        <SphereCollisionShape radius="2000" position="0,0,0" />
    938948      </collisionShapes>
    939     </Planet>
     949    </MovableEntity>
    940950
    941951    <?lua
    … …  
    946956    <!-- EnemyPlanet -->
    947957
    948     <Planet
     958    <MovableEntity
    949959        position="<?lua printC(cEnemyBasePlanet) ?>"
    950960        scale="5000"
    … …  
    954964        mass="5000000"
    955965        pitch="0"
    956         mesh="planets/jupiter.mesh"
    957         atmosphere="atmosphere1"
    958966        rotationaxis="1,0,0"
    959967        rotationrate="1.0"
    960         atmospheresize="80.0f"
    961         imagesize="1024.0f"
    962968        collisiondamage = 2
    963969        enablecollisiondamage = true
    964         visible=false
    965         active=false
    966970    >
    967         <attached>
     971      <attached>
     972        <Planet
     973            mesh="planets/jupiter.mesh"
     974            atmosphere="atmosphere1"
     975            atmospheresize="80.0f"
     976            imagesize="1024.0f"
     977            visible=false
     978            active=false
     979        >
     980          <attached>
    968981           <ForceField position="0,0,0" rotationaxis="0.1,1,0.1"mode="sphere" diameter="10000" velocity="-500" />
    969         </attached>
    970         <events>
     982          </attached>
     983          <events>
    971984            <activity>
    972985                <Trigger  name="enemyPlanetVisible" mode=and>
    … …  
    10051018                 </Trigger>
    10061019            </visibility>
    1007         </events>
    1008         <collisionShapes>
    1009           <SphereCollisionShape position="0,0,0" radius=5000/>
    1010         </collisionShapes>
    1011     </Planet>
     1020          </events>
     1021        </Planet>
     1022      </attached>
     1023      <collisionShapes>
     1024        <SphereCollisionShape position="0,0,0" radius=5000/>
     1025      </collisionShapes>
     1026    </MovableEntity>
    10121027
    10131028    <!-- Pawn that represents the planet during destruction -->

  • code/branches/cegui0.8_ogre1.9/data/levels/testSwallow.oxw

    r9348 r11795  
    5656?>
    5757<?lua end ?>
    58     <Planet position="0,0,0" scale=10000 pitch=-90 mesh="iceplanet.mesh" atmosphere="atmosphere1" rotationaxis="1,1,0" rotationrate="1" atmospheresize=224.0f imagesize=1024.0f />
     58    <MovableEntity position="0,0,0" scale=10000 pitch=-90 rotationaxis="1,1,0" rotationrate="1" >
     59      <attached>
     60        <Planet mesh="iceplanet.mesh" atmosphere="atmosphere1" atmospheresize=224.0f imagesize=1024.0f />
     61      </attached>
     62    </MovableEntity>
    5963
    6064  </Scene>

  • code/branches/cegui0.8_ogre1.9/src/libraries/core/CMakeLists.txt

    r11712 r11795  
    9595  LINK_LIBRARIES
    9696    ${OGRE_LIBRARY}
     97    ${OGRE_OVERLAY_LIBRARY}
    9798    ${Boost_FILESYSTEM_LIBRARY}
    9899    ${Boost_SYSTEM_LIBRARY} # Filesystem dependency

  • code/branches/cegui0.8_ogre1.9/src/libraries/core/GUIManager.cc

    r11117 r11795  
    482482        assert(guiSystem_);
    483483        this->protectedCeguiSystemCall(std::bind(&CEGUI::System::injectTimePulse, arg::_1, time.getDeltaTime()));
     484#if CEGUI_VERSION >= 0x000800
     485        this->protectedCeguiContextCall(std::bind(&CEGUI::GUIContext::injectTimePulse, arg::_1, time.getDeltaTime()));
     486#endif
    484487    }
    485488
    … …  
    664667            this->setBackgroundImage("");
    665668        else
    666             this->setBackgroundImage("set: " + imageSet + " image: " + imageName);
     669            this->setBackgroundImage(imageSet + "/" + imageName);
    667670    }
    668671
    … …  
    846849    bool GUIManager::protectedCeguiContextCall(FunctionType function)
    847850    {
    848         return this->protectedCall(function, this->guiSystem_->getDefaultGUIContext());
     851        return this->protectedCall(function, &this->guiSystem_->getDefaultGUIContext());
    849852    }
    850853#endif

  • code/branches/cegui0.8_ogre1.9/src/libraries/core/GraphicsManager.cc

    r11115 r11795  
    4545#include <OgreViewport.h>
    4646#include <OgreWindowEventUtilities.h>
     47#if OGRE_VERSION >= 0x010900
     48#   include <Overlay/OgreOverlaySystem.h>
     49#endif
    4750
    4851#include "SpecialConfig.h"
    … …  
    115118        this->loadOgreRoot();
    116119
     120#if OGRE_VERSION >= 0x010900
     121        this->overlaySystem_ = new Ogre::OverlaySystem();
     122#else
     123        this->overlaySystem_ = nullptr;
     124#endif
     125
    117126        // At first, add the root paths of the data directories as resource locations
    118127        Ogre::ResourceGroupManager::getSingleton().addResourceLocation(ConfigurablePaths::getDataPathString(), "FileSystem");
    … …  
    155164        Loader::getInstance().unload(extResources_.get());
    156165
     166#if OGRE_VERSION >= 0x010900
     167        safeObjectDelete(&overlaySystem_);
     168#endif
    157169        safeObjectDelete(&ogreRoot_);
    158170        safeObjectDelete(&ogreLogger_);

  • code/branches/cegui0.8_ogre1.9/src/libraries/core/GraphicsManager.h

    r11085 r11795  
    5252
    5353#include "util/DestructionHelper.h"
     54#include "util/OgreForwardRefs.h"
    5455#include "util/Singleton.h"
    5556#include "config/Configurable.h"
    … …  
    7980        void postUpdate(const Clock& time);
    8081
    81         Ogre::Viewport* getViewport()         { return this->viewport_; }
    82         Ogre::RenderWindow* getRenderWindow() { return this->renderWindow_; }
     82        Ogre::Viewport* getViewport()           { return this->viewport_; }
     83        Ogre::RenderWindow* getRenderWindow()   { return this->renderWindow_; }
     84        Ogre::OverlaySystem* getOverlaySystem() { return this->overlaySystem_; }
    8385        size_t getRenderWindowHandle();
    8486
    … …  
    129131        Ogre::RenderWindow*      renderWindow_;            //!< the one and only render window
    130132        Ogre::Viewport*          viewport_;                //!< default full size viewport
     133        Ogre::OverlaySystem*     overlaySystem_;
    131134        GlowMaterialListener*    glowMaterialListener_;    //!< Material Listener for the 'Glow' compositor
    132135        float                    lastFrameStartTime_;      //!< Time stamp of the beginning of the last frame

  • code/branches/cegui0.8_ogre1.9/src/libraries/util/DisplayStringConversions.h

    r11071 r11795  
    3737
    3838#include "UtilPrereqs.h"
    39 #include <OgreOverlayElement.h>
     39#include <OgrePrerequisites.h>
     40#if OGRE_VERSION >= 0x010900
     41#   include <Overlay/OgreOverlayElement.h>
     42#else
     43#   include <OgreOverlayElement.h>
     44#endif
    4045
    4146#if OGRE_UNICODE_SUPPORT

  • code/branches/cegui0.8_ogre1.9/src/libraries/util/OgreForwardRefs.h

    r7168 r11795  
    6767    class Factory;
    6868    class Font;
    69     class FontPtr;
    7069    class FontManager;
    7170    struct FrameEvent;
    … …  
    7372    class Frustum;
    7473    class GpuProgram;
    75     class GpuProgramPtr;
    7674    class GpuProgramManager;
    7775    class GpuProgramUsage;
    … …  
    8280    class HardwarePixelBufferSharedPtr;
    8381    class HighLevelGpuProgram;
    84     class HighLevelGpuProgramPtr;
    8582    class HighLevelGpuProgramManager;
    8683    class HighLevelGpuProgramFactory;
    … …  
    9693    class ManualObject;
    9794    class Material;
    98     class MaterialPtr;
    9995    class MaterialManager;
    10096    class MaterialScriptCompiler;
    … …  
    104100    class MemoryManager;
    105101    class Mesh;
    106     class MeshPtr;
    107102    class MeshSerializer;
    108103    class MeshSerializerImpl;
    … …  
    120115    class OverlayElementFactory;
    121116    class OverlayManager;
     117    class OverlaySystem;
    122118    class Particle;
    123119    class ParticleAffector;
    … …  
    179175    class SimpleSpline;
    180176    class Skeleton;
    181     class SkeletonPtr;
    182177    class SkeletonInstance;
    183178    class SkeletonManager;
    … …  
    195190    class TextureUnitState;
    196191    class Texture;
    197     class TexturePtr;
    198192    class TextureFont;
    199193    class TextureManager;

  • code/branches/cegui0.8_ogre1.9/src/modules/designtools/ScreenshotManager.cc

    r11071 r11795  
    101101        }
    102102        if(!this->tempTexture_.isNull())
    103             this->tempTexture_.freeMethod();
     103            this->tempTexture_.setNull();
    104104    }
    105105   

  • code/branches/cegui0.8_ogre1.9/src/modules/hover/FlagHUD.cc

    r11071 r11795  
    3232#include "FlagHUD.h"
    3333
    34 #include <OgreOverlayManager.h>
    35 #include <OgreMaterialManager.h>
    36 #include <OgrePanelOverlayElement.h>
     34#if OGRE_VERSION >= 0x010900
     35#   include <Overlay/OgreOverlayManager.h>
     36#   include <Overlay/OgrePanelOverlayElement.h>
     37#else
     38#   include <OgreOverlayManager.h>
     39#   include <OgrePanelOverlayElement.h>
     40#endif
    3741
    3842#include "util/StringUtils.h"

  • code/branches/cegui0.8_ogre1.9/src/modules/objects/Planet.cc

    r10624 r11795  
    3131#include <OgreEntity.h>
    3232#include <OgreBillboardSet.h>
    33 #include <OgreProgressiveMesh.h>
    3433
    3534#include "core/CoreIncludes.h"
    … …  
    4746     * @brief Constructor
    4847     */
    49     Planet::Planet(Context* context) : MovableEntity(context)
     48    Planet::Planet(Context* context) : Model(context)
    5049    {
    5150        RegisterObject(Planet);
     51        this->setLodEnabled(false);
    5252        this->registerVariables();
    5353    }
    … …  
    5858    Planet::~Planet()
    5959    {
    60         if (this->isInitialized() && this->mesh_.getEntity())
    61             this->detachOgreObject(this->mesh_.getEntity());
    6260    }
    6361
    … …  
    8785    }
    8886
    89     void Planet::changedMesh()
     87    void Planet::changedAtmosphere()
    9088    {
    9189        if( GameMode::showsGraphics() )
    9290        {
    93             if (this->mesh_.getEntity())
    94                 this->detachOgreObject(this->mesh_.getEntity());
    95 
    96             this->mesh_.setMeshSource(this->getScene()->getSceneManager(), this->meshSrc_);
    97 
    98             if (this->mesh_.getEntity())
     91            if (this->getMesh().getEntity())
    9992            {
    100                 this->attachOgreObject(this->mesh_.getEntity());
    101                 this->mesh_.getEntity()->setCastShadows(this->bCastShadows_);
    102                 this->mesh_.setVisible(this->isVisible());
    103 
    104                 float scaleFactor = this->getScale();
    105 
    106 #if OGRE_VERSION >= 0x010800
    107                 Ogre::ProgressiveMesh::LodValueList distList;
    108 #elif OGRE_VERSION >= 0x010700
    109                 Ogre::Mesh::LodValueList distList;
    110 #else
    111                 Ogre::Mesh::LodDistanceList distList;
    112 #endif
    113 
    114                 distList.push_back(10.0f*scaleFactor);
    115                 distList.push_back(19.0f*scaleFactor);
    116                 distList.push_back(27.0f*scaleFactor);
    117                 distList.push_back(34.0f*scaleFactor);
    118                 distList.push_back(40.0f*scaleFactor);
    119                 distList.push_back(45.0f*scaleFactor);
    120                 distList.push_back(49.0f*scaleFactor);
    121                 distList.push_back(52.0f*scaleFactor);
    122                 distList.push_back(54.0f*scaleFactor);
    123                 distList.push_back(55.0f*scaleFactor);
    124 
    125                 float reductionValue = 0.2f;
    126 
    127 #if OGRE_VERSION >= 0x010800
    128                 Ogre::ProgressiveMesh::generateLodLevels(this->mesh_.getEntity()->getMesh().get(), distList, Ogre::ProgressiveMesh::VRQ_PROPORTIONAL,
    129                     reductionValue);
    130 #else
    131                 this->mesh_.getEntity()->getMesh()->generateLodLevels(distList, Ogre::ProgressiveMesh::VRQ_PROPORTIONAL, reductionValue);
    132 #endif
    133                 billboard_.setBillboardSet(this->getScene()->getSceneManager(), this->atmosphere_, Vector3(0,0,0));
     93                this->billboard_.setBillboardSet(this->getScene()->getSceneManager(), this->atmosphere_, Vector3(0,0,0));
    13494
    13595                this->attachOgreObject(this->billboard_.getBillboardSet());
    13696                this->billboard_.getBillboardSet()->setUseAccurateFacing(true);
    137                 this->setCastShadows(true);
    138                 this->billboard_.getBillboardSet()->setRenderQueueGroup(this->mesh_.getEntity()->getRenderQueueGroup());
    139                 this->mesh_.setCastShadows(true);
     97                this->billboard_.getBillboardSet()->setRenderQueueGroup(this->getMesh().getEntity()->getRenderQueueGroup());
    14098            }
    14199        }
    142     }
    143 
    144     void Planet::changedShadows()
    145     {
    146         this->mesh_.setCastShadows(this->bCastShadows_);
    147100    }
    148101
    … …  
    154107        XMLPortParam(Planet, "atmospheresize", setAtmosphereSize, getAtmosphereSize, xmlelement,mode);
    155108        XMLPortParam(Planet, "imagesize", setImageSize, getImageSize, xmlelement,mode);
    156         XMLPortParam(Planet, "mesh", setMeshSource, getMeshSource, xmlelement, mode);
    157         XMLPortParam(Planet, "shadow", setCastShadows, getCastShadows, xmlelement, mode).defaultValues(true);
    158109    }
    159110
    160111    void Planet::registerVariables()
    161112    {
    162         registerVariable(this->atmosphere_, VariableDirection::ToClient);
     113        registerVariable(this->atmosphere_, VariableDirection::ToClient, new NetworkCallback<Planet>(this, &Planet::changedAtmosphere));
    163114        registerVariable(this->atmosphereSize, VariableDirection::ToClient);
    164115        registerVariable(this->imageSize, VariableDirection::ToClient);
    165         // Note: the meshSrc should be synchronised after atmosphere and other values, because the meshSrc callback setts the atmosphere billboards
    166         registerVariable(this->meshSrc_, VariableDirection::ToClient, new NetworkCallback<Planet>(this, &Planet::changedMesh));
    167         registerVariable(this->bCastShadows_, VariableDirection::ToClient, new NetworkCallback<Planet>(this, &Planet::changedShadows));
    168116    }
    169117
    … …  
    171119    {
    172120        SUPER(Planet, changedVisibility);
    173         if (this->isInitialized())
    174         {
    175             this->mesh_.setVisible(this->isVisible());
    176             this->billboard_.setVisible(this->isVisible());
    177         }
     121
     122        this->billboard_.setVisible(this->isVisible());
    178123    }
    179124}

  • code/branches/cegui0.8_ogre1.9/src/modules/objects/Planet.h

    r11071 r11795  
    4040#include <string>
    4141#include "tools/BillboardSet.h"
    42 #include "tools/Mesh.h"
    43 #include "worldentities/MovableEntity.h"
     42#include "tools/interfaces/Tickable.h"
     43#include "graphics/Model.h"
    4444
    4545namespace orxonox
    4646{
    47     class _ObjectsExport Planet : public MovableEntity
     47    class _ObjectsExport Planet : public Model, public Tickable
    4848    {
    4949        public:
    … …  
    5858            virtual void changedVisibility() override;
    5959
    60             inline void setMeshSource(const std::string& meshname)
    61                 { this->meshSrc_ = meshname; this->changedMesh(); }
    62 
    63             inline const std::string& getMeshSource() const
    64                 { return this->meshSrc_; }
    65 
    66             inline void setCastShadows(bool bCastShadows)
    67                 { this->bCastShadows_ = bCastShadows; this->changedShadows(); }
    68 
    69             inline bool getCastShadows() const
    70                 { return this->bCastShadows_; }
    71 
    72             inline const std::string& getMesh() const{
    73                 return this->meshSrc_;
    74             }
    75 
    7660            inline void setAtmosphereSize(float size){
    7761                this->atmosphereSize = size;
    … …  
    8468            inline void setAtmosphere(const std::string& atmosphere){
    8569                this->atmosphere_ = atmosphere;
     70                this->changedAtmosphere();
    8671            }
    8772
    … …  
    10388            void registerVariables();
    10489
    105             void changedMesh();
    106             void changedShadows();
     90            void changedAtmosphere();
    10791
    108             std::string meshSrc_;
    10992            std::string atmosphere_;
    110             Mesh mesh_;
    11193            float atmosphereSize;
    11294            float imageSize;
    11395            BillboardSet billboard_;
    114             bool bCastShadows_;
    11596
    11697    };

  • code/branches/cegui0.8_ogre1.9/src/modules/overlays/FadeoutText.cc

    r9667 r11795  
    2929#include "FadeoutText.h"
    3030
    31 #include <OgreTextAreaOverlayElement.h>
     31#if OGRE_VERSION >= 0x010900
     32#   include <Overlay/OgreTextAreaOverlayElement.h>
     33#else
     34#   include <OgreTextAreaOverlayElement.h>
     35#endif
    3236#include "util/Math.h"
    3337#include "core/CoreIncludes.h"

  • code/branches/cegui0.8_ogre1.9/src/modules/overlays/OverlayText.cc

    r11071 r11795  
    2929#include "OverlayText.h"
    3030
    31 #include <OgreOverlayManager.h>
    32 #include <OgrePanelOverlayElement.h>
    33 #include <OgreTextAreaOverlayElement.h>
     31#if OGRE_VERSION >= 0x010900
     32#   include <Overlay/OgreOverlayManager.h>
     33#   include <Overlay/OgrePanelOverlayElement.h>
     34#   include <Overlay/OgreTextAreaOverlayElement.h>
     35#else
     36#   include <OgreOverlayManager.h>
     37#   include <OgrePanelOverlayElement.h>
     38#   include <OgreTextAreaOverlayElement.h>
     39#endif
    3440
    3541#include "util/StringUtils.h"

  • code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/ChatOverlay.cc

    r11083 r11795  
    3030
    3131#include <string>
    32 #include <OgreTextAreaOverlayElement.h>
     32
     33#if OGRE_VERSION >= 0x010900
     34#   include <Overlay/OgreTextAreaOverlayElement.h>
     35#else
     36#   include <OgreTextAreaOverlayElement.h>
     37#endif
    3338
    3439#include "util/Convert.h"

  • code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/ChatOverlay.h

    r11071 r11795  
    3333
    3434#include <list>
    35 #include <OgreOverlayElement.h>
     35
     36#include <OgrePrerequisites.h>
     37#if OGRE_VERSION >= 0x010900
     38#   include <Overlay/OgreOverlayElement.h>
     39#else
     40#   include <OgreOverlayElement.h>
     41#endif
    3642
    3743#include "chat/ChatListener.h"

  • code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDBar.cc

    r11071 r11795  
    3232#include "HUDBar.h"
    3333
    34 #include <OgreOverlayManager.h>
    3534#include <OgreMaterialManager.h>
    3635#include <OgreTechnique.h>
    3736#include <OgrePass.h>
    38 #include <OgrePanelOverlayElement.h>
     37
     38#if OGRE_VERSION >= 0x010900
     39#   include <Overlay/OgreOverlayManager.h>
     40#   include <Overlay/OgrePanelOverlayElement.h>
     41#else
     42#   include <OgreOverlayManager.h>
     43#   include <OgrePanelOverlayElement.h>
     44#endif
    3945
    4046#include "util/Convert.h"
    … …  
    248254        return this->icon_->getMaterialName();
    249255    }
     256
     257    void HUDBar::setIconPosition(Vector2 position)
     258    {
     259        this->icon_->setPosition(position.x, position.y);
     260    }
     261
     262    void HUDBar::setIconDimensions(Vector2 dimensions)
     263    {
     264        this->icon_->setDimensions(dimensions.x, dimensions.y);
     265    }
    250266}

  • code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDBar.h

    r11071 r11795  
    3737#include <map>
    3838#include <vector>
    39 #include <OgrePanelOverlayElement.h>
    4039
    4140#include "util/Math.h"
    … …  
    122121            { return this->currentColour_; }
    123122
    124         inline void setIconPosition(Vector2 position)
    125             { this->icon_->setPosition(position.x, position.y); }
    126         inline void setIconDimensions(Vector2 dimensions)
    127             { this->icon_->setDimensions(dimensions.x, dimensions.y); }
     123        void setIconPosition(Vector2 position);
     124        void setIconDimensions(Vector2 dimensions);
    128125
    129126    protected:

  • code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDNavigation.cc

    r11071 r11795  
    3232
    3333#include <OgreCamera.h>
    34 #include <OgreFontManager.h>
    35 #include <OgreOverlayManager.h>
    36 #include <OgreTextAreaOverlayElement.h>
    37 #include <OgrePanelOverlayElement.h>
     34
     35#if OGRE_VERSION >= 0x010900
     36#   include <Overlay/OgreFontManager.h>
     37#   include <Overlay/OgreOverlayManager.h>
     38#   include <Overlay/OgreTextAreaOverlayElement.h>
     39#   include <Overlay/OgrePanelOverlayElement.h>
     40#else
     41#   include <OgreFontManager.h>
     42#   include <OgreOverlayManager.h>
     43#   include <OgreTextAreaOverlayElement.h>
     44#   include <OgrePanelOverlayElement.h>
     45#endif
    3846
    3947#include <typeinfo>

  • code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDRadar.cc

    r11071 r11795  
    3131#include "HUDRadar.h"
    3232
    33 #include <OgreOverlayManager.h>
    34 #include <OgrePanelOverlayElement.h>
     33#if OGRE_VERSION >= 0x010900
     34#   include <Overlay/OgreOverlayManager.h>
     35#   include <Overlay/OgrePanelOverlayElement.h>
     36#else
     37#   include <OgreOverlayManager.h>
     38#   include <OgrePanelOverlayElement.h>
     39#endif
    3540
    3641#include "util/Math.h"

  • code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDWeapon.cc

    r11071 r11795  
    2828
    2929#include "HUDWeapon.h"
     30
     31#if OGRE_VERSION >= 0x010900
     32#   include <Overlay/OgreOverlayManager.h>
     33#   include <Overlay/OgrePanelOverlayElement.h>
     34#else
     35#   include <OgreOverlayManager.h>
     36#   include <OgrePanelOverlayElement.h>
     37#endif
    3038
    3139#include "core/CoreIncludes.h"

  • code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDWeapon.h

    r11071 r11795  
    3535#include <vector>
    3636#include <string>
    37 
    38 #include <OgreOverlayManager.h>
    39 #include <OgrePanelOverlayElement.h>
    4037
    4138#include "overlays/OrxonoxOverlay.h"

  • code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDWeaponMode.cc

    r11071 r11795  
    2828
    2929#include "HUDWeaponMode.h"
     30
     31#if OGRE_VERSION >= 0x010900
     32#   include <Overlay/OgreOverlayManager.h>
     33#   include <Overlay/OgrePanelOverlayElement.h>
     34#else
     35#   include <OgreOverlayManager.h>
     36#   include <OgrePanelOverlayElement.h>
     37#endif
    3038
    3139#include "util/Convert.h"

  • code/branches/cegui0.8_ogre1.9/src/modules/overlays/hud/HUDWeaponMode.h

    r11071 r11795  
    3636#include <vector>
    3737#include <string>
    38 
    39 #include <OgreOverlayManager.h>
    40 #include <OgrePanelOverlayElement.h>
    4138
    4239#include "overlays/OrxonoxOverlay.h"

  • code/branches/cegui0.8_ogre1.9/src/modules/overlays/stats/Stats.cc

    r11071 r11795  
    3030
    3131#include <string>
    32 #include <OgreOverlayManager.h>
    33 #include <OgreBorderPanelOverlayElement.h>
     32
     33#if OGRE_VERSION >= 0x010900
     34#   include <Overlay/OgreOverlayManager.h>
     35#   include <Overlay/OgreBorderPanelOverlayElement.h>
     36#else
     37#   include <OgreOverlayManager.h>
     38#   include <OgreBorderPanelOverlayElement.h>
     39#endif
    3440
    3541#include "util/StringUtils.h"

  • code/branches/cegui0.8_ogre1.9/src/orxonox/CMakeLists.txt

    r11704 r11795  
    7171  LINK_LIBRARIES
    7272    ${OGRE_LIBRARY}
     73    ${OGRE_OVERLAY_LIBRARY}
    7374    ${CEGUI}
    7475    ${LUA5.1_LIBRARY}

  • code/branches/cegui0.8_ogre1.9/src/orxonox/RenderQueueListener.cc

    r11080 r11795  
    8383            renderSystem->setStencilBufferParams(Ogre::CMPF_ALWAYS_PASS,
    8484                STENCIL_VALUE_FOR_GLOW, STENCIL_FULL_MASK,
     85#if OGRE_VERSION >= 0x010900
     86                STENCIL_FULL_MASK,
     87#endif
    8588                Ogre::SOP_KEEP,Ogre::SOP_KEEP,Ogre::SOP_REPLACE,false);       
    8689        }
    … …  
    9194            renderSystem->setStencilBufferParams(Ogre::CMPF_NOT_EQUAL,
    9295                STENCIL_VALUE_FOR_GLOW, STENCIL_FULL_MASK,
     96#if OGRE_VERSION >= 0x010900
     97                STENCIL_FULL_MASK,
     98#endif
    9399                Ogre::SOP_KEEP,Ogre::SOP_KEEP,Ogre::SOP_REPLACE,false);       
    94100        }

  • code/branches/cegui0.8_ogre1.9/src/orxonox/Scene.cc

    r11085 r11795  
    4040#include <OgreSceneManagerEnumerator.h>
    4141#include <OgreSceneNode.h>
     42#if OGRE_VERSION >= 0x010900
     43#   include <Overlay/OgreOverlaySystem.h>
     44#endif
    4245
    4346#include <BulletCollision/BroadphaseCollision/btAxisSweep3.h>
    … …  
    9093            this->renderQueueListener_ = new RenderQueueListener();
    9194            this->sceneManager_->addRenderQueueListener(this->renderQueueListener_);//add our own renderQueueListener
     95#if OGRE_VERSION >= 0x010900
     96            this->sceneManager_->addRenderQueueListener(GraphicsManager::getInstance().getOverlaySystem());
     97#endif
    9298
    9399            this->radar_ = new Radar();
    … …  
    134140            if (GameMode::showsGraphics())
    135141            {
     142#if OGRE_VERSION >= 0x010900
     143                this->sceneManager_->removeRenderQueueListener(GraphicsManager::getInstance().getOverlaySystem());
     144#endif
    136145                this->sceneManager_->removeRenderQueueListener(this->renderQueueListener_);
    137146                delete this->renderQueueListener_;

  • code/branches/cegui0.8_ogre1.9/src/orxonox/chat/ChatInputHandler.cc

    r11083 r11795  
    131131    /* GET WINDOW POINTERS */
    132132#if CEGUI_VERSION >= 0x000800
    133     input = CEGUI::System::getSingleton().getDefaultGUIContext().getRootWindow()->getChild( "orxonox/ChatBox/input" );
    134     inputonly = CEGUI::System::getSingleton().getDefaultGUIContext().getRootWindow()->getChild( "orxonox/ChatBox-inputonly/input" );
    135     CEGUI::Window *history = CEGUI::System::getSingleton().getDefaultGUIContext().getRootWindow()->getChild( "orxonox/ChatBox/history" );
     133    //input = CEGUI::System::getSingleton().getDefaultGUIContext().getRootWindow()->getChild( "ChatBox/input" );
     134    //const CEGUI::Window* root = CEGUI::System::getSingleton().getDefaultGUIContext().getRootWindow()->getChild("MenuRootWindow");
     135    //std::cout << "Count: " << root->getChildCount() << std::endl;
     136    //for (int i = 0; i < root->getChildCount(); ++i) {
     137    //  std::cout << "Child: " << root->getChildAtIdx(i)->getName() << std::endl;
     138    //}
     139    for (auto iterator = CEGUI::WindowManager::getSingleton().getIterator(); !iterator.isAtEnd(); iterator++) {
     140        CEGUI::Window* currentWindow = iterator.getCurrentValue();
     141        if (currentWindow->getName().compare("ChatBox") == 0) {
     142                input = currentWindow->getChild("frame")->getChild("input");
     143                CEGUI::Window* history = currentWindow->getChild("frame")->getChild("history");
     144                lb_history = dynamic_cast<CEGUI::Listbox*>(history);
     145        } else if (currentWindow->getName().compare("ChatBox-inputonly") == 0) {
     146                inputonly = currentWindow->getChild("input");
     147        }
     148    }
     149
     150    //input = CEGUI::System::getSingleton().getDefaultGUIContext().getRootWindow()->getChild( "ChatBox" )->getChild("frame")->getChild("input");
     151    //inputonly = CEGUI::System::getSingleton().getDefaultGUIContext().getRootWindow()->getChild( "orxonox/ChatBox-inputonly/input" );
     152    //CEGUI::Window *history = CEGUI::System::getSingleton().getDefaultGUIContext().getRootWindow()->getChild( "orxonox/ChatBox/history" );
    136153#else
    137154    input = CEGUI::WindowManager::getSingleton().getWindow( "orxonox/ChatBox/input" );
    138155    inputonly = CEGUI::WindowManager::getSingleton().getWindow( "orxonox/ChatBox-inputonly/input" );
    139156    CEGUI::Window *history = CEGUI::WindowManager::getSingleton().getWindow( "orxonox/ChatBox/history" );
    140 #endif
    141157
    142158    /* cast it to a listbox */
    143159    lb_history = dynamic_cast<CEGUI::Listbox*>(history);
     160#endif
    144161
    145162    /* assert wee */

  • code/branches/cegui0.8_ogre1.9/src/orxonox/controllers/NewHumanController.cc

    r11071 r11795  
    397397                try
    398398                {
    399                     wePtr = orxonox_cast<WorldEntity*>(Ogre::any_cast<OrxonoxClass*>(itr->movable->getUserAny()));
     399#if OGRE_VERSION >= 0x010900
     400                    const Ogre::Any& any = itr->movable->getUserObjectBindings().getUserAny();
     401#else
     402                    const Ogre::Any& any = itr->movable->getUserAny();
     403#endif
     404                    wePtr = orxonox_cast<WorldEntity*>(Ogre::any_cast<OrxonoxClass*>(any));
    400405                }
    401406                catch (...)

  • code/branches/cegui0.8_ogre1.9/src/orxonox/graphics/AnimatedModel.cc

    r9667 r11795  
    4949    AnimatedModel::~AnimatedModel()
    5050    {
    51         if (this->isInitialized() && this->mesh_.getEntity())
    52             this->detachOgreObject(this->mesh_.getEntity());
     51        if (this->isInitialized() && this->getMesh().getEntity())
     52            this->detachOgreObject(this->getMesh().getEntity());
    5353    }
    5454
    … …  
    6666        if (GameMode::showsGraphics())
    6767        {
    68             if (this->mesh_.getEntity())
    69                 this->detachOgreObject(this->mesh_.getEntity());
     68            if (this->getMesh().getEntity())
     69                this->detachOgreObject(this->getMesh().getEntity());
    7070
    71             this->mesh_.setMeshSource(this->getScene()->getSceneManager(), this->meshSrc_);
     71            this->getMesh().setMeshSource(this->getScene()->getSceneManager(), this->getMeshSource());
    7272
    73             if (this->mesh_.getEntity())
     73            if (this->getMesh().getEntity())
    7474            {
    75                 this->attachOgreObject(this->mesh_.getEntity());
    76                 this->mesh_.getEntity()->setCastShadows(this->bCastShadows_);
     75                this->attachOgreObject(this->getMesh().getEntity());
     76                this->getMesh().getEntity()->setCastShadows(this->getCastShadows());
    7777                this->setAnimationState(this->bAnimLoop_, this->bAnimEnabled_, this->anims_);
    78                 this->mesh_.setVisible(this->isVisible());
     78                this->getMesh().setVisible(this->isVisible());
    7979            }
    8080        }
    … …  
    8989        if(state!="")
    9090        {
    91         if(this->mesh_.getEntity()->getAnimationState(state))
     91        if(this->getMesh().getEntity()->getAnimationState(state))
    9292        {
    93         Ogre::AnimationState* as = this->mesh_.getEntity()->getAnimationState(state);
     93        Ogre::AnimationState* as = this->getMesh().getEntity()->getAnimationState(state);
    9494        as->setLoop(loop);
    9595        as->setEnabled(enabled);
    … …  
    109109    void AnimatedModel::tick(float dt)
    110110    {
    111         if(this->mesh_.getEntity()->getAnimationState(anims_))
     111        if(this->getMesh().getEntity()->getAnimationState(anims_))
    112112        {
    113113// Test to change Material at runtime!
    114114
    115 //            Ogre::MaterialPtr mat = this->mesh_.getEntity()->getSubEntity(0)->getMaterial();
     115//            Ogre::MaterialPtr mat = this->getMesh().getEntity()->getSubEntity(0)->getMaterial();
    116116//            mat->setDiffuse(0.4, 0.3, 0.1, 0.1);
    117117//            mat->setAmbient(0.3, 0.7, 0.8);
    … …  
    121121//            mat->setSceneBlending(sbt);
    122122
    123             Ogre::AnimationState* as = this->mesh_.getEntity()->getAnimationState(anims_);
     123            Ogre::AnimationState* as = this->getMesh().getEntity()->getAnimationState(anims_);
    124124            as->addTime(dt);
    125125    }

  • code/branches/cegui0.8_ogre1.9/src/orxonox/graphics/Camera.cc

    r9667 r11795  
    6262
    6363        this->camera_ = this->getScene()->getSceneManager()->createCamera(getUniqueNumberString());
    64         static_cast<Ogre::MovableObject*>(this->camera_)->setUserAny(Ogre::Any(static_cast<OrxonoxClass*>(this)));
     64        Ogre::MovableObject* movable = static_cast<Ogre::MovableObject*>(this->camera_);
     65#if OGRE_VERSION >= 0x010900
     66        movable->getUserObjectBindings().setUserAny(Ogre::Any(static_cast<OrxonoxClass*>(this)));
     67#else
     68        movable->setUserAny(Ogre::Any(static_cast<OrxonoxClass*>(this)));
     69#endif
    6570        this->cameraNode_ = this->getScene()->getRootSceneNode()->createChildSceneNode();
    6671        this->attachNode(this->cameraNode_);

  • code/branches/cegui0.8_ogre1.9/src/orxonox/graphics/Model.cc

    r11783 r11795  
    3030
    3131#include <OgreEntity.h>
    32 #include <OgreProgressiveMesh.h>
     32#if OGRE_VERSION >= 0x010900
     33#   include <OgreProgressiveMeshGenerator.h>
     34#   include <OgreDistanceLodStrategy.h>
     35#else
     36#   include <OgreProgressiveMesh.h>
     37#endif
    3338
    3439#include "core/CoreIncludes.h"
    … …  
    203208            {
    204209                float volume = this->mesh_.getEntity()->getBoundingBox().volume();
    205 /*
    206                 float scaleFactor = 1;
    207 
    208                 BaseObject* creatorPtr = this;
    209 
    210                 while(creatorPtr!=nullptr&&orxonox_cast<WorldEntity*>(creatorPtr))
    211                 {
    212                     scaleFactor *= getBiggestScale(((WorldEntity*) creatorPtr)->getScale3D());
    213                     creatorPtr = creatorPtr->getCreator();
    214                 }
    215                 orxout() << "name: " << this->meshSrc_ << "scaleFactor: " << scaleFactor << ", volume: " << volume << endl;
    216 */
    217210                orxout(verbose, context::lod) << "Setting lodLevel for " << this->meshSrc_<< " with lodLevel_: " << this->lodLevel_ <<" and volume: "<< volume << ":" << endl;
    218211
    219 #if OGRE_VERSION >= 0x010800
     212#if OGRE_VERSION >= 0x010900
     213                Ogre::LodConfig::LodLevelList distList;
     214#elif OGRE_VERSION >= 0x010800
    220215                Ogre::ProgressiveMesh::LodValueList distList;
    221216#elif OGRE_VERSION >= 0x010700
    … …  
    227222                if( lodLevel_>0 )
    228223                {
    229 //                    float factor = scaleFactor*5/lodLevel_;
    230224                    float factor = pow(volume, 2.0f / 3.0f) * 15.0f / lodLevel_;
    231225
    232226                    orxout(verbose, context::lod) << "LodLevel set with factor: " << factor << endl;
    233227
    234                     distList.push_back(70.0f*factor);
    235                     distList.push_back(140.0f*factor);
    236                     distList.push_back(170.0f*factor);
    237                     distList.push_back(200.0f*factor);
    238                     distList.push_back(230.0f*factor);
    239                     distList.push_back(250.0f*factor);
    240                     distList.push_back(270.0f*factor);
    241                     distList.push_back(290.0f*factor);
    242                     distList.push_back(310.0f*factor);
    243                     distList.push_back(330.0f*factor);
     228                    addLodDistanceToList(distList, 70.0f*factor);
     229                    addLodDistanceToList(distList, 140.0f*factor);
     230                    addLodDistanceToList(distList, 170.0f*factor);
     231                    addLodDistanceToList(distList, 200.0f*factor);
     232                    addLodDistanceToList(distList, 230.0f*factor);
     233                    addLodDistanceToList(distList, 250.0f*factor);
     234                    addLodDistanceToList(distList, 270.0f*factor);
     235                    addLodDistanceToList(distList, 290.0f*factor);
     236                    addLodDistanceToList(distList, 310.0f*factor);
     237                    addLodDistanceToList(distList, 330.0f*factor);
    244238                    while(distList.size()>this->numLodLevels_)
    245239                        distList.pop_back();
    … …  
    247241
    248242                    //Generiert LOD-Levels
    249 #if OGRE_VERSION >= 0x010800
     243#if OGRE_VERSION >= 0x010900
     244                    Ogre::LodConfig config;
     245                    config.mesh = this->mesh_.getEntity()->getMesh();
     246                    config.levels = distList;
     247                    config.strategy = Ogre::DistanceLodSphereStrategy::getSingletonPtr();
     248
     249                    Ogre::ProgressiveMeshGenerator generator;
     250                    generator.generateLodLevels(config);
     251#elif OGRE_VERSION >= 0x010800
    250252                    Ogre::ProgressiveMesh::generateLodLevels(this->mesh_.getEntity()->getMesh().get(), distList, Ogre::ProgressiveMesh::VRQ_PROPORTIONAL,
    251253                        this->lodReductionRate_);
    … …  
    270272#endif
    271273    }
     274
     275    template <class T>
     276    void Model::addLodDistanceToList(T& list, float distance)
     277    {
     278#if OGRE_VERSION >= 0x010900
     279        list.push_back({distance, Ogre::LodLevel::VRM_COLLAPSE_COST, this->lodReductionRate_, 0, false});
     280#else
     281        list.push_back(distance);
     282#endif
     283    }
    272284}

  • code/branches/cegui0.8_ogre1.9/src/orxonox/graphics/Model.h

    r11783 r11795  
    8989
    9090        protected:
     91            inline Mesh& getMesh()
     92                { return this->mesh_; }
     93
     94            inline void setLodEnabled(bool bLodEnabled)
     95                { this->bLodEnabled_ = bLodEnabled; }
     96
     97        private:
    9198            /**
    9299            @brief
    … …  
    108115            //LoD
    109116            void enableLod();
     117
     118            template <class T>
     119            void addLodDistanceToList(T& list, float distance);
    110120
    111121            inline void setLodLevel(float lodLevel)

  • code/branches/cegui0.8_ogre1.9/src/orxonox/overlays/InGameConsole.cc

    r11071 r11795  
    3232#include <algorithm>
    3333#include <string>
    34 #include <OgreOverlay.h>
    35 #include <OgreOverlayElement.h>
    36 #include <OgreOverlayManager.h>
    37 #include <OgreOverlayContainer.h>
    38 #include <OgreBorderPanelOverlayElement.h>
    39 #include <OgreTextAreaOverlayElement.h>
    40 #include <OgreFontManager.h>
    41 #include <OgreFont.h>
     34#include <OgrePrerequisites.h>
     35#if OGRE_VERSION >= 0x010900
     36#   include <Overlay/OgreOverlay.h>
     37#   include <Overlay/OgreOverlayElement.h>
     38#   include <Overlay/OgreOverlayManager.h>
     39#   include <Overlay/OgreOverlayContainer.h>
     40#   include <Overlay/OgreBorderPanelOverlayElement.h>
     41#   include <Overlay/OgreTextAreaOverlayElement.h>
     42#   include <Overlay/OgreFontManager.h>
     43#   include <Overlay/OgreFont.h>
     44#else
     45#   include <OgreOverlay.h>
     46#   include <OgreOverlayElement.h>
     47#   include <OgreOverlayManager.h>
     48#   include <OgreOverlayContainer.h>
     49#   include <OgreBorderPanelOverlayElement.h>
     50#   include <OgreTextAreaOverlayElement.h>
     51#   include <OgreFontManager.h>
     52#   include <OgreFont.h>
     53#endif
    4254
    4355#include "util/Clock.h"

  • code/branches/cegui0.8_ogre1.9/src/orxonox/overlays/OrxonoxOverlay.cc

    r11099 r11795  
    3535
    3636#include <cmath>
    37 #include <OgreOverlay.h>
    38 #include <OgreOverlayManager.h>
    39 #include <OgrePanelOverlayElement.h>
     37#if OGRE_VERSION >= 0x010900
     38#   include <Overlay/OgreOverlay.h>
     39#   include <Overlay/OgreOverlayManager.h>
     40#   include <Overlay/OgrePanelOverlayElement.h>
     41#else
     42#   include <OgreOverlay.h>
     43#   include <OgreOverlayManager.h>
     44#   include <OgrePanelOverlayElement.h>
     45#endif
    4046#include <OgreRenderWindow.h>
    4147#include <OgreMaterialManager.h>

  • code/branches/cegui0.8_ogre1.9/src/orxonox/worldentities/WorldEntity.cc

    r11083 r11795  
    548548    {
    549549        this->node_->attachObject(object);
     550#if OGRE_VERSION >= 0x010900
     551        object->getUserObjectBindings().setUserAny(Ogre::Any(static_cast<OrxonoxClass*>(this)));
     552#else
    550553        object->setUserAny(Ogre::Any(static_cast<OrxonoxClass*>(this)));
     554#endif
    551555    }
    552556
    … …  
    563567    void WorldEntity::detachOgreObject(Ogre::MovableObject* object)
    564568    {
     569#if OGRE_VERSION >= 0x010900
     570        object->getUserObjectBindings().setUserAny(Ogre::Any(static_cast<OrxonoxClass*>(nullptr)));
     571#else
    565572        object->setUserAny(Ogre::Any(static_cast<OrxonoxClass*>(nullptr)));
     573#endif
    566574        this->node_->detachObject(object);
    567575    }
Note: See TracChangeset for help on using the changeset viewer.