[Oge-cvsmail] samples/ObjectSerialisation Main.cpp,1.2,1.3

[Steven <laz...@us...>]

Update of /cvsroot/oge/samples/ObjectSerialisation
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv11074/ObjectSerialisation

Modified Files:
	Main.cpp 
Log Message:
2008/04/02 - CVS HEAD v0.2.20

- Added Place and Physics components
- Added several sub SceneManagers (gui, physics, etc)
- Updated the licensing year to 2008

NOTE: This version will be branched to the 0.2.20 cvs version.
There will probably not be any new commit to this 0.2 branch.

The HEAD will be cleaned completely (even the folders) and replaced by the refactoring code (aka 0.3).

Index: Main.cpp
===================================================================
RCS file: /cvsroot/oge/samples/ObjectSerialisation/Main.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Main.cpp	19 Aug 2007 14:02:54 -0000	1.2
--- Main.cpp	2 Apr 2008 06:34:24 -0000	1.3
***************
*** 4,8 ****
  For the latest info, see http://sourceforge.net/projects/oge
  
! Copyright (c) 2006 The OGE Team
  Also see acknowledgements in Readme.html
  
--- 4,8 ----
  For the latest info, see http://sourceforge.net/projects/oge
  
! Copyright (c) 2006-2008 The OGE Team
  Also see acknowledgements in Readme.html
  
***************
*** 135,142 ****
      void printDebug()
      {
!         LOG( "----" + getClass());
          LOG( "----" + getFamily());
          LOG( "----" + mesh);
!         std::cout << "----" << getClass() << std::endl;
          std::cout << "----" << getFamily() << std::endl;
          std::cout << "----" << mesh << std::endl;
--- 135,142 ----
      void printDebug()
      {
!         LOG( "----" + getType());
          LOG( "----" + getFamily());
          LOG( "----" + mesh);
!         std::cout << "----" << getType() << std::endl;
          std::cout << "----" << getFamily() << std::endl;
          std::cout << "----" << mesh << std::endl;
***************
*** 172,177 ****
      virtual bool write(SerialiserPtr serialisePtr)
      {
!         LOG(getClass());
!         std::cout << getClass() << std::endl;
  
          bool success = VisualComponent::write(serialisePtr); // This MUST be the first write of any component
--- 172,177 ----
      virtual bool write(SerialiserPtr serialisePtr)
      {
!         LOG(getType());
!         std::cout << getType() << std::endl;
  
          bool success = VisualComponent::write(serialisePtr); // This MUST be the first write of any component
***************
*** 191,194 ****
--- 191,200 ----
      };
  
+     virtual MessageDelegateMap getMessageDelgates()
+     {
+         MessageDelegateMap map;
+         return map;
+     };
+ 
      // ----------------------------------------------------------------------
      // This wouldn't normally be public, but it's more convenient for this example
***************
*** 198,205 ****
      {
          VisualComponent::printDebug();
!         LOG( "----" + (String)getClass());
          LOG( "----" + (String)getFamily());
          LOG( "----" + StringUtil::toString((int) unitColor));
!         std::cout << "----- " << (String)getClass() << std::endl;
          std::cout << "----- " << (String)getFamily() << std::endl;
          std::cout << "----- " << StringUtil::toString((int) unitColor) << std::endl;
--- 204,211 ----
      {
          VisualComponent::printDebug();
!         LOG( "----" + (String)getType());
          LOG( "----" + (String)getFamily());
          LOG( "----" + StringUtil::toString((int) unitColor));
!         std::cout << "----- " << (String)getType() << std::endl;
          std::cout << "----- " << (String)getFamily() << std::endl;
          std::cout << "----- " << StringUtil::toString((int) unitColor) << std::endl;
***************
*** 216,223 ****
  {
  public:
!     WarriorVisualComponentTemplate() { setClass("WarriorVisualComponentTemplate"); };
  
      // Can be used to verify it is allocated to the correct ObjectTemplate
!     virtual Component* makeComponent( Object* object )
      {
          WarriorVisualComponent* comp =
--- 222,229 ----
  {
  public:
!     WarriorVisualComponentTemplate() { setType("WarriorVisualComponentTemplate"); };
  
      // Can be used to verify it is allocated to the correct ObjectTemplate
!     virtual Component* createComponent( Object* object )
      {
          WarriorVisualComponent* comp =
***************
*** 235,243 ****
  /** Main entry point for the application
   *****************************************************************************/
! #ifndef _CONSOLE && OGE_PLATFORM == OGE_PLATFORM_WIN32
! INT WINAPI WinMain(HINSTANCE hInst, HINSTANCE,LPSTR strCmdLine, INT)
! #else
  int main(int argc, char *argv[])
! #endif
  {
  	std::cout << "----- Component/Object system - v0.1 -----" << std::endl;
--- 241,249 ----
  /** Main entry point for the application
   *****************************************************************************/
! //#if OGE_PLATFORM == OGE_PLATFORM_WIN32
! //INT WINAPI WinMain(HINSTANCE hInst, HINSTANCE,LPSTR strCmdLine, INT)
! //#else
  int main(int argc, char *argv[])
! //#endif
  {
  	std::cout << "----- Component/Object system - v0.1 -----" << std::endl;
***************
*** 246,250 ****
  	{
  		// Create the LogManager
!         LogManager* logManager = LogManager::createManager();
          logManager->createLog( "Oge_log", LogManager::LOGTYPE_HTML );
  
--- 252,256 ----
  	{
  		// Create the LogManager
!         LogManager* logManager = LogManager::createInstance();
          logManager->createLog( "Oge_log", LogManager::LOGTYPE_HTML );