[Orxonox-commit 2212] r6928 - in code/branches/presentation3: . data/defaultConfig data/gui/layouts data/gui/schemes data/gui/scripts src/libraries/network src/libraries/network/packet src/orxonox src/orxonox/graphics
scheusso at orxonox.net
scheusso at orxonox.net
Thu May 20 11:33:07 CEST 2010
Author: scheusso
Date: 2010-05-20 11:33:07 +0200 (Thu, 20 May 2010)
New Revision: 6928
Added:
code/branches/presentation3/data/gui/layouts/ChatBox-inputonly.layout
code/branches/presentation3/data/gui/layouts/ChatBox.layout
code/branches/presentation3/data/gui/scripts/ChatBox-inputonly.lua
code/branches/presentation3/data/gui/scripts/ChatBox.lua
code/branches/presentation3/src/orxonox/ChatHistory.cc
code/branches/presentation3/src/orxonox/ChatHistory.h
code/branches/presentation3/src/orxonox/ChatInputHandler.cc
code/branches/presentation3/src/orxonox/ChatInputHandler.h
code/branches/presentation3/src/orxonox/graphics/CEGuiSample.cc
code/branches/presentation3/src/orxonox/graphics/CEGuiSample.h
Modified:
code/branches/presentation3/
code/branches/presentation3/data/defaultConfig/keybindings.ini
code/branches/presentation3/data/gui/schemes/OrxonoxGUIScheme.scheme
code/branches/presentation3/src/libraries/network/ChatListener.cc
code/branches/presentation3/src/libraries/network/ChatListener.h
code/branches/presentation3/src/libraries/network/Host.h
code/branches/presentation3/src/libraries/network/packet/Chat.cc
code/branches/presentation3/src/libraries/network/packet/Chat.h
code/branches/presentation3/src/orxonox/CMakeLists.txt
Log:
mergine chat2 into presentation merger branch
Property changes on: code/branches/presentation3
___________________________________________________________________
Modified: svn:mergeinfo
- /code/branches/buildsystem:1874-2276,2278-2400
/code/branches/buildsystem2:2506-2658
/code/branches/buildsystem3:2662-2708
/code/branches/ceguilua:1802-1808
/code/branches/console:5941-6104
/code/branches/core3:1572-1739
/code/branches/core4:3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5:5768-5928,6009
/code/branches/gamestate:6430-6572,6621-6661
/code/branches/gamestates2:6594-6745
/code/branches/gametypes:2826-3031
/code/branches/gcc43:1580
/code/branches/gui:1635-1723,2795-2894
/code/branches/ingamemenu:6000-6023
/code/branches/input:1629-1636
/code/branches/libraries:5612-5692
/code/branches/libraries2:5703-5737
/code/branches/lod:6586-6911
/code/branches/lodfinal:2372-2411
/code/branches/map:2801-3086,3089
/code/branches/menu:5941-6146,6148
/code/branches/miniprojects:2754-2824
/code/branches/netp2:2835-2988
/code/branches/netp3:2988-3082
/code/branches/netp6:3214-3302
/code/branches/network:2356
/code/branches/network64:2210-2355
/code/branches/objecthierarchy:1911-2085,2100,2110-2169
/code/branches/objecthierarchy2:2171-2479
/code/branches/overlay:2117-2385
/code/branches/particles:2829-3085
/code/branches/particles2:6050-6106,6109
/code/branches/pch:3113-3194
/code/branches/physics:1912-2055,2107-2439
/code/branches/physics_merge:2436-2457
/code/branches/pickup2:5942-6405
/code/branches/pickup3:6418-6523
/code/branches/pickup4:6594-6710
/code/branches/pickups:1926-2086,2127,2827-2915
/code/branches/pickups2:2107-2497,2915-3071
/code/branches/ppspickups1:6552-6708
/code/branches/ppspickups2:6527-6532,6554-6709
/code/branches/presentation:2369-2652,2654-2660
/code/branches/presentation2:6106-6416
/code/branches/questsystem:1894-2088
/code/branches/questsystem2:2107-2259
/code/branches/questsystem5:2776-2905
/code/branches/resource:3327-3366
/code/branches/resource2:3372-5694
/code/branches/script_trigger:1295-1953,1955
/code/branches/sound:2829-3010
/code/branches/sound3:5941-6102
/code/branches/steering:5949-6091
/code/branches/weapon:1925-2094
/code/branches/weapon2:2107-2488
/code/branches/weapons:2897-3051
/code/branches/weaponsystem:2742-2890
+ /code/branches/buildsystem:1874-2276,2278-2400
/code/branches/buildsystem2:2506-2658
/code/branches/buildsystem3:2662-2708
/code/branches/ceguilua:1802-1808
/code/branches/chat:6527-6797
/code/branches/chat2:6836-6910
/code/branches/console:5941-6104
/code/branches/core3:1572-1739
/code/branches/core4:3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5:5768-5928,6009
/code/branches/gamestate:6430-6572,6621-6661
/code/branches/gamestates2:6594-6745
/code/branches/gametypes:2826-3031
/code/branches/gcc43:1580
/code/branches/gui:1635-1723,2795-2894
/code/branches/ingamemenu:6000-6023
/code/branches/input:1629-1636
/code/branches/libraries:5612-5692
/code/branches/libraries2:5703-5737
/code/branches/lod:6586-6911
/code/branches/lodfinal:2372-2411
/code/branches/map:2801-3086,3089
/code/branches/menu:5941-6146,6148
/code/branches/miniprojects:2754-2824
/code/branches/netp2:2835-2988
/code/branches/netp3:2988-3082
/code/branches/netp6:3214-3302
/code/branches/network:2356
/code/branches/network64:2210-2355
/code/branches/objecthierarchy:1911-2085,2100,2110-2169
/code/branches/objecthierarchy2:2171-2479
/code/branches/overlay:2117-2385
/code/branches/particles:2829-3085
/code/branches/particles2:6050-6106,6109
/code/branches/pch:3113-3194
/code/branches/physics:1912-2055,2107-2439
/code/branches/physics_merge:2436-2457
/code/branches/pickup2:5942-6405
/code/branches/pickup3:6418-6523
/code/branches/pickup4:6594-6710
/code/branches/pickups:1926-2086,2127,2827-2915
/code/branches/pickups2:2107-2497,2915-3071
/code/branches/ppspickups1:6552-6708
/code/branches/ppspickups2:6527-6532,6554-6709
/code/branches/presentation:2369-2652,2654-2660
/code/branches/presentation2:6106-6416
/code/branches/questsystem:1894-2088
/code/branches/questsystem2:2107-2259
/code/branches/questsystem5:2776-2905
/code/branches/resource:3327-3366
/code/branches/resource2:3372-5694
/code/branches/script_trigger:1295-1953,1955
/code/branches/sound:2829-3010
/code/branches/sound3:5941-6102
/code/branches/steering:5949-6091
/code/branches/weapon:1925-2094
/code/branches/weapon2:2107-2488
/code/branches/weapons:2897-3051
/code/branches/weaponsystem:2742-2890
Modified: code/branches/presentation3/data/defaultConfig/keybindings.ini
===================================================================
--- code/branches/presentation3/data/defaultConfig/keybindings.ini 2010-05-20 08:28:10 UTC (rev 6927)
+++ code/branches/presentation3/data/defaultConfig/keybindings.ini 2010-05-20 09:33:07 UTC (rev 6928)
@@ -6,7 +6,7 @@
KeyAX=
KeyApostrophe=
KeyApps=
-KeyB=
+KeyB =
KeyBack=
KeyBackslash=
KeyC=switchCamera
Copied: code/branches/presentation3/data/gui/layouts/ChatBox-inputonly.layout (from rev 6910, code/branches/chat2/data/gui/layouts/ChatBox-inputonly.layout)
===================================================================
--- code/branches/presentation3/data/gui/layouts/ChatBox-inputonly.layout (rev 0)
+++ code/branches/presentation3/data/gui/layouts/ChatBox-inputonly.layout 2010-05-20 09:33:07 UTC (rev 6928)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<GUILayout >
+ <Window Type="DefaultWindow" Name="orxonox/ChatBox-inputonly/Root" >
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
+ <Window Type="MenuWidgets/Editbox" Name="orxonox/ChatBox-inputonly/input" >
+ <Property Name="Text" Value="" />
+ <Property Name="Font" Value="Monofur-10" />
+ <Property Name="AlwaysOnTop" Value="True" />
+ <Property Name="MaxTextLength" Value="12981298" />
+ <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.02,0},{0,5},{0.98,0},{0,30}}" />
+ </Window>
+ </Window>
+</GUILayout>
Copied: code/branches/presentation3/data/gui/layouts/ChatBox.layout (from rev 6910, code/branches/chat2/data/gui/layouts/ChatBox.layout)
===================================================================
--- code/branches/presentation3/data/gui/layouts/ChatBox.layout (rev 0)
+++ code/branches/presentation3/data/gui/layouts/ChatBox.layout 2010-05-20 09:33:07 UTC (rev 6928)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<GUILayout >
+ <Window Type="DefaultWindow" Name="orxonox/ChatBox/Root" >
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
+ <Window Type="MenuWidgets/FrameWindow" Name="/ChatBox" >
+ <Property Name="Text" Value="Chat" />
+ <Property Name="InheritsAlpha" Value="False" />
+ <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+ <Property Name="TitlebarEnabled" Value="True" />
+ <!--<Property Name="UnifiedAreaRect" Value="{{0.01,0},{0.03,0},{0.6,0},{0.69375,0}}" />-->
+ <Property Name="UnifiedAreaRect" Value="{{0.35,0},{0.10,0},{0.98,0},{0.65,0}}" />
+ <Window Type="MenuWidgets/Listbox" Name="orxonox/ChatBox/history" >
+ <Property Name="Font" Value="Monofur-10" />
+ <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.02,0},{0.078,0},{0.98,0},{1,-30}}" />
+ </Window>
+ <Window Type="MenuWidgets/Editbox" Name="orxonox/ChatBox/input" >
+ <Property Name="Text" Value="" />
+ <Property Name="Font" Value="Monofur-10" />
+ <Property Name="MaxTextLength" Value="1073741823" />
+ <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
+ <Property Name="UnifiedAreaRect" Value="{{0.02,0},{1,-30},{0.98,0},{1,-5}}" />
+ </Window>
+ </Window>
+ </Window>
+</GUILayout>
Modified: code/branches/presentation3/data/gui/schemes/OrxonoxGUIScheme.scheme
===================================================================
--- code/branches/presentation3/data/gui/schemes/OrxonoxGUIScheme.scheme 2010-05-20 08:28:10 UTC (rev 6927)
+++ code/branches/presentation3/data/gui/schemes/OrxonoxGUIScheme.scheme 2010-05-20 09:33:07 UTC (rev 6928)
@@ -5,4 +5,5 @@
<Font Name="BlueHighway-12" Filename="bluehighway-12.font" />
<Font Name="BlueHighway-10" Filename="bluehighway-10.font" />
<Font Name="BlueHighway-8" Filename="bluehighway-8.font" />
+ <Font Name="Monofur-10" Filename="Monofur-10.font" />
</GUIScheme>
Copied: code/branches/presentation3/data/gui/scripts/ChatBox-inputonly.lua (from rev 6910, code/branches/chat2/data/gui/scripts/ChatBox-inputonly.lua)
===================================================================
--- code/branches/presentation3/data/gui/scripts/ChatBox-inputonly.lua (rev 0)
+++ code/branches/presentation3/data/gui/scripts/ChatBox-inputonly.lua 2010-05-20 09:33:07 UTC (rev 6928)
@@ -0,0 +1,5 @@
+-- ChatBox-inputonly.lua
+
+local P = createMenuSheet("ChatBox-inputonly")
+return P
+
Copied: code/branches/presentation3/data/gui/scripts/ChatBox.lua (from rev 6910, code/branches/chat2/data/gui/scripts/ChatBox.lua)
===================================================================
--- code/branches/presentation3/data/gui/scripts/ChatBox.lua (rev 0)
+++ code/branches/presentation3/data/gui/scripts/ChatBox.lua 2010-05-20 09:33:07 UTC (rev 6928)
@@ -0,0 +1,5 @@
+-- ChatBox.lua
+
+local P = createMenuSheet("ChatBox")
+return P
+
Modified: code/branches/presentation3/src/libraries/network/ChatListener.cc
===================================================================
--- code/branches/presentation3/src/libraries/network/ChatListener.cc 2010-05-20 08:28:10 UTC (rev 6927)
+++ code/branches/presentation3/src/libraries/network/ChatListener.cc 2010-05-20 09:33:07 UTC (rev 6928)
@@ -35,6 +35,16 @@
{
RegisterRootObject(ChatListener);
}
+
+ //void ChatListener::incomingChat( const std::string& message,
+ //unsigned int senderID )
+ //{
+ //COUT(0) << "Chat: \"" << message << "\"\n";
+
+
+ //}
+
+
}
Modified: code/branches/presentation3/src/libraries/network/ChatListener.h
===================================================================
--- code/branches/presentation3/src/libraries/network/ChatListener.h 2010-05-20 08:28:10 UTC (rev 6927)
+++ code/branches/presentation3/src/libraries/network/ChatListener.h 2010-05-20 09:33:07 UTC (rev 6928)
@@ -37,9 +37,11 @@
class _NetworkExport ChatListener : virtual public OrxonoxClass
{
public:
+ /* constructor, destructor */
ChatListener();
virtual ~ChatListener() {}
+ /* What to do with incoming chat */
virtual void incomingChat(const std::string& message, unsigned int senderID) = 0;
};
}
Modified: code/branches/presentation3/src/libraries/network/Host.h
===================================================================
--- code/branches/presentation3/src/libraries/network/Host.h 2010-05-20 08:28:10 UTC (rev 6927)
+++ code/branches/presentation3/src/libraries/network/Host.h 2010-05-20 09:33:07 UTC (rev 6928)
@@ -48,7 +48,7 @@
*/
class _NetworkExport Host{
private:
- //TODO add theese functions or adequate
+ //TODO add these functions or adequate
//virtual bool processChat(packet::Chat *message, unsigned int clientID)=0;
//virtual bool sendChat(packet::Chat *chat)=0;
virtual bool queuePacket(ENetPacket *packet, int clientID)=0;
Modified: code/branches/presentation3/src/libraries/network/packet/Chat.cc
===================================================================
--- code/branches/presentation3/src/libraries/network/packet/Chat.cc 2010-05-20 08:28:10 UTC (rev 6927)
+++ code/branches/presentation3/src/libraries/network/packet/Chat.cc 2010-05-20 09:33:07 UTC (rev 6928)
@@ -36,6 +36,8 @@
namespace packet {
#define PACKET_FLAGS_CHAT PacketFlag::Reliable
+
+/* Some lengths */
#define _PACKETID 0
const int _PLAYERID = _PACKETID + sizeof(Type::Value);
#define _MESSAGELENGTH _PLAYERID + sizeof(uint32_t)
@@ -44,12 +46,22 @@
Chat::Chat( const std::string& message, unsigned int playerID )
: Packet()
{
+ /* Add chat flag to packet flags */
flags_ = flags_ | PACKET_FLAGS_CHAT;
+
+ /* set message length to length of input string + 1 */
messageLength_ = message.length()+1;
+
+ /* allocate memory for the data */
data_=new unsigned char[ getSize() ];
+
*(Type::Value *)(data_ + _PACKETID ) = Type::Chat;
*(unsigned int *)(data_ + _PLAYERID ) = playerID;
*(unsigned int *)(data_ + _MESSAGELENGTH ) = messageLength_;
+
+ /* cast the hell out of the message string, and copy it into the
+ * data buffer.
+ */
memcpy( data_+_MESSAGE, static_cast<void*>(const_cast<char*>(message.c_str())), messageLength_ );
}
Modified: code/branches/presentation3/src/libraries/network/packet/Chat.h
===================================================================
--- code/branches/presentation3/src/libraries/network/packet/Chat.h 2010-05-20 08:28:10 UTC (rev 6927)
+++ code/branches/presentation3/src/libraries/network/packet/Chat.h 2010-05-20 09:33:07 UTC (rev 6928)
@@ -40,17 +40,31 @@
class _NetworkExport Chat : public Packet
{
public:
+ /* constructors */
Chat( const std::string& message, unsigned int playerID );
Chat( uint8_t* data, unsigned int clientID );
+
+ /* destructor */
~Chat();
+ /* get size of packet */
inline unsigned int getSize() const;
+
+ /* process chat message packet and remove it afterwards */
bool process();
+ /* Get the length of the message (not the full size of the packet) */
unsigned int getMessageLength(){ return messageLength_; };
+
+ /* return message content */
unsigned char *getMessage();
+
private:
+
+ /* Message length */
uint32_t messageLength_;
+
+ /* Client ID (an integral value for identification) */
unsigned int clientID_;
};
Modified: code/branches/presentation3/src/orxonox/CMakeLists.txt
===================================================================
--- code/branches/presentation3/src/orxonox/CMakeLists.txt 2010-05-20 08:28:10 UTC (rev 6927)
+++ code/branches/presentation3/src/orxonox/CMakeLists.txt 2010-05-20 09:33:07 UTC (rev 6928)
@@ -31,6 +31,8 @@
PawnManager.cc
PlayerManager.cc
Radar.cc
+ ChatHistory.cc
+ ChatInputHandler.cc
COMPILATION_BEGIN SceneCompilation.cc
CameraManager.cc
Scene.cc
Copied: code/branches/presentation3/src/orxonox/ChatHistory.cc (from rev 6910, code/branches/chat2/src/orxonox/ChatHistory.cc)
===================================================================
--- code/branches/presentation3/src/orxonox/ChatHistory.cc (rev 0)
+++ code/branches/presentation3/src/orxonox/ChatHistory.cc 2010-05-20 09:33:07 UTC (rev 6928)
@@ -0,0 +1,195 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Sandro 'smerkli' Merkli
+ * Co-authors:
+ * ...
+ *
+ */
+
+#include "ChatHistory.h"
+#include <core/ScopedSingletonManager.h>
+
+#ifndef CHATTEST
+namespace orxonox
+{
+ /* singleton */
+ ManageScopedSingleton( ChatHistory, ScopeID::Root, false );
+#endif
+
+ /* constructor */
+#ifndef CHATTEST
+ //ChatHistory::ChatHistory( BaseObject* creator ) : BaseObject(creator)
+ ChatHistory::ChatHistory()
+#else
+ ChatHistory::ChatHistory()
+#endif
+ {
+ /* register the object */
+#ifndef CHATTEST
+ RegisterObject(ChatHistory);
+#endif
+
+ this->hist_log_enabled = true;
+
+ /* Read setting for logfiles */
+ if( hist_log_enabled ) /* NOTE Make this a check for the logfile setting */
+ { this->chat_hist_openlog();
+
+ /* push starting line */
+ this->chat_hist_logline( "--- Logfile opened ---" );
+ }
+
+ /* Read setting for maximum number of lines and set limit */
+ this->hist_maxlines = 200; /* NOTE to be changed, 200 is just for testing */
+ }
+
+ /* destructor */
+ ChatHistory::~ChatHistory()
+ {
+ chat_hist_closelog();
+
+ /* clear list */
+ this->hist_buffer.clear();
+ }
+
+ /* react to incoming chat */
+ void ChatHistory::incomingChat(const std::string& message,
+ unsigned int senderID)
+ {
+ /* --> a) look up the actual name of the sender */
+ std::string text;
+
+#ifndef CHATTEST
+ /* get sender ID and prepend it to the message */
+ if (senderID != CLIENTID_UNKNOWN)
+ {
+ /* if we can't find anything, use "unknown" as default */
+ std::string name = "unknown";
+
+ PlayerInfo* player = PlayerManager::getInstance().getClient(senderID);
+ if (player)
+ name = player->getName();
+
+ text = name + ": " + message;
+ }
+ else
+ text = message;
+#else
+ text = message;
+#endif
+
+ /* add the line to the history */
+ this->chat_hist_addline( text );
+
+ /* add the line to the log */
+ this->chat_hist_logline( text );
+ }
+
+ /* Synchronize logfile onto the hard drive */ /* MARK MARK */
+ int ChatHistory::syncLog()
+ {
+ //if( this->hist_logfile )
+ //this->hist_logfile.sync();
+ return 0;
+ }
+
+ /* add a line to this history */
+ int ChatHistory::chat_hist_addline( const std::string& toadd )
+ {
+ /* crop history at the end if it's too large */
+ while( this->hist_buffer.size() > this->hist_maxlines+1 )
+ this->hist_buffer.pop_front();
+
+ /* push to the front of the history */
+ this->hist_buffer.push_back( toadd );
+ return 0;
+ }
+
+ /* log a line to a logfile */
+ int ChatHistory::chat_hist_logline( const std::string& toadd )
+ {
+ /* output the line to the file if logging is enabled */
+ if( this->hist_log_enabled )
+ this->hist_logfile << toadd << std::endl;
+ return 0;
+ }
+
+ /* open logfile */
+ int ChatHistory::chat_hist_openlog()
+ {
+ /* TODO: find out the name of the file to log to via settings
+ * and set the this->hist_logfile_path variable to it
+ */
+#ifndef CHATTEST
+ this->hist_logfile.open( (PathConfig::getInstance().getLogPathString() +
+ "chatlog.log").c_str(),
+ std::fstream::out | std::fstream::app );
+#else
+ this->hist_logfile.open( "/tmp/chatlog.log",
+ std::fstream::out | std::fstream::app );
+#endif
+
+ /* TODO check whether this works (not sure how you'd like it?) */
+ if( !this->hist_logfile )
+ { this->hist_log_enabled = false;
+#ifndef CHATTEST
+ COUT(2) << "Warning: Could not open logfile." << std::endl;
+#endif
+ }
+
+ /* if it worked */
+ return 0;
+ }
+
+ /* close logfile */
+ void ChatHistory::chat_hist_closelog()
+ {
+ /* see if we've actually got a logfile */
+ if( this->hist_logfile )
+ {
+ /* yes, we've got one, add a line that shows we're closing it */
+ this->chat_hist_logline( "--- Logfile closed ---" );
+
+ /* actually close down the file */
+ this->hist_logfile.close();
+ }
+ }
+
+ /* output history for debugging */
+ void ChatHistory::debug_printhist()
+ {
+ /* create deque iterator */
+ std::deque<std::string>::iterator it;
+
+ /* output all the strings */
+ for( it = this->hist_buffer.begin(); it != this->hist_buffer.end();
+ ++it )
+ std::cout << *it << std::endl;
+
+ /* output size */
+ std::cout << "Size: " << hist_buffer.size() << std::endl;
+ }
+
+#ifndef CHATTEST
+}
+#endif
Copied: code/branches/presentation3/src/orxonox/ChatHistory.h (from rev 6910, code/branches/chat2/src/orxonox/ChatHistory.h)
===================================================================
--- code/branches/presentation3/src/orxonox/ChatHistory.h (rev 0)
+++ code/branches/presentation3/src/orxonox/ChatHistory.h 2010-05-20 09:33:07 UTC (rev 6928)
@@ -0,0 +1,149 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Sandro 'smerkli' Merkli
+ * Co-authors:
+ * ...
+ *
+ */
+
+#include <deque>
+#include <string>
+#include <fstream>
+#include <iostream>
+#include <cassert>
+
+/* define this if you're unit testing */
+//#define CHATTEST
+
+#ifndef CHATTEST
+#include <OrxonoxPrereqs.h>
+#include <PlayerManager.h>
+#include <infos/PlayerInfo.h>
+#include <core/BaseObject.h>
+#include <network/ChatListener.h>
+#include <core/PathConfig.h>
+#include <util/Singleton.h>
+#endif
+
+#ifndef _ChatHistory_H__
+#define _ChatHistory_H__
+
+
+/* Class to implement chat history */
+#ifndef CHATTEST
+namespace orxonox
+{
+#endif
+
+ /* constructor */
+#ifndef CHATTEST
+ class _OrxonoxExport ChatHistory : public ChatListener,
+ public Singleton<ChatHistory>
+
+#else
+ class ChatHistory
+#endif
+ {
+ public:
+ /* constructors, destructors */
+#ifndef CHATTEST
+ ChatHistory();
+ friend class Singleton<ChatHistory>;
+#else
+ ChatHistory();
+#endif
+ virtual ~ChatHistory();
+
+
+ //protected:
+ /** what to do with incoming chat
+ *
+ * \param message The incoming message
+ * \param senderID Identification number of the sender
+ */
+ virtual void incomingChat(const std::string& message,
+ unsigned int senderID);
+
+ /** Synchronize logfile onto the hard drive
+ *
+ * \return 0 for success, other for error
+ */
+ int syncLog();
+
+ /** debug-print: output the whole history to stdout */
+ void debug_printhist();
+
+ private:
+ /* FIELDS */
+ /** Vector to store the history in */
+ std::deque<std::string> hist_buffer;
+
+ /** Maximum number of lines stored in this history */
+ unsigned int hist_maxlines;
+
+ /** is logging enabled? */
+ bool hist_log_enabled;
+
+ /** path of logfile on the file system */
+ std::string hist_logfile_path;
+
+ /** Output file stream for logfile */
+ std::ofstream hist_logfile;
+
+#ifndef CHATTEST
+ static ChatHistory* singletonPtr_s;
+#endif
+
+
+
+ /* METHODS */
+ /** Append line to chat history
+ *
+ * \param toadd The line to add to the history
+ * \return 0 for success, other for error TODO: Throw exception
+ */
+ int chat_hist_addline( const std::string& toadd );
+
+ /** Append line to logfile
+ *
+ * \param toadd The line to add to the logfile
+ * \return 0 for success, other for error TODO: Throw exception
+ */
+ int chat_hist_logline( const std::string& toadd );
+
+ /** open logfile to log to
+ *
+ * \return 0 for success,s other for error
+ */
+ int chat_hist_openlog();
+
+
+ /** close logfile */
+ void chat_hist_closelog();
+ };
+
+#ifndef CHATTEST
+}
+#endif
+
+#endif /* _ChatHistory_H__ */
Copied: code/branches/presentation3/src/orxonox/ChatInputHandler.cc (from rev 6910, code/branches/chat2/src/orxonox/ChatInputHandler.cc)
===================================================================
--- code/branches/presentation3/src/orxonox/ChatInputHandler.cc (rev 0)
+++ code/branches/presentation3/src/orxonox/ChatInputHandler.cc 2010-05-20 09:33:07 UTC (rev 6928)
@@ -0,0 +1,287 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Sandro 'smerkli' Merkli
+ * Co-authors:
+ * ...
+ *
+ */
+
+#include "ChatInputHandler.h"
+#include <core/ScopedSingletonManager.h>
+#include "core/ConsoleCommand.h"
+#include "core/CoreIncludes.h"
+#include "core/GUIManager.h"
+#include "core/CorePrereqs.h"
+#include <CEGUIWindow.h>
+#include <CEGUI/elements/CEGUIListbox.h>
+#include <CEGUI/elements/CEGUIListboxItem.h>
+#include <CEGUI/elements/CEGUIListboxTextItem.h>
+#include <CEGUIWindowManager.h>
+#include <string>
+
+namespace orxonox
+{
+ /* singleton */
+ ManageScopedSingleton( ChatInputHandler, ScopeID::Graphics, false );
+
+ /* add commands to console */
+ SetConsoleCommandAlias( ChatInputHandler, activate_static, "startchat",
+ true );
+ SetConsoleCommandAlias( ChatInputHandler, activate_small_static,
+ "startchat_small", true );
+
+ /* constructor */
+ ChatInputHandler::ChatInputHandler()
+ {
+ /* register the object */
+ RegisterObject(ChatInputHandler);
+
+ /* create necessary objects */
+ this->inpbuf = new InputBuffer();
+ this->disp_offset = 0;
+ assert( this->inpbuf != NULL );
+
+ /* generate chatbox ui and chatbox-inputonly ui */
+ GUIManager::getInstance().loadGUI( "ChatBox" );
+ GUIManager::getInstance().loadGUI( "ChatBox-inputonly" );
+
+ /* configure the input buffer */
+ configureInputBuffer();
+
+ this->inputState = InputManager::getInstance().createInputState( "chatinput", false, false, InputStatePriority::Dynamic );
+ this->inputState->setKeyHandler(this->inpbuf);
+ }
+
+ void ChatInputHandler::configureInputBuffer()
+ {
+ /* INSTALL CALLBACKS */
+ /* input has changed */
+ this->inpbuf->registerListener(this, &ChatInputHandler::inputChanged, true);
+
+ /* add a line */
+ this->inpbuf->registerListener(this, &ChatInputHandler::addline, '\r', false);
+ this->inpbuf->registerListener(this, &ChatInputHandler::addline, '\n', false);
+
+ /* backspace */
+ this->inpbuf->registerListener(this, &ChatInputHandler::backspace, '\b', true);
+ //this->inpbuf->registerListener(this, &ChatInputHandler::backspace, '\177', true);
+
+ /* exit the chatinputhandler thingy (tbd) */
+ this->inpbuf->registerListener(this, &ChatInputHandler::exit, '\033', true); // escape
+
+ /* delete character */
+ this->inpbuf->registerListener(this, &ChatInputHandler::deleteChar, KeyCode::Delete);
+
+ /* cursor movement */
+ this->inpbuf->registerListener(this, &ChatInputHandler::cursorRight, KeyCode::Right);
+ this->inpbuf->registerListener(this, &ChatInputHandler::cursorLeft, KeyCode::Left);
+ this->inpbuf->registerListener(this, &ChatInputHandler::cursorEnd, KeyCode::End);
+ this->inpbuf->registerListener(this, &ChatInputHandler::cursorHome, KeyCode::Home);
+
+ /* GET WINDOW POINTERS */
+ input = CEGUI::WindowManager::getSingleton().getWindow( "orxonox/ChatBox/input" );
+ inputonly = CEGUI::WindowManager::getSingleton().getWindow( "orxonox/ChatBox-inputonly/input" );
+
+ /* get pointer to the history window */
+ CEGUI::Window *history = CEGUI::WindowManager::getSingleton().getWindow( "orxonox/ChatBox/history" );
+
+ /* cast it to a listbox */
+ lb_history = dynamic_cast<CEGUI::Listbox*>(history);
+
+ /* assert wee */
+ assert( lb_history );
+ }
+
+
+ /* activate, deactivate */
+ void ChatInputHandler::activate_static()
+ { ChatInputHandler::getInstance().activate( true ); }
+
+ void ChatInputHandler::activate_small_static()
+ { ChatInputHandler::getInstance().activate( false ); }
+
+
+
+
+ void ChatInputHandler::activate( bool full )
+ {
+ /* start listening */
+ //COUT(0) << "chatinput activated." << std::endl;
+ InputManager::getInstance().enterState("chatinput");
+
+ /* MARK add spawning of chat widget stuff here.*/
+ if( full )
+ GUIManager::getInstance().showGUI( "ChatBox" );
+ else
+ GUIManager::getInstance().showGUI( "ChatBox-inputonly" );
+
+ this->fullchat = full;
+ }
+
+ void ChatInputHandler::deactivate()
+ {
+ /* stop listening */
+ InputManager::getInstance().leaveState("chatinput");
+
+ /* un-spawning of chat widget stuff */
+ GUIManager::getInstance().hideGUI( "ChatBox" );
+ GUIManager::getInstance().hideGUI( "ChatBox-inputonly" );
+ }
+
+
+ void ChatInputHandler::incomingChat(const std::string& message,
+ unsigned int senderID)
+ {
+ /* --> a) look up the actual name of the sender */
+ std::string text;
+
+ if (senderID != CLIENTID_UNKNOWN)
+ {
+ std::string name = "unknown";
+ PlayerInfo* player = PlayerManager::getInstance().getClient(senderID);
+ if (player)
+ name = player->getName();
+
+ text = name + ": " + message;
+ }
+ else
+ text = message;
+
+ /* e) create item and add to history */
+ CEGUI::ListboxTextItem *toadd = new CEGUI::ListboxTextItem( text );
+ this->lb_history->addItem( dynamic_cast<CEGUI::ListboxItem*>(toadd) );
+ this->lb_history->ensureItemIsVisible( dynamic_cast<CEGUI::ListboxItem*>(toadd) );
+
+ /* f) make sure the history handles it */
+ this->lb_history->handleUpdatedItemData();
+ }
+
+
+ void ChatInputHandler::sub_adjust_dispoffset( int maxlen,
+ int cursorpos,
+ int inplen )
+ {
+ /* already start offsetting 5 characters before end */
+ if( cursorpos+5 > maxlen )
+ {
+ /* always stay 5 characters ahead of end, looks better */
+ ((disp_offset = cursorpos-maxlen+5) >= 0) ? 1 : disp_offset = 0;
+
+ /* enforce visibility of cursor */
+ (disp_offset > cursorpos ) ? disp_offset = 0 : 1;
+ }
+
+ /* make sure we don't die at substr */
+ if( inplen <= disp_offset ) disp_offset = 0;
+ }
+
+ /* callbacks for InputBuffer */
+ void ChatInputHandler::inputChanged()
+ {
+ /* update the cursor and the window */
+ std::string raw = this->inpbuf->get();
+ int cursorpos = this->inpbuf->getCursorPosition();
+
+ /* get string before cursor */
+ std::string left = raw.substr( 0, cursorpos );
+
+ /* see if there's a string after the cursor */
+ std::string right = "";
+ if( raw.length() >= left.length()+1 )
+ right = raw.substr( cursorpos );
+
+ /* set the text */
+ std::string assembled = "$ " + left + "|" + right;
+
+ if( this->fullchat )
+ {
+ /* adjust curser position - magic number 5 for font width */
+ sub_adjust_dispoffset( (this->input->getUnclippedInnerRect().getWidth()/6),
+ cursorpos, assembled.length() );
+ this->input->setProperty( "Text", assembled.substr( disp_offset ) );
+ }
+ else
+ {
+ /* adjust curser position - magic number 5 for font width */
+ sub_adjust_dispoffset( (this->inputonly->getUnclippedInnerRect().getWidth()/6),
+ cursorpos, assembled.length() );
+ this->inputonly->setProperty( "Text", assembled.substr( disp_offset) );
+ }
+
+ /* reset display offset */
+ disp_offset = 0;
+ }
+
+ void ChatInputHandler::addline()
+ {
+ /* actually do send what was input */
+ /* a) get the string out of the inputbuffer */
+ std::string msgtosend = this->inpbuf->get();
+
+ if( msgtosend.length() == 0 )
+ { this->deactivate();
+ return;
+ }
+
+ /* b) clear the input buffer */
+ if (this->inpbuf->getSize() > 0)
+ this->inpbuf->clear();
+
+ /* c) send the chat via some call */
+ Host::Chat( msgtosend );
+
+ /* d) stop listening to input - only if this is not fullchat */
+ if( !this->fullchat )
+ this->deactivate();
+
+ }
+
+ void ChatInputHandler::backspace()
+ { this->inpbuf->removeBehindCursor(); }
+
+ void ChatInputHandler::deleteChar()
+ { this->inpbuf->removeAtCursor(); }
+
+ void ChatInputHandler::cursorRight()
+ { this->inpbuf->increaseCursor(); }
+
+ void ChatInputHandler::cursorLeft()
+ { this->inpbuf->decreaseCursor(); }
+
+ void ChatInputHandler::cursorEnd()
+ { this->inpbuf->setCursorToEnd(); }
+
+ void ChatInputHandler::cursorHome()
+ { this->inpbuf->setCursorToBegin(); }
+
+ void ChatInputHandler::exit()
+ {
+ /* b) clear the input buffer */
+ if (this->inpbuf->getSize() > 0)
+ this->inpbuf->clear();
+
+ /* d) stop listening to input */
+ this->deactivate();
+ }
+
+}
Copied: code/branches/presentation3/src/orxonox/ChatInputHandler.h (from rev 6910, code/branches/chat2/src/orxonox/ChatInputHandler.h)
===================================================================
--- code/branches/presentation3/src/orxonox/ChatInputHandler.h (rev 0)
+++ code/branches/presentation3/src/orxonox/ChatInputHandler.h 2010-05-20 09:33:07 UTC (rev 6928)
@@ -0,0 +1,137 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Sandro 'smerkli' Merkli
+ * Co-authors:
+ * ...
+ *
+ */
+
+#ifndef _ChatInputHandler_H__
+#define _ChatInputHandler_H__
+
+/* std includes */
+#include <deque>
+#include <string>
+#include <fstream>
+#include <iostream>
+#include <cassert>
+#include <CEGUIForwardRefs.h>
+
+/* project includes */
+#include <OrxonoxPrereqs.h>
+#include <core/BaseObject.h>
+#include <core/PathConfig.h>
+
+#include "core/input/InputBuffer.h"
+#include "core/input/InputManager.h"
+#include "core/input/InputState.h"
+
+#include <network/ChatListener.h>
+#include <PlayerManager.h>
+#include <infos/PlayerInfo.h>
+
+#include "../libraries/network/Host.h"
+#include <util/Singleton.h>
+
+
+namespace orxonox
+{
+ /* class to handle chat using an InputBuffer */
+ class _OrxonoxExport ChatInputHandler : public Singleton<ChatInputHandler>,
+ public ChatListener
+ {
+ private:
+ /** Input buffer, to be used to catch input from the
+ * keyboard
+ */
+ InputBuffer *inpbuf;
+ int disp_offset, width;
+ bool fullchat;
+
+ /** input state */
+ InputState *inputState;
+
+ /** setup input buffer, the constructor calls this */
+ void configureInputBuffer();
+
+ /** adjust display offset depending on cursor position */
+ void sub_adjust_dispoffset( int maxlen, int cursorpos, int inplen );
+
+ /** singleton pointer */
+ static ChatInputHandler* singletonPtr_s;
+
+ /** cegui window handles */
+ CEGUI::Window *input, *inputonly;
+
+ /** cegui handle for the history window */
+ CEGUI::Listbox *lb_history;
+
+ /* callbacks for input handler */
+ void inputChanged();
+ void addline();
+ void backspace();
+ void deleteChar();
+ void cursorRight();
+ void cursorLeft();
+ void cursorEnd();
+ void cursorHome();
+ void exit();
+
+ public:
+ /** constructor */
+ ChatInputHandler();
+ friend class Singleton<ChatInputHandler>;
+
+ /** start listening */
+ static void activate_static();
+
+ /** stop listening */
+ static void activate_small_static();
+
+ /** \param message the message text
+ * \param senderID ID of the player who sent the message
+ *
+ * Deal with incoming chat (which means in our case: Add it to the
+ * history window of the full chat window)
+ */
+ void incomingChat( const std::string& message,
+ unsigned int senderID );
+
+ /** \param full true means show full chat window with history,
+ false means show only an input line
+ *
+ * Show the chat window and redirect the game's keyboard input
+ * into it.
+ */
+ void activate( bool full );
+
+ /** Deactivate the chat window, meaning: hide it. */
+ void deactivate();
+
+ };
+
+
+}
+
+
+#endif /*_ChatInputHandler_H__*/
Copied: code/branches/presentation3/src/orxonox/graphics/CEGuiSample.cc (from rev 6910, code/branches/chat2/src/orxonox/graphics/CEGuiSample.cc)
===================================================================
--- code/branches/presentation3/src/orxonox/graphics/CEGuiSample.cc (rev 0)
+++ code/branches/presentation3/src/orxonox/graphics/CEGuiSample.cc 2010-05-20 09:33:07 UTC (rev 6928)
@@ -0,0 +1,304 @@
+/***********************************************************************
+ filename: CEGuiSample.cpp
+ created: 24/9/2004
+ author: Paul D Turner
+*************************************************************************/
+/***************************************************************************
+ * Copyright (C) 2004 - 2008 Paul D Turner & The CEGUI Development Team
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ ***************************************************************************/
+#include "CEGuiSample.h"
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#include "CEGUISamplesConfig.h"
+
+// includes for renderer selector classes
+#if defined( __WIN32__ ) || defined( _WIN32 )
+# include "Win32CEGuiRendererSelector.h"
+#elif defined(__linux__)
+# ifdef CEGUI_SAMPLES_USE_GTK2
+# include "GTK2CEGuiRendererSelector.h"
+# else
+# include "CLICEGuiRendererSelector.h"
+# endif
+#elif defined(__APPLE__)
+# include "MacCEGuiRendererSelector.h"
+#endif
+
+// includes for application types
+#ifdef CEGUI_SAMPLES_USE_OGRE
+# include "CEGuiOgreBaseApplication.h"
+#endif
+#ifdef CEGUI_SAMPLES_USE_OPENGL
+# include "CEGuiOpenGLBaseApplication.h"
+#endif
+#ifdef CEGUI_SAMPLES_USE_IRRLICHT
+# include "CEGuiIrrlichtBaseApplication.h"
+#endif
+#ifdef CEGUI_SAMPLES_USE_DIRECTFB
+# include "CEGuiDirectFBBaseApplication.h"
+#endif
+#if defined( __WIN32__ ) || defined( _WIN32 )
+# ifdef CEGUI_SAMPLES_USE_DIRECTX_8
+# include "CEGuiD3D81BaseApplication.h"
+# endif
+# ifdef CEGUI_SAMPLES_USE_DIRECTX_9
+# include "CEGuiD3D9BaseApplication.h"
+# endif
+# ifdef CEGUI_SAMPLES_USE_DIRECTX_10
+# include "CEGuiD3D10BaseApplication.h"
+# endif
+#endif
+// now we include the base CEGuiBaseApplication just in case someone has managed to
+// get this far without any of the renderers. This ensures the framework will build,
+// although there will be no renderers available for selection in the samples.
+#include "CEGuiBaseApplication.h"
+
+#include "CEGUI.h"
+
+#ifdef CEGUI_WITH_XERCES
+# include "CEGUIXercesParser.h"
+#endif
+
+// Include iostream if not on windows.
+#if defined( __WIN32__ ) || defined( _WIN32 )
+#else
+# include <iostream>
+#endif
+
+
+/*************************************************************************
+ Constructor
+*************************************************************************/
+CEGuiSample::CEGuiSample() :
+ d_rendererSelector(0),
+ d_sampleApp(0)
+{}
+
+
+/*************************************************************************
+ Destructor
+*************************************************************************/
+CEGuiSample::~CEGuiSample()
+{
+ if (d_sampleApp)
+ {
+ d_sampleApp->cleanup();
+ delete d_sampleApp;
+ }
+
+ if (d_rendererSelector)
+ {
+ delete d_rendererSelector;
+ }
+
+}
+
+
+/*************************************************************************
+ Application entry point
+*************************************************************************/
+int CEGuiSample::run()
+{
+ try
+ {
+ if (initialise())
+ cleanup();
+ }
+ catch (CEGUI::Exception& exc)
+ {
+ outputExceptionMessage(exc.getMessage().c_str());
+ }
+ catch (std::exception& exc)
+ {
+ outputExceptionMessage(exc.what());
+ }
+ catch(...)
+ {
+ outputExceptionMessage("Unknown exception was caught!");
+ }
+
+ return 0;
+}
+
+
+/*************************************************************************
+ Initialise the sample application
+*************************************************************************/
+bool CEGuiSample::initialise()
+{
+ // Setup renderer selection dialog for Win32
+#if defined( __WIN32__ ) || defined( _WIN32 )
+ d_rendererSelector = new Win32CEGuiRendererSelector;
+
+ // enable renderer types supported for Win32
+#ifdef CEGUI_SAMPLES_USE_DIRECTX_8
+ d_rendererSelector->setRendererAvailability(Direct3D81GuiRendererType);
+#endif
+#ifdef CEGUI_SAMPLES_USE_DIRECTX_9
+ d_rendererSelector->setRendererAvailability(Direct3D9GuiRendererType);
+#endif
+#ifdef CEGUI_SAMPLES_USE_DIRECTX_10
+ d_rendererSelector->setRendererAvailability(Direct3D10GuiRendererType);
+#endif
+
+#elif defined(__linux__)
+ // decide which method to use for renderer selection
+# ifdef CEGUI_SAMPLES_USE_GTK2
+ d_rendererSelector = new GTK2CEGuiRendererSelector();
+# else
+ d_rendererSelector = new CLICEGuiRendererSelector();
+# endif
+
+#elif defined(__APPLE__)
+ d_rendererSelector = new MacCEGuiRendererSelector();
+#endif
+
+ // enable available renderer types
+#ifdef CEGUI_SAMPLES_USE_OGRE
+ d_rendererSelector->setRendererAvailability(OgreGuiRendererType);
+#endif
+#ifdef CEGUI_SAMPLES_USE_OPENGL
+ d_rendererSelector->setRendererAvailability(OpenGLGuiRendererType);
+#endif
+#ifdef CEGUI_SAMPLES_USE_IRRLICHT
+ d_rendererSelector->setRendererAvailability(IrrlichtGuiRendererType);
+#endif
+#ifdef CEGUI_SAMPLES_USE_DIRECTFB
+ d_rendererSelector->setRendererAvailability(DirectFBGuiRendererType);
+#endif
+
+ // get selection from user
+ if (d_rendererSelector->invokeDialog())
+ {
+ // create appropriate application type based upon users selection
+ switch(d_rendererSelector->getSelectedRendererType())
+ {
+#ifdef CEGUI_SAMPLES_USE_OGRE
+ case OgreGuiRendererType:
+ d_sampleApp = new CEGuiOgreBaseApplication();
+ break;
+#endif
+#if defined( __WIN32__ ) || defined( _WIN32 )
+#ifdef CEGUI_SAMPLES_USE_DIRECTX_8
+ case Direct3D81GuiRendererType:
+ d_sampleApp = new CEGuiD3D81BaseApplication();
+ break;
+#endif
+#ifdef CEGUI_SAMPLES_USE_DIRECTX_9
+ case Direct3D9GuiRendererType:
+ d_sampleApp = new CEGuiD3D9BaseApplication();
+ break;
+#endif // DX9
+#ifdef CEGUI_SAMPLES_USE_DIRECTX_10
+ case Direct3D10GuiRendererType:
+ d_sampleApp = new CEGuiD3D10BaseApplication();
+ break;
+#endif // DX10
+#endif // Win32
+#ifdef CEGUI_SAMPLES_USE_OPENGL
+ case OpenGLGuiRendererType:
+ d_sampleApp = new CEGuiOpenGLBaseApplication();
+ break;
+#endif
+#ifdef CEGUI_SAMPLES_USE_IRRLICHT
+ case IrrlichtGuiRendererType:
+ d_sampleApp = new CEGuiIrrlichtBaseApplication();
+ break;
+#endif
+#ifdef CEGUI_SAMPLES_USE_DIRECTFB
+ case DirectFBGuiRendererType:
+ d_sampleApp = new CEGuiDirectFBBaseApplication();
+ break;
+#endif
+
+ default:
+ throw CEGUI::GenericException("No renderer was selected!");
+ break;
+ }
+
+ // set the default resource groups to be used
+ CEGUI::Imageset::setDefaultResourceGroup("imagesets");
+ CEGUI::Font::setDefaultResourceGroup("fonts");
+ CEGUI::Scheme::setDefaultResourceGroup("schemes");
+ CEGUI::WidgetLookManager::setDefaultResourceGroup("looknfeels");
+ CEGUI::WindowManager::setDefaultResourceGroup("layouts");
+ CEGUI::ScriptModule::setDefaultResourceGroup("lua_scripts");
+#ifdef CEGUI_WITH_XERCES
+ CEGUI::XercesParser::setSchemaDefaultResourceGroup("schemas");
+#endif
+
+ // execute the base application (which sets up the demo via 'this' and runs it.
+ if (d_sampleApp->execute(this))
+ {
+ // signal that app initialised and ran
+ return true;
+ }
+
+ // sample app did not initialise, delete the object.
+ delete d_sampleApp;
+ d_sampleApp = 0;
+ }
+
+ // delete renderer selector object
+ delete d_rendererSelector;
+ d_rendererSelector = 0;
+
+ // signal app did not initialise and run.
+ return false;
+}
+
+
+/*************************************************************************
+ Cleanup the sample application.
+*************************************************************************/
+void CEGuiSample::cleanup()
+{
+ if (d_sampleApp)
+ {
+ d_sampleApp->cleanup();
+ delete d_sampleApp;
+ d_sampleApp = 0;
+ }
+
+ if (d_rendererSelector)
+ {
+ delete d_rendererSelector;
+ d_rendererSelector = 0;
+ }
+
+}
+
+
+/*************************************************************************
+ Output a message to the user in some OS independant way.
+*************************************************************************/
+void CEGuiSample::outputExceptionMessage(const char* message) const
+{
+#if defined(__WIN32__) || defined(_WIN32)
+ MessageBoxA(0, message, "CEGUI - Exception", MB_OK|MB_ICONERROR);
+#else
+ std::cout << "An exception was thrown within the sample framework:" << std::endl;
+ std::cout << message << std::endl;
+#endif
+}
Copied: code/branches/presentation3/src/orxonox/graphics/CEGuiSample.h (from rev 6910, code/branches/chat2/src/orxonox/graphics/CEGuiSample.h)
===================================================================
--- code/branches/presentation3/src/orxonox/graphics/CEGuiSample.h (rev 0)
+++ code/branches/presentation3/src/orxonox/graphics/CEGuiSample.h 2010-05-20 09:33:07 UTC (rev 6928)
@@ -0,0 +1,130 @@
+/***********************************************************************
+ filename: CEGuiSample.h
+ created: 24/9/2004
+ author: Paul D Turner
+*************************************************************************/
+/***************************************************************************
+ * Copyright (C) 2004 - 2006 Paul D Turner & The CEGUI Development Team
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ ***************************************************************************/
+#ifndef _CEGuiSample_h_
+#define _CEGuiSample_h_
+
+#if (defined( __WIN32__ ) || defined( _WIN32 )) && !defined (CEGUI_STATIC)
+# ifdef CEGUISAMPLE_EXPORTS
+# define CEGUISAMPLE_API __declspec(dllexport)
+# else
+# define CEGUISAMPLE_API __declspec(dllimport)
+# endif
+#else
+# define CEGUISAMPLE_API
+#endif
+
+
+// forward declarations
+class CEGuiBaseApplication;
+class CEGuiRendererSelector;
+
+
+/*!
+\brief
+ This is a base class that is intended to be used for all sample applications.
+ Here we take care of common things such the renderer selection and application
+ startup.
+*/
+class CEGUISAMPLE_API CEGuiSample
+{
+public:
+ /*!
+ \brief
+ Constructor.
+ */
+ CEGuiSample();
+
+
+ /*!
+ \brief
+ Destructor.
+ */
+ virtual ~CEGuiSample();
+
+
+ /*!
+ \brief
+ Application entry point.
+
+ \return
+ code to be returned by the application.
+ */
+ int run();
+
+
+ /*!
+ \brief
+ Sample specific initialisation goes here. This method is called by the application base object created
+ as part of the initialise call.
+
+ \return
+ false if something went wrong.
+ */
+ virtual bool initialiseSample() = 0;
+
+
+ /*!
+ \brief
+ Cleans up resources allocated in the initialiseSample call.
+ */
+ virtual void cleanupSample() = 0;
+
+
+protected:
+ /*!
+ \brief
+ Initialises the sample system, this includes asking the user for a render to use and
+ the subsequent creation of the required systems to support that renderer.
+
+ \return
+ false if anything went wrong.
+ */
+ virtual bool initialise();
+
+
+ /*!
+ \brief
+ Cleans up all resources allocated by the initialise call.
+ */
+ virtual void cleanup();
+
+
+ /*!
+ \brief
+ Output a message to the user in some OS independant way.
+ */
+ void outputExceptionMessage(const char* message) const;
+
+ /*************************************************************************
+ Data fields
+ *************************************************************************/
+ CEGuiRendererSelector* d_rendererSelector; //!< Points to the renderer selector object.
+ CEGuiBaseApplication* d_sampleApp; //!< Pointer to the base application object.
+};
+
+#endif // end of guard _CEGuiSample_h_
More information about the Orxonox-commit
mailing list