Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
May 23, 2011, 11:26:08 PM (14 years ago)
Author:
dafrick
Message:

Some cleanup. Ready for merge.

Location:
code/branches/pickup/src/modules
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • code/branches/pickup/src/modules/objects/collisionshapes/BoxCollisionShape.h

    r8422 r8554  
    5151        Reto Grieder
    5252
     53    @see btBoxShape
    5354    @ingroup Collisionshapes
    5455    */

  • code/branches/pickup/src/modules/objects/collisionshapes/ConeCollisionShape.h

    r8422 r8554  
    4949        Reto Grieder
    5050
    51     @ingroup Collisionshapes.
     51    @see btConeShape
     52    @ingroup Collisionshapes
    5253    */
    5354    class _ObjectsExport ConeCollisionShape : public CollisionShape

  • code/branches/pickup/src/modules/objects/collisionshapes/PlaneCollisionShape.h

    r8422 r8554  
    5151        Martin Stypinski
    5252
     53    @see btStaticPlaneShape
    5354    @ingroup Collisionshapes
    5455    */

  • code/branches/pickup/src/modules/objects/collisionshapes/SphereCollisionShape.h

    r8422 r8554  
    4949        Reto Grieder
    5050
     51    @see btSphereShape
    5152    @ingroup Collisionshapes
    5253    */

  • code/branches/pickup/src/modules/pickup/PickupPrereqs.h

    r8255 r8554  
    8282    class SpeedPickup;
    8383    class ShieldPickup;
    84         class ShrinkPickup;
     84    class ShrinkPickup;
    8585
    8686}

  • code/branches/pickup/src/modules/pickup/items/ShrinkPickup.cc

    r8535 r8554  
    5151    CreateFactory(ShrinkPickup);
    5252
    53                 /**
     53        /**
    5454    @brief
    5555        Constructor: Initializes the Pickup.
    … …  
    6060
    6161        this->initialize();
     62        this->shrinkFactor_ = 5.0;
     63        this->shrinkSpeed_ = 5.0;
     64        this->duration_ = 5.0;
    6265        isActive_ = false;
    6366        isTerminating_ = false;
    … …  
    9295   /**
    9396    @brief
    94         Method for creating a HealthPickup object through XML.
     97        Method for creating a ShrinkhPickup object through XML.
    9598    */
    9699    void ShrinkPickup::XMLPort(Element& xmlelement, orxonox::XMLPort::Mode mode)
    … …  
    143146    }
    144147
    145                 /**
     148    /**
    146149    @brief
    147150        Prepares for shrinking (collecting several informations).
    … …  
    153156        if(this->isUsed())
    154157        {
    155             this->pawn = this->carrierToPawnHelper();
    156             if(pawn == NULL) // If the PickupCarrier is no Pawn, then this pickup is useless and therefore is destroyed.
     158            this->pawn_ = this->carrierToPawnHelper();
     159            if(pawn_ == NULL) // If the PickupCarrier is no Pawn, then this pickup is useless and therefore is destroyed.
    157160                this->Pickupable::destroy();
    158161
    159162            //Collect scaling information.
    160             defaultScale_ = this->pawn->getScale3D();
    161             defaultMass_ = this->pawn->getMass();
     163            defaultScale_ = this->pawn_->getScale3D();
     164            defaultMass_ = this->pawn_->getMass();
    162165
    163166            smallScale_ = defaultScale_ / shrinkFactor_;
    … …  
    167170            actualMass_ = defaultMass_;
    168171
    169             cameraPositions_ = this->pawn->getCameraPositions();
     172            cameraPositions_ = this->pawn_->getCameraPositions();
    170173            size_ = cameraPositions_.size();
    171174            isActive_ = true;    //start shrinking now.
    172             durationTimer.setTimer(duration_, false, createExecutor(createFunctor(&ShrinkPickup::terminate, this)));    //Set timer for termination.
     175            durationTimer_.setTimer(duration_, false, createExecutor(createFunctor(&ShrinkPickup::terminate, this)));    //Set timer for termination.
    173176        }
    174177    }
    175178
    176         /**
     179    /**
    177180    @brief
    178181        Updates the scales of the ship.
    … …  
    189192            actualMass_ /= factor_;
    190193
    191             this->pawn->setScale3D(actualScale_);
    192             this->pawn->setMass(actualMass_);
     194            this->pawn_->setScale3D(actualScale_);
     195            this->pawn_->setMass(actualMass_);
    193196
    194197            for(int index = 0; index < size_; index++)
    195198            {
    196                 CameraPosition* cameraPos_ = this->pawn->getCameraPosition(index);
     199                CameraPosition* cameraPos_ = this->pawn_->getCameraPosition(index);
    197200                if(cameraPos_ == NULL)
    198201                continue;
    … …  
    209212            actualMass_ *= factor_;
    210213
    211             this->pawn->setScale3D(actualScale_);
    212             this->pawn->setMass(actualMass_);
     214            this->pawn_->setScale3D(actualScale_);
     215            this->pawn_->setMass(actualMass_);
    213216
    214217            for(int index = 0; index < size_; index++)
    215218            {
    216                 CameraPosition* cameraPos_ = this->pawn->getCameraPosition(index);
     219                CameraPosition* cameraPos_ = this->pawn_->getCameraPosition(index);
    217220                if(cameraPos_ == NULL)
    218221                continue;
    … …  
    225228    }
    226229
    227         /**
     230    /**
    228231    @brief
    229232        Initializes the termination.
    … …  
    244247    }
    245248
    246         /**
     249    /**
    247250    @brief
    248251        Creates a duplicate of the input OrxonoxClass.

  • code/branches/pickup/src/modules/pickup/items/ShrinkPickup.h

    r8536 r8554  
    4848
    4949    /**
    50         @author
     50    @author
    5151        Sandro Sgier
    5252
    … …  
    101101        private:
    102102            void initialize(void);
    103             float duration_;                    //!< determines how long the pickup will be active
     103            float duration_;            //!< determines how long the pickup will be active
    104104            float shrinkFactor_;        //shrink factor of the space ship
    105105            float shrinkSpeed_;         //speed of shrinking
    … …  
    114114            float defaultMass_;
    115115            float actualMass_;
    116             float smallMass_;                   
     116            float smallMass_;           
    117117            Pawn* carrierToPawnHelper(void);
    118             Pawn* pawn;
    119             Timer durationTimer;
     118            Pawn* pawn_;
     119            Timer durationTimer_;
    120120            void terminate(void);
    121121    };
Note: See TracChangeset for help on using the changeset viewer.