Changeset 9656 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Aug 4, 2006, 11:01:28 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the proxy bache back with no conflicts

Location:

trunk/src/world_entities

Files:

• WorldEntities.am (modified) (2 diffs)
• bsp_entity.cc (modified) (1 diff)
• environments/model_entity.cc (modified) (1 diff)
• environments/water.cc (modified) (2 diffs)
• npcs/ground_turret.cc (modified) (7 diffs)
• npcs/ground_turret.h (modified) (2 diffs)
• npcs/network_turret.cc (copied) (copied from branches/proxy/src/world_entities/npcs/network_turret.cc)
• npcs/network_turret.h (copied) (copied from branches/proxy/src/world_entities/npcs/network_turret.h)
• npcs/space_turret.cc (modified) (5 diffs)
• npcs/space_turret.h (modified) (3 diffs)
• playable.cc (modified) (4 diffs)
• playable.h (modified) (7 diffs)
• power_ups/param_power_up.cc (modified) (1 diff)
• projectiles/guided_missile.h (modified) (1 diff)
• projectiles/laser.cc (modified) (1 diff)
• projectiles/projectile.cc (modified) (1 diff)
• script_trigger.cc (modified) (1 diff)
• skybox.cc (modified) (3 diffs)
• space_ships/hover.cc (modified) (1 diff)
• space_ships/space_ship.cc (modified) (1 diff)
• space_ships/turbine_hover.cc (modified) (5 diffs)
• space_ships/turbine_hover.h (modified) (3 diffs)
• spawning_point.cc (modified) (1 diff)
• spawning_point.h (modified) (1 diff)
• weapons/aim.cc (modified) (8 diffs)
• weapons/aim.h (modified) (4 diffs)
• weapons/aiming_turret.cc (modified) (7 diffs)
• weapons/aiming_turret.h (modified) (1 diff)
• weapons/laser_cannon.cc (modified) (1 diff)
• weapons/targeting_turret.cc (modified) (8 diffs)
• weapons/targeting_turret.h (modified) (1 diff)
• weapons/test_gun.cc (modified) (1 diff)
• world_entity.cc (modified) (5 diffs)
• world_entity.h (modified) (1 diff)

trunk/src/world_entities/WorldEntities.am

@@ -5 +5 @@
                 world_entities/npcs/ground_turret.cc \
                 world_entities/npcs/space_turret.cc \
+                world_entities/npcs/network_turret.cc \
                 world_entities/npcs/generic_npc.cc \
                 world_entities/npcs/door.cc \
@@ -79 +80 @@
                 npcs/ground_turret.h \
                 npcs/space_turret.h \
+                npcs/network_turret.h \
                 npcs/door.cc \
                 npcs/repair_station.h \

trunk/src/world_entities/bsp_entity.cc

@@ -54 +54 @@
   this->bspManager = NULL;
 
-  this->name_handle = registerVarId( new SynchronizeableString( &this->name, &this->name_write, "name" ) );
+  this->name_handle = registerVarId( new SynchronizeableString( &this->name, &this->name_write, "name", PERMISSION_MASTER_SERVER ) );
 
   this->setSynchronized( true );

trunk/src/world_entities/environments/model_entity.cc

@@ -36 +36 @@
   this->speed = NULL;
   this->momentum = NULL;
+
+  this->setSynchronized(true);
 
   if (root != NULL)

trunk/src/world_entities/environments/water.cc

@@ -59 +59 @@
   // To test the Wave equation
   //this->wave(5.0,4.0, 1, 10);
-  
-  height_handle = registerVarId( new SynchronizeableFloat( &height, &height, "height" ) );
-  resX_handle = registerVarId( new SynchronizeableUInt( &resX, &resX, "resX" ) );
-  resY_handle = registerVarId( new SynchronizeableUInt( &resY, &resY, "resY" ) );
-  sizeX_handle = registerVarId( new SynchronizeableFloat( &sizeX, &sizeX, "sizeX" ) );
-  sizeY_handle = registerVarId( new SynchronizeableFloat( &sizeY, &sizeY, "sizeY" ) );
+
+  height_handle = registerVarId( new SynchronizeableFloat( &height, &height, "height", PERMISSION_MASTER_SERVER ) );
+  resX_handle = registerVarId( new SynchronizeableUInt( &resX, &resX, "resX", PERMISSION_MASTER_SERVER ) );
+  resY_handle = registerVarId( new SynchronizeableUInt( &resY, &resY, "resY", PERMISSION_MASTER_SERVER ) );
+  sizeX_handle = registerVarId( new SynchronizeableFloat( &sizeX, &sizeX, "sizeX", PERMISSION_MASTER_SERVER ) );
+  sizeY_handle = registerVarId( new SynchronizeableFloat( &sizeY, &sizeY, "sizeY", PERMISSION_MASTER_SERVER ) );
 }
 
@@ -313 +313 @@
     this->rebuildGrid();
   }
-  
+
   WorldEntity::varChangeHandler( id );
 }

trunk/src/world_entities/npcs/ground_turret.cc

@@ -39 +39 @@
  */
 GroundTurret::GroundTurret(const TiXmlElement* root)
