Changeset 4381 in orxonox.OLD for orxonox/trunk

Timestamp:

May 29, 2005, 8:47:30 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: made include more local. stdincl.h not in base_object.h anymore

Location:

orxonox/trunk/src

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• defs/debug.h (modified) (1 diff)
• defs/glincl.h (modified) (1 diff)
• defs/sdlincl.h (added)
• defs/stdincl.h (modified) (1 diff)
• defs/stdlibincl.h (added)
• lib/graphics/graphics_engine.h (modified) (1 diff)
• lib/graphics/importer/texture.h (modified) (1 diff)
• lib/graphics/light.cc (modified) (1 diff)
• lib/graphics/particles/particle_emitter.cc (modified) (1 diff)
• lib/graphics/particles/particle_emitter.h (modified) (2 diffs)
• lib/graphics/particles/particle_engine.cc (modified) (1 diff)
• lib/graphics/particles/particle_system.h (modified) (1 diff)
• lib/gui/gui/gui_video.cc (modified) (1 diff)
• lib/lang/base_object.h (modified) (1 diff)
• lib/physics/physics_connection.h (modified) (2 diffs)
• lib/physics/physics_engine.cc (modified) (1 diff)
• lib/util/ini_parser.cc (modified) (1 diff)
• subprojects/particles/particle_fun.cc (modified) (1 diff)
• util/animation/animation.h (modified) (1 diff)
• util/event/event.h (modified) (1 diff)
• util/event/event_handler.cc (modified) (1 diff)
• util/resource_manager.cc (modified) (1 diff)
• util/resource_manager.h (modified) (1 diff)
• util/state.cc (modified) (1 diff)
• util/track/track_manager.h (modified) (1 diff)

orxonox/trunk/src/Makefile.am

@@ -150 +150 @@
                  network/synchronisable.h \
                  defs/stdincl.h \
+                 defs/stdlibincl.h \
+                 defs/sdlincl.h \
                  defs/glincl.h \
                  defs/comincl.h \

orxonox/trunk/src/Makefile.in

@@ -363 +363 @@
                  network/synchronisable.h \
                  defs/stdincl.h \
+                 defs/stdlibincl.h \
+                 defs/sdlincl.h \
                  defs/glincl.h \
                  defs/comincl.h \

orxonox/trunk/src/defs/debug.h

@@ -74 +74 @@
 #define DEBUG_MODULE_ANIM               1
 #define DEBUG_MODULE_PARTICLE           1
+#define DEBUG_MODULE_PHYSICS            1
 #define DEBUG_MODULE_EVENT              3
 

orxonox/trunk/src/defs/glincl.h

@@ -9 +9 @@
 #define _GLINCL_H
 
-#include <SDL.h>
-
 #ifndef __APPLE__
 #include <GL/gl.h>

orxonox/trunk/src/defs/stdincl.h

@@ -17 +17 @@
 #endif
 
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
+#include <stdlibincl.h>
 
+#include "sdlincl.h"
 #include "glincl.h"
 

orxonox/trunk/src/lib/graphics/graphics_engine.h

@@ -10 +10 @@
 #define _GRAPHICS_ENGINE_H
 
-#include "glincl.h"
 #include "base_object.h"
 
+#include "sdlincl.h"
+#include "glincl.h"
 
+// Forward Declaration
 class Text;
 

orxonox/trunk/src/lib/graphics/importer/texture.h

@@ -10 +10 @@
 #define _TEXTURE_H
 
+#include "sdlincl.h"
 #include "glincl.h"
 

orxonox/trunk/src/lib/graphics/light.cc

@@ -22 +22 @@
 #include "glincl.h"
 #include "vector.h"
+#include "debug.h"
 
 using namespace std;

orxonox/trunk/src/lib/graphics/particles/particle_emitter.cc

@@ -20 +20 @@
 #include "particle_system.h"
 #include "particle_engine.h"
