Changeset 6055 in orxonox.OLD

Timestamp:

Dec 11, 2005, 10:15:23 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: first optimisations with InactiveNode
observe this through changing weapons while showing the PNodes with Shell → World togglePNodeVisibility

Location:

trunk/src/world_entities/weapons

Files:

• weapon_manager.cc (modified) (2 diffs)
• weapon_manager.h (modified) (2 diffs)

trunk/src/world_entities/weapons/weapon_manager.cc

@@ -23 +23 @@
 #include "crosshair.h"
 
-#include "class_list.h"
 #include "load_param.h"
 #include "factory.h"
-#include "list.h"
+
 #include "t_animation.h"
 #include "null_parent.h"
@@ -380 +379 @@
           tickWeapon->requestAction(WA_ACTIVATE);
           tickWeapon->setParent(&this->currentSlotConfig[i].position);
+          this->currentSlotConfig[i].position.activateNode();
         }
+        else
+          this->currentSlotConfig[i].position.deactivateNode();
       }
     }

trunk/src/world_entities/weapons/weapon_manager.h

@@ -17 +17 @@
 // FORWARD DECLARATION
 template <class T> class tAnimation;
-template <class T> class tIterator;
-
 
 #define    WM_MAX_SLOTS            10             //!< How many slots the WeaponManager has at its max
 #define    WM_MAX_CONFIGS          4              //!< The maximum number of predefined Configurations
 #define    WM_MAX_LOADED_WEAPONS   20             //!< The
-
-//! an enumerator defining a Slot, where a Weapon can be stored inside.
-typedef struct
-{
-  PNode         position;               //!< the relative Position to the position of the carrying entity. (const PNode* parent; of WeaponManager)
-  long          capability;             //!< the capabilities of the Slot @see WM_SlotCapability.
-
-  Weapon*       currentWeapon;          //!< The current weapon this slot is carrying.
-  Weapon*       nextWeapon;             //!< either NULL or the next weapon that will be set (require currentWeapon to deactivate)
-} WM_Slot;
 
 //! This is a special class, that can handle many different Weapons of a ship/man/whatever.
@@ -45 +33 @@
  */
 class WeaponManager : public BaseObject {
+
+  //! an enumerator defining a Slot, where a Weapon can be stored inside.
+  typedef struct
+  {
+    PNode         position;               //!< the relative Position to the position of the carrying entity. (const PNode* parent; of WeaponManager)
+    long          capability;             //!< the capabilities of the Slot @see WM_SlotCapability.
+
+    Weapon*       currentWeapon;          //!< The current weapon this slot is carrying.
+    Weapon*       nextWeapon;             //!< either NULL or the next weapon that will be set (require currentWeapon to deactivate)
+  } WM_Slot;
+
   public:
     WeaponManager(PNode* parent);