-  : NPC(root)
+    : NPC(root)
 {
   this->init();
@@ -52 +52 @@
 GroundTurret::~GroundTurret ()
 {
-
 }
 
@@ -80 +79 @@
 
 /**
- * loads a GroundTurret from a XML-element
+ * @brief loads a GroundTurret from a XML-element
  * @param root the XML-element to load from
  * @todo make the class Loadable
@@ -88 +87 @@
   // all the clases this Entity is directly derived from must be called in this way, to load all settings.
   NPC::loadParams(root);
-
 
   /**
@@ -126 +124 @@
 void GroundTurret::tick(float dt)
 {
-  if(this->getHealth() > 0.0f && State::getPlayer() &&
-     State::getPlayer()->getPlayable() &&
-     State::getPlayer()->getPlayable()->distance(this) < 120) // HACK
+  if(this->getHealth() > 0.0f
+    ) // HACK <--- YOU ARE THE MOTHERFUCKER
   {
-  if (likely(this->left != NULL))
-  {
-//    this->left->tickW(dt);
-    this->left->requestAction(WA_SHOOT);
-  }
-  if (likely(this->right != NULL))
-  {
-//    this->right->tickW(dt);
-    this->right->requestAction(WA_SHOOT);
-  }
+    if (likely(this->left != NULL))
+    {
+      //    this->left->tickW(dt);
+      this->left->requestAction(WA_SHOOT);
+    }
+    if (likely(this->right != NULL))
+    {
+      //    this->right->tickW(dt);
+      this->right->requestAction(WA_SHOOT);
+    }
   }
 }
@@ -164 +161 @@
 void GroundTurret::postSpawn ()
 {
-
 }
 
@@ -173 +169 @@
 void GroundTurret::leftWorld ()
 {
-
 }
 

trunk/src/world_entities/npcs/ground_turret.h

@@ -15 +15 @@
 {
 
- public:
+public:
   GroundTurret(const TiXmlElement* root = NULL);
   virtual ~GroundTurret();
 
-  void init();
   virtual void loadParams(const TiXmlElement* root);
 
@@ -30 +29 @@
   virtual void tick(float time);
 
- private:
-   PNode  weaponHolder[2];
-   Weapon *left, *right;
+private:
+  void init();
+
+
+private:
+  PNode  weaponHolder[2];
+  Weapon *left, *right;
 };
 

trunk/src/world_entities/npcs/space_turret.cc

@@ -74 +74 @@
   this->weaponHolder[0].setParent(this);
   this->weaponHolder[1].setParent(this);
+
+  this->wLeftHandle = registerVarId( new SynchronizeableString( &this->wLeft, &this->wLeft, "weapon-left", PERMISSION_MASTER_SERVER ) );
+  this->wRightHandle = registerVarId( new SynchronizeableString( &this->wRight, &this->wRight, "weapon-right", PERMISSION_MASTER_SERVER ) );
+
 }
 
@@ -98 +102 @@
   if (this->left)
   {
+    this->wLeft = element->Value();
+
     this->left->setParent(this);
     this->left->toList(this->getOMListNumber());
@@ -110 +116 @@
   if (this->right)
   {
+    this->wRight = element->Value();
+
     this->right->setParent(this);
     this->right->toList(this->getOMListNumber());
@@ -117 +125 @@
   }
 }
+
+
+/**
+ * sets the left weapon called from net sync
+ * @param wLeft the left weapon string
+ */
+void SpaceTurret::setWeaponLeft(const std::string& wLeft)
+{
+
+}
+
+/**
+ * sets the left weapon called from net sync
+ * @param wRught the right weapon string
+ */
+void SpaceTurret::setWeaponRight(const std::string& wRight)
+{}
 
 /**
@@ -198 +223 @@
 
 }
+
+
+
+/**
+ * handler for changes on registred vars
+ * @param id id's which changed
+ */
+void SpaceTurret::varChangeHandler( std::list< int > & id )
+{
+  if ( std::find( id.begin(), id.end(), this->wLeftHandle ) != id.end())
+  {
+    this->setWeaponLeft(this->wLeft);
+  }
+
+  if ( std::find( id.begin(), id.end(), this->wRightHandle ) != id.end() )
+  {
+    this->setWeaponRight(this->wRight);
+  }
+
+
+  WorldEntity::varChangeHandler( id );
+}
+

trunk/src/world_entities/npcs/space_turret.h

@@ -8 +8 @@
 
 #include "npcs/npc.h"
+
+#include <string>
+#include <list>
+
 
 class Weapon;
@@ -20 +24 @@
 
   virtual void loadParams(const TiXmlElement* root);
+  virtual void varChangeHandler( std::list< int > & id );
+
+
+  void setWeaponLeft(const std::string& wLeft);
+  void setWeaponRight(const std::string& wRight);
 
   virtual void postSpawn ();
@@ -36 +45 @@
   PNode  weaponHolder[2];
   Weapon *left, *right;
+
+  std::string wLeft;
+  std::string wRight;
+  int wLeftHandle;
+  int wRightHandle;
 };
 

trunk/src/world_entities/playable.cc

