Changeset 1846 for code/branches/orxonox_tutorial/src

Timestamp:

Sep 28, 2008, 2:27:03 PM (17 years ago)

Author:

rgrieder

Message:

Merged Revisions 1831 - 1845 to tutorial. This is an update from the trunk.

Location:

code/branches/orxonox_tutorial

Files:

• . (modified) (1 prop)
• src/ceguilua-0.5.0b/ceguilua/CEGUILua.cpp (modified) (1 diff)
• src/core/BaseObject.h (modified) (1 diff)
• src/core/CMakeLists.txt (modified) (3 diffs)
• src/core/Namespace.h (modified) (1 diff)
• src/core/Super.h (modified) (1 diff)
• src/core/XMLPort.h (modified) (1 diff)
• src/network/ConnectionManager.cc (modified) (2 diffs)
• src/network/Synchronisable.cc (modified) (1 diff)
• src/network/Synchronisable.h (modified) (1 diff)
• src/network/packet/Chat.h (modified) (1 diff)
• src/network/packet/ClassID.cc (modified) (1 diff)
• src/orxonox/CMakeLists.txt (modified) (3 diffs)
• src/orxonox/OrxonoxStableHeaders.h (modified) (2 diffs)
• src/orxonox/SignalHandler.cc (modified) (1 diff)
• src/orxonox/gui/OgreCEGUIRenderer.h (modified) (1 diff)
• src/orxonox/objects/WorldEntity.h (modified) (1 diff)
• src/tolua/tolua-5.1.pkg (modified) (1 prop)
• src/util/CMakeLists.txt (modified) (1 diff)
• src/util/Convert.h (modified) (1 diff)
• src/util/Exception.cc (modified) (1 prop)
• src/util/Exception.h (modified) (1 prop)
• src/util/Math.h (modified) (1 diff)
• src/util/Sleep.h (modified) (1 diff)
• src/util/XMLIncludes.h (deleted)

code/branches/orxonox_tutorial/src/ceguilua-0.5.0b/ceguilua/CEGUILua.cpp

@@ -38 +38 @@
 #include "tolua/tolua++.h"
 
-#include "tolua++.h"
-
 // prototype for bindings initialisation function
 int tolua_CEGUI_open(lua_State* tolua_S);

code/branches/orxonox_tutorial/src/core/BaseObject.h

@@ -41 +41 @@
 #include "Super.h"
 #include "OrxonoxClass.h"
-#include "util/XMLIncludes.h"
+#include "XMLIncludes.h"
 
 namespace orxonox

code/branches/orxonox_tutorial/src/core/CMakeLists.txt