+
+#include "debug.h"
+#include "stdlibincl.h"
 
 using namespace std;

orxonox/trunk/src/lib/graphics/particles/particle_emitter.h

@@ -1 +1 @@
 /*! 
-    \file particle_e,otter.h
+    \file particle_emitter.h
     \brief Definition of a ParticleEmitter
 */
@@ -19 +19 @@
                            EMITTER_CUBE  = 8};
 
-//! A default singleton class.
+//! A class to handle an Emitter.
 class ParticleEmitter : public PNode {
 

orxonox/trunk/src/lib/graphics/particles/particle_engine.cc

@@ -22 +22 @@
 
 #include "list.h"
+#include "debug.h"
+#include "stdlibincl.h"
 
 using namespace std;

orxonox/trunk/src/lib/graphics/particles/particle_system.h

@@ -10 +10 @@
 #include "physics_interface.h"
 
+#include "glincl.h"
 #include "vector.h"
 

orxonox/trunk/src/lib/gui/gui/gui_video.cc

@@ -28 +28 @@
 
 #include "gui_gtk.h"
-#include "glincl.h"
+#include "sdlincl.h"
 #include <stdlib.h>
 

orxonox/trunk/src/lib/lang/base_object.h

@@ -8 +8 @@
 #define _BASE_OBJECT_H
 
-#include "stdincl.h"
 #include "class_list.h"
 

orxonox/trunk/src/lib/physics/physics_connection.h

@@ -7 +7 @@
 #define _PHYSICS_CONNECTION_H
 
+#include "base_object.h"
 // Forward Declaration
 class PhysicsInterface;
@@ -20 +21 @@
 
 //! A class that Handles Physical Connection between subjects
-class PhysicsConnection {
+class PhysicsConnection : virtual public BaseObject
+{
 
  public:

orxonox/trunk/src/lib/physics/physics_engine.cc

@@ -14 +14 @@
 */
 
-//#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_PHYSICS
 
 #include "physics_engine.h"
+
+#include "debug.h"
 
 #include "list.h"

orxonox/trunk/src/lib/util/ini_parser.cc

@@ -16 +16 @@
 
 #include "ini_parser.h"
+
 #include "resource_manager.h"
+#include "debug.h"
 
 using namespace std;

orxonox/trunk/src/subprojects/particles/particle_fun.cc

@@ -21 +21 @@
 #include "particle_engine.h"
 #include "fields.h"
+#include "stdlibincl.h"
 
 #define PINIT_EMISSION_RATE          50

orxonox/trunk/src/util/animation/animation.h

@@ -10 +10 @@
 #include "base_object.h"
 #include "confincl.h"  // must be here to determin the DEBUG-level
+#include "debug.h"
 
 // FORWARD DEFINITION

orxonox/trunk/src/util/event/event.h

@@ -11 +11 @@
 #include "base_object.h"
 #include "event_def.h"
+#include "sdlincl.h"
 
 

orxonox/trunk/src/util/event/event_handler.cc

@@ -24 +24 @@
 #include "ini_parser.h"
 #include "keynames.h"
-
+#include "compiler.h"
+#include "debug.h"
 
 using namespace std;

orxonox/trunk/src/util/resource_manager.cc

@@ -25 +25 @@
 
 #include "list.h"
+#include "sdlincl.h"
 
 // File Handling Includes

orxonox/trunk/src/util/resource_manager.h

@@ -13 +13 @@
 
 #include "base_object.h"
+
+#include "stdlibincl.h"
 
 // FORWARD DEFINITION 

orxonox/trunk/src/util/state.cc

@@ -17 +17 @@
 
 #include "state.h"
+
+#ifndef NULL
+#define NULL 0
+#endif
 
 using namespace std;

orxonox/trunk/src/util/track/track_manager.h

@@ -14 +14 @@
 #include "curve.h"
 #include "base_object.h"
+
+#ifndef NULL
+#define NULL 0
+#endif
 
 // Forward Definition