Changeset 3608 in orxonox.OLD for orxonox/trunk/src

Timestamp:

Mar 20, 2005, 11:37:26 PM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: now there is a real speedup in compiling time when dependencies are modified: just realy only includes, what is needed. Byside the speedup, there is more overview! never add an orxonox class to stdincl.h if it doesn't have to be

Location:

orxonox/trunk/src

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• camera.cc (modified) (1 diff)
• camera.h (modified) (1 diff)
• command_node.cc (modified) (1 diff)
• command_node.h (modified) (1 diff)
• defs/comincl.h (added)
• defs/stdincl.h (modified) (2 diffs)
• game_loader.h (modified) (2 diffs)
• lib/coord/null_parent.cc (modified) (1 diff)
• lib/coord/p_node.cc (modified) (2 diffs)
• lib/coord/p_node.h (modified) (1 diff)
• lib/graphics/light.cc (modified) (1 diff)
• message_structures.h (modified) (1 diff)
• orxonox.h (modified) (1 diff)
• story_entities/campaign.cc (modified) (5 diffs)
• story_entities/campaign.h (modified) (2 diffs)
• story_entities/story_entity.h (modified) (1 diff)
• story_entities/world.cc (modified) (1 diff)
• story_entities/world.h (modified) (1 diff)
• track_manager.cc (modified) (1 diff)
• track_manager.h (modified) (1 diff)
• world_entities/player.cc (modified) (1 diff)
• world_entities/player.h (modified) (2 diffs)
• world_entities/primitive.cc (modified) (1 diff)
• world_entities/primitive.h (modified) (1 diff)
• world_entities/skysphere.cc (modified) (1 diff)
• world_entities/skysphere.h (modified) (1 diff)
• world_entities/terrain.cc (modified) (1 diff)
• world_entities/world_entity.cc (modified) (1 diff)
• world_entities/world_entity.h (modified) (1 diff)

orxonox/trunk/src/Makefile.am

@@ -98 +98 @@
                  defs/stdincl.h \
                  defs/glincl.h \
+                 defs/comincl.h \
                  defs/error.h \
                  defs/debug.h \

orxonox/trunk/src/Makefile.in

@@ -299 +299 @@
                  defs/stdincl.h \
                  defs/glincl.h \
+                 defs/comincl.h \
                  defs/error.h \
                  defs/debug.h \

orxonox/trunk/src/camera.cc

@@ -17 +17 @@
 
 #include "camera.h"
+
 #include "world.h"
 #include "world_entity.h"
+#include "vector.h"
 
 using namespace std;

orxonox/trunk/src/camera.h

@@ -38 +38 @@
   float deltaTime;
   float t;
-  Vector r;
+  Vector* r;
   float rAbs;
   float ka;

orxonox/trunk/src/command_node.cc

@@ -22 +22 @@
 #include "game_loader.h"
 #include "world.h"
+#include "list.h"
+#include "orxonox.h"
 
 #include <stdio.h>

orxonox/trunk/src/command_node.h

@@ -9 +9 @@
 #define _COMMAND_NODE_H
 
-#include "stdincl.h"
 
+#include "comincl.h"
+
+template<class T> class tList;
 class WorldEntity;
 class World;

orxonox/trunk/src/defs/stdincl.h

@@ -8 +8 @@
 #ifndef _STDINCL_H
 #define _STDINCL_H
-
-#define null 0   //!< null
-
 
 typedef unsigned char byte;
@@ -29 +26 @@
 #include "glincl.h"
 
-
-// MATH //
-#include "vector.h"
-
-#include "list.h"
-#include "list_template.h"
-#include "message_structures.h"
-#include "orxonox.h"
-#include "data_tank.h"
-#include "base_object.h"
-
 #include "error.h"
 #include "debug.h"

orxonox/trunk/src/game_loader.h

@@ -2 +2 @@
 #define _GAME_LOADER_H
 
-#include "stdincl.h"
+//#include "stdincl.h"
 #include "story_def.h"
+#include "comincl.h"
 
 //-----------------------------------------------------------------------------
@@ -12 +13 @@
 class Camera;
 class CammandNode;
