Changeset 5924 in orxonox.OLD for branches

Timestamp:

Dec 4, 2005, 11:37:49 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/avi_play: merged the Trunk back into the branche avi_play again

merged with command svn merge ../trunk/ avi_play/ -r5845:HEAD
no conflicts

Location:

branches

Files:

• avi_play/src/Makefile.am (modified) (3 diffs)
• avi_play/src/defs/class_id.h (modified) (5 diffs)
• avi_play/src/lib/collision_detection/cd_engine.cc (modified) (2 diffs)
• avi_play/src/lib/collision_detection/cd_engine.h (modified) (3 diffs)
• avi_play/src/lib/coord/p_node.cc (modified) (2 diffs)
• avi_play/src/lib/coord/p_node.h (modified) (3 diffs)
• avi_play/src/lib/event/key_mapper.cc (modified) (2 diffs)
• avi_play/src/lib/event/key_mapper.h (modified) (2 diffs)
• avi_play/src/lib/graphics/graphics_engine.cc (modified) (3 diffs)
• avi_play/src/lib/graphics/graphics_engine.h (modified) (1 diff)
• avi_play/src/lib/graphics/importer/Makefile.am (modified) (2 diffs)
• avi_play/src/lib/graphics/importer/material.h (modified) (1 diff)
• avi_play/src/lib/graphics/importer/texture.cc (modified) (12 diffs)
• avi_play/src/lib/graphics/importer/texture.h (modified) (3 diffs)
• avi_play/src/lib/graphics/importer/texture_sequence.cc (copied) (copied from trunk/src/lib/graphics/importer/texture_sequence.cc)
• avi_play/src/lib/graphics/importer/texture_sequence.h (copied) (copied from trunk/src/lib/graphics/importer/texture_sequence.h)
• avi_play/src/lib/graphics/text_engine/font.cc (modified) (2 diffs)
• avi_play/src/lib/graphics/text_engine/text_engine.cc (modified) (4 diffs)
• avi_play/src/lib/lang/base_object.cc (modified) (1 diff)
• avi_play/src/lib/lang/class_list.cc (modified) (2 diffs)
• avi_play/src/lib/lang/class_list.h (modified) (2 diffs)
• avi_play/src/lib/network/network_manager.cc (modified) (1 diff)
• avi_play/src/lib/network/network_manager.h (modified) (1 diff)
• avi_play/src/lib/shell/shell_command.cc (modified) (1 diff)
• avi_play/src/lib/shell/shell_completion.cc (modified) (1 diff)
• avi_play/src/lib/sound/sound_engine.cc (modified) (4 diffs)
• avi_play/src/lib/sound/sound_engine.h (modified) (4 diffs)
• avi_play/src/lib/sound/sound_source.cc (modified) (1 diff)
• avi_play/src/lib/sound/sound_source.h (modified) (1 diff)
• avi_play/src/story_entities/world.cc (modified) (22 diffs)
• avi_play/src/story_entities/world.h (modified) (3 diffs)
• avi_play/src/subprojects/importer/Makefile.am (modified) (2 diffs)
• avi_play/src/subprojects/importer/multitex.cc (copied) (copied from trunk/src/subprojects/importer/multitex.cc)
• avi_play/src/world_entities/Makefile.am (modified) (4 diffs)
• avi_play/src/world_entities/playable.cc (copied) (copied from trunk/src/world_entities/playable.cc)
• avi_play/src/world_entities/playable.h (copied) (copied from trunk/src/world_entities/playable.h)
• avi_play/src/world_entities/player.cc (modified) (4 diffs)
• avi_play/src/world_entities/player.h (modified) (2 diffs)
• avi_play/src/world_entities/power_ups/laser_power_up.cc (modified) (1 diff)
• avi_play/src/world_entities/power_ups/turret_power_up.cc (modified) (1 diff)
• avi_play/src/world_entities/space_ships (copied) (copied from trunk/src/world_entities/space_ships)
• avi_play/src/world_entities/space_ships/space_ship.cc (copied) (copied from trunk/src/world_entities/space_ships/space_ship.cc)
• avi_play/src/world_entities/space_ships/space_ship.h (copied) (copied from trunk/src/world_entities/space_ships/space_ship.h)
• avi_play/src/world_entities/weapons/aiming_turret.cc (modified) (2 diffs)
• avi_play/src/world_entities/weapons/ground_turret.cc (modified) (1 diff)
• avi_play/src/world_entities/weapons/guided_missile.cc (modified) (1 diff)
• avi_play/src/world_entities/weapons/weapon_manager.cc (modified) (2 diffs)
• avi_play/src/world_entities/weapons/weapon_manager.h (modified) (2 diffs)
• spaceshipcontrol/src/world_entities/space_ships/space_ship.cc (modified) (1 diff)

branches/avi_play/src/Makefile.am

@@ -47 +47 @@
                   world_entities/world_entity.cc \
                   world_entities/camera.cc \
+                  world_entities/playable.cc \
                   world_entities/player.cc \
                   world_entities/npcs/npc.cc \
@@ -76 +77 @@
                   world_entities/power_ups/turret_power_up.cc \
                   world_entities/power_ups/laser_power_up.cc \
+                  world_entities/space_ships/space_ship.cc \
                   subprojects/benchmark.cc
 
@@ -87 +89 @@
                  world_entities/world_entity.h \
                  world_entities/camera.h \
+                 world_entities/playable.h \
                  world_entities/player.h \
                  world_entities/npcs/npc.h \

branches/avi_play/src/defs/class_id.h

@@ -57 +57 @@
   // superclasses
   CL_MASK_SUPER_CLASS           =    0xff000000,
-  CL_BASE_OBJECT                =    0xff000000,
+  CL_BASE_OBJECT                =    0x00000000,
 
   CL_PARENT_NODE                =    0x01000000,
@@ -69 +69 @@
   CL_ELEMENT_2D                 =    0x10000000,
 
-  CL_SYNCHRONIZEABLE             =    0x20000000,
+  CL_SYNCHRONIZEABLE            =    0x20000000,
 
   CL_WORLD_ENTITY               =    0x40000000,
 
-
+  // subsuper-classes derivations taken : 1, 2, 5, a, b, c.     << THIS IS A LIST OF ALL THE DCL_MASK_SUBSUPERCLASS_ID's taken
   // subsuper-classes
   CL_MASK_SUBSUPER_CLASS        =    0x00fff000,
-  CL_MASK_SUBSUPER_CLASS_ID     =    0x00f00000,
-  CL_MASK_SUBSUPER_CLASS_ID2    =    0x000ff000,
-  CL_PLAYER                     =    0x00101000,
-  CL_NPC                        =    0x00102000,
-  CL_POWER_UP                   =    0x00104000,
-  CL_FIELD                      =    0x00108000,
-  CL_PROJECTILE                 =    0x00110000,
-  CL_WEAPON                     =    0x00120000,
-
-  // subsuper-classes derivations taken : 1, 5, a, b, c.     << THIS IS A LIST OF ALL THE DCL_MASK_SUBSUPERCLASS_ID's taken
+  CL_MASK_SUBSUPER_CLASS_IDA    =    0x00f00000,
+  CL_MASK_SUBSUPER_CLASS_IDB    =    0x000ff000,
+  // SUPER-PNodes
+  CL_FIELD                      =    0x00101000,
+  // SUPER-WorldEntities
+  CL_PLAYABLE                   =    0x00201000,
+  CL_PLAYER                     =    0x00202000,
+  CL_NPC                        =    0x00204000,
+  CL_PROJECTILE                 =    0x00208000,
+  CL_WEAPON                     =    0x00210000,
+  CL_POWER_UP                   =    0x00220000,
+
+  // SUPER-Modeling
+  CL_TEXTURE                    =    0x00c01000,
+  CL_MODEL                      =    0x00c02000,
+
+
+  // subsuper-classes derivations taken : 1, 2, 5, a, b, c.     << THIS IS A LIST OF ALL THE DCL_MASK_SUBSUPERCLASS_ID's taken
 
   // lowest level classes
@@ -120 +128 @@
 
 
+
   // StoryEntities (range from 0x00000100 to 0x000001ff)
   CL_CAMPAIGN                   =    0x00000101,
@@ -135 +144 @@
   CL_TERRAIN                    =    0x00000207,
   CL_TEST_ENTITY                =    0x00000209,
+  CL_SPACE_SHIP                 =    0x0000020a,
 
   CL_TURRET_POWER_UP            =    0x00000211,
@@ -177 +187 @@
 
   // graphical stuff (range from 0x00000800 to 0x000009ff)
-  CL_TEXTURE                    =    0x00c01000,
+  CL_FONT                       =    0x00c02802,
+
+
   CL_TEXT                       =    0x00b01801,
-  CL_FONT                       =    0x00c02802,
   CL_MATERIAL                   =    0x00000804,
-  CL_MODEL                      =    0x00000805, //!< @todo make this a SUBCLASS maybe
-  CL_OBJMODEL                   =    0x00000806,
-  CL_PROMITIVE_MODEL            =    0x00000807,
-  CL_MD2Model                   =    0x00000808,
-  CL_LIGHT                      =    0x00000809,
-  CL_PARTICLE_EMITTER           =    0x0000080a,
-  CL_PARTICLE_SYSTEM            =    0x0000080b,
+  CL_TEXTURE_SEQUENCE           =    0x00c04805,
+  CL_OBJMODEL                   =    0x00000807,
+  CL_PROMITIVE_MODEL            =    0x00000808,
+  CL_MD2Model                   =    0x00000809,
+  CL_LIGHT                      =    0x0000080a,
+  CL_PARTICLE_EMITTER           =    0x0000080b,
+  CL_PARTICLE_SYSTEM            =    0x0000080c,
   CL_ENVIRONMENT                =    0x00000810,
   CL_SHADER                     =    0x00000811,

branches/avi_play/src/lib/collision_detection/cd_engine.cc

@@ -24 +24 @@
 #include "world_entity.h"
 #include "terrain.h"
-#include "player.h"
+// #include "player.h"
 
 #include "spatial_separation.h"