@@ -68 +68 @@
 
 
-  registerVar( new SynchronizeableInt( &score, &score, "score" ) );
+  this->teamChangeHandler = registerVarId( new SynchronizeableInt( &this->teamId, &this->teamId, "team-id", PERMISSION_MASTER_SERVER ) );
+
+  registerVar( new SynchronizeableInt( &score, &score, "score", PERMISSION_MASTER_SERVER ) );
   registerVar( new SynchronizeableBool( &bFire, &bFire, "bFire", PERMISSION_OWNER));
 }
@@ -139 +141 @@
 bool Playable::addWeapon(Weapon* weapon, int configID, int slotID)
 {
+  weapon->setOwner(this->getOwner());
+
+
   if(this->weaponMan.addWeapon(weapon, configID, slotID))
   {
@@ -272 +277 @@
   return false;
 }
+
+
+/**
+ * @brief sets the TeamID and all the properties needed to be visible on the Playable
+ * @param teamID: the new TeamID of the Entity
+ */
+void Playable::setTeam(int teamID)
+{
+  /// Derive this function to make it look different with differen groups.
+  PRINTF(4)("No special team specific function implemented for %s::%s in Team %d\n", this->getClassCName(), this->getCName(), teamID);
+}
+
 
 /**
@@ -512 +529 @@
   "FirstPerson"
 };
+
+
+/**
+ * handler for changes on registred vars
+ * @param id id's which changed
+ */
+void Playable::varChangeHandler( std::list< int > & id )
+{
+  if ( std::find( id.begin(), id.end(), this->teamChangeHandler) != id.end() )
+  {
+    this->setTeam(this->teamId);
+  }
+
+  WorldEntity::varChangeHandler(id);
+}

trunk/src/world_entities/playable.h

@@ -11 +11 @@
 #include "event.h"
 #include <vector>
+#include <list>
 
 #include "world_entities/weapons/weapon_manager.h"
@@ -43 +44 @@
 
   virtual void loadParams(const TiXmlElement* root);
+  void varChangeHandler( std::list< int > & id );
 
   // Weapon and Pickups
@@ -62 +64 @@
   inline const std::vector<int>& getEventList() { return this->events; };
 
+
   // Camera and Playmode
   void attachCamera();
@@ -72 +75 @@
   void setPlayDirection(float angle, float dirX, float dirY, float dirZ, float speed = 0.0f);
 
+  // Networking interface
   inline void setScore( int score ) { this->score = score; }
   inline int  getScore() { return this->score; }
+  inline void setTeamId( int teamId) { this->teamId = teamId;}
+  inline int getTeamId() const { return this->teamId; }
+  virtual void setTeam(int teamID);
+
 
   void setEnterRadius(float radius) { this->enterRadius = radius; };
@@ -85 +93 @@
   virtual void tick(float dt);
 
+
+  inline bool beFire() const { return this->bFire; }
+  inline void fire(bool bF) { this->bFire = bF;}
+
   // Transformations:
   static Playable::Playmode stringToPlaymode(const std::string& playmode);
   static const std::string& playmodeToString(Playable::Playmode playmode);
   static const std::string playmodeNames[];
-
-  inline bool beFire(){ return this->bFire; }
-  inline void fire(bool bF){ this->bFire = bF;}
 
 protected:
@@ -117 +126 @@
 
   int                   score;              //!< players score
+  int                   teamChangeHandler;  //!< handler id for team changes network sync
+  int                   teamId;             //!< id of the current team
 
   bool                  bDead;
@@ -124 +135 @@
   float                 enterRadius;        //!< How far one can be away from the Playable to enter it.
 
-  WorldEntity* collider;
+  WorldEntity*          collider;
 };
 

trunk/src/world_entities/power_ups/param_power_up.cc

@@ -43 +43 @@
   if( root != NULL)
     this->loadParams(root);
-  
-  registerVar( new SynchronizeableInt( (int*)&type, (int*)&type, "type" ) );
-  registerVar( new SynchronizeableFloat( &value, &value, "value" ) );
-  registerVar( new SynchronizeableFloat( &max_value, &max_value, "max_value" ) );
-  registerVar( new SynchronizeableFloat( &min_value, &min_value, "min_value" ) );
+
+  registerVar( new SynchronizeableInt( (int*)&type, (int*)&type, "type", PERMISSION_MASTER_SERVER ) );
+  registerVar( new SynchronizeableFloat( &value, &value, "value", PERMISSION_MASTER_SERVER ) );
+  registerVar( new SynchronizeableFloat( &max_value, &max_value, "max_value", PERMISSION_MASTER_SERVER ) );
+  registerVar( new SynchronizeableFloat( &min_value, &min_value, "min_value", PERMISSION_MASTER_SERVER ) );
 }
 

trunk/src/world_entities/projectiles/guided_missile.h

@@ -13 +13 @@
 class ParticleEmitter;
 class FastFactory;
-class Aim;
 
 class GuidedMissile : public Projectile

trunk/src/world_entities/projectiles/laser.cc

@@ -88 +88 @@
   }
 
-  this->setDamage(0);
+  this->setDamage(20);
   this->setHealth(0);
 }

trunk/src/world_entities/projectiles/projectile.cc

@@ -45 +45 @@
   this->explosionBuffer = NULL;
   this->engineBuffer = NULL;
