Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Apr 13, 2010, 10:16:10 AM (14 years ago)
Author:
dafrick
Message:

Merged pickup4 branch back to trunk.

Location:
code/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/trunk

  • code/trunk/src/modules/pickup/PickupManager.h

    r6540 r6711  
    4444#include "core/OrxonoxClass.h"
    4545
    46 namespace orxonox
    47 {
     46namespace orxonox // tolua_export
     47{ // tolua_export
    4848
    4949    /**
    5050    @brief
    5151        Manages Pickupables.
    52         In essence has two tasks to fulfill. Firstly it must link Pickupables (through their PickupIdentifiers) and their PickupRepresentations. Secondly it manages the Pickup GUI.
     52        In essence has two tasks to fulfill. Firstly it must link Pickupables (through their PickupIdentifiers) and their PickupRepresentations. Secondly it manages the PickupInventory.
    5353        //TODO: Manage Pickup GUI.
    5454    @author
    5555        Damian 'Mozork' Frick
    5656    */
    57     class _PickupExport PickupManager : public Singleton<PickupManager>, public OrxonoxClass
    58     {
     57    class _PickupExport PickupManager // tolua_export
     58        : public Singleton<PickupManager>, public OrxonoxClass
     59    { // tolua_export
    5960        friend class Singleton<PickupManager>;
    6061       
     
    6364            virtual ~PickupManager();
    6465           
    65             static PickupManager& getInstance() { return Singleton<PickupManager>::getInstance(); }
     66            static PickupManager& getInstance() { return Singleton<PickupManager>::getInstance(); } // tolua_export
    6667           
    6768            bool registerRepresentation(const PickupIdentifier* identifier, PickupRepresentation* representation); //!< Registers a PickupRepresentation together with the PickupIdentifier of the Pickupable the PickupRepresentation represents.
    6869            PickupRepresentation* getRepresentation(const PickupIdentifier* identifier); //!< Get the PickupRepresentation representing the Pickupable with the input PickupIdentifier.
    6970           
     71            // tolua_begin
     72            orxonox::PickupCarrier* getPawn(void);
     73           
     74            int getNumCarrierChildren(orxonox::PickupCarrier* carrier);
     75            orxonox::PickupCarrier* getCarrierChild(int index, orxonox::PickupCarrier* carrier);
     76           
     77            const std::string& getCarrierName(orxonox::PickupCarrier* carrier);
     78           
     79            int getNumPickups(orxonox::PickupCarrier* carrier);
     80            PickupRepresentation* getPickupRepresentation(int index, orxonox::PickupCarrier* carrier);
     81            void dropPickup(int index, orxonox::PickupCarrier* carrier);
     82            void usePickup(int index, orxonox::PickupCarrier* carrier, bool use);
     83            // tolua_end
     84           
    7085        private:
    7186            static PickupManager* singletonPtr_s;
     87            static const std::string guiName_s;
    7288           
    7389            PickupRepresentation* defaultRepresentation_; //!< The default PickupRepresentation.
    7490            std::map<const PickupIdentifier*, PickupRepresentation*, PickupIdentifierCompare> representations_; //!< Map linking PickupIdentifiers (representing types if Pickupables) and PickupRepresentations.
    7591       
    76     };
     92    }; // tolua_export
    7793   
    78 }
     94} // tolua_export
    7995
    8096#endif // _PickupManager_H__
Note: See TracChangeset for help on using the changeset viewer.