Changeset 9610 in orxonox.OLD

Timestamp:

Jul 30, 2006, 11:33:31 AM (18 years ago)

Author:

bensch

Message:

orxonox/proxy: var-change-handler for the groups

Location:

branches/proxy/src/world_entities

Files:

• npcs/network_turret.cc (modified) (3 diffs)
• npcs/network_turret.h (modified) (3 diffs)
• weapons/targeting_turret.h (modified) (1 diff)

branches/proxy/src/world_entities/npcs/network_turret.cc

@@ -80 +80 @@
   this->weaponHolder.setRelCoor(0,25,0);
   this->weaponHolder.setParent(this);
+
+  this->targetGroup_handle = this->registerVarId( new SynchronizeableInt ( &targetGroup, &targetGroup_write, "targetgroup" ) );
 }
 
@@ -92 +94 @@
   // all the clases this Entity is directly derived from must be called in this way, to load all settings.
   NPC::loadParams(root);
+
+  LoadParam(root, "target-group", this, NetworkTurret, setTargetGroupS);
 }
 
@@ -122 +126 @@
 }
 
+void NetworkTurret::setTargetGroup(int targetGroup)
+{
+  this->weapon->setTargetGroup((OM_LIST)targetGroup);
+}
 
+
+void NetworkTurret::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());
+}
+
+void NetworkTurret::varChangeHandler( std::list< int > & id )
+{
+  WorldEntity::varChangeHandler( id );
+
+  if ( std::find( id.begin(), id.end(), targetGroup_handle) != id.end() )
+  {
+    setTargetGroup( targetGroup_write );
+  }
+}
 
 /**

branches/proxy/src/world_entities/npcs/network_turret.h

@@ -9 +9 @@
 #include "npcs/npc.h"
 
-class Weapon;
+class TargetingTurret;
 
 //! A Class to ...
@@ -24 +24 @@
   virtual void leftWorld ();
 
+
   virtual void destroy(WorldEntity* killer);
 
   virtual void draw() const;
   virtual void tick(float time);
+
+
+  void setTargetGroup(int targetGroup);
+  void setTargetGroupS(const std::string& targetGroup);
+
+  virtual void varChangeHandler( std::list<int> & id );
+
 
 private:
@@ -34 +42 @@
 private:
   PNode  weaponHolder;
-  Weapon *weapon;
+  TargetingTurret *weapon;
+
+  int    targetGroup;
+  int    targetGroup_write;
+
+  int    targetGroup_handle;
 };
 

branches/proxy/src/world_entities/weapons/targeting_turret.h

@@ -26 +26 @@
   virtual void draw() const;
 
+  void setTargetGroup(OM_LIST targetGroup) { this->target.setTargetGroup(targetGroup); };
   const PNode* getLockedTarget() const { return lockedTarget; };