@@ -119 +119 @@
     Quadtree* q = this->terrain->ssp->getQuadtree();
 
-    QuadtreeNode* n = q->getQuadtreeFromPosition(this->player->getAbsCoor());
+//    QuadtreeNode* n = q->getQuadtreeFromPosition(this->player->getAbsCoor());
   }
   //sTriangleExt* tri = q->getTriangleFromPosition(this->player->getAbsCoor());

branches/avi_play/src/lib/collision_detection/cd_engine.h

@@ -17 +17 @@
 class OBBTree;
 class Terrain;
-class Player;
+//class Player;
 
 
@@ -51 +51 @@
   inline void setEntityList(tList<WorldEntity>* entityList) { this->entityList = entityList; }
   inline void setTerrain(Terrain* terrain) { this->terrain = terrain; }
-  inline void setPlayer(Player* player) { this->player = player; } /* only for debug purposes \todo: delete*/
+  //  inline void setPlayer(Player* player) { this->player = player; } /* only for debug purposes \todo: delete*/
 
   void drawBV(int depth, int drawMode) const;
@@ -79 +79 @@
 
   Terrain*                terrain;                          //!< this it a ref to the terrain, serving as a ground for all WE
-  Player*                 player;
+//  Player*                 player;
 };
 

branches/avi_play/src/lib/coord/p_node.cc

@@ -428 +428 @@
 
   this->bias = bias;
+  this->bRelDirChanged = true;
 }
 
@@ -836 +837 @@
         glEnd();
       }
+
       /* if we want to draw the children too */
       if (depth == 0) /* -> all of them */

branches/avi_play/src/lib/coord/p_node.h

@@ -76 +76 @@
   inline const Vector& getRelCoor () const { return this->prevRelCoordinate; };
   /** @returns the Relative Coordinate Destination */
-  inline const Vector& getRelCoorSoft2D() const { return (this->toCoordinate)?*this->toCoordinate:this->relCoordinate; };
+  inline const Vector& getRelCoorSoft2D() const { return (this->toCoordinate)? *this->toCoordinate : this->relCoordinate; };
   void setAbsCoor (const Vector& absCoord);
   void setAbsCoor (float x, float y, float z);
@@ -93 +93 @@
   inline const Quaternion& getRelDir () const { return this->prevRelDirection; };
   /** @returns the Relative Directional Destination */
-  inline const Quaternion& getRelDirSoft2D() const { return (this->toDirection)?*this->toDirection:this->relDirection; };
+  inline const Quaternion& getRelDirSoft2D() const { return (this->toDirection)? *this->toDirection : this->relDirection; };
   /** @returns a Vector pointing into the relative Direction */
   inline Vector getRelDirV() const { return this->prevRelDirection.apply(Vector(0,1,0)); };
@@ -100 +100 @@
   void setAbsDirSoft(const Quaternion& absDirSoft, float bias = 1.0);
   void setAbsDirSoft(float x, float y, float z, float bias = 1.0);
+  void shiftDir (const Quaternion& shift);
   /** @returns the absolute Direction */
   inline const Quaternion& getAbsDir () const { return this->absDirection; };
   /** @returns a Vector pointing into the absolute Direction */
   inline Vector getAbsDirV() const { return this->absDirection.apply(Vector(0,1,0)); };
-  void shiftDir (const Quaternion& shift);
+  /** @returns A Vector pointing into the forward direction (X) of the Node */
+  inline Vector getAbsDirX() const { return this->absDirection.apply(Vector(1,0,0)); };
+  /** @returns A Vector pointing into the upward direction (Y) of the Node */
+  inline Vector getAbsDirY() const { return this->absDirection.apply(Vector(0,1,0)); };
+  /** @returns A Vector pointing into the right direction (Z) of the Node */
+  inline Vector getAbsDirZ() const { return this->absDirection.apply(Vector(0,0,1)); };
 
   /** @returns the Speed of the Node */

branches/avi_play/src/lib/event/key_mapper.cc

@@ -21 +21 @@
 #include "key_mapper.h"
 
+#include "event_def.h"
+
 #include "globals.h"
 #include "ini_parser.h"
 #include "key_names.h"
 #include "debug.h"
+
 
 using namespace std;
@@ -191 +194 @@
       {
         if( index[0] == 0)
-        {
+        {
           *map[i].pValue = index[1];
           PRINTF(4)("Mapping %s to '%s' (id %i)\n", name, SDLKToKeyname(index[1]), index[1]);
           break;
-        }
-        else { 
+        }
+        else {
           *map[i].pValue = index[1];
           PRINTF(4)("Mapping %s to '%s' (id %i)\n", name, SDLBToButtonname(index[1]), index[1]);
           break;
-        }
+        }
       }
     }

branches/avi_play/src/lib/event/key_mapper.h

@@ -10 +10 @@
 
 #include "base_object.h"
-#include "event_def.h"
+//#include "event_def.h"
 
 class IniParser;
@@ -66 +66 @@
 
  private:
-  Sint32     coord[2];              //!< temp place to save variables in nameToIndex() function
+  int         coord[2];              //!< temp place to save variables in nameToIndex() function
 };
 

branches/avi_play/src/lib/graphics/graphics_engine.cc

@@ -31 +31 @@
 
 #include "globals.h"
+#include "texture.h"
 
 #ifdef __WIN32__
  #include "class_list.h"
- #include "texture.h"
  #include "list.h"
  #include "model.h"
@@ -131 +131 @@
   const char* textures = iniParser->getVar(CONFIG_NAME_TEXTURES, CONFIG_SECTION_VIDEO_ADVANCED, "0");
   if (strchr(textures, '1') || !strcasecmp(textures, "true"))
-    this->texturesEnabled = true;
+    Texture::setTextureEnableState( true);
   else
-    this->texturesEnabled = false;
+    Texture::setTextureEnableState(false);
 
   // searching for a usefull resolution
@@ -365 +365 @@
 
 /**
- * if Textures should be enabled
-*/
-bool GraphicsEngine::texturesEnabled = true;
-
-/**
  *
  * @param show if The mouse-cursor should be visible

branches/avi_play/src/lib/graphics/graphics_engine.h

@@ -83 +83 @@
 
   public:
-    static bool             texturesEnabled;    //!< if textures should be enabled (globally)
-
 
   private:

branches/avi_play/src/lib/graphics/importer/Makefile.am

@@ -9 +9 @@
                            md2Model.cc \
                            material.cc \
-                           texture.cc
+                           texture.cc \
+                           texture_sequence.cc
 
 
@@ -20 +21 @@
                  material.h \
                  texture.h \
+                 texture_sequence.h \
                  anorms.h \
                  anormtab.h

branches/avi_play/src/lib/graphics/importer/material.h

@@ -51 +51 @@
   static void addTexturePath(const char* pathName);
 
- private:
-  int         illumModel;       //!< The IlluminationModel is either flat or smooth.
-  float       diffuse [4];      //!< The diffuse color of the Material.
-  float       ambient [4];      //!< The ambient color of the Material.
-  float       specular [4];     //!< The specular color of the Material.
-  float       shininess;        //!< The shininess of the Material.
-  float       transparency;     //!< The transperency of the Material.
+  private:
+    int         illumModel;       //!< The IlluminationModel is either flat or smooth.
+    float       diffuse [4];      //!< The diffuse color of the Material.
+    float       ambient [4];      //!< The ambient color of the Material.
+    float       specular [4];     //!< The specular color of the Material.
+    float       shininess;        //!< The shininess of the Material.
+    float       transparency;     //!< The transperency of the Material.
   public:
-  Texture*    diffuseTexture;   //!< The diffuse texture of the Material.
-  Texture*    ambientTexture;   //!< The ambient texture of the Material.
-  Texture*    specularTexture;  //!< The specular texture of the Material.
+    Texture*    diffuseTexture;   //!< The diffuse texture of the Material.
+    Texture*    ambientTexture;   //!< The ambient texture of the Material.
+    Texture*    specularTexture;  //!< The specular texture of the Material.
 };
 #endif

branches/avi_play/src/lib/graphics/importer/texture.cc

@@ -19 +19 @@
 
 #include "debug.h"
-#include "graphics_engine.h"
-
+
+// INCLUDING SDL_Image
 #ifdef HAVE_SDL_IMAGE_H
 #include <SDL_image.h>
@@ -45 +45 @@
 }
 
+
 /**
  *  Destructor of a Texture
@@ -65 +66 @@
 bool Texture::loadImage(const char* imageName)
 {
-  if (GraphicsEngine::texturesEnabled)
+  if (Texture::texturesEnabled)
     {
       if (this->image != NULL)
@@ -80 +81 @@
         {
           SDL_Surface* tmpSurf;
-          if (this->texture)
+          if (this->texture != 0 && glIsTexture(this->texture))
             glDeleteTextures(1, &this->texture);
           // load the new Image to memory
@@ -87 +88 @@
           {
             PRINTF(4)("loading Image %s\n", imageName);
-            if (this->prepareSurface(tmpSurf))
-              loadTexToGL();
+            bool hasAlpha;
+            SDL_Surface* newSurf = this->prepareSurface(tmpSurf, hasAlpha);
+            if (newSurf != NULL)
+            {
+              this->setSurface(newSurf);
+              this->setAlpha(hasAlpha);
+              this->setTexture(Texture::loadTexToGL(newSurf));
+            }
+
             SDL_FreeSurface(tmpSurf);
             return true;
@@ -108 +116 @@
 }
 
+
+/**
+ * rebuilds the texture.
+ * reloads the Texture from Memory to OpenGL.
+ */
 bool Texture::rebuild()
 {
   if (this->texture != 0)
     {
-      glDeleteTextures(1,&this->texture);
-      this->texture = 0;
+      if (glIsTexture(this->texture))
+        glDeleteTextures(1,&this->texture);
+      this->setTexture(0);
     }
 
@@ -119 +133 @@
     {
       PRINTF(3)("Reloading Texture of %s '%s'\n", this->getClassName(), this->getName());
-      this->loadTexToGL();
+      this->setTexture(loadTexToGL(this->image));
     }
-
-}
-
+}
+
+
+/**
+ * set the surface this Texture handles
+ * @param newSurface the new Surface to set as the image for this Texture.
+ *
+ * This deletes the old version of the stored Texture,
+ * and sets the newly given Surface as current.
+ */
+bool Texture::setSurface(SDL_Surface* newSurface)
+{
+  if (this->image != NULL)
+    SDL_FreeSurface(this->image);
+
+  this->image = newSurface;
+
+  return (this->image != NULL);
+}
+
+
+bool Texture::texturesEnabled = true;
+
+/**
+ * enables, disables textures
+ * @param texturesEnabled true if the textures should be enabled
+ */
+void Texture::setTextureEnableState(bool texturesEnabled)
+{
+  Texture::texturesEnabled = texturesEnabled;
+}
+
+
+//////////////////////////////////////
+// UTILITY FUNCTIONALITY OF TEXTURE //
+//////////////////////////////////////
 /**
  * converts surface to a new SDL_Surface, that is loadable by openGL
  * @param surface the Surface to convert
+ * @param hasAlpha if the newly created Surface has an alpha channel, true is returned otherwise false.
  * @returns a !!new!! Surface, that is loadable by openGL.
  */
