Changeset 10558 for code/branches/core7

Timestamp:

Aug 29, 2015, 6:45:20 PM (9 years ago)

Author:

landauf

Message:

no need to call get() on Weak or StrongPtr. they are automatically converted to normal pointers.

Location:

code/branches/core7/src

Files:

• modules/objects/SpaceBoundaries.cc (modified) (1 diff)
• modules/objects/triggers/DistanceTrigger.cc (modified) (1 diff)
• orxonox/interfaces/PlayerTrigger.h (modified) (1 diff)
• orxonox/overlays/OverlayGroup.cc (modified) (1 diff)
• orxonox/worldentities/ControllableEntity.cc (modified) (1 diff)
• orxonox/worldentities/ControllableEntity.h (modified) (2 diffs)

code/branches/core7/src/modules/objects/SpaceBoundaries.cc

@@ -210 +210 @@
         for( std::list<WeakPtr<Pawn> >::iterator current = pawnsIn_.begin(); current != pawnsIn_.end(); current++ )
         {
-            Pawn* currentPawn = current->get();
+            Pawn* currentPawn = *current;
             if( currentPawn && currentPawn->getNode() ) 
             {

code/branches/core7/src/modules/objects/triggers/DistanceTrigger.cc

@@ -147 +147 @@
     {
         // Check whether there is a cached object, it still exists and whether it is still in range, if so nothing further needs to be done.
-        if(this->cache_.get() != NULL)
-        {
-            if((this->cache_.get()->getWorldPosition() - this->getWorldPosition()).length() < this->distance_)
+        if(this->cache_ != NULL)
+        {
+            if((this->cache_->getWorldPosition() - this->getWorldPosition()).length() < this->distance_)
                 return true;
             else

code/branches/core7/src/orxonox/interfaces/PlayerTrigger.h

@@ -63 +63 @@
         */
         inline Pawn* getTriggeringPawn(void) const
-            { return this->pawn_.get(); }
+            { return this->pawn_; }
 
         /**

code/branches/core7/src/orxonox/overlays/OverlayGroup.cc

@@ -135 +135 @@
             for (unsigned int i = 0; i != index; ++it, ++i)
                 ;
-            return it->get();
+            return *it;
         }
         else

code/branches/core7/src/orxonox/worldentities/ControllableEntity.cc

@@ -215 +215 @@
             {
                 this->cameraPositions_.front()->attachCamera(this->camera_);
-                this->currentCameraPosition_ = this->cameraPositions_.front().get();
+                this->currentCameraPosition_ = this->cameraPositions_.front();
             }
             else if (this->cameraPositions_.size() > 0)

code/branches/core7/src/orxonox/worldentities/ControllableEntity.h

@@ -155 +155 @@
 
             inline Controller* getController() const
-                { return this->controller_.get(); }
+                { return this->controller_; }
             void setController(Controller* val);
 
@@ -161 +161 @@
             virtual void setTarget( WorldEntity* target );
             virtual WorldEntity* getTarget()
-                { return this->target_.get(); }
+                { return this->target_; }
             void setTargetInternal( uint32_t targetID );