Changeset 5427 in orxonox.OLD

Timestamp:

Oct 24, 2005, 6:06:06 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: some minor include stuff

Location:

trunk/src

Files:

• lib/collision_detection/obb_tree_node.h (modified) (1 diff)
• lib/graphics/importer/abstract_model.h (modified) (2 diffs)
• lib/graphics/importer/model.cc (modified) (1 diff)
• lib/graphics/spatial_separation/quadtree_node.cc (modified) (1 diff)
• lib/graphics/spatial_separation/spatial_separation.cc (modified) (1 diff)
• lib/graphics/text_engine/font.cc (modified) (1 diff)
• lib/graphics/text_engine/text.h (modified) (1 diff)
• lib/gui/gl_gui/glgui_button.cc (modified) (1 diff)
• lib/gui/gl_gui/glgui_button.h (modified) (1 diff)
• lib/sound/sound_engine.cc (modified) (1 diff)
• subprojects/benchmark.cc (modified) (1 diff)
• world_entities/npc.cc (modified) (2 diffs)
• world_entities/npc2.cc (modified) (1 diff)
• world_entities/test_entity.cc (modified) (1 diff)
• world_entities/test_entity.h (modified) (1 diff)

trunk/src/lib/collision_detection/obb_tree_node.h

@@ -8 +8 @@
 #define _OBB_TREE_NODE_H
 
+#include "glincl.h"
 #include "bv_tree_node.h"
 

trunk/src/lib/graphics/importer/abstract_model.h

@@ -22 +22 @@
 #define _ABSTRACT_MODEL_H
 
-#include "stdincl.h"
 #include "base_object.h"
 
@@ -42 +41 @@
 typedef struct
 {
-  byte             v[3];                 //!< the vector of the vertex
+  char             v[3];                 //!< the vector of the vertex
   unsigned char    lightNormalIndex;     //!< the index of the light normal
 } sVertex;

trunk/src/lib/graphics/importer/model.cc

@@ -20 +20 @@
 #include "model.h"
 
+#include "stdlibincl.h"
 #include <math.h>
+
 #include <stdarg.h>
 

trunk/src/lib/graphics/spatial_separation/quadtree_node.cc

@@ -18 +18 @@
 #include "quadtree_node.h"
 
+#include "glincl.h"
 #include "quadtree.h"
 #include "material.h"

trunk/src/lib/graphics/spatial_separation/spatial_separation.cc

@@ -21 +21 @@
 #include "quadtree.h"
 #include "debug.h"
+#include "compiler.h"
 
 using namespace std;

trunk/src/lib/graphics/text_engine/font.cc

@@ -27 +27 @@
 
 #include "debug.h"
+#include "stdlibincl.h"
 #include "compiler.h"
 

trunk/src/lib/graphics/text_engine/text.h

@@ -24 +24 @@
 // FORWARD DECLARATION
 class Font;
+struct SDL_Surface;
 
 /**

trunk/src/lib/gui/gl_gui/glgui_button.cc

@@ -65 +65 @@
  * draws the GLGuiButton
  */
-void GLGuiButton::draw()
+void GLGuiButton::draw() const
 {
 

trunk/src/lib/gui/gl_gui/glgui_button.h

@@ -37 +37 @@
    void setLabel(const char* label);
 
-   virtual void draw();
+   virtual void draw() const;
 
   protected:

trunk/src/lib/sound/sound_engine.cc

@@ -29 +29 @@
 #include "debug.h"
 #include "ini_parser.h"
+#include "globals.h"
 
 using namespace std;

trunk/src/subprojects/benchmark.cc

@@ -34 +34 @@
 #include "base_object.h"
 
+#include <stdlib.h>
 #include <asm/msr.h>
 #include <linux/timex.h>

trunk/src/world_entities/npc.cc

@@ -23 +23 @@
 #include "state.h"
 #include "list.h"
+#include "stdlibincl.h"
 
 using namespace std;
@@ -33 +34 @@
   this->loadModelWithScale("models/ships/bolido.obj", 2);
 
-  this->randomRotAxis = VECTOR_RAND(1);
+  this->randomRotAxis =  VECTOR_RAND(1);
 }
 

trunk/src/world_entities/npc2.cc

@@ -24 +24 @@
 #include "state.h"
 #include "list.h"
+#include "stdlibincl.h"
 
 using namespace std;

trunk/src/world_entities/test_entity.cc

@@ -78 +78 @@
 
 
-void TestEntity::collide (WorldEntity* other,  Uint32 ownhitflags, Uint32 otherhitflags) {}
 
 

trunk/src/world_entities/test_entity.h

@@ -24 +24 @@
   virtual void hit (WorldEntity* weapon, Vector* loc);
   virtual void destroy ();
-  virtual void collide (WorldEntity* other,  Uint32 ownhitflags, Uint32 otherhitflags);
   virtual void collidesWith(WorldEntity* entity, const Vector& location);
   virtual void draw ();