@@ -56 +56 @@
 GET_TARGET_PROPERTY(TOLUA_EXE tolua_orxonox LOCATION)
 ADD_CUSTOM_COMMAND(
-  OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/tolua/tolua_bind.cc
+  OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/tolua/tolua_bind.cc ${CMAKE_CURRENT_SOURCE_DIR}/tolua/tolua_bind.h
   COMMAND ${TOLUA_EXE} -n Core -o ../../src/core/tolua/tolua_bind.cc -H ../../src/core/tolua/tolua_bind.h ../../src/core/tolua/tolua.pkg
   DEPENDS
@@ -70 +70 @@
 TARGET_LINK_LIBRARIES(core
   ${OGRE_LIBRARIES}
+  ${Boost_thread_LIBRARIES}
+  ${Boost_filesystem_LIBRARIES}
   lua_orxonox
   cpptcl_orxonox
@@ -76 +78 @@
   tolualib_orxonox
   util
-  ${Boost_thread_LIBRARIES}
-  ${Boost_filesystem_LIBRARIES}
 )

code/branches/orxonox_tutorial/src/core/Namespace.h

@@ -34 +34 @@
 #include <map>
 
-#include "util/XMLIncludes.h"
+#include "XMLIncludes.h"
 #include "BaseObject.h"
 

code/branches/orxonox_tutorial/src/core/Super.h

@@ -72 +72 @@
 
 #include "util/Debug.h"
-#include "util/XMLIncludes.h"
+#include "XMLIncludes.h"
 
 ///////////////////////

code/branches/orxonox_tutorial/src/core/XMLPort.h

@@ -33 +33 @@
 
 #include "util/Debug.h"
-#include "util/XMLIncludes.h"
 #include "util/MultiType.h"
 #include "tinyxml/ticpp.h"
+#include "XMLIncludes.h"
 #include "Executor.h"
 #include "CoreIncludes.h"

code/branches/orxonox_tutorial/src/network/ConnectionManager.cc

@@ -37 +37 @@
 // Author:  Oliver Scheuss
 //
+
+#include "ConnectionManager.h"
 
 #include <iostream>
@@ -51 +53 @@
 #include "util/Sleep.h"
 #include "ClientInformation.h"
-#include "ConnectionManager.h"
 #include "Synchronisable.h"
 #include "packet/ClassID.h"

code/branches/orxonox_tutorial/src/network/Synchronisable.cc

@@ -41 +41 @@
 #include "Synchronisable.h"
 
-#include <string>
+#include <cstring>
 #include <iostream>
 #include <assert.h>

code/branches/orxonox_tutorial/src/network/Synchronisable.h

@@ -34 +34 @@
 #include <list>
 #include "core/OrxonoxClass.h"
-#include "util/XMLIncludes.h"
+#include "core/XMLIncludes.h"
 #include "NetworkCallback.h"
 

code/branches/orxonox_tutorial/src/network/packet/Chat.h

@@ -4 +4 @@
 
 #include <string>
+#include <cstring>
 
 #include "Packet.h"

code/branches/orxonox_tutorial/src/network/packet/ClassID.cc

@@ -31 +31 @@
 #include "ClassID.h"
 #include "core/CoreIncludes.h"
-#include <string>
+#include <cstring>
 #include <assert.h>
 

code/branches/orxonox_tutorial/src/orxonox/CMakeLists.txt

@@ -34 +34 @@
   overlays/hud/HUDSpeedBar.cc
 
-  tolua/tolua_bind.cc
-
   tools/BillboardSet.cc
   tools/Light.cc
@@ -64 +62 @@
   objects/RotatingProjectile.cc
   objects/ParticleProjectile.cc
+
+  tolua/tolua_bind.cc
 )
 
 GET_TARGET_PROPERTY(TOLUA_EXE tolua_orxonox LOCATION)
 ADD_CUSTOM_COMMAND(
-  OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/tolua/tolua_bind.cc
+  OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/tolua/tolua_bind.cc ${CMAKE_CURRENT_SOURCE_DIR}/tolua/tolua_bind.h
   COMMAND ${TOLUA_EXE} -n Orxonox -o ../../src/orxonox/tolua/tolua_bind.cc -H ../../src/orxonox/tolua/tolua_bind.h ../../src/orxonox/tolua/tolua.pkg
   DEPENDS
@@ -105 +105 @@
   tinyxml_orxonox
   tolualib_orxonox
-  ois_orxonox
   util
   core

code/branches/orxonox_tutorial/src/orxonox/OrxonoxStableHeaders.h

@@ -79 +79 @@
 #include "util/String.h"
 #include "util/SubString.h"
-#include "util/XMLIncludes.h"
 
 #include "core/BaseObject.h"
@@ -87 +86 @@
 #include "core/CommandExecutor.h"
 #include "core/Executor.h"
+#include "core/XMLIncludes.h"
 #include "core/XMLPort.h"
 

code/branches/orxonox_tutorial/src/orxonox/SignalHandler.cc

@@ -38 +38 @@
 #include <assert.h>
 #include <iostream>
+#include <cstdlib>
+#include <cstring>
 
 SignalHandler * SignalHandler::singletonRef = NULL;

code/branches/orxonox_tutorial/src/orxonox/gui/OgreCEGUIRenderer.h

@@ -38 +38 @@
 #include <OgreTextureUnitState.h>
 
-#if (OGRE_PLATFORM == OGRE_PLATFORM_WIN32) && !defined(OGRE_STATIC_LIB)
-#   ifdef OGRE_GUIRENDERER_EXPORTS
+/** CHANGES MADE BY ORXONOX TO FIT DLL IMPORT/EXPORT **/
+#if (OGRE_PLATFORM == OGRE_PLATFORM_WIN32) && !(defined(ORXONOX_STATIC_BUILD) || defined(ORXONOX_NO_EXPORTS))
+#   ifdef ORXONOX_SHARED_BUILD
 #       define OGRE_GUIRENDERER_API __declspec(dllexport)
 #   else

code/branches/orxonox_tutorial/src/orxonox/objects/WorldEntity.h

@@ -35 +35 @@
 #include <OgreSceneNode.h>
 #include "util/Math.h"
-#include "util/XMLIncludes.h"
 #include "network/Synchronisable.h"
+#include "core/XMLIncludes.h"
 #include "core/BaseObject.h"
 #include "Tickable.h"
-#include "../tools/Mesh.h"
+#include "tools/Mesh.h"
 
 namespace orxonox

code/branches/orxonox_tutorial/src/util/CMakeLists.txt

@@ -20 +20 @@
 TARGET_LINK_LIBRARIES(util
   ${OGRE_LIBRARIES}
-  ${Lua_LIBRARIES}
 )

code/branches/orxonox_tutorial/src/util/Convert.h

@@ -39 +39 @@
 #include <string>
 #include <sstream>
+#include <typeinfo>
 
 #include "Math.h"

code/branches/orxonox_tutorial/src/util/Math.h

@@ -220 +220 @@
 inline _UtilExport float rnd()
 {
-    return ((float)rand() / (RAND_MAX + 1));
+    return rand() / (RAND_MAX + 1.0);
 }
 

code/branches/orxonox_tutorial/src/util/Sleep.h

@@ -39 +39 @@
 
 #if ORXONOX_PLATFORM == ORXONOX_PLATFORM_WIN32
-
-#ifndef WIN32_LEAN_AND_MEAN
-# define WIN32_LEAN_AND_MEAN
-#endif
-#include <windows.h>
+#include <winbase.h>
 
 inline void usleep(DWORD dwMicroseconds)