Changeset 11042 for code/branches/presentationHS15/src/modules/hover/HoverFlag.cc

Timestamp:

Jan 4, 2016, 6:31:29 PM (8 years ago)

Author:

landauf

Message:

use only default constructor (with context, but no other arguments)

File:

• code/branches/presentationHS15/src/modules/hover/HoverFlag.cc (modified) (3 diffs)

code/branches/presentationHS15/src/modules/hover/HoverFlag.cc

@@ -48 +48 @@
     {
         RegisterObject(HoverFlag);
-        model_ = NULL;
-        cs_ = NULL;
+
+        this->model_ = NULL;
+        this->cs_ = NULL;
+        this->collided_ = false;
+
+        this->enableCollisionCallback();
+        this->setCollisionResponse(true);
+        this->setCollisionType(Static);
     }
 
     /**
     @brief
-        Constructor that expects two coordinate-values in the range 0-9
+        Initializes the flag.
     @param xCoordinate
         X-Coordinate of the flage, 0-9, origin is bottom left
@@ -60 +66 @@
         Y-Coordinate of the flage, 0-9, origin is bottom left
     */
-    HoverFlag::HoverFlag(Context* context, int xCoordinate, int yCoordinate, int cellSize) : StaticEntity(context)
+    void HoverFlag::init(int xCoordinate, int yCoordinate, int cellSize)
     {
-        RegisterObject(HoverFlag);
-        enableCollisionCallback();
-        model_ = NULL;
-        cs_ = NULL;
-
-        model_ = new Model(context);
+        model_ = new Model(this->getContext());
         model_->setMeshSource("ss_flag_eu.mesh");
         model_->setScale3D(Vector3(5, 5, 5));
@@ -74 +75 @@
         this->attach(model_);
 
-        this->enableCollisionCallback();
-        this->setCollisionResponse(true);
-        this->setCollisionType(Static);
-
-        cs_ = new BoxCollisionShape(context);
+        cs_ = new BoxCollisionShape(this->getContext());
         cs_->setHalfExtents(Vector3(5, 5, 5));
         cs_->setPosition(Vector3(xCoordinate*cellSize*1.0f + cellSize/2,0.0f,yCoordinate*cellSize*1.0f + cellSize/2));
 
         this->attachCollisionShape(cs_);
-        this->collided_ = false;
-
     }