+
+  //this->addNodeFlags(PNODE_PROHIBIT_DELETE_WITH_PARENT);
 }
 

trunk/src/world_entities/script_trigger.cc

@@ -49 +49 @@
  */
 ScriptTrigger::ScriptTrigger(const TiXmlElement* root)
-{ PRINT(1)("testerror\n");
+{ 
   this->setClassID(CL_SCRIPT_TRIGGER, "ScriptTrigger");
   this->toList(OM_COMMON);

trunk/src/world_entities/skybox.cc

@@ -96 +96 @@
 {
   this->rebuild();
-  
-  textureName_handle = registerVarId( new SynchronizeableString( &textureName, &textureName, "textureName") );
-  size_handle = registerVarId( new SynchronizeableFloat( &size, &size, "size" ) );
+
+  textureName_handle = registerVarId( new SynchronizeableString( &textureName, &textureName, "textureName", PERMISSION_MASTER_SERVER) );
+  size_handle = registerVarId( new SynchronizeableFloat( &size, &size, "size", PERMISSION_MASTER_SERVER ) );
 }
 
@@ -297 +297 @@
 {
   bool somethinChanged = false;
-  
+
   if ( std::find( id.begin(), id.end(), textureName_handle ) != id.end() )
   {
@@ -303 +303 @@
     setTexture( textureName );
   }
-  
+
   if ( std::find( id.begin(), id.end(), size_handle ) != id.end() )
   {
     somethinChanged = true;
   }
-  
+
   rebuild();
-  
+
   WorldEntity::varChangeHandler( id );
 }

trunk/src/world_entities/space_ships/hover.cc

@@ -330 +330 @@
   this->shiftCoor (this->velocity * dt);
 
-    // limit the maximum rotation speed.
+  // limit the maximum rotation speed.
   if (this->rotation != 0.0f)
   {

trunk/src/world_entities/space_ships/space_ship.cc

@@ -234 +234 @@
   this->burstSystem->setColor(1.0, .8,.8,.8,.0);
 
-  registerVar( new SynchronizeableVector( &velocity, &velocity, "velocity" ) );
+  registerVar( new SynchronizeableVector( &velocity, &velocity, "velocity", PERMISSION_MASTER_SERVER ) );
   registerVar( new SynchronizeableQuaternion( &mouseDir, &mouseDir, "mousedir", PERMISSION_OWNER ) );
 

trunk/src/world_entities/space_ships/turbine_hover.cc

@@ -91 +91 @@
 
   this->loadModel("models/ships/hoverglider_mainbody.obj");
+
 }
 
@@ -222 +223 @@
   registerVar( new SynchronizeableFloat( &cameraLook, &cameraLook, "cameraLook", PERMISSION_OWNER ) );
   registerVar( new SynchronizeableFloat( &rotation, &rotation, "rotation", PERMISSION_OWNER ) );
+
+  if( State::isOnline())
+    toList( OM_PLAYERS );
 }
 
@@ -231 +235 @@
 {
   Playable::loadParams(root);
+}
+
+
+void TurbineHover::setBoostColor(const Color& color)
+{
+  this->burstSystem->setColor(0.0, color);
+  this->burstSystem->setColor(0.2, color * 0.6);
+  this->burstSystem->setColor(0.5, color * .3 + Color(0.5, 0.5, 0.8, 0.3));
+  this->burstSystem->setColor(1.0, 0.8, 0.8, 0.8, 0.0);
+
+  printf(":::::::::::::::::::::::\n");
+  this->burstSystem->debug();
 }
 
@@ -256 +272 @@
 
 }
+
+void TurbineHover::setTeam(int teamID)
+{
+  printf("::::::::::::::::: TEAM ::: %d\n", teamID);
+  if (teamID == 0)
+  {
+    this->setBoostColor(Color::blue);
+  }
+  else if (teamID == 1)
+  {
+    this->setBoostColor(Color::red);
+  }
+
+  ///HACK this is very much hard coded.set the owner of the weapons
+  this->getWeaponManager().getWeapon(0)->setOwner(this->getOwner());
+  this->getWeaponManager().getWeapon(1)->setOwner(this->getOwner());
+
+  //choose collision list
+  if( State::isOnline())
+  {
+    if( teamID == 0)
+      toList( OM_GROUP_00 );
+    else if(teamID == 1)
+      toList( OM_GROUP_01);
+  }
+
+
+  // set the local team id, very important
+  this->setTeamId(teamID);
+}
+
 
 
@@ -527 +574 @@
   }
 }
+
+
+/**
+ *  respawning function called by the GameRules
+ */
+void TurbineHover::respawn( )
+{
+
+  Playable::respawn();
+}

trunk/src/world_entities/space_ships/turbine_hover.h

@@ -9 +9 @@
 
 #include "playable.h"
+
+#include "color.h"
 
 // Forward Declaration
@@ -21 +23 @@
     virtual ~TurbineHover();
 
+    void setBoostColor(const Color& color);
+
     virtual void loadParams(const TiXmlElement* root);
     virtual void setPlayDirection(const Quaternion& rot, float speed = 0.0f);
@@ -26 +30 @@
     virtual void leave();
 
+    virtual void setTeam(int teamID);
+
     virtual void postSpawn();
     virtual void leftWorld();