-
 
 class GameLoader 

orxonox/trunk/src/lib/coord/null_parent.cc

@@ -20 +20 @@
 #include "null_parent.h"
 #include "stdincl.h"
+#include "vector.h"
+#include "list.h"
 
 

orxonox/trunk/src/lib/coord/p_node.cc

@@ -23 +23 @@
 #include "stdincl.h"
 
+#include "error.h"
+#include "debug.h"
+#include "list.h"
+#include "vector.h"
 #include "null_parent.h"
+
+
 //#include "vector.h"
 //#include "quaternion.h"
@@ -479 +485 @@
       if( this->bRelDirChanged || this->bAbsDirChanged)
         pn->parentDirChanged ();
+
       pn->update();
       pn = this->children->nextElement();

orxonox/trunk/src/lib/coord/p_node.h

@@ -23 +23 @@
 
 #include "base_object.h"
-#include "vector.h"
+//#include "vector.h"
 
 // FORWARD DEFINITION \\

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

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

orxonox/trunk/src/message_structures.h

@@ -6 +6 @@
 #ifndef _MESSAGE_STRUCTURES_H
 #define _MESSAGE_STRUCTURES_H
+
+#include "stdincl.h"
 
 #define CMD_LENGHT 16

orxonox/trunk/src/orxonox.h

@@ -7 +7 @@
 #define _ORXONOX_H
 
-#include "stdincl.h"
+#include "comincl.h"
+#include "glincl.h"
 
 class CommandNode;

orxonox/trunk/src/story_entities/campaign.cc

@@ -20 +20 @@
 #include "world.h"
 #include "camera.h"
-#include "story_entity.h"
+//#include "story_entity.h"
+#include "list.h"
 
 using namespace std;
@@ -27 +28 @@
 Campaign::Campaign () 
 {
-  this->entities = new ListTemplate<StoryEntity>();
+  this->entities = new tList<StoryEntity>();
   this->isInit = false;
 }
@@ -184 +185 @@
   if( storyID == WORLD_ID_GAMEEND)
     return NULL;
-  ListTemplate<StoryEntity>* l;
+
+  /*
+  tList<StoryEntity>* l;
   StoryEntity* entity = NULL;
   l = this->entities->getNext();  
@@ -191 +194 @@
       entity = l->getObject();
       l = l->getNext();
+
       int id = entity->getStoryID();
       //printf("Campaing::getStoryEntity() - now looping, found entity nr=%i\n", id);
@@ -198 +202 @@
           return entity;
         }
-    }
+
+    }
+  */
+
+
+
+  StoryEntity* entity = this->entities->enumerate();
+  while( entity != NULL) 
+    { 
+      int id = entity->getStoryID();
+      //printf("Campaing::getStoryEntity() - now looping, found entity nr=%i\n", id);
+      if(id == storyID)
+        {
+          //printf("Campaing::getStoryEntity() - yea, this is what we where looking for: %id\n");
+          return entity;
+        }
+      entity = this->entities->nextElement();
+    }
+
+
+
   return NULL;
 }

orxonox/trunk/src/story_entities/campaign.h

@@ -8 +8 @@
 
 class World;
