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

Everything: Ogre 1.9.0 and CEGUI 0.8.4 should work now

+ Enabled logging in some Ogre/CEGUI using parts
+ Moved some dox files around, removed one obsolete scenario
parent 8b79b275
This source diff could not be displayed because it is too large. You can view the blob instead.
<?xml version="1.0" ?>
<GUIScheme version="5" name="TaharezLook">
<Imageset filename="TaharezLook-0.8.imageset" />
<Font filename="bluehighway-8-0.8.font" />
<Font filename="bluehighway-10-0.8.font" />
<Font filename="bluehighway-12-0.8.font" />
<Font filename="bluehighway-24-0.8.font" />
<LookNFeel filename="TaharezLook-0.8.looknfeel" />
<WindowRendererSet filename="CEGUICoreWindowRendererSet" />
<FalagardMapping windowType="TaharezLook/Button" targetType="CEGUI/PushButton" renderer="Core/Button" lookNFeel="TaharezLook/Button" />
<FalagardMapping windowType="TaharezLook/Checkbox" targetType="CEGUI/Checkbox" renderer="Core/ToggleButton" lookNFeel="TaharezLook/Checkbox" />
<FalagardMapping windowType="TaharezLook/ImageButton" targetType="CEGUI/PushButton" renderer="Core/Button" lookNFeel="TaharezLook/ImageButton" />
<FalagardMapping windowType="TaharezLook/RadioButton" targetType="CEGUI/RadioButton" renderer="Core/ToggleButton" lookNFeel="TaharezLook/RadioButton" />
<FalagardMapping windowType="TaharezLook/FrameWindow" targetType="CEGUI/FrameWindow" renderer="Core/FrameWindow" lookNFeel="TaharezLook/FrameWindow" />
<FalagardMapping windowType="TaharezLook/Titlebar" targetType="CEGUI/Titlebar" renderer="Core/Titlebar" lookNFeel="TaharezLook/Titlebar" />
<FalagardMapping windowType="TaharezLook/SystemButton" targetType="CEGUI/PushButton" renderer="Core/Button" lookNFeel="TaharezLook/Button" />
<FalagardMapping windowType="TaharezLook/Editbox" targetType="CEGUI/Editbox" renderer="Core/Editbox" lookNFeel="TaharezLook/Editbox" />
<FalagardMapping windowType="TaharezLook/MultiLineEditbox" targetType="CEGUI/MultiLineEditbox" renderer="Core/MultiLineEditbox" lookNFeel="TaharezLook/MultiLineEditbox" />
<FalagardMapping windowType="TaharezLook/Menubar" targetType="CEGUI/Menubar" renderer="Core/Menubar" lookNFeel="TaharezLook/Menubar" />
<FalagardMapping windowType="TaharezLook/PopupMenu" targetType="CEGUI/PopupMenu" renderer="Core/PopupMenu" lookNFeel="TaharezLook/PopupMenu" />
<FalagardMapping windowType="TaharezLook/MenuItem" targetType="CEGUI/MenuItem" renderer="Core/MenuItem" lookNFeel="TaharezLook/MenuItem" />
<FalagardMapping windowType="TaharezLook/AlternateProgressBar" targetType="CEGUI/ProgressBar" renderer="Core/ProgressBar" lookNFeel="TaharezLook/AltProgressBar" />
<FalagardMapping windowType="TaharezLook/ProgressBar" targetType="CEGUI/ProgressBar" renderer="Core/ProgressBar" lookNFeel="TaharezLook/ProgressBar" />
<FalagardMapping windowType="TaharezLook/VUMeter" targetType="CEGUI/ProgressBar" renderer="Core/ProgressBar" lookNFeel="TaharezLook/VUMeter" />
<FalagardMapping windowType="TaharezLook/VerticalScrollbar" targetType="CEGUI/Scrollbar" renderer="Core/Scrollbar" lookNFeel="TaharezLook/VerticalScrollbar" />
<FalagardMapping windowType="TaharezLook/HorizontalScrollbar" targetType="CEGUI/Scrollbar" renderer="Core/Scrollbar" lookNFeel="TaharezLook/HorizontalScrollbar" />
<FalagardMapping windowType="TaharezLook/VerticalScrollbarThumb" targetType="CEGUI/Thumb" renderer="Core/Button" lookNFeel="TaharezLook/VerticalScrollbarThumb" />
<FalagardMapping windowType="TaharezLook/HorizontalScrollbarThumb" targetType="CEGUI/Thumb" renderer="Core/Button" lookNFeel="TaharezLook/HorizontalScrollbarThumb" />
<FalagardMapping windowType="TaharezLook/LargeVerticalScrollbar" targetType="CEGUI/Scrollbar" renderer="Core/Scrollbar" lookNFeel="TaharezLook/LargeVerticalScrollbar" />
<FalagardMapping windowType="TaharezLook/LargeVerticalScrollbarThumb" targetType="CEGUI/Thumb" renderer="Core/Button" lookNFeel="TaharezLook/LargeVerticalScrollbarThumb" />
<FalagardMapping windowType="TaharezLook/TabButton" targetType="CEGUI/TabButton" renderer="Core/TabButton" lookNFeel="TaharezLook/TabButton" />
<FalagardMapping windowType="TaharezLook/TabControl" targetType="CEGUI/TabControl" renderer="Core/TabControl" lookNFeel="TaharezLook/TabControl" />
<FalagardMapping windowType="TaharezLook/TabContentPane" targetType="DefaultWindow" renderer="Core/Default" lookNFeel="TaharezLook/TabContentPane" />
<FalagardMapping windowType="TaharezLook/TabButtonPane" targetType="DefaultWindow" renderer="Core/Default" lookNFeel="TaharezLook/TabButtonPane" />
<FalagardMapping windowType="TaharezLook/ComboDropList" targetType="CEGUI/ComboDropList" renderer="Core/Listbox" lookNFeel="TaharezLook/ComboDropList" />
<FalagardMapping windowType="TaharezLook/ComboEditbox" targetType="CEGUI/Editbox" renderer="Core/Editbox" lookNFeel="TaharezLook/ComboEditbox" />
<FalagardMapping windowType="TaharezLook/Combobox" targetType="CEGUI/Combobox" renderer="Core/Default" lookNFeel="TaharezLook/Combobox" />
<FalagardMapping windowType="TaharezLook/Listbox" targetType="CEGUI/Listbox" renderer="Core/Listbox" lookNFeel="TaharezLook/Listbox" />
<FalagardMapping windowType="TaharezLook/ListHeader" targetType="CEGUI/ListHeader" renderer="Core/ListHeader" lookNFeel="TaharezLook/ListHeader" />
<FalagardMapping windowType="TaharezLook/ListHeaderSegment" targetType="CEGUI/ListHeaderSegment" renderer="Core/ListHeaderSegment" lookNFeel="TaharezLook/ListHeaderSegment" />
<FalagardMapping windowType="TaharezLook/MultiColumnList" targetType="CEGUI/MultiColumnList" renderer="Core/MultiColumnList" lookNFeel="TaharezLook/MultiColumnList" />
<FalagardMapping windowType="TaharezLook/Slider" targetType="CEGUI/Slider" renderer="Core/Slider" lookNFeel="TaharezLook/Slider" />
<FalagardMapping windowType="TaharezLook/SliderThumb" targetType="CEGUI/Thumb" renderer="Core/Button" lookNFeel="TaharezLook/SliderThumb" />
<FalagardMapping windowType="TaharezLook/ScrollablePane" targetType="CEGUI/ScrollablePane" renderer="Core/ScrollablePane" lookNFeel="TaharezLook/ScrollablePane" />
<FalagardMapping windowType="TaharezLook/Spinner" targetType="CEGUI/Spinner" renderer="Core/Default" lookNFeel="TaharezLook/Spinner" />
<FalagardMapping windowType="TaharezLook/Tooltip" targetType="CEGUI/Tooltip" renderer="Core/Tooltip" lookNFeel="TaharezLook/Tooltip" />
<FalagardMapping windowType="TaharezLook/StaticImage" targetType="DefaultWindow" renderer="Core/StaticImage" lookNFeel="TaharezLook/StaticImage" />
<FalagardMapping windowType="TaharezLook/StaticText" targetType="DefaultWindow" renderer="Core/StaticText" lookNFeel="TaharezLook/StaticText" />
<FalagardMapping windowType="TaharezLook/ItemListbox" targetType="CEGUI/ItemListbox" renderer="Core/ItemListbox" lookNFeel="TaharezLook/ItemListbox" />
<FalagardMapping windowType="TaharezLook/ListboxItem" targetType="CEGUI/ItemEntry" renderer="Core/ItemEntry" lookNFeel="TaharezLook/ListboxItem" />
<FalagardMapping windowType="TaharezLook/GroupBox" targetType="CEGUI/GroupBox" renderer="Core/Default" lookNFeel="TaharezLook/GroupBox" />
<FalagardMapping windowType="TaharezLook/Tree" targetType="CEGUI/Tree" renderer="Core/Tree" lookNFeel="TaharezLook/Tree" />
</GUIScheme>
<?xml version="1.0" ?>
<Font version="3" name="BlueHighway-10" filename="bluehigh.ttf" type="FreeType" size="10" nativeHorzRes="1024" nativeVertRes="768" autoScaled="false" antiAlias="true" />
<?xml version="1.0" ?>
<Font version="3" name="BlueHighway-12" filename="bluehigh.ttf" type="FreeType" size="12" nativeHorzRes="800" nativeVertRes="600" autoScaled="true"/>
<?xml version="1.0" ?>
<Font version="3" name="BlueHighway-24" filename="bluehigh.ttf" type="FreeType" size="24" nativeHorzRes="800" nativeVertRes="600" autoScaled="true"/>
<?xml version="1.0" ?>
<Font version="3" name="BlueHighway-8" filename="bluehigh.ttf" type="FreeType" size="8" nativeHorzRes="1024" nativeVertRes="768" autoScaled="true" antiAlias="true" />
......@@ -13,7 +13,7 @@ using namespace OpenViBE;
using namespace OpenViBE::Kernel;
using namespace OpenViBESSVEP;
#if !((CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR > 7))
#if !((CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR >= 8))
namespace CEGUI
{
typedef CEGUI::UVector2 USize;
......@@ -51,15 +51,16 @@ bool CShooterApplication::setup(OpenViBE::Kernel::IKernelContext* poKernelContex
m_poInstructionsReady->setPosition(CEGUI::UVector2(cegui_reldim(0.0f), cegui_reldim(0.0f)) );
m_poInstructionsReady->setSize(CEGUI::USize(CEGUI::UDim(0.0f, 640.f), CEGUI::UDim(0.0f, 32.f)));
#if (CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR > 7)
#if (CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR >= 8)
m_poSheet->addChild(m_poInstructionsReady);
CEGUI::ImageManager::getSingleton().addFromImageFile("InstructionsReady","InstructionText-Start.png");
m_poInstructionsReady->setProperty("Image","InstructionsReady");
#else
m_poSheet->addChildWindow(m_poInstructionsReady);
CEGUI::ImagesetManager::getSingleton().createFromImageFile("InstructionsReady", "InstructionText-Start.png");
m_poInstructionsReady->setProperty("Image", "set:InstructionsReady image:full_image");
#endif
m_poInstructionsReady->setProperty("Image","set:InstructionsReady image:full_image");
m_poInstructionsReady->setProperty("FrameEnabled","False");
m_poInstructionsReady->setProperty("BackgroundEnabled","False");
m_poInstructionsReady->setVisible(true);
......
......@@ -12,7 +12,7 @@ using namespace OpenViBE;
using namespace OpenViBE::Kernel;
using namespace OpenViBESSVEP;
#if !((CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR > 7))
#if !((CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR >= 8))
namespace CEGUI
{
typedef CEGUI::UVector2 USize;
......@@ -50,15 +50,17 @@ bool CTrainerApplication::setup(OpenViBE::Kernel::IKernelContext* poKernelContex
m_poInstructionsReady->setPosition(CEGUI::UVector2(cegui_reldim(0.0f), cegui_reldim(0.0f)) );
m_poInstructionsReady->setSize(CEGUI::USize(CEGUI::UDim(0.0f, 640.f), CEGUI::UDim(0.0f, 32.f)));
#if (CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR > 7)
#if (CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR >= 8)
m_poSheet->addChild(m_poInstructionsReady);
CEGUI::ImageManager::getSingleton().addFromImageFile("InstructionsReady","InstructionText-Start.png");
m_poInstructionsReady->setProperty("Image","InstructionsReady");
#else
m_poSheet->addChildWindow(m_poInstructionsReady);
CEGUI::ImagesetManager::getSingleton().createFromImageFile("InstructionsReady", "InstructionText-Start.png");
m_poInstructionsReady->setProperty("Image", "set:InstructionsReady image:full_image");
#endif
m_poInstructionsReady->setProperty("Image","set:InstructionsReady image:full_image");
m_poInstructionsReady->setProperty("FrameEnabled","False");
m_poInstructionsReady->setProperty("BackgroundEnabled","False");
m_poInstructionsReady->setVisible(true);
......
......@@ -210,8 +210,8 @@ void CApplication::initCEGUI(const char *logFilename)
m_roGUIRenderer = &(CEGUI::OgreRenderer::bootstrapSystem(*m_poWindow));
(*m_poLogManager) << LogLevel_Debug << "+ Creating CEGUI Scheme Manager\n";
#if (CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR > 7)
CEGUI::SchemeManager::getSingleton().createFromFile((CEGUI::utf8*)"TaharezLook-ov.scheme");
#if (CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR >= 8)
CEGUI::SchemeManager::getSingleton().createFromFile((CEGUI::utf8*)"TaharezLook-ov-0.8.scheme");
#else
CEGUI::SchemeManager::getSingleton().create((CEGUI::utf8*)"TaharezLook-ov.scheme");
#endif
......@@ -222,8 +222,8 @@ void CApplication::initCEGUI(const char *logFilename)
(*m_poLogManager) << LogLevel_Debug << "+ Setting CEGUI StyleSheet\n";
#if (CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR > 7)
// @FIXME
#if (CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR >= 8)
CEGUI::System::getSingleton().getDefaultGUIContext().setRootWindow(m_poSheet);
#else
CEGUI::System::getSingleton().setGUISheet(m_poSheet);
#endif
......
......@@ -9,7 +9,7 @@
#include <Ogre.h>
#include <vector>
#include <CEGUI.h>
#if (CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR > 7)
#if (CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR >= 8)
#include <CEGUI/RendererModules/Ogre/Renderer.h>
#else
#include <RendererModules/Ogre/CEGUIOgreRenderer.h>
......
......@@ -6,6 +6,7 @@
#if (OGRE_VERSION_MAJOR > 1) || ((OGRE_VERSION_MAJOR == 1) && (OGRE_VERSION_MINOR >= 9))
#include "Overlay/OgreOverlayManager.h"
#include "Overlay/OgreOverlaySystem.h"
#endif
using namespace Ogre;
......@@ -18,6 +19,12 @@ using namespace OpenViBE::Kernel;
{
m_oAABInf.setInfinite();
#if (OGRE_VERSION_MAJOR > 1) || ((OGRE_VERSION_MAJOR == 1) && (OGRE_VERSION_MINOR >= 9))
// on Ogre 1.9, overlay system needs to be manually created
Ogre::OverlaySystem* pOverlaySystem = OGRE_NEW Ogre::OverlaySystem();
m_poSceneManager->addRenderQueueListener(pOverlaySystem);
#endif
m_poOverlayManager = Ogre::OverlayManager::getSingletonPtr();
(m_poApplication->getLogManager()) << LogLevel_Debug << " + Creating OverlayManager\n";
......
This source diff could not be displayed because it is too large. You can view the blob instead.
<?xml version="1.0" ?>
<GUIScheme version="5" name="TaharezLook">
<Imageset filename="TaharezLook-0.8.imageset" />
<Font filename="bluehighway-8-0.8.font" />
<Font filename="bluehighway-10-0.8.font" />
<Font filename="bluehighway-12-0.8.font" />
<Font filename="bluehighway-24-0.8.font" />
<Font filename="bluehighway-impact-0.8.font" />
<LookNFeel filename="TaharezLook-0.8.looknfeel" />
<WindowRendererSet filename="CEGUICoreWindowRendererSet" />
<FalagardMapping windowType="TaharezLook/Button" targetType="CEGUI/PushButton" renderer="Core/Button" lookNFeel="TaharezLook/Button" />
<FalagardMapping windowType="TaharezLook/Checkbox" targetType="CEGUI/Checkbox" renderer="Core/ToggleButton" lookNFeel="TaharezLook/Checkbox" />
<FalagardMapping windowType="TaharezLook/ImageButton" targetType="CEGUI/PushButton" renderer="Core/Button" lookNFeel="TaharezLook/ImageButton" />
<FalagardMapping windowType="TaharezLook/RadioButton" targetType="CEGUI/RadioButton" renderer="Core/ToggleButton" lookNFeel="TaharezLook/RadioButton" />
<FalagardMapping windowType="TaharezLook/FrameWindow" targetType="CEGUI/FrameWindow" renderer="Core/FrameWindow" lookNFeel="TaharezLook/FrameWindow" />
<FalagardMapping windowType="TaharezLook/Titlebar" targetType="CEGUI/Titlebar" renderer="Core/Titlebar" lookNFeel="TaharezLook/Titlebar" />
<FalagardMapping windowType="TaharezLook/SystemButton" targetType="CEGUI/PushButton" renderer="Core/Button" lookNFeel="TaharezLook/Button" />
<FalagardMapping windowType="TaharezLook/Editbox" targetType="CEGUI/Editbox" renderer="Core/Editbox" lookNFeel="TaharezLook/Editbox" />
<FalagardMapping windowType="TaharezLook/MultiLineEditbox" targetType="CEGUI/MultiLineEditbox" renderer="Core/MultiLineEditbox" lookNFeel="TaharezLook/MultiLineEditbox" />
<FalagardMapping windowType="TaharezLook/Menubar" targetType="CEGUI/Menubar" renderer="Core/Menubar" lookNFeel="TaharezLook/Menubar" />
<FalagardMapping windowType="TaharezLook/PopupMenu" targetType="CEGUI/PopupMenu" renderer="Core/PopupMenu" lookNFeel="TaharezLook/PopupMenu" />
<FalagardMapping windowType="TaharezLook/MenuItem" targetType="CEGUI/MenuItem" renderer="Core/MenuItem" lookNFeel="TaharezLook/MenuItem" />
<FalagardMapping windowType="TaharezLook/AlternateProgressBar" targetType="CEGUI/ProgressBar" renderer="Core/ProgressBar" lookNFeel="TaharezLook/AltProgressBar" />
<FalagardMapping windowType="TaharezLook/ProgressBar" targetType="CEGUI/ProgressBar" renderer="Core/ProgressBar" lookNFeel="TaharezLook/ProgressBar" />
<FalagardMapping windowType="TaharezLook/VUMeter" targetType="CEGUI/ProgressBar" renderer="Core/ProgressBar" lookNFeel="TaharezLook/VUMeter" />
<FalagardMapping windowType="TaharezLook/VerticalScrollbar" targetType="CEGUI/Scrollbar" renderer="Core/Scrollbar" lookNFeel="TaharezLook/VerticalScrollbar" />
<FalagardMapping windowType="TaharezLook/HorizontalScrollbar" targetType="CEGUI/Scrollbar" renderer="Core/Scrollbar" lookNFeel="TaharezLook/HorizontalScrollbar" />
<FalagardMapping windowType="TaharezLook/VerticalScrollbarThumb" targetType="CEGUI/Thumb" renderer="Core/Button" lookNFeel="TaharezLook/VerticalScrollbarThumb" />
<FalagardMapping windowType="TaharezLook/HorizontalScrollbarThumb" targetType="CEGUI/Thumb" renderer="Core/Button" lookNFeel="TaharezLook/HorizontalScrollbarThumb" />
<FalagardMapping windowType="TaharezLook/LargeVerticalScrollbar" targetType="CEGUI/Scrollbar" renderer="Core/Scrollbar" lookNFeel="TaharezLook/LargeVerticalScrollbar" />
<FalagardMapping windowType="TaharezLook/LargeVerticalScrollbarThumb" targetType="CEGUI/Thumb" renderer="Core/Button" lookNFeel="TaharezLook/LargeVerticalScrollbarThumb" />
<FalagardMapping windowType="TaharezLook/TabButton" targetType="CEGUI/TabButton" renderer="Core/TabButton" lookNFeel="TaharezLook/TabButton" />
<FalagardMapping windowType="TaharezLook/TabControl" targetType="CEGUI/TabControl" renderer="Core/TabControl" lookNFeel="TaharezLook/TabControl" />
<FalagardMapping windowType="TaharezLook/TabContentPane" targetType="DefaultWindow" renderer="Core/Default" lookNFeel="TaharezLook/TabContentPane" />
<FalagardMapping windowType="TaharezLook/TabButtonPane" targetType="DefaultWindow" renderer="Core/Default" lookNFeel="TaharezLook/TabButtonPane" />
<FalagardMapping windowType="TaharezLook/ComboDropList" targetType="CEGUI/ComboDropList" renderer="Core/Listbox" lookNFeel="TaharezLook/ComboDropList" />
<FalagardMapping windowType="TaharezLook/ComboEditbox" targetType="CEGUI/Editbox" renderer="Core/Editbox" lookNFeel="TaharezLook/ComboEditbox" />
<FalagardMapping windowType="TaharezLook/Combobox" targetType="CEGUI/Combobox" renderer="Core/Default" lookNFeel="TaharezLook/Combobox" />
<FalagardMapping windowType="TaharezLook/Listbox" targetType="CEGUI/Listbox" renderer="Core/Listbox" lookNFeel="TaharezLook/Listbox" />
<FalagardMapping windowType="TaharezLook/ListHeader" targetType="CEGUI/ListHeader" renderer="Core/ListHeader" lookNFeel="TaharezLook/ListHeader" />
<FalagardMapping windowType="TaharezLook/ListHeaderSegment" targetType="CEGUI/ListHeaderSegment" renderer="Core/ListHeaderSegment" lookNFeel="TaharezLook/ListHeaderSegment" />
<FalagardMapping windowType="TaharezLook/MultiColumnList" targetType="CEGUI/MultiColumnList" renderer="Core/MultiColumnList" lookNFeel="TaharezLook/MultiColumnList" />
<FalagardMapping windowType="TaharezLook/Slider" targetType="CEGUI/Slider" renderer="Core/Slider" lookNFeel="TaharezLook/Slider" />
<FalagardMapping windowType="TaharezLook/SliderThumb" targetType="CEGUI/Thumb" renderer="Core/Button" lookNFeel="TaharezLook/SliderThumb" />
<FalagardMapping windowType="TaharezLook/ScrollablePane" targetType="CEGUI/ScrollablePane" renderer="Core/ScrollablePane" lookNFeel="TaharezLook/ScrollablePane" />
<FalagardMapping windowType="TaharezLook/Spinner" targetType="CEGUI/Spinner" renderer="Core/Default" lookNFeel="TaharezLook/Spinner" />
<FalagardMapping windowType="TaharezLook/Tooltip" targetType="CEGUI/Tooltip" renderer="Core/Tooltip" lookNFeel="TaharezLook/Tooltip" />
<FalagardMapping windowType="TaharezLook/StaticImage" targetType="DefaultWindow" renderer="Core/StaticImage" lookNFeel="TaharezLook/StaticImage" />
<FalagardMapping windowType="TaharezLook/StaticText" targetType="DefaultWindow" renderer="Core/StaticText" lookNFeel="TaharezLook/StaticText" />
<FalagardMapping windowType="TaharezLook/ItemListbox" targetType="CEGUI/ItemListbox" renderer="Core/ItemListbox" lookNFeel="TaharezLook/ItemListbox" />
<FalagardMapping windowType="TaharezLook/ListboxItem" targetType="CEGUI/ItemEntry" renderer="Core/ItemEntry" lookNFeel="TaharezLook/ListboxItem" />
<FalagardMapping windowType="TaharezLook/GroupBox" targetType="CEGUI/GroupBox" renderer="Core/Default" lookNFeel="TaharezLook/GroupBox" />
<FalagardMapping windowType="TaharezLook/Tree" targetType="CEGUI/Tree" renderer="Core/Tree" lookNFeel="TaharezLook/Tree" />
</GUIScheme>
<?xml version="1.0" ?>
<Font version="3" name="BlueHighway-10" filename="bluehigh.ttf" type="FreeType" size="10" nativeHorzRes="1024" nativeVertRes="768" autoScaled="false" antiAlias="true" />
<?xml version="1.0" ?>
<Font version="3" name="BlueHighway-12" filename="bluehigh.ttf" type="FreeType" size="12" nativeHorzRes="800" nativeVertRes="600" autoScaled="true"/>
<?xml version="1.0" ?>
<Font version="3" name="BlueHighway-24" filename="bluehigh.ttf" type="FreeType" size="24" nativeHorzRes="800" nativeVertRes="600" autoScaled="true"/>
<?xml version="1.0" ?>
<Font version="3" name="BlueHighway-8" filename="bluehigh.ttf" type="FreeType" size="8" nativeHorzRes="1024" nativeVertRes="768" autoScaled="true" antiAlias="true" />
<?xml version="1.0" ?>
<Font version="3" name="BlueHighway-impact" filename="bluehigh.ttf" type="FreeType" size="10" nativeHorzRes="800" nativeVertRes="600" autoScaled="true" antiAlias="true" />
......@@ -14,7 +14,7 @@ using namespace OpenViBE;
using namespace OpenViBE::Kernel;
using namespace OpenViBESSVEP;
#if !((CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR > 7))
#if !((CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR >= 8))
namespace CEGUI
{
typedef CEGUI::UVector2 USize;
......@@ -61,15 +61,16 @@ bool CGenericStimulatorApplication::setup(OpenViBE::Kernel::IKernelContext* poKe
m_poInstructionsReady->setPosition(CEGUI::UVector2(cegui_reldim(0.0f), cegui_reldim(0.0f)) );
m_poInstructionsReady->setSize(CEGUI::USize(CEGUI::UDim(0.0f, 640.f), CEGUI::UDim(0.0f, 32.f)));
#if (CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR > 7)
#if (CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR >= 8)
m_poSheet->addChild(m_poInstructionsReady);
CEGUI::ImageManager::getSingleton().addFromImageFile("InstructionsReady","InstructionText-Start.png");
m_poInstructionsReady->setProperty("Image","InstructionsReady");
#else
m_poSheet->addChildWindow(m_poInstructionsReady);
CEGUI::ImagesetManager::getSingleton().createFromImageFile("InstructionsReady", "InstructionText-Start.png");
m_poInstructionsReady->setProperty("Image", "set:InstructionsReady image:full_image");
#endif
m_poInstructionsReady->setProperty("Image","set:InstructionsReady image:full_image");
m_poInstructionsReady->setProperty("FrameEnabled","False");
m_poInstructionsReady->setProperty("BackgroundEnabled","False");
m_poInstructionsReady->setVisible(true);
......
......@@ -29,7 +29,7 @@ using namespace OpenViBESSVEP;
//#define NO_KEYBOARD
//#define NO_VRPN
#if !((CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR > 7))
#if !((CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR >= 8))
namespace CEGUI
{
typedef CEGUI::UVector2 USize;
......@@ -71,7 +71,7 @@ bool CImpactApplication::setup(OpenViBE::Kernel::IKernelContext* poKernelContext
poKernelContext->getLogManager().activate(LogLevel_First, LogLevel_Last, true);
ILogListener* l_poLogListenerFileBuffered = new CLogListenerFileBuffered(*poKernelContext, "ssvep-stimulator",
ILogListener* l_poLogListenerFileBuffered = new CLogListenerFileBuffered(*poKernelContext, "ssvep-mind-shooter-stimulator",
l_poConfigurationManager->expand("${SSVEP_UserDataFolder}/log-[$core{date}-$core{time}].log"));
poKernelContext->getLogManager().addListener(l_poLogListenerFileBuffered);
......@@ -128,7 +128,7 @@ bool CImpactApplication::setup(OpenViBE::Kernel::IKernelContext* poKernelContext
m_poStatusWindow->setFont("BlueHighway-impact");
m_poStatusWindow->hide();
#if (CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR > 7)
#if (CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR >= 8)
m_poSheet->addChild(m_poStatusWindow);
m_poSheet->addChild(m_poInstructionWindow);
#else
......
......@@ -85,7 +85,7 @@ bool CApplication::setup(OpenViBE::Kernel::IKernelContext* poKernelContext)
CString l_sOgreLog = l_poConfigurationManager->expand("${Path_Log}") + "/openvibe-ssvep-mind-shooter-ogre.log";
(*m_poLogManager) << LogLevel_Info << "Ogre log file : " << l_sOgreLog << "\n";
FS::Files::createParentPath(l_sOgreLog);
l_poLogManager->createLog(l_sOgreLog.toASCIIString(), true, l_poConfigurationManager->expandAsBoolean("${SSVEP_Ogre_LogToConsole}", false), true );
l_poLogManager->createLog(l_sOgreLog.toASCIIString(), true, l_poConfigurationManager->expandAsBoolean("${SSVEP_Ogre_LogToConsole}", false), false );
// Root creation
CString l_sOgreCfg = l_poConfigurationManager->expand("${Path_UserData}") + "/openvibe-ssvep-mind-shooter-ogre.cfg";
......@@ -149,7 +149,7 @@ bool CApplication::setup(OpenViBE::Kernel::IKernelContext* poKernelContext)
m_poPainter = new CBasicPainter( this );
(*m_poLogManager) << LogLevel_Debug << " * initializing CEGUI\n";
this->initCEGUI();
this->initCEGUI(OpenViBE::Directories::getLogDir() + "/openvibe-ssvep-mind-shooter-demo-cegui.log");
(*m_poLogManager) << LogLevel_Debug << " * CEGUI initialized\n";
// create the vector of stimulation frequencies
......@@ -279,14 +279,23 @@ bool CApplication::configure()
}
void CApplication::initCEGUI()
void CApplication::initCEGUI(const char *logFilename)
{
// Instantiate logger before bootstrapping the system, this way we will be able to get the log redirected
if (!CEGUI::Logger::getSingletonPtr())
{
new CEGUI::DefaultLogger(); // singleton; instantiate only, no delete
}
(*m_poLogManager) << LogLevel_Info << "+ CEGUI log will be in '" << logFilename << "'\n";
FS::Files::createParentPath(logFilename);
CEGUI::Logger::getSingleton().setLogFilename(logFilename, false);
(*m_poLogManager) << LogLevel_Debug << "+ Creating CEGUI Ogre bootstrap\n";
m_roGUIRenderer = &(CEGUI::OgreRenderer::bootstrapSystem(*m_poWindow));
(*m_poLogManager) << LogLevel_Debug << "+ Creating CEGUI Scheme Manager\n";
#if (CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR > 7)
CEGUI::SchemeManager::getSingleton().createFromFile((CEGUI::utf8*)"TaharezLook-ov.scheme");
#if (CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR >= 8)
CEGUI::SchemeManager::getSingleton().createFromFile((CEGUI::utf8*)"TaharezLook-ov-0.8.scheme");
#else
CEGUI::SchemeManager::getSingleton().create((CEGUI::utf8*)"TaharezLook-ov.scheme");
#endif
......@@ -296,8 +305,8 @@ void CApplication::initCEGUI()
m_poSheet = m_poGUIWindowManager->createWindow("DefaultWindow", "RootSheet");
(*m_poLogManager) << LogLevel_Debug << "+ Setting CEGUI StyleSheet\n";
#if (CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR > 7)
// @FIXME
#if (CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR >= 8)
CEGUI::System::getSingleton().getDefaultGUIContext().setRootWindow(m_poSheet);
#else
CEGUI::System::getSingleton().setGUISheet(m_poSheet);
#endif
......
......@@ -9,7 +9,7 @@
#include <Ogre.h>
#include <vector>
#include <CEGUI.h>
#if (CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR > 7)
#if (CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR >= 8)
#include <CEGUI/RendererModules/Ogre/Renderer.h>
#else
#include <RendererModules/Ogre/CEGUIOgreRenderer.h>
......@@ -116,7 +116,7 @@ namespace OpenViBESSVEP
private:
void initCEGUI();
void initCEGUI(const char *logFilename);
Ogre::uint32 m_ui32WindowWidth;
Ogre::uint32 m_ui32WindowHeight;
......
......@@ -5,6 +5,7 @@
#include "ovassvepCApplication.h"
#if (OGRE_VERSION_MAJOR > 1) || ((OGRE_VERSION_MAJOR == 1) && (OGRE_VERSION_MINOR >= 9))
#include "Overlay/OgreOverlaySystem.h"
#include "Overlay/OgreOverlayContainer.h"
#include "Overlay/OgreOverlayElement.h"
#endif
......@@ -19,6 +20,12 @@ using namespace OpenViBE::Kernel;
{
m_oAABInf.setInfinite();
#if (OGRE_VERSION_MAJOR > 1) || ((OGRE_VERSION_MAJOR == 1) && (OGRE_VERSION_MINOR >= 9))
// on Ogre 1.9, overlay system needs to be manually created
Ogre::OverlaySystem* pOverlaySystem = OGRE_NEW Ogre::OverlaySystem();
m_poSceneManager->addRenderQueueListener(pOverlaySystem);
#endif
m_poOverlayManager = Ogre::OverlayManager::getSingletonPtr();
(m_poApplication->getLogManager()) << LogLevel_Debug << " + Creating OverlayManager\n";
......
<?xml version="1.0" ?>
<GUIScheme version="5" name="TaharezLook">
<Imageset filename="TaharezLook-0.8.imageset" />
<Font filename="bluehighway-8-0.8.font" />
<Font filename="bluehighway-10-0.8.font" />
<Font filename="bluehighway-12-0.8.font" />
<Font filename="bluehighway-24-0.8.font" />
<LookNFeel filename="TaharezLook-0.8.looknfeel" />
<WindowRendererSet filename="CEGUICoreWindowRendererSet" />
<FalagardMapping windowType="TaharezLook/Button" targetType="CEGUI/PushButton" renderer="Core/Button" lookNFeel="TaharezLook/Button" />
<FalagardMapping windowType="TaharezLook/Checkbox" targetType="CEGUI/Checkbox" renderer="Core/ToggleButton" lookNFeel="TaharezLook/Checkbox" />
<FalagardMapping windowType="TaharezLook/ImageButton" targetType="CEGUI/PushButton" renderer="Core/Button" lookNFeel="TaharezLook/ImageButton" />
<FalagardMapping windowType="TaharezLook/RadioButton" targetType="CEGUI/RadioButton" renderer="Core/ToggleButton" lookNFeel="TaharezLook/RadioButton" />
<FalagardMapping windowType="TaharezLook/FrameWindow" targetType="CEGUI/FrameWindow" renderer="Core/FrameWindow" lookNFeel="TaharezLook/FrameWindow" />
<FalagardMapping windowType="TaharezLook/Titlebar" targetType="CEGUI/Titlebar" renderer="Core/Titlebar" lookNFeel="TaharezLook/Titlebar" />
<FalagardMapping windowType="TaharezLook/SystemButton" targetType="CEGUI/PushButton" renderer="Core/Button" lookNFeel="TaharezLook/Button" />
<FalagardMapping windowType="TaharezLook/Editbox" targetType="CEGUI/Editbox" renderer="Core/Editbox" lookNFeel="TaharezLook/Editbox" />
<FalagardMapping windowType="TaharezLook/MultiLineEditbox" targetType="CEGUI/MultiLineEditbox" renderer="Core/MultiLineEditbox" lookNFeel="TaharezLook/MultiLineEditbox" />
<FalagardMapping windowType="TaharezLook/Menubar" targetType="CEGUI/Menubar" renderer="Core/Menubar" lookNFeel="TaharezLook/Menubar" />
<FalagardMapping windowType="TaharezLook/PopupMenu" targetType="CEGUI/PopupMenu" renderer="Core/PopupMenu" lookNFeel="TaharezLook/PopupMenu" />
<FalagardMapping windowType="TaharezLook/MenuItem" targetType="CEGUI/MenuItem" renderer="Core/MenuItem" lookNFeel="TaharezLook/MenuItem" />
<FalagardMapping windowType="TaharezLook/AlternateProgressBar" targetType="CEGUI/ProgressBar" renderer="Core/ProgressBar" lookNFeel="TaharezLook/AltProgressBar" />
<FalagardMapping windowType="TaharezLook/ProgressBar" targetType="CEGUI/ProgressBar" renderer="Core/ProgressBar" lookNFeel="TaharezLook/ProgressBar" />
<FalagardMapping windowType="TaharezLook/VUMeter" targetType="CEGUI/ProgressBar" renderer="Core/ProgressBar" lookNFeel="TaharezLook/VUMeter" />
<FalagardMapping windowType="TaharezLook/VerticalScrollbar" targetType="CEGUI/Scrollbar" renderer="Core/Scrollbar" lookNFeel="TaharezLook/VerticalScrollbar" />
<FalagardMapping windowType="TaharezLook/HorizontalScrollbar" targetType="CEGUI/Scrollbar" renderer="Core/Scrollbar" lookNFeel="TaharezLook/HorizontalScrollbar" />
<FalagardMapping windowType="TaharezLook/VerticalScrollbarThumb" targetType="CEGUI/Thumb" renderer="Core/Button" lookNFeel="TaharezLook/VerticalScrollbarThumb" />
<FalagardMapping windowType="TaharezLook/HorizontalScrollbarThumb" targetType="CEGUI/Thumb" renderer="Core/Button" lookNFeel="TaharezLook/HorizontalScrollbarThumb" />
<FalagardMapping windowType="TaharezLook/LargeVerticalScrollbar" targetType="CEGUI/Scrollbar" renderer="Core/Scrollbar" lookNFeel="TaharezLook/LargeVerticalScrollbar" />
<FalagardMapping windowType="TaharezLook/LargeVerticalScrollbarThumb" targetType="CEGUI/Thumb" renderer="Core/Button" lookNFeel="TaharezLook/LargeVerticalScrollbarThumb" />
<FalagardMapping windowType="TaharezLook/TabButton" targetType="CEGUI/TabButton" renderer="Core/TabButton" lookNFeel="TaharezLook/TabButton" />
<FalagardMapping windowType="TaharezLook/TabControl" targetType="CEGUI/TabControl" renderer="Core/TabControl" lookNFeel="TaharezLook/TabControl" />
<FalagardMapping windowType="TaharezLook/TabContentPane" targetType="DefaultWindow" renderer="Core/Default" lookNFeel="TaharezLook/TabContentPane" />
<FalagardMapping windowType="TaharezLook/TabButtonPane" targetType="DefaultWindow" renderer="Core/Default" lookNFeel="TaharezLook/TabButtonPane" />
<FalagardMapping windowType="TaharezLook/ComboDropList" targetType="CEGUI/ComboDropList" renderer="Core/Listbox" lookNFeel="TaharezLook/ComboDropList" />
<FalagardMapping windowType="TaharezLook/ComboEditbox" targetType="CEGUI/Editbox" renderer="Core/Editbox" lookNFeel="TaharezLook/ComboEditbox" />
<FalagardMapping windowType="TaharezLook/Combobox" targetType="CEGUI/Combobox" renderer="Core/Default" lookNFeel="TaharezLook/Combobox" />
<FalagardMapping windowType="TaharezLook/Listbox" targetType="CEGUI/Listbox" renderer="Core/Listbox" lookNFeel="TaharezLook/Listbox" />
<FalagardMapping windowType="TaharezLook/ListHeader" targetType="CEGUI/ListHeader" renderer="Core/ListHeader" lookNFeel="TaharezLook/ListHeader" />
<FalagardMapping windowType="TaharezLook/ListHeaderSegment" targetType="CEGUI/ListHeaderSegment" renderer="Core/ListHeaderSegment" lookNFeel="TaharezLook/ListHeaderSegment" />
<FalagardMapping windowType="TaharezLook/MultiColumnList" targetType="CEGUI/MultiColumnList" renderer="Core/MultiColumnList" lookNFeel="TaharezLook/MultiColumnList" />
<FalagardMapping windowType="TaharezLook/Slider" targetType="CEGUI/Slider" renderer="Core/Slider" lookNFeel="TaharezLook/Slider" />
<FalagardMapping windowType="TaharezLook/SliderThumb" targetType="CEGUI/Thumb" renderer="Core/Button" lookNFeel="TaharezLook/SliderThumb" />
<FalagardMapping windowType="TaharezLook/ScrollablePane" targetType="CEGUI/ScrollablePane" renderer="Core/ScrollablePane" lookNFeel="TaharezLook/ScrollablePane" />
<FalagardMapping windowType="TaharezLook/Spinner" targetType="CEGUI/Spinner" renderer="Core/Default" lookNFeel="TaharezLook/Spinner" />
<FalagardMapping windowType="TaharezLook/Tooltip" targetType="CEGUI/Tooltip" renderer="Core/Tooltip" lookNFeel="TaharezLook/Tooltip" />
<FalagardMapping windowType="TaharezLook/StaticImage" targetType="DefaultWindow" renderer="Core/StaticImage" lookNFeel="TaharezLook/StaticImage" />
<FalagardMapping windowType="TaharezLook/StaticText" targetType="DefaultWindow" renderer="Core/StaticText" lookNFeel="TaharezLook/StaticText" />
<FalagardMapping windowType="TaharezLook/ItemListbox" targetType="CEGUI/ItemListbox" renderer="Core/ItemListbox" lookNFeel="TaharezLook/ItemListbox" />
<FalagardMapping windowType="TaharezLook/ListboxItem" targetType="CEGUI/ItemEntry" renderer="Core/ItemEntry" lookNFeel="TaharezLook/ListboxItem" />
<FalagardMapping windowType="TaharezLook/GroupBox" targetType="CEGUI/GroupBox" renderer="Core/Default" lookNFeel="TaharezLook/GroupBox" />
<FalagardMapping windowType="TaharezLook/Tree" targetType="CEGUI/Tree" renderer="Core/Tree" lookNFeel="TaharezLook/Tree" />
</GUIScheme>
<?xml version="1.0" ?>
<Font version="3" name="BlueHighway-10" filename="bluehigh.ttf" type="FreeType" size="10" nativeHorzRes="1024" nativeVertRes="768" autoScaled="false" antiAlias="true" />
<?xml version="1.0" ?>
<Font version="3" name="BlueHighway-12" filename="bluehigh.ttf" type="FreeType" size="12" nativeHorzRes="800" nativeVertRes="600" autoScaled="true"/>
<?xml version="1.0" ?>
<Font version="3" name="BlueHighway-24" filename="bluehigh.ttf" type="FreeType" size="24" nativeHorzRes="800" nativeVertRes="600" autoScaled="true"/>
<?xml version="1.0" ?>
<Font version="3" name="BlueHighway-8" filename="bluehigh.ttf" type="FreeType" size="8" nativeHorzRes="1024" nativeVertRes="768" autoScaled="true" antiAlias="true" />
......@@ -32,7 +32,7 @@ static const float g_fOffset = 2.0f;
#define _strcmpi strcasecmp
#endif
#if !( (CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR > 7) )
#if !( (CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR >= 8) )
namespace CEGUI
{
typedef CEGUI::UVector2 USize;
......@@ -145,57 +145,61 @@ void CSpaceshipBCI::loadGUI()
CEGUI::Window * l_poMove = m_poGUIWindowManager->createWindow("TaharezLook/StaticImage", "Move");
l_poMove->setPosition(CEGUI::UVector2(cegui_reldim(0.35f), cegui_reldim(0.8f)) );
l_poMove->setSize(CEGUI::USize(CEGUI::UDim(0.3f, 0.f), CEGUI::UDim(0.2f, 0.f)));
#if (CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR > 7)
#if (CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR >= 8)
m_poSheet->addChild(l_poMove);
CEGUI::ImageManager::getSingleton().addFromImageFile("ImageMove",l_sMoveImage);
l_poMove->setProperty("Image", "ImageMove");
#else
m_poSheet->addChildWindow(l_poMove);
CEGUI::ImagesetManager::getSingleton().createFromImageFile("ImageMove", l_sMoveImage);
l_poMove->setProperty("Image", "set:ImageMove image:full_image");
#endif
l_poMove->setProperty("Image","set:ImageMove image:full_image");
l_poMove->setProperty("FrameEnabled","False");
l_poMove->setProperty("BackgroundEnabled","False");
CEGUI::Window * l_poNoMove = m_poGUIWindowManager->createWindow("TaharezLook/StaticImage", "NoMove");
l_poNoMove->setPosition(CEGUI::UVector2(cegui_reldim(0.35f), cegui_reldim(0.8f)) );
l_poNoMove->setSize(CEGUI::USize(CEGUI::UDim(0.3f, 0.f), CEGUI::UDim(0.2f, 0.f)));
#if (CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR > 7)
#if (CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR >= 8)
m_poSheet->addChild(l_poNoMove);
CEGUI::ImageManager::getSingleton().addFromImageFile("ImageNoMove",l_sStopImage);
l_poNoMove->setProperty("Image","ImageNoMove");
#else
m_poSheet->addChildWindow(l_poNoMove);
CEGUI::ImagesetManager::getSingleton().createFromImageFile("ImageNoMove", l_sStopImage);
l_poNoMove->setProperty("Image", "set:ImageNoMove image:full_image");
#endif
l_poNoMove->setProperty("Image","set:ImageNoMove image:full_image");
l_poNoMove->setProperty("FrameEnabled","False");
l_poNoMove->setProperty("BackgroundEnabled","False");
CEGUI::Window * l_poCalibration = m_poGUIWindowManager->createWindow("TaharezLook/StaticImage", "Calibration");
l_poCalibration->setPosition(CEGUI::UVector2(cegui_reldim(0.35f), cegui_reldim(0.8f)) );
l_poCalibration->setSize(CEGUI::USize(CEGUI::UDim(0.3f, 0.f), CEGUI::UDim(0.2f, 0.f)));
#if (CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR > 7)
#if (CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR >= 8)
m_poSheet->addChild(l_poCalibration);
CEGUI::ImageManager::getSingleton().addFromImageFile("ImageCalibration",l_sInitImage);
l_poCalibration->setProperty("Image","ImageCalibration");
#else
m_poSheet->addChildWindow(l_poCalibration);
CEGUI::ImagesetManager::getSingleton().createFromImageFile("ImageCalibration", l_sInitImage);
l_poCalibration->setProperty("Image", "set:ImageCalibration image:full_image");
#endif
l_poCalibration->setProperty("Image","set:ImageCalibration image:full_image");
l_poCalibration->setProperty("FrameEnabled","False");
l_poCalibration->setProperty("BackgroundEnabled","False");
CEGUI::Window * l_poStatsImage = m_poGUIWindowManager->createWindow("TaharezLook/StaticImage", "StatsImage");
l_poStatsImage->setPosition(CEGUI::UVector2(cegui_reldim(0.25f), cegui_reldim(0.2f)) );
l_poStatsImage->setSize(CEGUI::USize(CEGUI::UDim(0.5f, 0.f), CEGUI::UDim(0.2f, 0.f)));
#if (CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR > 7)
#if (CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR >= 8)
m_poSheet->addChild(l_poStatsImage);
CEGUI::ImageManager::getSingleton().addFromImageFile("ImageStatistics",l_sEndImage);
l_poStatsImage->setProperty("Image", "ImageStatistics");
#else
m_poSheet->addChildWindow(l_poStatsImage);
CEGUI::ImagesetManager::getSingleton().createFromImageFile("ImageStatistics", l_sEndImage);
l_poStatsImage->setProperty("Image", "set:ImageStatistics image:full_image");
#endif
l_poStatsImage->setProperty("Image","set:ImageStatistics image:full_image");
l_poStatsImage->setProperty("FrameEnabled","False");
l_poStatsImage->setProperty("BackgroundEnabled","False");
l_poStatsImage->setVisible(false);
......@@ -203,21 +207,24 @@ void CSpaceshipBCI::loadGUI()
CEGUI::Window * l_poStatistics = m_poGUIWindowManager->createWindow("TaharezLook/StaticText", "Statistics");
l_poStatistics->setPosition(CEGUI::UVector2(cegui_reldim(0.25f), cegui_reldim(0.35f)) );
l_poStatistics->setSize(CEGUI::USize(CEGUI::UDim(0.5f, 0.f), CEGUI::UDim(0.5f, 0.f)));
#if (CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR > 7)
#if (CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR >= 8)
m_poSheet->addChild(l_poStatistics);
l_poStatistics->setFont("BlueHighway-24");
l_poStatistics->setProperty("HorzFormatting", "WordWrapCentreAligned");
l_poStatistics->setProperty("VertFormatting", "WordWrapCentreAligned");
l_poStatistics->setVisible(false);
#else
m_poSheet->addChildWindow(l_poStatistics);
#endif
l_poStatistics->setFont("BlueHighway-24");
l_poStatistics->setProperty("HorzFormatting","WordWrapCentred");
l_poStatistics->setProperty("VertFormatting","WordWrapCentred");
l_poStatistics->setProperty("HorzFormatting", "WordWrapCentred");
l_poStatistics->setProperty("VertFormatting", "WordWrapCentred");
l_poStatistics->setVisible(false);
#endif
CEGUI::Window * l_poThreshold = m_poGUIWindowManager->createWindow("TaharezLook/StaticText", "Threshold");
l_poThreshold->setPosition(CEGUI::UVector2(cegui_reldim(0.01f), cegui_reldim(0.01f)) );
l_poThreshold->setSize(CEGUI::USize(CEGUI::UDim(0.15f, 0.f), CEGUI::UDim(0.08f, 0.f)));
#if (CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR > 7)
#if (CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR >= 8)
m_poSheet->addChild(l_poThreshold);
#else
m_poSheet->addChildWindow(l_poThreshold);
......@@ -489,8 +496,8 @@ bool CSpaceshipBCI::process(double timeSinceLastProcess)
{
ss << " Merci d'avoir participe !" << "\n------------\n";
ss << "Le vaisseau s'est souleve pendant :\n" << m_dStat_SpaceshipLiftTime << " secondes.\n\n";
ss << "Temps moyen par essai :\n" << m_dStat_SpaceshipLiftTime/l_iCount << " secondes.\n\n";
ss << "Le vaisseau s'est souleve pendant :\n" << m_dStat_SpaceshipLiftTime << " secondes.\n";
ss << "Temps moyen par essai :\n" << m_dStat_SpaceshipLiftTime/l_iCount << " secondes.\n";
ss << "------------\n";
ss << "Votre rang : \n";
l_sRang = "- Apprenti -";
......@@ -502,8 +509,8 @@ bool CSpaceshipBCI::process(double timeSinceLastProcess)
{
ss << " Thanks for your participation" << "\n------------\n";
ss << "You lifted the spaceship during :\n" << m_dStat_SpaceshipLiftTime << " seconds.\n\n";
ss << "Mean time per attempt :\n" << m_dStat_SpaceshipLiftTime/l_iCount << " seconds.\n\n";
ss << "You lifted the spaceship during :\n" << m_dStat_SpaceshipLiftTime << " seconds.\n";
ss << "Mean time per attempt :\n" << m_dStat_SpaceshipLiftTime/l_iCount << " seconds.\n";
ss << "------------\n";
ss << "Rank : \n";
l_sRang = "- Apprentice -";
......
......@@ -269,18 +269,15 @@ bool COgreVRApplication::initCEGUI(const char *logFilename)
m_rGUIRenderer = &(CEGUI::OgreRenderer::bootstrapSystem(*m_poWindow));
#if (CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR > 7)
CEGUI::SchemeManager::getSingleton().createFromFile((CEGUI::utf8*)"TaharezLook-ov.scheme");
#if (CEGUI_VERSION_MAJOR > 0) || (CEGUI_VERSION_MINOR >= 8)
CEGUI::SchemeManager::getSingleton().createFromFile((CEGUI::utf8*)"TaharezLook-ov-0.8.scheme");