-bool Texture::prepareSurface(SDL_Surface* surface)
+SDL_Surface* Texture::prepareSurface(SDL_Surface* surface, bool& hasAlpha)
 {
   PRINTF(4)("Loading texture to OpenGL-Environment.\n");
 
-  SDL_Surface* putSurface;
+  SDL_Surface* retSurface;
   SDL_Rect area;
   Uint32 saved_flags;
   Uint8  saved_alpha;
 
-  putSurface = SDL_CreateRGBSurface(SDL_SWSURFACE,
-                               surface->w, surface->h,
-                               32,
+  hasAlpha = false;
+  retSurface = SDL_CreateRGBSurface(SDL_SWSURFACE,
+                                    surface->w, surface->h,
+                                    32,
 #if SDL_BYTEORDER == SDL_LIL_ENDIAN /* OpenGL RGBA masks */
                                0x000000FF,
@@ -147 +196 @@
                                0xFF000000
 #else
-                               0xFF000000,
+                                   0xFF000000,
                                0x00FF0000,
                                0x0000FF00,
                                0x000000FF
 #endif
-                               );
-  if ( putSurface == NULL )
+                                   );
+  if ( retSurface == NULL )
   {
-    this->setSurface(NULL);
-    return false;
+    return NULL;
   }
 
@@ -171 +219 @@
   area.w = surface->w;
   area.h = surface->h;
-  SDL_BlitSurface(surface, &area, putSurface, &area);
+  SDL_BlitSurface(surface, &area, retSurface, &area);
 
   /* Restore the alpha blending attributes */
@@ -177 +225 @@
   {
     SDL_SetAlpha(surface, saved_flags | SDL_OPENGL, saved_alpha);
-    this->bAlpha = true;
-  }
-
-  return (this->setSurface(putSurface));
-}
-
-bool Texture::setSurface(SDL_Surface* newSurface)
-{
-  if (this->image != NULL)
-    SDL_FreeSurface(this->image);
-
-  this->image = newSurface;
-
-  return (this->image != NULL);
+    hasAlpha = true;
+  }
+
+  return (retSurface);
 }
 
@@ -199 +237 @@
  * @returns The ID of the texture.
  */
-GLuint Texture::loadTexToGL ()
-{
-  if (this->texture != 0 && glIsTexture(this->texture))
-    glDeleteTextures(1, &this->texture);
-  this->texture = 0;
-
-  if (this->image == NULL)
+GLuint Texture::loadTexToGL (const SDL_Surface* surface)
+{
+//   if (this->texture != 0 && glIsTexture(this->texture))
+//     glDeleteTextures(1, &this->texture);
+//   this->texture = 0;
+
+  GLuint texture;
+
+  if (surface == NULL)
     return 0;
 
   /* Create an OpenGL texture for the image */
-  glGenTextures(1, &this->texture);
-  glBindTexture(GL_TEXTURE_2D, this->texture);
+  glGenTextures(1, &texture);
+  glBindTexture(GL_TEXTURE_2D, texture);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
@@ -217 +257 @@
                0,
                GL_RGBA,
-               this->image->w, this->image->h,
+               surface->w, surface->h,
                0,
                GL_RGBA,
                GL_UNSIGNED_BYTE,
-               this->image->pixels);
+               surface->pixels);
   // build the MipMaps
   gluBuild2DMipmaps(GL_TEXTURE_2D,
                     GL_RGBA,
-                    this->image->w,
-                    this->image->h,
+                    surface->w,
+                    surface->h,
                     GL_RGBA,
                     GL_UNSIGNED_BYTE,
-                    this->image->pixels);
+                    surface->pixels);
   glBindTexture(GL_TEXTURE_2D, 0);
-  return this->texture;
-}
+  return texture;
+}

branches/avi_play/src/lib/graphics/importer/texture.h

@@ -14 +14 @@
 struct SDL_Surface;
 
-//! an enumerator for different procedural texture-types
-typedef enum TEXTURE_TYPE { TEXTURE_RADIAL_ALIAS,
-  TEXTURE_NOISE };
-
 //! A Class, that reads in Textures from different fileformats.
   class Texture : public BaseObject
@@ -27 +23 @@
 
       bool loadImage(const char* imageName);
-      bool rebuild();
+      virtual bool rebuild();
 
       /** @returns The textureID of this texture.  */
@@ -33 +29 @@
       /** @returns true if texture has alpha, false otherwise */
       inline bool hasAlpha() const {return bAlpha;}
+      /** @returns the stored image of this Texture */
+      const SDL_Surface* const getStoredImage() const { return this->image; };
+
+
+
+      static void setTextureEnableState(bool texturesEnabled);
+      /** @returns true if Textures are enabled */
+      inline static bool getTextureEnableState() { return Texture::texturesEnabled; };
+
+      // Utility functionality:
+      static SDL_Surface* prepareSurface(SDL_Surface* input, bool& hasAlpha);
+      static GLuint loadTexToGL (const SDL_Surface* surface);
 
     protected:
-      bool prepareSurface(SDL_Surface* input);
+
       bool setSurface(SDL_Surface* newSurface);
+      bool setAlpha(bool hasAlpha) { this->bAlpha = hasAlpha; };
+      bool setTexture(GLuint texture) { this->texture = texture; };
 
-      GLuint loadTexToGL ();
 
     private:
-      GLuint        texture;            //!< The Texture-ID of opengl from this Texture.
-      bool          bAlpha;             //!< if the texture has an alpha channel.
-      SDL_Surface*  image;              //!< The SDL_Surfce that stores the Texture on it.
+      GLuint           texture;            //!< The Texture-ID of opengl from this Texture.
+      bool             bAlpha;             //!< if the texture has an alpha channel.
+      SDL_Surface*     image;              //!< The SDL_Surfce that stores the Texture on it.
+
+      static bool      texturesEnabled;    //!< If the Textures are enabled.
   };
 

branches/avi_play/src/lib/graphics/text_engine/font.cc

@@ -181 +181 @@
     this->fontTTF = NULL;
   }
-  if (this->prepareSurface(surface))
-    this->loadTexToGL( );
+  bool hasAlpha;
+  SDL_Surface* newSurf = this->prepareSurface(surface, hasAlpha);
+  if (newSurf != NULL)
+  {
+    this->setSurface(newSurf);
+    this->setAlpha(hasAlpha);
+    this->setTexture(Texture::loadTexToGL(newSurf));
+  }
 
   // initializing the Glyphs.
@@ -491 +497 @@
 
   if (this->setSurface(tmpSurf))
-    loadTexToGL();
+    (this->setTexture(Texture::loadTexToGL(tmpSurf)));
 }
 

branches/avi_play/src/lib/graphics/text_engine/text_engine.cc