+template<class T> class tList;
 
 class Campaign : public StoryEntity {
@@ -34 +35 @@
 
  private:
-  ListTemplate<StoryEntity>* entities;
+  //ListTemplate<StoryEntity>* entities;
+  tList<StoryEntity>* entities;
   bool running;
 

orxonox/trunk/src/story_entities/story_entity.h

@@ -8 +8 @@
 #define _STORY_ENTITY_H
 
-#include "stdincl.h"
+#include "base_object.h"
 #include "story_def.h"
+#include "error.h"
+
 
 //! A class that represents something to play in orxonox. it is a container for worlds, movies, mission briefings, etc...

orxonox/trunk/src/story_entities/world.cc

@@ -18 +18 @@
 
 #include "world.h"
+
+#include "orxonox.h"
+#include "p_node.h"
+#include "null_parent.h"
+#include "helper_parent.h"
+#include "track_node.h"
 #include "world_entity.h"
 #include "track_manager.h"
 #include "player.h"
-#include "command_node.h"
 #include "camera.h"
 #include "environment.h"
 #include "primitive.h"
-#include "p_node.h"
-#include "null_parent.h"
-#include "helper_parent.h"
+#include "skysphere.h"
+#include "terrain.h"
+#include "light.h"
+#include "command_node.h"
 #include "glmenu_imagescreen.h"
-#include "skysphere.h"
-#include "light.h"
 #include "fontset.h"
-#include "track_node.h"
-#include "terrain.h"
+#include "list.h"
+
+
 
 using namespace std;

orxonox/trunk/src/story_entities/world.h

@@ -8 +8 @@
 
 #include "stdincl.h"
+#include "comincl.h"
 #include "story_entity.h"
 #include "p_node.h"

orxonox/trunk/src/track_manager.cc

@@ -18 +18 @@
 #include "track_manager.h"
 
+#include "base_object.h"
 #include "p_node.h"
-
 #include "track_node.h"
+#include "stdincl.h"
+#include "list.h"
+
+
 
 #include <stdarg.h>

orxonox/trunk/src/track_manager.h

@@ -12 +12 @@
 #define _TRACK_MANAGER_H
 
-#include "stdincl.h"
 #include "curve.h"
+#include "base_object.h"
 
 class PNode;
+template<class T> class tList;
 
 // Static Definitions

orxonox/trunk/src/world_entities/player.cc

@@ -40 +40 @@
 
   travelSpeed = 15.0;
-  velocity = Vector();
+  velocity = new Vector();
   bUp = bDown = bLeft = bRight = bAscend = bDescend = false;
   bFire = false;

orxonox/trunk/src/world_entities/player.h

@@ -12 +12 @@
 class OBJModel;
 class Weapon;
+class Vector;
 
 //! Basic controllable WorldEntity
@@ -48 +49 @@
   Weapon* activeWeapon;  //!< the weapon that is currenty activated
 
-  Vector velocity;       //!< the velocity of the player.
+  Vector* velocity;       //!< the velocity of the player.
   float travelSpeed;     //!< the current speed of the player (to make soft movement)
   float acceleration;    //!< the acceleration of the player.

orxonox/trunk/src/world_entities/primitive.cc

@@ -18 +18 @@
 
 #include "primitive.h"
+
 #include "stdincl.h"
 #include "world_entity.h"
 #include "objModel.h"
+#include "vector.h"
 
 using namespace std;

orxonox/trunk/src/world_entities/primitive.h

@@ -3 +3 @@
 
 #include "world_entity.h"
+#include "glincl.h"
 
 typedef enum PRIMITIVE_FORM {PSPHERE = 0, PCUBE, PSQUARE};
+
+class Material;
+
 
 class Primitive : public WorldEntity 

orxonox/trunk/src/world_entities/skysphere.cc

@@ -26 +26 @@
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
 
-#include "material.h"
+
 #include "skysphere.h"
 #include "stdincl.h"
+
+#include "material.h"
 #include "vector.h"
-#include "world_entity.h"
+//#include "world_entity.h"
+
 
 using namespace std;

orxonox/trunk/src/world_entities/skysphere.h

@@ -14 +14 @@
 
 /* INCLUDES */
-#include "p_node.h"
 #include "world_entity.h"
 

orxonox/trunk/src/world_entities/terrain.cc

@@ -16 +16 @@
 
 #include "terrain.h"
-
+#include "stdincl.h"
+#include "objModel.h"
+#include "vector.h"
 #include "glincl.h"
 

orxonox/trunk/src/world_entities/world_entity.cc

@@ -19 +19 @@
 
 #include "world_entity.h"
-#include "stdincl.h"
+#include "objModel.h"
+#include "list.h"
+
+//#include "stdincl.h"
 //#include "collision.h"
 

orxonox/trunk/src/world_entities/world_entity.h

@@ -7 +7 @@
 #define _WORLD_ENTITY_H
 
-#include "stdincl.h"
 #include "p_node.h"
-#include "objModel.h"
+#include "comincl.h"
 
 //class CollisionCluster;
 class CharacterAttributes;
+class OBJModel;