Changeset 4122 in orxonox.OLD for orxonox/branches/heightMap/src/defs

Timestamp:

May 9, 2005, 11:29:19 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/heightMap: merged the Trunk back into branches/heightMap:
merged with Command
svn merge -r 3918:HEAD trunk branches/heightMap
conflicts resolved in favor of the Trunk

Location:

orxonox/branches/heightMap

Files:

• . (modified) (1 prop)
• src/defs/debug.h (modified) (2 diffs)
• src/defs/globals.h (copied) (copied from orxonox/trunk/src/defs/globals.h)
• src/defs/stdincl.h (modified) (1 diff)

orxonox/branches/heightMap

@@ -1 @@
-data http://svn.orxonox.ethz.ch/data
+

@@ -1 @@
-data http://svn.orxonox.ethz.ch/data
+

orxonox/branches/heightMap/src/defs/debug.h

@@ -59 +59 @@
 #define DEBUG_MODULE_PNODE              0
 #define DEBUG_MODULE_WORLD_ENTITY       0
-#define DEBUG_MODULE_COMMAND_NODE       0
+#define DEBUG_MODULE_COMMAND_NODE       4
 #define DEBUG_MODULE_GRAPHICS           0
-#define DEBUG_MODULE_LOAD               0
+#define DEBUG_MODULE_LOAD               2
 
 #define DEBUG_MODULE_IMPORTER           0
+#define DEBUG_MODULE_IMPORTER           3
 #define DEBUG_MODULE_TRACK_MANAGER      0
 #define DEBUG_MODULE_GARBAGE_COLLECTOR  0
@@ -73 +74 @@
 #define DEBUG_MODULE_ANIM               0
 #define DEBUG_MODULE_HEIGHTMAP                  4
+#define DEBUG_MODULE_PARTICLE           4
 
 #define DEBUG_MODULE_NULL_PARENT        0

orxonox/branches/heightMap/src/defs/stdincl.h

@@ -25 +25 @@
 #include "error.h"
 #include "debug.h"
+#include "globals.h"
 
 #include "compiler.h"
+#include "xmlparser/tinyxml.h"
+#include "factory.h"
 
 #endif /* _STDINCL_H */

@@ -1 @@
-data http://svn.orxonox.ethz.ch/data
+