@@ -64 +64 @@
 {
   // first remove all the remaining Texts (if any).
-  std::list<BaseObject*>* textList = ClassList::getList(CL_TEXT);
+  const std::list<BaseObject*>* textList = ClassList::getList(CL_TEXT);
   if (textList != NULL)
   {
@@ -71 +71 @@
   }
   // delete all remaining fonts (There should not be Anything to do here)
-  std::list<BaseObject*>* fontList = ClassList::getList(CL_FONT);
+  const std::list<BaseObject*>* fontList = ClassList::getList(CL_FONT);
   if (fontList != NULL)
   {
@@ -124 +124 @@
 void TextEngine::debug() const
 {
-  list<BaseObject*>* textList = ClassList::getList(CL_TEXT);
+  const list<BaseObject*>* textList = ClassList::getList(CL_TEXT);
   if (textList != NULL)
   {
@@ -132 +132 @@
     PRINT(0)("Reference: %p; Text Counts: %d\n", this, textList->size());
 
-    list<BaseObject*>::iterator text;
+    list<BaseObject*>::const_iterator text;
     for ( text = textList->begin(); text != textList->end(); text++)
       dynamic_cast<Text*>(*text)->debug();

branches/avi_play/src/lib/lang/base_object.cc

@@ -112 +112 @@
   else if (classID & CL_MASK_SUBSUPER_CLASS)
   {
-    if (likely(((this->classID & CL_MASK_SUBSUPER_CLASS_ID) == (this->classID & CL_MASK_SUBSUPER_CLASS_ID)) &&
-        this->classID & classID & CL_MASK_SUBSUPER_CLASS_ID2))
+    if (likely(((this->classID & CL_MASK_SUBSUPER_CLASS_IDA) == (this->classID & CL_MASK_SUBSUPER_CLASS_IDA)) &&
+        this->classID & classID & CL_MASK_SUBSUPER_CLASS_IDB))
       return true;
   }

branches/avi_play/src/lib/lang/class_list.cc

@@ -133 +133 @@
  * @return the List accessed by classID, or NULL if not found
  */
-std::list<BaseObject*>* ClassList::getList(ClassID classID)
+const std::list<BaseObject*>* ClassList::getList(ClassID classID)
 {
   ClassList* fl;
@@ -156 +156 @@
  * @return the List accessed by classID, or NULL if not found
  */
-std::list<BaseObject*>* ClassList::getList(const char* className)
+const std::list<BaseObject*>* ClassList::getList(const char* className)
 {
   ClassList* fl;

branches/avi_play/src/lib/lang/class_list.h

@@ -40 +40 @@
     static void                           removeFromClassList(BaseObject* objectPointer);
 
-    static std::list<BaseObject*>*        getList(ClassID classID = CL_NULL);// { return (ClassList* fl = ClassList::getClassList(classID) != NULL)? &(fl->objectList) : NULL; };
-    static std::list<BaseObject*>*        getList(const char* className); // { return (ClassList* fl = ClassList::getClassList(className) != NULL)? &(fl->objectList) : NULL;  };
+    static const std::list<BaseObject*>*  getList(ClassID classID = CL_NULL);// { return (ClassList* fl = ClassList::getClassList(classID) != NULL)? &(fl->objectList) : NULL; };
+    static const std::list<BaseObject*>*  getList(const char* className); // { return (ClassList* fl = ClassList::getClassList(className) != NULL)? &(fl->objectList) : NULL;  };
     static const std::list<const char*>*  getClassNames();
     static BaseObject*                    getObject(const char* name, ClassID classID = CL_NULL);
     static bool                           exists(const BaseObject* object, ClassID classID = CL_NULL);
+
+    void                                  sendBack(std::list<BaseObject*>::const_iterator it);
 
     static void                           whatIs(const BaseObject* object);
@@ -51 +53 @@
     static long                           StringToID(const char* className);
     static void                           debug(unsigned int debugLevel = 0, long classID = CL_NULL);
-    static void                           debugS(const char* className = 0x0, unsigned int debugLevel = 0);
+    static void                           debugS(const char* className = NULL, unsigned int debugLevel = 0);
 
     inline bool                           operator==(ClassID classID) { return (this->classID == classID); };

branches/avi_play/src/lib/network/network_manager.cc

@@ -161 +161 @@
   if (this->netStreamList != NULL || (this->netStreamList = ClassList::getList(CL_NETWORK_STREAM)) != NULL)
   {
-    std::list<BaseObject*>::iterator stream;
+    std::list<BaseObject*>::const_iterator stream;
     for (stream = this->netStreamList->begin(); stream != this->netStreamList->end(); ++stream)
       static_cast<NetworkStream*>(*stream)->processData();

branches/avi_play/src/lib/network/network_manager.h

@@ -41 +41 @@
 
 private:
-  std::list<BaseObject*>*    netStreamList;            // list with refs to all network streams
-  std::list<BaseObject*>*    syncList;                 // list of synchronizeables
+  const std::list<BaseObject*>*    netStreamList;            // list with refs to all network streams
+  const std::list<BaseObject*>*    syncList;                 // list of synchronizeables
 
 };

branches/avi_play/src/lib/shell/shell_command.cc

@@ -159 +159 @@
   long classID = CL_NULL;                      //< the classID retrieved from the Class.
   ShellCommandClass* commandClass = NULL;      //< the command class this command applies to.
-  std::list<BaseObject*>* objectList = NULL;   //< the list of Objects stored in classID
+  const std::list<BaseObject*>* objectList = NULL;   //< the list of Objects stored in classID
   BaseObject* objectPointer = NULL;            //< a pointer to th Object to Execute the command on
   bool emptyComplete = false;                  //< if the completion input is empty string. e.g ""

branches/avi_play/src/lib/shell/shell_completion.cc

@@ -58 +58 @@
 
   long classID;                         //< the classID retrieved from the Class.
-  std::list<BaseObject*>* objectList;   //< the list of Objects stored in classID
+  const std::list<BaseObject*>* objectList;   //< the list of Objects stored in classID
   bool emptyComplete = false;           //< if the completion input is empty string. e.g ""
   long completeType = SHELLC_NONE;      //< the Type we'd like to complete.

branches/avi_play/src/lib/sound/sound_engine.cc

@@ -137 +137 @@
   if (this->sourceList != NULL)
   {
-    list<BaseObject*>::iterator source;
+    list<BaseObject*>::const_iterator source;
     for (source = this->sourceList->begin(); source != this->sourceList->end(); source++)
     {
@@ -182 +182 @@
   if (likely(this->sourceList != NULL))
   {
-    list<BaseObject*>::iterator sourceIT;
+    list<BaseObject*>::const_iterator sourceIT;
     SoundSource* source;
     for (sourceIT = this->sourceList->begin(); sourceIT != this->sourceList->end(); sourceIT++)
@@ -281 +281 @@
 
   // INITIALIZING THE DEVICE:
-  ALchar deviceName[] =
+#ifndef AL_VERSION_1_1
+  ALubyte deviceName[] =
+#else
+  ALCchar deviceName[] =
+#endif
 #ifdef __WIN32__
-      "native";
+      "Direct3D";
 #else
-      "'( ( devices '( native arts null ) ) )";
+      "'( ( devices '( native null ) ) )";
 #endif
   //
@@ -301 +305 @@
 }
 
+
+/**
+ * Allocates openAL sources
+ * @param count how many sources to allocate
+ * @returns true on success, false if at least one source could not be allocated
+ */
+bool SoundEngine::allocateSources(unsigned int count)
+{
+  ALuint* sourceList = new ALuint[count];
+  ALenum result;
+
+  alGenSources(count, sourceList);
+  if ((result = alGetError()) != AL_NO_ERROR)
+  {
+    SoundEngine::PrintALErrorString(result);
+    return false;
+  }
+
+  /// @TODO check syntax
+
+
+  // Setting default values.
+  for (int i = 0; i < count; i++)
+  {
+    alSourcef (sourceList[i], AL_PITCH,    1.0      );
+    alSourcef (sourceList[i], AL_GAIN,     this->getEffectsVolume() );
+    alSourcei (sourceList[i], AL_LOOPING,  AL_FALSE );
+    this->ALSources.push(sourceList[i]);
+  }
+  return true;
+}
+
 /**
  *  Transforms AL-errors into something readable

branches/avi_play/src/lib/sound/sound_engine.h

@@ -14 +14 @@
 
 #include <list>
+#include <stack>
 
 #define SOUND_DOPPLER_FACTOR       0.001          //!< A factor for the audible doppler effect
@@ -21 +22 @@
 class PNode;
 class IniParser;
+
 
 //! A class that handles audio via the openAudioLibrary
@@ -54 +56 @@
     void flushAllBuffers();
     void flushAllSources();
+
+    bool allocateSources(unsigned int count);
     bool initAudio();
 
@@ -66 +70 @@
 
   private:
-    static SoundEngine*      singletonRef;             //!< Reference to this class
+    static SoundEngine*            singletonRef;             //!< Reference to this class
 
-    ALCdevice*               device;                   //!< the used audio-device.
-    ALCcontext*              context;                  //!< the context, currently in use.
+    ALCdevice*                     device;                   //!< the used audio-device.
+    ALCcontext*                    context;                  //!< the context, currently in use.
 
-    float                    musicVolume;              //!< the maximum volume of the music in % (0f,1f]
-    float                    effectsVolume;            //!< the maximum volume of sound-effects in % (0f,1f]
-    PNode*                   listener;                 //!< The listener of the Scene
+    float                          musicVolume;              //!< the maximum volume of the music in % (0f,1f]
+    float                          effectsVolume;            //!< the maximum volume of sound-effects in % (0f,1f]
+    PNode*                         listener;                 //!< The listener of the Scene
 
-    std::list<BaseObject*>*  bufferList;               //!< A list of buffers
-    std::list<BaseObject*>*  sourceList;               //!< A list for all the sources in the scene.
+    const std::list<BaseObject*>*  bufferList;               //!< A list of buffers
+    const std::list<BaseObject*>*  sourceList;               //!< A list for all the sources in the scene.
 
-
+    unsigned int                   maxSourceCount;           //!< How many Sources is the Maximum
+    std::stack<ALuint>             ALSources;                //!< A list of real openAL-Sources, the engine allocates, and stores for reuse.
 };
 

branches/avi_play/src/lib/sound/sound_source.cc

@@ -18 +18 @@
 #include "sound_source.h"
 #include "sound_engine.h"
+
 #include "alincl.h"
 #include "compiler.h"

branches/avi_play/src/lib/sound/sound_source.h

@@ -39 +39 @@
 
   private:
+    bool                   bPlay;                 //!< If the Source is Playing.
     ALuint                 sourceID;              //!< The ID of the Source
     const SoundBuffer*     buffer;                //!< The buffer to play in this source.

branches/avi_play/src/story_entities/world.cc

@@ -26 +26 @@
 #include "null_parent.h"
 #include "pilot_node.h"
-#include "track_node.h"
 #include "world_entity.h"
 #include "player.h"
@@ -40 +39 @@
 #include "shell.h"
 
-#include "track_manager.h"
 #include "garbage_collector.h"
 #include "fast_factory.h"
@@ -63 +61 @@
 #include "weapons/projectile.h"
 #include "event_handler.h"
-
 #include "sound_engine.h"
 #include "ogg_player.h"
@@ -72 +69 @@
 #include "npcs/npc_test1.h"
 #include "shader.h"
+
+#include "playable.h"
 
 SHELL_COMMAND(speed, World, setSpeed);
@@ -122 +121 @@
   PRINTF(3)("World::~World() - deleting current world\n");
 
+
   // here everything that is alocated by the World is deleted
   delete this->entities;
   State::setWorldEntityList(NULL);
 
+  delete this->localPlayer;
 
   // delete all the initialized Engines.
   FastFactory::flushAll(true);
   delete LightManager::getInstance();
-  delete TrackManager::getInstance();
   delete ParticleEngine::getInstance();
   delete AnimationPlayer::getInstance();
@@ -142 +142 @@
   // erease everything that is left.
   delete NullParent::getInstance();
+
   Shader::suspendShader();
 
@@ -172 +173 @@
   this->shell = NULL;
   this->entities = NULL;
+  this->localPlayer = NULL;
+  this->localCamera = NULL;
 
   this->showPNodes = false;
@@ -213 +216 @@
 
   AnimationPlayer::getInstance(); // initializes the animationPlayer
+  ParticleEngine::getInstance();
   PhysicsEngine::getInstance();
 
@@ -242 +246 @@
     }
 
-  TiXmlDocument* XMLDoc = new TiXmlDocument( path);
+  TiXmlDocument* XMLDoc = new TiXmlDocument( getPath());
   // load the campaign document
   if( !XMLDoc->LoadFile())
   {
     // report an error
-    PRINTF(1)("loading XML File: %s @ %d:%d\n", XMLDoc->ErrorDesc(), XMLDoc->ErrorRow(), XMLDoc->ErrorCol());
+    PRINTF(1)("loading XML File: %s @ %s:l%d:c%d\n", XMLDoc->ErrorDesc(), this->getPath(), XMLDoc->ErrorRow(), XMLDoc->ErrorCol());
     delete XMLDoc;
     return (ErrorMessage){213,"XML File parsing error","World::load()"};
@@ -313 +317 @@
       while( element != NULL)
         {
-          WorldEntity* created = dynamic_cast<WorldEntity*>( loader->fabricate( element));
-          if( created != NULL) this->spawn( created);
+          BaseObject* created = (loader->fabricate(element));
+          if( created != NULL )
+          {
+            if(created->isA(CL_WORLD_ENTITY))
+              this->spawn(dynamic_cast<WorldEntity*>(created));
+            printf("Created a %s: %s\n", created->getClassName(), created->getName());
+          }
+
           // if we load a 'Player' we use it as localPlayer
+
+
           //todo do this more elegant
-          if( element->Value() != NULL && !strcmp( element->Value(), "Player"))
-          {
-            localPlayer = (Player*) created;
-            CDEngine::getInstance()->setPlayer(localPlayer);
-          }
-          if( element->Value() != NULL && !strcmp( element->Value(), "SkyBox")) sky = (SkyBox*) created;
+          if( element->Value() != NULL && !strcmp( element->Value(), "SkyBox"))
+            sky = dynamic_cast<SkyBox*>(created);
           if( element->Value() != NULL && !strcmp( element->Value(), "Terrain"))
           {
-            terrain = (Terrain*) created;
+            terrain = dynamic_cast<Terrain*>(created);
             CDEngine::getInstance()->setTerrain(terrain);
           }
@@ -340 +348 @@
     LoadParamXML(root, "LightManager", LightManager::getInstance(), LightManager, loadParams);
 
-    LoadParamXML(root, "ParticleEngine", ParticleEngine::getInstance(), ParticleEngine, loadParams);
-    LoadParamXML(root, "PhysicsEngine", PhysicsEngine::getInstance(), PhysicsEngine, loadParams);
-
-  // find Track
-  element = root->FirstChildElement( "Track");
-  if( element == NULL)
-    {
-      PRINTF(0)("World is missing a 'Track'\n");
-    }
-  else
-    {
-      //load track
-      PRINTF(4)("Loading Track\n");
-
-      TrackManager::getInstance()->loadParams( element);
-      TrackManager::getInstance()->finalize();
-    }
+   LoadParamXML(root, "ParticleEngine", ParticleEngine::getInstance(), ParticleEngine, loadParams);
+//   LoadParamXML(root, "PhysicsEngine", PhysicsEngine::getInstance(), PhysicsEngine, loadParams);
 
   // free the XML data
@@ -363 +356 @@
   /* GENERIC LOADING PROCESS FINISHED */
 
-  // bind input
-  EventHandler::getInstance()->subscribe(this->localPlayer, ES_GAME, KeyMapper::PEV_UP);
-  EventHandler::getInstance()->subscribe(this->localPlayer, ES_GAME, KeyMapper::PEV_DOWN);
-  EventHandler::getInstance()->subscribe(this->localPlayer, ES_GAME, KeyMapper::PEV_LEFT);
-  EventHandler::getInstance()->subscribe(this->localPlayer, ES_GAME, KeyMapper::PEV_RIGHT);
-  EventHandler::getInstance()->subscribe(this->localPlayer, ES_GAME, KeyMapper::PEV_FIRE1);
-  EventHandler::getInstance()->subscribe(this->localPlayer, ES_GAME, KeyMapper::PEV_NEXT_WEAPON);
-  EventHandler::getInstance()->subscribe(this->localPlayer, ES_GAME, KeyMapper::PEV_PREVIOUS_WEAPON);
-  EventHandler::getInstance()->subscribe(this->localPlayer, ES_GAME, SDLK_PAGEUP);
-  EventHandler::getInstance()->subscribe(this->localPlayer, ES_GAME, SDLK_PAGEDOWN);
+
+  // Create a Player
+  this->localPlayer = new Player();
+
+  Playable* playable;
+  const list<BaseObject*>* playableList = ClassList::getList(CL_PLAYABLE);
+  if (playableList != NULL)
+  {
+    playable = dynamic_cast<Playable*>(playableList->front());
+    this->localPlayer->setControllable(playable);
+  }
 
   // bind camera
-  //this->localCamera->bind (localPlayer);
- // this->localPlayer->addChild (this->localCamera);
-
-
-  //        TrackManager::getInstance()->setBindSlave(env);
-  PNode* tn = TrackManager::getInstance()->getTrackNode();
-  tn->addChild(this->localPlayer);
-
-  //localCamera->setParent(TrackNode::getInstance());
-  tn->addChild(this->localCamera);
-  localCamera->lookAt(tn);
+  playable->addChild (this->localCamera);
+
+//   //localCamera->setParent(TrackNode::getInstance());
+//  tn->addChild(this->localCamera);
   localCamera->setClipRegion(1, 10000.0);
-  this->localPlayer->setParentMode(PNODE_ALL);
-  TrackManager::getInstance()->condition(1, LEFTRIGHT, this->localPlayer);
-
+  localCamera->lookAt(playable);
+//  this->localPlayer->setParentMode(PNODE_ALL);
   if (sky != NULL)
   {
@@ -400 +386 @@
   glNewList (objectList, GL_COMPILE);
 
-  //TrackManager::getInstance()->drawGraph(.01);
-  //TrackManager::getInstance()->debug(2);
   glEndList();
 
@@ -412 +396 @@
   ////////////
 
-  Gravity* test = new Gravity();
-
-  // SYSTEM TRAILING THE PLAYER
-  // Creating a Test Particle System
-
-  //new PhysicsConnection(system, gravity);
-  //    new PhysicsConnection(this->localPlayer, gravity);
 
 //   TestEntity* testEntity = new TestEntity();
@@ -424 +401 @@
 //   testEntity->setRelDir(Quaternion(M_PI, Vector(0, 1, 0)));
 //   this->spawn(testEntity);
-
-//   TestEntity* testEntity2 = new TestEntity();
-//   testEntity2->setAnim(STAND);
-//   testEntity2->setRelCoor(Vector(2400.0, 10.0, -30.0));
-//   testEntity2->setRelDir(Quaternion(M_PI, Vector(0, 1, 0)));
-//   //testEntity2->setParent(this->localPlayer);
-//   this->spawn(testEntity2);
-//
-//   TestEntity* testEntity3 = new TestEntity();
-//   testEntity3->setAnim(BOOM);
-//   testEntity3->setRelCoor(Vector(2450.0, 10.0, -40.0));
-//   testEntity3->setRelDir(Quaternion(M_PI, Vector(0, 1, 0)));
-//   this->spawn(testEntity3);
-//
-//   TestEntity* testEntity4 = new TestEntity();
-//   testEntity4->setAnim(FLIP);
-//   testEntity4->setRelCoor(Vector(2500.0, 10.0, -22.0));
-//   testEntity4->setRelDir(Quaternion(M_PI, Vector(0, 1, 0)));
-//   this->spawn(testEntity4);
-//
-//   TestEntity* testEntity5 = new TestEntity();
-//   testEntity5->setAnim(WAVE);
-//   testEntity5->setRelCoor(Vector(2420.0, 10.0, -50.0));
-//   testEntity5->setRelDir(Quaternion(M_PI, Vector(0, 1, 0)));
-//   this->spawn(testEntity5);
-//
-//   TestEntity* testEntity6 = new TestEntity();
-//   testEntity6->setAnim(WAVE);
-//   testEntity6->setRelCoor(Vector(2420.0, 10.0, -20.0));
-//   testEntity6->setRelDir(Quaternion(M_PI, Vector(0, 1, 0)));
-//   this->spawn(testEntity6);
-//
-//   TestEntity* testEntity7 = new TestEntity();
-//   testEntity7->setAnim(WAVE);
-//   testEntity7->setRelCoor(Vector(2500.0, 10.0, -50.0));
-//   testEntity7->setRelDir(Quaternion(M_PI, Vector(0, 1, 0)));
-//   this->spawn(testEntity7);
-
-
-
-//  PhysicsEngine::getInstance()->debug();
-
-
 
   for(int i = 0; i < 100; i++)
@@ -476 +410 @@
     tmp->setAbsCoor(((float)rand()/RAND_MAX) * 5000, 50/*+ (float)rand()/RAND_MAX*20*/, ((float)rand()/RAND_MAX -.5) *30);
     this->spawn(tmp);
-
-
   }
-
-
-
-//  ClassList::debug();
 
   this->music = NULL;//(OggPlayer*)ResourceManager::getInstance()->load("sound/00-luke_grey_-_hypermode.ogg", OGG, RP_LEVEL);
@@ -498 +426 @@
   this->glmis->step();
   // stuff beyond this point remains to be loaded properly
-
-  // initializing the TrackManager
-  TrackManager::getInstance()->addPointV(Vector(150, -35, 5));
-  TrackManager::getInstance()->addPointV(Vector(200,-35, 5));
-  TrackManager::getInstance()->addPointV(Vector(250, -35, 5));
-  TrackManager::getInstance()->addPointV(Vector(320,-33,-.55));
-  TrackManager::getInstance()->setDuration(1);
-  TrackManager::getInstance()->setSavePoint();
-
-  TrackManager::getInstance()->addPointV(Vector(410, 0, 0));
-  TrackManager::getInstance()->addPointV(Vector(510, 20, -10));
-  TrackManager::getInstance()->addPointV(Vector(550, 20, -10));
-  TrackManager::getInstance()->addPointV(Vector(570, 20, -10));
-  TrackManager::getInstance()->setDuration(2);
-
-  TrackManager::getInstance()->forkS("testFork1,testFork2");
-  TrackManager::getInstance()->workOnS("testFork1");
-  TrackManager::getInstance()->addPointV(Vector(640, 25, -30));
-  TrackManager::getInstance()->addPointV(Vector(700, 40, -120));
-  TrackManager::getInstance()->addPointV(Vector(800, 50, -150));
-  TrackManager::getInstance()->addPointV(Vector(900, 60, -100));
-  TrackManager::getInstance()->addPointV(Vector(900, 60, -70));
-  TrackManager::getInstance()->addPointV(Vector(990, 65, -15));
-  TrackManager::getInstance()->addPointV(Vector(1050, 65, -10));
-  TrackManager::getInstance()->addPointV(Vector(1100, 65, -20));
-  TrackManager::getInstance()->setDuration(4);
-
-  TrackManager::getInstance()->workOnS("testFork2");
-  TrackManager::getInstance()->addPointV(Vector(640, 25, 20));
-  TrackManager::getInstance()->addPointV(Vector(670, 50, 120));
-  TrackManager::getInstance()->addPointV(Vector(700, 70, 80));
-  TrackManager::getInstance()->addPointV(Vector(800, 70, 65));
-  TrackManager::getInstance()->addPointV(Vector(850, 65, 65));
-  TrackManager::getInstance()->addPointV(Vector(920, 35, 40));
-  TrackManager::getInstance()->addPointV(Vector(945, 40, 40));
-  TrackManager::getInstance()->addPointV(Vector(970, 24, 40));
-  TrackManager::getInstance()->addPointV(Vector(1000, 40, -7));
-
-  TrackManager::getInstance()->setDuration(4);
-
-
-  TrackManager::getInstance()->joinS("testFork1,testFork2");
-
-  TrackManager::getInstance()->addPointV(Vector(1200, 60, -50));
-  TrackManager::getInstance()->addPointV(Vector(1300, 50, -50));
-  TrackManager::getInstance()->addPointV(Vector(1400, 40, -50));
-  TrackManager::getInstance()->addPointV(Vector(1500, 40, -60));
-  TrackManager::getInstance()->addPointV(Vector(1600, 35, -55));
-  TrackManager::getInstance()->addPointV(Vector(1700, 45, -40));
-  TrackManager::getInstance()->addPointV(Vector(1750, 60, -40));
-  TrackManager::getInstance()->addPointV(Vector(1770, 80, -40));
-  TrackManager::getInstance()->addPointV(Vector(1800, 100, -40));
-  TrackManager::getInstance()->setDuration(10);
-
-  TrackManager::getInstance()->finalize();
-
 
   // LIGHT initialisation
@@ -571 +443 @@
       {
         LightManager::getInstance()->getLight()->setAbsCoor(-5.0, 10.0, -40.0);
-
-
-        this->localPlayer = new Player ();
-        this->localPlayer->setName ("player");
-        this->spawn (this->localPlayer);
-        this->localPlayer->setRelCoor(Vector(5,0,0));
         /*monitor progress*/
         this->glmis->step();
-
-
-        EventHandler::getInstance()->subscribe(this->localPlayer, ES_GAME, KeyMapper::PEV_FIRE1);
-        EventHandler::getInstance()->subscribe(this->localPlayer, ES_GAME, KeyMapper::PEV_NEXT_WEAPON);
-        EventHandler::getInstance()->subscribe(this->localPlayer, ES_GAME, KeyMapper::PEV_PREVIOUS_WEAPON);
-
-        /*
-        Field* testField = new Gravity();
-        testField->setMagnitude(10);
-        new PhysicsConnection(this->localPlayer, testField);
-        */
 
         // bind camera
@@ -614 +469 @@
         this->glmis->step();
 
-        this->pilotNode = new PilotNode();
-        this->spawn(this->pilotNode);
-        this->pilotNode->setAbsCoor(Vector(150, -35, 5));
-        this->pilotNode->addChild(this->localPlayer);
-        this->pilotNode->addChild(this->localCamera);
-        this->localCamera->lookAt(this->localPlayer);
-
-        EventHandler::getInstance()->subscribe(this->pilotNode, ES_GAME, KeyMapper::PEV_UP);
-        EventHandler::getInstance()->subscribe(this->pilotNode, ES_GAME, KeyMapper::PEV_DOWN);
-        EventHandler::getInstance()->subscribe(this->pilotNode, ES_GAME, KeyMapper::PEV_LEFT);
-        EventHandler::getInstance()->subscribe(this->pilotNode, ES_GAME, KeyMapper::PEV_RIGHT);
-        EventHandler::getInstance()->subscribe(this->pilotNode, ES_GAME, EV_MOUSE_MOTION);
-
-        /*
-        PNode* tn = TrackManager::getInstance()->getTrackNode();
-        tn->addChild(this->localPlayer);
-        this->localCamera->lookAt(tn);
-
-        tn->addChild(this->localCamera);
-        this->localPlayer->setParentMode(PNODE_ALL);
-        TrackManager::getInstance()->condition(2, LEFTRIGHT, this->localPlayer);
-        */
         this->glmis->step();
         break;
@@ -663 +496 @@
 {
   this->bPause = false;
-  this->pilotNode = NULL;
 
   /* update the object position before game start - so there are no wrong coordinates used in the first processing */
@@ -838 +670 @@
 void World::handleInput ()
 {
-  // localinput
-  //CommandNode* cn = Orxonox::getInstance()->getLocalInput();
-  //cn->process();
-
   EventHandler::getInstance()->process();
 
@@ -893 +721 @@
 
       /* update tick the rest */
-      TrackManager::getInstance()->tick(this->dtS);
       this->localCamera->tick(this->dtS);
       // tick the engines

branches/avi_play/src/story_entities/world.h

@@ -16 +16 @@
 class Camera;
 class Player;
-class PNode;
 class GLMenuImageScreen;
 class Terrain;
@@ -22 +21 @@
 class Text;
 class TiXmlElement;
-class PilotNode;
 
 class Shell;
@@ -121 +119 @@
     tList<WorldEntity>* entities;       //!< A template List of all entities. Every moving thing should be included here, and world automatically updates them.
     Player* localPlayer;                //!< The Player, you fly through the level.
-    PilotNode* pilotNode;               //!< THe pilot node to fly with the mouse
-
-
 };
 

branches/avi_play/src/subprojects/importer/Makefile.am

@@ -6 +6 @@
 importer_LDFLAGS = $(MWINDOWS)
 
-bin_PROGRAMS = importer
+bin_PROGRAMS = importer \
+               multitex
 
 importer_LDADD = $(MAINSRCDIR)/lib/event/libORXevent.a \
@@ -32 +33 @@
                   $(MAINSRCDIR)/lib/util/color.cc \
                   $(MAINSRCDIR)/lib/util/multi_type.cc \
+                  $(MAINSRCDIR)/lib/util/executor/executor.cc \
                   $(MAINSRCDIR)/util/loading/factory.cc
+
+
+multitex_LDADD = $(MAINSRCDIR)/lib/event/libORXevent.a \
+                 $(MAINSRCDIR)/lib/tinyxml/libtinyxml.a \
+                 $(MAINSRCDIR)/lib/graphics/libORXgraphics.a \
+                 $(MAINSRCDIR)/lib/shell/libORXshell.a \
+                 $(MAINSRCDIR)/lib/sound/libORXsound.a \
+                 $(MAINSRCDIR)/lib/graphics/importer/libORXimporter.a
+
+multitex_SOURCES= ../framework.cc \
+                  multitex.cc \
+                  $(MAINSRCDIR)/util/state.cc \
+                  $(MAINSRCDIR)/world_entities/camera.cc \
+                  $(MAINSRCDIR)/lib/lang/base_object.cc \
+                  $(MAINSRCDIR)/lib/lang/class_list.cc \
+                  $(MAINSRCDIR)/lib/math/vector.cc \
+                  $(MAINSRCDIR)/util/loading/resource_manager.cc \
+                  $(MAINSRCDIR)/lib/util/ini_parser.cc \
+                  $(MAINSRCDIR)/lib/coord/p_node.cc \
+                  $(MAINSRCDIR)/lib/coord/null_parent.cc \
+                  $(MAINSRCDIR)/util/loading/load_param.cc \
+                  $(MAINSRCDIR)/util/loading/load_param_description.cc \
+                  $(MAINSRCDIR)/lib/util/helper_functions.cc \
+                  $(MAINSRCDIR)/lib/util/substring.cc \
+                  $(MAINSRCDIR)/lib/util/color.cc \
+                  $(MAINSRCDIR)/lib/util/multi_type.cc \
+                  $(MAINSRCDIR)/lib/util/executor/executor.cc \
+                  $(MAINSRCDIR)/util/loading/factory.cc

branches/avi_play/src/world_entities/Makefile.am

@@ -7 +7 @@
                   world_entity.cc \
                   camera.cc \
-                  player.cc \
+                  playable.cc \
+                  player.cc \
                   npc.cc \
                   npc2.cc \
@@ -17 +18 @@
                   character_attributes.cc \
                   test_entity.cc \
+                  space_ships/space_ship.cc \
                   weapons/weapon_manager.cc \
                   weapons/weapon.cc \
@@ -35 +37 @@
                  world_entity.h \
                  camera.h \
-                 player.h \
+                 playable.h \
+                 player.h \
                  npc.h \
                  npc2.h \
@@ -45 +48 @@
                  character_attributes.h \
                  test_entity.h \
+                 space_ships/space_ship.h \
                  weapons/weapon_manager.h \
                  weapons/weapon.h \

branches/avi_play/src/world_entities/player.cc

@@ -10 +10 @@
 
    ### File Specific:
-   main-programmer: Patrick Boenzli
-   co-programmer: Christian Meyer
+   main-programmer: Silvan Nellen
+   co-programmer: Benjamin Knecht
 */
 
-#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
-
-
-#include "executor/executor.h"
 #include "player.h"
-
-#include "track_manager.h"
-#include "objModel.h"
-#include "resource_manager.h"
-#include "factory.h"
-
-#include "weapons/weapon_manager.h"
-#include "weapons/test_gun.h"
-#include "weapons/turret.h"
-#include "weapons/cannon.h"
-
-#include "list.h"
+#include "playable.h"
 
 #include "event_handler.h"
 
-#include "event.h"
-
 using namespace std;
 
-CREATE_FACTORY(Player, CL_PLAYER);
 
 /**
  * creates a new Player
- * @param isFree if the player is free
 */
 Player::Player()
@@ -49 +30 @@
 }
 
-/**
- * loads a Players information from a specified file.
- * @param fileName the name of the File to load the player from (absolute path)
- */
-Player::Player(const char* fileName)
-{
-  this->init();
-  TiXmlDocument doc(fileName);
-
-  if(!doc.LoadFile())
-  {
-    PRINTF(2)("Loading file %s failed for player.\n", fileName);
-    return;
-  }
-
-  this->loadParams(doc.RootElement());
-}
-
-/**
- *  creates a new Player from Xml Data
- * @param root the xml element containing player data
-
-   @todo add more parameters to load
-*/
-Player::Player(const TiXmlElement* root)
-{
-  this->init();
-  if (root != NULL)
-    this->loadParams(root);
-
-  //weapons:
-  Weapon* wpRight = new TestGun(0);
-  wpRight->setName("testGun Right");
-  Weapon* wpLeft = new TestGun(1);
-  wpLeft->setName("testGun Left");
-  Weapon* cannon = dynamic_cast<Weapon*>(Factory::getFirst()->fabricate(CL_CANNON));
-
-  cannon->setName("BFG");
-
-  this->weaponMan->addWeapon(wpLeft, 1, 0);
-  this->weaponMan->addWeapon(wpRight,1 ,1);
-  this->weaponMan->addWeapon(cannon, 0, 6);
-
-  //this->weaponMan->addWeapon(turret, 3, 0);
-
-  this->weaponMan->changeWeaponConfig(1);
-}
 
 /**
@@ -102 +36 @@
 Player::~Player ()
 {
-  /* do not delete the weapons, they are contained in the pnode tree
-  and will be deleted there.
-  this only frees the memory allocated to save the list.
-  */
-  delete this->weaponMan;
 }
 
-//#include "glgui_pushbutton.h"
 
 /**
@@ -120 +48 @@
 
   PRINTF(4)("PLAYER INIT\n");
-  travelSpeed = 15.0;
-  bUp = bDown = bLeft = bRight = bAscend = bDescend = false;
-  bFire = false;
-  acceleration = 10.0;
 
-//   GLGuiButton* button = new GLGuiPushButton();
-//   button->show();
-//   button->setLabel("orxonox");
-//   button->setBindNode(this);
-
-  this->weaponMan = new WeaponManager(this);
-  this->weaponMan->setSlotCount(7);
-
-  this->weaponMan->setSlotPosition(0, Vector(-2.6, .1, -3.0));
-  this->weaponMan->setSlotCapability(0, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
-
-  this->weaponMan->setSlotPosition(1, Vector(-2.6, .1, 3.0));
-  this->weaponMan->setSlotCapability(1, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
-
-  this->weaponMan->setSlotPosition(2, Vector(-1.5, .5, -.5));
-  this->weaponMan->setSlotDirection(2, Quaternion(-M_PI_4*.5, Vector(1,0,0)));
-
-  this->weaponMan->setSlotPosition(3, Vector(-1.5, .5, .5));
-  this->weaponMan->setSlotDirection(3, Quaternion(M_PI_4*.5, Vector(1,0,0)));
-
-  this->weaponMan->setSlotPosition(4, Vector(-1.5, -.5, .5));
-  this->weaponMan->setSlotDirection(4, Quaternion(-M_PI_4*.5+M_PI, Vector(1,0,0)));
-
-  this->weaponMan->setSlotPosition(5, Vector(-1.5, -.5, -.5));
-  this->weaponMan->setSlotDirection(5, Quaternion(+M_PI_4*.5-M_PI, Vector(1,0,0)));
-//
-   this->weaponMan->setSlotPosition(6, Vector(-1, 0.0, 0));
-   this->weaponMan->setSlotCapability(6, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
-   //
-//   this->weaponMan->setSlotPosition(8, Vector(-2.5, -0.3, -2.0));
-//   this->weaponMan->setSlotDirection(8, Quaternion(-M_PI, Vector(1,0,0)));
-//
-//   this->weaponMan->setSlotPosition(9, Vector(-2.5, -0.3, 2.0));
-//   this->weaponMan->setSlotDirection(9, Quaternion(+M_PI, Vector(1,0,0)));:
-
+  this->controllable = NULL;
 }
 
 
-/**
- * loads the Settings of a Player from an XML-element.
- * @param root the XML-element to load the Player's properties from
- */
-void Player::loadParams(const TiXmlElement* root)
+bool Player::setControllable(Playable* controllable)
 {
-  static_cast<WorldEntity*>(this)->loadParams(root);
-
-
-
+  if(controllable != NULL && controllable->subscribePlayer(this))
+  {
+      this->controllable = controllable;
+      return true;
+  }
+  else
+    return false;
 }
 
-/**
- * adds a weapon to the weapon list of player
- * @param weapon to add
-*/
-void Player::addWeapon(Weapon* weapon)
-{
-  this->weaponMan->addWeapon(weapon);
-}
+bool Player::disconnectControllable()
+ {
+   if(this->controllable == NULL) return true;
 
+   if(this->controllable->unsubscribePlayer(this))
+   {
+     this->controllable = NULL;
+     return true;
+   }
+   else
+     return false;
+ }
 
-/**
- *  removes a weapon from the player
- * @param weapon to remove
-*/
-void Player::removeWeapon(Weapon* weapon)
-{
-  this->weaponMan->removeWeapon(weapon);
-}
+ void Player::process(const Event &event)
+ {
+   if (likely(this->controllable != NULL))
+     this->controllable->process(event);
+ }
 
-
-/**
- *  effect that occurs after the player is spawned
-*/
-void Player::postSpawn ()
-{
-  //setCollision(new CollisionCluster(1.0, Vector(0,0,0)));
-}
-
-
-/**
- *  the action occuring if the player left the game
-*/
-void Player::leftWorld ()
-{}
-
-
-WorldEntity* ref = NULL;
-/**
- *  this function is called, when two entities collide
- * @param entity: the world entity with whom it collides
- *
- * Implement behaviour like damage application or other miscellaneous collision stuff in this function
- */
-void Player::collidesWith(WorldEntity* entity, const Vector& location)
-{
-  if (entity->isA(CL_TURRET_POWER_UP) && entity != ref)
-  {
-    this->ADDWEAPON();
-    ref = entity;
-    }
-//  PRINTF(3)("collision %s vs %s @ (%f,%f,%f)\n", this->getClassName(), entity->getClassName(), location.x, location.y, location.z);
-}
-
-/**
- *  draws the player after transforming him.
-*/
-void Player::draw () const
-{
-  glMatrixMode(GL_MODELVIEW);
-  glPushMatrix();
-  /* translate */
-  glTranslatef (this->getAbsCoor ().x,
-                this->getAbsCoor ().y,
-                this->getAbsCoor ().z);
-  /* rotate */
-  Vector tmpRot = this->getAbsDir().getSpacialAxis();
-  glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
-  this->model->draw();
-  glPopMatrix();
-
-  this->weaponMan->draw();
-
-  //this->debug(0);
-}
-
-
-/**
- *  the function called for each passing timeSnap
- * @param time The timespan passed since last update
-*/
-void Player::tick (float time)
-{
-  // player controlled movement
-  this->move(time);
-
-  this->weaponMan->tick(time);
-  // weapon system manipulation
-  this->weaponAction();
-}
-
-
-/**
- *  action if player moves
- * @param time the timeslice since the last frame
-*/
-void Player::move (float time)
-{
-  Vector accel(0.0, 0.0, 0.0);
-  Vector rot(0.0, 0.0, 0.0);
-  float rotVal = 0.0;
-  /* FIXME: calculating the direction and orthDirection every timeSlice is redundant! save it somewhere */
-  /* calculate the direction in which the craft is heading  */
-  Vector direction (1.0, 0.0, 0.0);
-  //direction = this->absDirection.apply (direction);
-  Vector orthDirection (0.0, 0.0, 1.0);
-  //orthDirection = orthDirection.cross (direction);
-
-  if( this->bUp && this->getRelCoor().x < 20)
-    accel += direction;
-  if( this->bDown && this->getRelCoor().x > -5)
-    accel -= direction;
-
-  if( this->bLeft && TrackManager::getInstance()->getWidth() > -this->getRelCoor().z*2)
-  {
-    accel -=(orthDirection);
-    rot +=Vector(1,0,0);
-    rotVal -= .4;
-  }
-  if( this->bRight && TrackManager::getInstance()->getWidth() > this->getRelCoor().z*2)
-  {
-    accel += orthDirection;
-    rot += Vector(1,0,0);
-    rotVal += .4;
-  }
-  if (this->bAscend )
-  {
-    accel += Vector(0,1,0);
-    rot += Vector(0,0,1);
-    rotVal += .4;
-  }
-  if (this->bDescend )
-  {
-    accel -= Vector(0,1,0);
-    rot += Vector(0,0,1);
-    rotVal -= .4;
-  }
-
-  Vector move = accel * time *acceleration;
-
-/*  if (accel.z < 0)
-    this->setRelDirSoft(Quaternion(-.4, accel), 5);
-  else if (accel.z > 0)
-    this->setRelDirSoft(Quaternion(.4, accel), 5);
-  else*/
-  rot.normalize();
-  this->setRelDirSoft(Quaternion(rotVal, rot), 5);
-  this->shiftCoor (move);
-}
-
-
-/**
- * weapon manipulation by the player
-*/
-void Player::weaponAction()
-{
-  if( this->bFire)
-    {
-      this->weaponMan->fire();
-    }
-}
-
-/**
- * @todo switch statement ??
- */
-void Player::process(const Event &event)
-{
-  if( event.type == KeyMapper::PEV_UP)
-      this->bUp = event.bPressed;
-  else if( event.type == KeyMapper::PEV_DOWN)
-      this->bDown = event.bPressed;
-  else if( event.type == KeyMapper::PEV_RIGHT)
-      this->bRight= event.bPressed;
-  else if( event.type == KeyMapper::PEV_LEFT)
-      this->bLeft = event.bPressed;
-  else if( event.type == KeyMapper::PEV_FIRE1)
-      this->bFire = event.bPressed;
-  else if( event.type == KeyMapper::PEV_NEXT_WEAPON && event.bPressed)
-    this->weaponMan->nextWeaponConfig();//if( !event.bPressed) this->bWeaponChange = !this->bWeaponChange;
-  else if ( event.type == KeyMapper::PEV_PREVIOUS_WEAPON && event.bPressed)
-    this->weaponMan->previousWeaponConfig();
-
-  else if( event.type == SDLK_PAGEUP)
-    this->bAscend = event.bPressed; //this->shiftCoor(0,.1,0);
-  else if( event.type == SDLK_PAGEDOWN)
-    this->bDescend = event.bPressed; //this->shiftCoor(0,-.1,0);
-}
-
-#include "weapons/aiming_turret.h"
-// FIXME THIS MIGHT BE CONSIDERED EITHER A FEATURE, OR A BUG
-void Player::ADDWEAPON()
-{
-  Weapon* turret = NULL;
-
-  if ((float)rand()/RAND_MAX < .1)
-  {
-    //if (this->weaponMan->hasFreeSlot(2, WTYPE_TURRET))
-    {
-      turret = new Turret();
-      this->weaponMan->addWeapon(turret, 2);
-      this->weaponMan->changeWeaponConfig(2);
-    }
-  }
-  else
-  {
-    //if (this->weaponMan->hasFreeSlot(3))
-    {
-      turret = new AimingTurret();
-      this->weaponMan->addWeapon(turret, 3);
-
-      this->weaponMan->changeWeaponConfig(3);
-    }
-  }
-
-  if(turret != NULL)
-  {
-    turret->setName("Turret");
-    turret->setStateDuration(WS_SHOOTING, (float)rand()/RAND_MAX*.5+.1);
-  }
-}

branches/avi_play/src/world_entities/player.h

@@ -7 +7 @@
 #define _PLAYER_H
 
-#include "world_entity.h"
-#include "physics_interface.h"
 #include "event_listener.h"
 
-template<class T> class tList;
-class Weapon;
-class WeaponManager;
-class Vector;
-class Event;
+/* Forward Declaration */
+class Playable;
 
 //! Basic controllable WorldEntity
@@ -23 +18 @@
      the player.cc for debug also
 */
-class Player : public WorldEntity, public EventListener
+class Player : public EventListener
 {
-  friend class World;
 
   public:
     Player();
-    Player(const char* fileName);
-    Player(const TiXmlElement* root);
     virtual ~Player();
 
-    void init();
-    void loadParams(const TiXmlElement* root);
+    bool              setControllable(Playable* controllalble);
+    inline Playable*  getControllable() { return this->controllable; };
 
-    void addWeapon(Weapon* weapon);
-    void removeWeapon(Weapon* weapon);
+    bool              disconnectControllable();
 
-    virtual void postSpawn();
-    virtual void leftWorld();
+    // eventListener extension.
+    virtual void      process(const Event &event);
 
-    virtual void collidesWith(WorldEntity* entity, const Vector& location);
-    virtual void tick(float time);
-    virtual void draw() const;
-
-    virtual void process(const Event &event);
+  private:
+    void              init();
 
 
   private:
-    void move(float time);
-    void weaponAction();
-
-    // !! temporary !!
-    void ADDWEAPON();
-
-  private:
-    bool                  bUp;                //!< up button pressed.
-    bool                  bDown;              //!< down button pressed.
-    bool                  bLeft;              //!< left button pressed.
-    bool                  bRight;             //!< right button pressed.
-    bool                  bAscend;            //!< ascend button pressed.
-    bool                  bDescend;           //!< descend button presses.
-    bool                  bFire;              //!< fire button pressed.
-
-    WeaponManager*        weaponMan;          //!< the weapon manager: managing a list of weapon to wepaon-slot mapping
-
-    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.
+    Playable*         controllable;                  //!< The one we controll or NULL if none
 };
 

branches/avi_play/src/world_entities/power_ups/laser_power_up.cc

@@ -79 +79 @@
 {
  // PRINTF(3)("collision %s vs %s @ (%f,%f,%f)\n", this->getClassName(), entity->getClassName(), location.x, location.y, location.z);
- if (entity->isA(CL_PLAYER))
+ if (entity->isA(CL_PLAYABLE))
   State::getWorldEntityList()->remove(this);
 }

branches/avi_play/src/world_entities/power_ups/turret_power_up.cc

@@ -79 +79 @@
 {
  // PRINTF(3)("collision %s vs %s @ (%f,%f,%f)\n", this->getClassName(), entity->getClassName(), location.x, location.y, location.z);
- if (entity->isA(CL_PLAYER))
+ if (entity->isA(CL_PLAYABLE))
   State::getWorldEntityList()->remove(this);
 }

branches/avi_play/src/world_entities/weapons/aiming_turret.cc

@@ -93 +93 @@
 
   this->setCapability(WTYPE_ALLDIRS | WTYPE_TURRET);
-  this->setProjectileType(CL_ROCKET);
+  this->setProjectileType(CL_GUIDED_MISSILE);
 
 
@@ -142 +142 @@
     return;
 
-    pj->setVelocity(/*this->getVelocity()+*/(this->getAbsDir().apply(Vector(1,0,0))*250.0 + VECTOR_RAND(13)
+  pj->setVelocity(/*this->getVelocity()+*/(this->getAbsDir().apply(Vector(1,0,0))*250.0 + VECTOR_RAND(13)
             /*target->getAbsCoor() - this->getAbsCoor()*/)*.5);//this->getVelocity());
 
+  pj->setTarget(this->target->getParent());
   pj->setParent(NullParent::getInstance());
   pj->setAbsCoor(this->getEmissionPoint());

branches/avi_play/src/world_entities/weapons/ground_turret.cc

@@ -145 +145 @@
 void GroundTurret::collidesWith (WorldEntity* entity, const Vector& location)
 {
-
+  if (entity->isA(CL_PROJECTILE))
+    this->setAbsDirSoft(Quaternion(-90, Vector(0,0,1)), 90);
 }
 

branches/avi_play/src/world_entities/weapons/guided_missile.cc

@@ -48 +48 @@
   this->energyMin = 1;
   this->energyMax = 10;
-  this->lifeSpan = 5;
-  this->agility = 5;
+  this->lifeSpan = 5.0;
+  this->agility = 5.0;
   this->maxVelocity = 100;
 

branches/avi_play/src/world_entities/weapons/weapon_manager.cc

@@ -110 +110 @@
   this->crossHairSizeAnim->addKeyFrame(100, .05, ANIM_LINEAR);
   this->crossHairSizeAnim->addKeyFrame(50, .01, ANIM_LINEAR);
-
-  this->targetIterator = NULL;
 }
 
@@ -337 +335 @@
     }
   }
-}
-
-
-/**
- * Selects an Entity from the NPC-list, and returns the Target
- */
-PNode* WeaponManager::getSomeTarget()
-{
-   if (this->targetIterator == NULL)
-   {
-     std::list<BaseObject*>* npcList = ClassList::getList(CL_NPC);
-     if (npcList != NULL)
-     {
-       this->targetIterator = npcList->begin();
-     }
-     else
-       return NULL;
-   }
-
-   ///FIXME
-//   this->targetIterator++;
-   PNode* retNode = dynamic_cast<PNode*>((*targetIterator));
-//   if (retNode == NULL && this->targetIterator->getList()->getSize() > 0)
-//     retNode =  dynamic_cast<PNode*>(targetIterator->firstElement());
-
-   return retNode;
-}
-
-
-/**
- * Selects an Entity from the Entity-List, that is near of the carrier PNode.
- * @param carrier: The PNode from which the distance should be measured
- * @param distance: The Maximum Distance to Return.
- */
-PNode* WeaponManager::getDistanceTarget(const PNode* carrier, float distance)
-{
-  std::list<BaseObject*>* npcList = ClassList::getList(CL_NPC);
-  if (npcList != NULL)
-  {
-    list<BaseObject*>::iterator node;
-    for (node= npcList->begin(); node != npcList->end(); node++)
-      if ((carrier->getAbsCoor() - dynamic_cast<PNode*>(*node)->getAbsCoor()).len() < distance)
-        return dynamic_cast<PNode*>(*node);
-  }
-  return this->getFixedTarget();
 }
 

branches/avi_play/src/world_entities/weapons/weapon_manager.h

@@ -80 +80 @@
     /** @returns a fixed target namely the Crosshair's 3D position */
     inline PNode* getFixedTarget() const { return this->crosshair; };
-    PNode* getSomeTarget();
-    PNode* getDistanceTarget(const PNode* carrier, float distance);
 
     void fire();
@@ -109 +107 @@
     Crosshair*              crosshair;                                //!< an aim.
     tAnimation<Crosshair>*  crossHairSizeAnim;                        //!< An animation for the crosshair (scaling)
-
-    std::list<BaseObject*>::iterator  targetIterator;                           //!< An iterator for traversion lists of enemies.
 };

branches/spaceshipcontrol/src/world_entities/space_ships/space_ship.cc

@@ -375 +375 @@
   else if( event.type == EV_MOUSE_MOTION)
   {
-    this->xMouse = event.x;
-    this->yMouse = event.y;
+    this->xMouse = event.xRel;
+    this->yMouse = event.yRel;
   }
 }