+    virtual void respawn();
 
     virtual void collidesWith(WorldEntity* entity, const Vector& location);

trunk/src/world_entities/spawning_point.cc

@@ -207 +207 @@
 void SpawningPoint::sendRespawnMessage( int uniqueId )
 {
-#warning this byte array is not being deleted according to valginrd
-  byte * buf = new byte[2*INTSIZE];
+  byte buf[2*INTSIZE];
 
   assert( Converter::intToByteArray( this->getUniqueID(), buf, INTSIZE ) == INTSIZE );
   assert( Converter::intToByteArray( uniqueId, buf + INTSIZE, INTSIZE ) == INTSIZE );
 
-  MessageManager::getInstance()->sendMessage( MSGID_RESPAWN, buf, 2*INTSIZE, RT_ALL_BUT_ME, 0, MP_HIGHBANDWIDTH );
-}
-
-bool SpawningPoint::respawnMessageHandler( MessageId messageId, byte * data, int dataLength, void * someData, int userId )
+  MessageManager::getInstance()->sendMessage( MSGID_RESPAWN, buf, 2*INTSIZE, RT_ALL_BUT_ME, NET_UNASSIGNED, MP_HIGHBANDWIDTH );
+}
+
+/**
+ * message handler for respawn message
+ */
+bool SpawningPoint::respawnMessageHandler( MessageType messageType, byte * data, int dataLength, void * someData, int senderId, int destinationId  )
 {
   if ( SharedNetworkData::getInstance()->isMasterServer() /*|| SharedNetworkData::getInstance()->isProxyServerActive()*/)

trunk/src/world_entities/spawning_point.h

@@ -70 +70 @@
 
     void sendRespawnMessage( int uniqueId );
-    static bool respawnMessageHandler( MessageId messageId, byte * data, int dataLength, void * someData, int userId );
+    static bool respawnMessageHandler( MessageType messageType, byte * data, int dataLength, void * someData, int senderId, int destinationId  );
 
 

trunk/src/world_entities/weapons/aim.cc

@@ -50 +50 @@
 Aim::~Aim ()
 {
-  if (this->material)
-    delete this->material;
-
 /*  if (this->text != NULL)
     delete this->text;*/
@@ -70 +67 @@
 
   this->setBindNode(this);
-  this->material = new Material;
   this->source = NULL;
 
-  this->range = 10000;
+  this->range = 1000;
   this->angle = M_PI_4;
-  this->group = OM_GROUP_01;
+  this->targetGroup = OM_GROUP_01;
   this->anim = new tAnimation<Aim>(this, &Aim::setSize);
   this->anim->setInfinity(ANIM_INF_CONSTANT);
@@ -103 +99 @@
   LoadParam(root, "rotation-speed", this, Aim, setRotationSpeed)
       .describe("the Speed with which the Aim should rotate");
+
+  LoadParam(root, "target-group", this, Aim, setTargetGroupS);
 }
 
@@ -108 +106 @@
 {
   ObjectManager::EntityList::iterator entity;
-
-  for (entity = State::getObjectManager()->getObjectList(group).begin();
-       entity != State::getObjectManager()->getObjectList(group).end();
+  //printf("%d\n", this->targetGroup);
+  for (entity = State::getObjectManager()->getObjectList(this->targetGroup).begin();
+       entity != State::getObjectManager()->getObjectList(this->targetGroup).end();
        entity ++)
   {
     diffVec = ( (*entity)->getAbsCoor() - this->source->getAbsCoor() );
 
-    if ( diffVec.len() < range &&  acos( (this->source->getAbsDirX()).dot(diffVec)/(diffVec.len() * (this->source->getAbsDirX()).len() ) )  < angle)
+    if ( diffVec.len() < range )//&&  acos( (this->source->getAbsDirX()).dot(diffVec)/(diffVec.len() * (this->source->getAbsDirX()).len() ) )  < angle)
     {
       //if (this->getParent() != (*entity))
       {
+        printf("found target::: %d %s::%s\n", (*entity)->getOMListNumber(), (*entity)->getClassCName(), (*entity)->getCName());
         this->anim->replay();
         this->setParentSoft(*entity, 5);
@@ -128 +127 @@
    //if no target found:
    this->setParent(PNode::getNullParent());
-
-
-
-}
-
+}
+
+void Aim::setTargetGroupS(const std::string& groupName)
+{
+  OM_LIST id = ObjectManager::StringToOMList(groupName);
+  if (id != OM_NULL)
+    this->setTargetGroup(id);
+  else
+    PRINTF(2)("List %s not found for targetting\n", groupName.c_str());
+}
 
 /**
@@ -149 +153 @@
 void Aim::setTexture(const std::string& textureFile)
 {
-  this->material->setDiffuseMap(textureFile);
+  this->material.setDiffuseMap(textureFile);
 }
 
@@ -170 +174 @@
 //only look for target if the aim hasn`t locked a target yet or if the actual target is out of range
    if(this->getParent() == PNode::getNullParent() ||
-      diffVec.len() > range  ||
-     ( acos( (this->source->getAbsDirX()).dot(diffVec)/(diffVec.len() * (this->source->getAbsDirX()).len() ) ) > angle))
+      diffVec.len() > range )// ||
+     //( acos( (this->source->getAbsDirX()).dot(diffVec)/(diffVec.len() * (this->source->getAbsDirX()).len() ) ) > angle))
     {
      this->setParentSoft(PNode::getNullParent(),5);
@@ -213 +217 @@
 
   glRotatef(this->getAbsDir2D(), 0,0,1);
-  this->material->select();
+  this->material.select();
   glBegin(GL_TRIANGLE_STRIP);
   glTexCoord2f(0, 0);

trunk/src/world_entities/weapons/aim.h

@@ -11 +11 @@
 #include "object_manager.h"
 
+#include "material.h"
+
 // FORWARD DECLARATION
 class Model;
 class Text;
-class Material;
 class TiXmlElement;
 template<class T> class tAnimation;
@@ -25 +26 @@
  * Also the Aim is a Element2D, as it draws a cross onto the Target.
  */
-class Aim : public PNode, public Element2D {
+class Aim : public PNode, public Element2D
+{
 
- public:
+public:
   Aim(PNode* source, const TiXmlElement* root = NULL);
   virtual ~Aim();
 
-  void init();
   virtual void loadParams(const TiXmlElement* root);
 
@@ -37 +38 @@
 
   inline void selectTarget(PNode* target) { this->setParent(target); };
-  inline PNode* getTarget(PNode* target) { return this->getParent(); };
+  inline PNode* getTarget(PNode* target) const { return this->getParent(); };
 
   void searchTarget();
 
-  void setRange(float range){this->range = range;};
-  void setAngle(float angle){this->angle = angle;};
-  void setGroup(OM_LIST group){this->group = group;};
+  void setRange(float range) {this->range = range;};
+  void setAngle(float angle) {this->angle = angle;};
+  void setTargetGroup(OM_LIST group) { this->targetGroup = group; };
+  void setTargetGroupS(const std::string& grounName);
 
   void setSize(float size);
@@ -53 +55 @@
   virtual void draw() const;
 
- private:
-   Material*        material;             //!< a material for the Aim.
-   float            rotationSpeed;        //!< Speed of the Rotation.
-   tAnimation<Aim>* anim;
+private:
+  void init();
 
-   float            range;                //!<
-   float            angle;                //!<
-   Vector           diffVec;
-   OM_LIST          group;
 
-   PNode*           source;               //!< Where this Shot has come from.
+private:
+  Material         material;             //!< a material for the Aim.
+  float            rotationSpeed;        //!< Speed of the Rotation.
+  tAnimation<Aim>* anim;
 
-   Text*            text;                 //!< A Text to display onto this Node. (distance to Target)
+  float            range;                //!<
+  float            angle;                //!<
+  Vector           diffVec;
+  OM_LIST          targetGroup;
+
+  PNode*           source;               //!< Where this Shot has come from.
+
+  //   Text             text;                 //!< A Text to display onto this Node. (distance to Target)
 };
 

trunk/src/world_entities/weapons/aiming_turret.cc

@@ -38 +38 @@
 */
 AimingTurret::AimingTurret ()
-  : Weapon()
+    : Weapon(), target(this)
 {
   this->init();
@@ -46 +46 @@
 
 AimingTurret::AimingTurret(const TiXmlElement* root)
+    : target(this)
 {
   this->init();
@@ -58 +59 @@
 {
   // model will be deleted from WorldEntity-destructor
-//  delete this->target;
+  //  delete this->target;
 }
 
@@ -91 +92 @@
   //this->getProjectileFactory()->prepare(100);
 
-  this->target = new Aim(this);
-  this->target->setVisibility(false);
-  this->target->setRange(400);
-  this->target->setAngle(M_PI_2);
+  this->target.addNodeFlags(PNODE_PROHIBIT_DELETE_WITH_PARENT | PNODE_PROHIBIT_CHILD_DELETE);
+  this->target.setVisibility(false);
+  this->target.setRange(400);
+  this->target.setAngle(M_PI_2);
 
   this->setActionSound(WA_SHOOT, "sound/explosions/explosion_3.wav");
@@ -110 +111 @@
 void AimingTurret::activate()
 {
-  this->target->setVisibility(true);
+  this->target.setVisibility(true);
 }
 
 void AimingTurret::deactivate()
 {
-  this->target->setVisibility(false);
+  this->target.setVisibility(false);
 }
 
@@ -123 +124 @@
     return;
   Quaternion quat;
-  Vector direction = this->target->getAbsCoor() - this->getAbsCoor();
+  Vector direction = this->target.getAbsCoor() - this->getAbsCoor();
 
   direction.normalize();
 
   if (likely (this->getParent() != NULL))
-    quat = Quaternion(direction, this->getParent()->getAbsDir().apply(Vector(0,1,0))) * Quaternion ( -M_PI_2, Vector(0,1,0)) ;
+    //quat = Quaternion(direction, this->getParent()->getAbsDirY()) * Quaternion ( -M_PI_2, Vector(0,1,0)) ;
+    quat = Quaternion ( M_PI_2, this->getParent()->getAbsDirY()) * Quaternion::lookAt(this->getAbsCoor(), this->target.getAbsCoor(), this->getParent()->getAbsDirY());
   else
-    quat = Quaternion(direction, Vector(0,1,0)) * Quaternion ( -M_PI_2, Vector(0,1,0)) ;
+    //quat = Quaternion(direction, Vector(0,1,0)) * Quaternion ( -M_PI_2, Vector(0,1,0)) ;
+    quat = Quaternion ( M_PI_2, Vector(0,1,0)) * Quaternion::lookAt(this->getAbsCoor(), this->target.getAbsCoor(), Vector(0,1,0));
 
   this->setAbsDirSoft(quat, 5);
 
-  this->target->tick(dt);
+  this->target.tick(dt);
 }
 
@@ -143 +146 @@
     return;
 
-  pj->setVelocity(/*this->getVelocity()+*/(this->getAbsDir().apply(Vector(1,0,0))*250.0 + VECTOR_RAND(13)
-            /*target->getAbsCoor() - this->getAbsCoor()*/)*.5);//this->getVelocity());
+  pj->setVelocity(/*this->getVelocity()+*/(this->getAbsDirX()*250.0 + VECTOR_RAND(4)
+                                          /*target.getAbsCoor() - this->getAbsCoor()*/)*.5);//this->getVelocity());
 
   pj->setParent(PNode::getNullParent());

trunk/src/world_entities/weapons/aiming_turret.h

@@ -8 +8 @@
 
 #include "weapon.h"
-
+#include "aim.h"
 /* FORWARD DECLARATION */
-class Aim;
 
 class AimingTurret : public Weapon
-  {
-  public:
-    AimingTurret ();
-    AimingTurret(const TiXmlElement* root);
-    virtual ~AimingTurret ();
+{
+public:
+  AimingTurret ();
+  AimingTurret(const TiXmlElement* root);
+  virtual ~AimingTurret ();
 
-    void init();
-    virtual void loadParams(const TiXmlElement* root);
+  virtual void loadParams(const TiXmlElement* root);
 
-    virtual void activate();
-    virtual void deactivate();
+  void setTargetGroup(OM_LIST targetGroup) { this->target.setTargetGroup(targetGroup); };
 
-    virtual void tick(float dt);
-    virtual void fire();
+  virtual void activate();
+  virtual void deactivate();
+
+  virtual void tick(float dt);
+  virtual void fire();
 
 
-    virtual void draw() const;
+  virtual void draw() const;
 
-  private:
-    Aim*          target;
-  };
+private:
+  void init();
+
+private:
+  Aim           target;
+};
 
 #endif /* _AIMING_TURRET_H */

trunk/src/world_entities/weapons/laser_cannon.cc

@@ -121 +121 @@
     return;
 
+  // make this to let the onKill(...) fuction get the stuff
+  pj->setOwner(this->getOwner());
+
   pj->setParent(PNode::getNullParent());
 

trunk/src/world_entities/weapons/targeting_turret.cc

@@ -17 +17 @@
 #include "targeting_turret.h"
 
-#include "weapon_manager.h"
-#include "aim.h"
-#include "world_entities/projectiles/projectile.h"
+#include "projectiles/projectile.h"
 
 #include "model.h"
@@ -25 +23 @@
 #include "animation3d.h"
 
+#include "util/loading/load_param.h"
 #include "util/loading/factory.h"
 
@@ -30 +29 @@
 
 
-
-
-/**
- *  standard constructor
-
-   creates a new weapon
-*/
-TargetingTurret::TargetingTurret ()
-  : Weapon()
-{
-  this->init();
-
-}
-
-
 TargetingTurret::TargetingTurret(const TiXmlElement* root)
+  : target(this)
 {
   this->init();
@@ -91 +76 @@
   //this->getProjectileFactory()->prepare(100);
 
-  this->target = new Aim(this);
-  this->target->setVisibility(false);
-  this->target->setRange(1000);
-  this->target->setAngle(M_PI_4);
-  this->lockedTarget = this->target;
+  this->target.setVisibility(false);
+  this->target.addNodeFlags(PNODE_PROHIBIT_DELETE_WITH_PARENT | PNODE_PROHIBIT_CHILD_DELETE);
+  this->target.setRange(1000);
+  this->target.setAngle(M_PI_4);
+  this->lockedTarget = &this->target;
 
   this->lockedTime = 0;
@@ -112 +97 @@
   Weapon::loadParams(root);
 
+  LoadParam(root, "target-group", &target, Aim, setTargetGroupS);
+
 }
 
@@ -122 +109 @@
 void TargetingTurret::deactivate()
 {
-  this->target->setVisibility(false);
+  this->target.setVisibility(false);
 }
 
@@ -130 +117 @@
     return;
 
+  this->target.tick(dt);
+
   if( lockedTime >= neededLockTime )
    {
-    lockedTarget = this->target->getParent();
+    lockedTarget = this->target.getParent();
     lockedTime = 0;
    }
 
-  this->target->tick(dt);
 
-  if(this->target->getParent() == PNode::getNullParent())
+  if(this->target.getParent() == PNode::getNullParent())
    lockedTime = 0;
   else
@@ -159 +147 @@
   pj->setAbsDir(this->getAbsDir());
   pj->activate();
-
 }
 

trunk/src/world_entities/weapons/targeting_turret.h

@@ -8 +8 @@
 
 #include "weapon.h"
-
-/* FORWARD DECLARATION */
-class Aim;
+#include "aim.h"
 
 class TargetingTurret : public Weapon
-  {
-  public:
-    TargetingTurret ();
-    TargetingTurret(const TiXmlElement* root);
-    virtual ~TargetingTurret ();
+{
+public:
+  TargetingTurret(const TiXmlElement* root = NULL);
+  virtual ~TargetingTurret ();
 
-    void init();
-    virtual void loadParams(const TiXmlElement* root);
+  virtual void loadParams(const TiXmlElement* root);
 
-    virtual void activate();
-    virtual void deactivate();
+  virtual void activate();
+  virtual void deactivate();
 
-    virtual void tick(float dt);
-    virtual void fire();
+  virtual void tick(float dt);
+  virtual void fire();
 
-    virtual void draw() const;
+  virtual void draw() const;
 
-  private:
-    Aim*           target;
-    PNode*         lockedTarget;
-    float          lockedTime;
-    float          neededLockTime;
-  };
+  void setTargetGroup(OM_LIST targetGroup) { this->target.setTargetGroup(targetGroup); };
+  const PNode* getLockedTarget() const { return lockedTarget; };
+
+private:
+  void init();
+
+private:
+  Aim            target;
+  PNode*         lockedTarget;
+  float          lockedTime;
+  float          neededLockTime;
+};
 
 #endif /* _TARGETING_TURRET_H */

trunk/src/world_entities/weapons/test_gun.cc

@@ -177 +177 @@
   if (pj == NULL)
     return;
+
+  // set the owner
+  pj->setOwner(this->getOwner());
 
   pj->setParent(PNode::getNullParent());

trunk/src/world_entities/world_entity.cc

@@ -28 +28 @@
 #include "util/loading/resource_manager.h"
 #include "util/loading/load_param.h"
-#include "vector.h"
 #include "obb_tree.h"
 
@@ -86 +85 @@
   this->toList(OM_NULL);
 
-  registerVar( new SynchronizeableString( &this->md2TextureFileName, &this->md2TextureFileName, "md2TextureFileName" ) );
-  modelFileName_handle = registerVarId( new SynchronizeableString( &modelFileName, &modelFileName, "modelFileName" ) );
-  scaling_handle = registerVarId( new SynchronizeableFloat( &scaling, &scaling, "scaling" ) );
-  list_handle = registerVarId( new SynchronizeableInt( (int*)&objectListNumber, &list_write, "list" ) );
-
-  health_handle = registerVarId( new SynchronizeableFloat( &this->health, &this->health_write, "health" ) );
-  healthMax_handle = registerVarId( new SynchronizeableFloat( &this->healthMax, &this->healthMax_write, "maxHealth" ) );
+  registerVar( new SynchronizeableString( &this->md2TextureFileName, &this->md2TextureFileName, "md2TextureFileName", PERMISSION_MASTER_SERVER ) );
+  modelFileName_handle = registerVarId( new SynchronizeableString( &modelFileName, &modelFileName, "modelFileName", PERMISSION_MASTER_SERVER ) );
+  scaling_handle = registerVarId( new SynchronizeableFloat( &scaling, &scaling, "scaling", PERMISSION_MASTER_SERVER ) );
+  list_handle = registerVarId( new SynchronizeableInt( (int*)&objectListNumber, &list_write, "list", PERMISSION_MASTER_SERVER ) );
+
+  health_handle = registerVarId( new SynchronizeableFloat( &this->health, &this->health_write, "health", PERMISSION_MASTER_SERVER ) );
+  healthMax_handle = registerVarId( new SynchronizeableFloat( &this->healthMax, &this->healthMax_write, "maxHealth", PERMISSION_MASTER_SERVER ) );
 }
 
@@ -141 +140 @@
   .describe("The Health the WorldEntity has at this moment")
   .defaultValues(1.0f);
+
+  LoadParam(root, "list", this, WorldEntity, toListS);
 }
 
@@ -478 +479 @@
 }
 
+void WorldEntity::toListS(const std::string& listName)
+{
+  OM_LIST id = ObjectManager::StringToOMList(listName);
+  if (id != OM_NULL)
+    this->toList(id);
+  else
+    PRINTF(2)("List %s not found\n", listName.c_str());
+}
+
+
 void WorldEntity::toReflectionList()
 {
@@ -822 +833 @@
   PRINT(0)("WorldEntity %s::%s  (DEBUG)\n", this->getClassCName(), this->getCName());
   this->debugNode();
-  PRINT(0)("List: %s ; ModelCount %d - ", ObjectManager::OMListToString(this->objectListNumber) , this->models.size());
+  PRINT(0)("List: %s ; ModelCount %d - ", ObjectManager::OMListToString(this->objectListNumber).c_str(), this->models.size());
   for (unsigned int i = 0; i < this->models.size(); i++)
   {

trunk/src/world_entities/world_entity.h

@@ -115 +115 @@
   /* --- Object Manager Block --- */
   void toList(OM_LIST list);
+  void toListS(const std::string& listName);
 
   void toReflectionList();