Changeset 11043 for code/branches/presentationHS15/src

Timestamp:

Jan 4, 2016, 8:59:19 PM (9 years ago)

Author:

landauf

Message:

more cleanup & deleting member objects in destructor

Location:

code/branches/presentationHS15/src/modules/hover

Files:

• FlagHUD.cc (modified) (1 diff)
• Hover.cc (modified) (2 diffs)
• Hover.h (modified) (1 diff)
• HoverFlag.cc (modified) (2 diffs)
• HoverWall.cc (modified) (1 diff)
• MazeGenerator.cc (modified) (1 diff)
• MazeGenerator.h (modified) (1 diff)
• TimeHUD.cc (modified) (1 diff)

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

@@ -88 +88 @@
         SUPER(FlagHUD, tick, dt);
 
-        setFlagCount(this->hoverGame_->getFlags());
+        setFlagCount(this->hoverGame_->getNumberOfFlags());
     }
 

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

@@ -49 +49 @@
 
         this->origin_ = NULL;
-        this->flags_ = 1;
+        this->numberOfFlags_ = 1;
         this->firstTick_ = true;
 
@@ -99 +99 @@
                 HoverFlag* flag = new HoverFlag(origin_->getContext());
                 flag->init(rand()%numCells, rand()%numCells, cellSize);
-                flagVector_.push_back(flag);
+                flags_.push_back(flag);
             }
-
-            flags_ = flagVector_.size();
 
         }//firsttick end
 
         // Check if ship collided with one of the flags
-        for ( unsigned int i = 0; i < flagVector_.size(); i++ ){
-            if(flagVector_[i]->getCollided()){
-                flagVector_[i]->destroyLater();
-                flagVector_.erase (flagVector_.begin()+i);
+        for ( unsigned int i = 0; i < flags_.size(); i++ ){
+            if(flags_[i]->getCollided()){
+                flags_[i]->destroyLater();
+                flags_.erase (flags_.begin()+i);
             }
         }
-        flags_ = flagVector_.size();
+        numberOfFlags_ = flags_.size();
     }
 }

code/branches/presentationHS15/src/modules/hover/Hover.h

@@ -55 +55 @@
                 { this->origin_ = origin; }
 
-            inline int getFlags() const
-                { return this->flags_; }
+            inline int getNumberOfFlags() const
+                { return this->numberOfFlags_; }
 
         private:
             WeakPtr<HoverOrigin> origin_;
-            std::vector<HoverFlag*> flagVector_;
-            int flags_;
+            std::vector<HoverFlag*> flags_;
+            int numberOfFlags_;
             bool firstTick_;
     };

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

@@ -60 +60 @@
     /**
     @brief
+        Destructor.
+    */
+    HoverFlag::~HoverFlag()
+    {
+        if (this->isInitialized())
+        {
+            if (this->model_)
+                this->model_->destroy();
+            if (this->cs_)
+                this->cs_->destroy();
+        }
+    }
+
+    /**
+    @brief
         Initializes the flag.
     @param xCoordinate
@@ -84 +99 @@
     /**
     @brief
-        Destructor.
-    */
-    HoverFlag::~HoverFlag()
-    {
-
-    }
-
-    /**
-    @brief
         Checks if the Hovership collided with the flag
     */

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

@@ -60 +60 @@
     HoverWall::~HoverWall()
     {
-
+        if (this->isInitialized())
+        {
+            if (this->model_)
+                this->model_->destroy();
+            if (this->cs_)
+                this->cs_->destroy();
+        }
     }
 

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

@@ -84 +84 @@
     }
 
+    MazeGenerator::~MazeGenerator()
+    {
+        delete[] this->levelcode_;
+        delete[] this->maze_;
+    }
+
     /**
     @brief

code/branches/presentationHS15/src/modules/hover/MazeGenerator.h

@@ -52 +52 @@
         public:
             MazeGenerator(int numCells);
+            ~MazeGenerator();
 
             void generateMaze();

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

@@ -83 +83 @@
             this->setCaption(getTimeString(this->time_));
         }
-        if(this->hoverGame_->getFlags() == 0)
+        if(this->hoverGame_->getNumberOfFlags() == 0)
             setRunning(false);