Changeset 721 for GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/src/BBCBillboardCloud.cpp

Timestamp:

03/31/06 17:29:32 (19 years ago)

Author:

igarcia

Message:

 

File:

• GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/src/BBCBillboardCloud.cpp (modified) (12 diffs)

GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/src/BBCBillboardCloud.cpp

@@ -6 +6 @@
 BillboardCloud::BillboardCloud() 
 {
-        mEntity = new Entity();
+        //mEntity = new Entity();
+        mEntity = 0;
 }
 
 BillboardCloud::~BillboardCloud() 
 {
-        for (unsigned int iBillboard = 0; iBillboard < getNumBillboards(); iBillboard++)
-        {
-                Billboard *billboard = getBillboard(iBillboard);
-                delete billboard;
-        }
-
-        for (unsigned int iBillboardGroup = 0; iBillboardGroup < getNumBillboardGroups(); iBillboardGroup++)
-        {
-                BillboardGroup *billboardGroup = getBillboardGroup(iBillboardGroup);
-                delete billboardGroup;
-        }
-
-        delete mEntity;
-}
-
-std::vector<Billboard*>* BillboardCloud::getBillboardList() 
+
+}
+
+std::vector<BillboardPtr>* BillboardCloud::getBillboardList() 
 {
         return &mBillboardList;
 }
 
-void BillboardCloud::setBillboardList(std::vector<Billboard*> &value) 
+void BillboardCloud::setBillboardList(std::vector<BillboardPtr> &value) 
 {
         mBillboardList = value;
@@ -41 +30 @@
 }
 
-void BillboardCloud::addBillboard(Billboard *value) 
+void BillboardCloud::addBillboard(BillboardPtr value) 
 {
         value->setBillboardHandle((unsigned int)(mBillboardList.size()));       
@@ -49 +38 @@
 void BillboardCloud::removeBillboard(unsigned int value) 
 {
-        Billboard *billboard = mBillboardList[value];
+        BillboardPtr billboard = mBillboardList[value];
         mBillboardList.erase(mBillboardList.begin() + value);
-        delete billboard;
-}
-
-Billboard* BillboardCloud::getBillboard(unsigned int value) 
+}
+
+BillboardPtr BillboardCloud::getBillboard(unsigned int value) 
 {
         return mBillboardList[value];
 }
 
-Entity* BillboardCloud::getEntity() 
+EntityPtr BillboardCloud::getEntity() 
 {
         return mEntity;
 }
 
-void BillboardCloud::setEntity(Entity *value) 
+void BillboardCloud::setEntity(EntityPtr value) 
 {
         mEntity = value;
@@ -71 +59 @@
 void BillboardCloud::generateBillboardCloud(bool mergeBillboards)
 {
-        if (mEntity != NULL)
-        {
-                delete mEntity;
-                mEntity = new Entity();
-        }
+        mEntity = EntityPtr(new Entity());
 
         unsigned int numGeneratedBillboardClouds = 0;
         for (unsigned int iBillboard = 0; iBillboard < getNumBillboards(); iBillboard++)
         {
-                Billboard *billboard = this->getBillboard(iBillboard);          
-                EntityCluster *entityCluster = billboard->getBillboardClusterData()->getEntityCluster();
+                BillboardPtr billboard = this->getBillboard(iBillboard);                
+                EntityClusterPtr entityCluster = billboard->getBillboardClusterData()->getEntityCluster();
 
                 if (entityCluster->getNumEntitiesClusterData() > 0)
                 {               
-                        SubEntity *subEntity;                   
+                        SubEntityPtr subEntity;                 
                         if (mergeBillboards)
                         {
@@ -157 +141 @@
         while (getNumBillboardGroups() > 0)
         {
-                BillboardGroup *billboardGroup = getBillboardGroup(getNumBillboardGroups()-1);
+                BillboardGroupPtr billboardGroup = getBillboardGroup(getNumBillboardGroups()-1);
                 removeBillboardGroup(getNumBillboardGroups()-1);
         }
@@ -166 +150 @@
         for (iBillboardGroup = 0; iBillboardGroup < numberGroups; iBillboardGroup++)
         {
-                BillboardGroup *billboardGroup = new BillboardGroup();
+                BillboardGroupPtr billboardGroup = BillboardGroupPtr( new BillboardGroup() );
                 addBillboardGroup(billboardGroup);
         }
 
         Ogre::LogManager::getSingleton().logMessage("New.Num.Billboard Groups:" + Ogre::StringConverter::toString(getNumBillboardGroups()));
-        std::cin.get();
-        std::cin.get();
 
         unsigned int numGeneratedBillboardClouds = 0;
         for (unsigned int iBillboard = 0; iBillboard < getNumBillboards(); iBillboard++)
         {
-                Billboard *billboard = this->getBillboard(iBillboard);          
-                EntityCluster *entityCluster = billboard->getBillboardClusterData()->getEntityCluster();
+                BillboardPtr billboard = this->getBillboard(iBillboard);                
+                EntityClusterPtr entityCluster = billboard->getBillboardClusterData()->getEntityCluster();
 
                 if (entityCluster->getNumEntitiesClusterData() > 0)
@@ -197 +179 @@
         for (unsigned int iBillboard = 0; iBillboard < getNumBillboards(); iBillboard++)
         {
-                Billboard *billboard = this->getBillboard(iBillboard);          
-                EntityCluster *entityCluster = billboard->getBillboardClusterData()->getEntityCluster();
+                BillboardPtr billboard = this->getBillboard(iBillboard);                
+                EntityClusterPtr entityCluster = billboard->getBillboardClusterData()->getEntityCluster();
 
                 if (entityCluster->getNumEntitiesClusterData() > 0)
@@ -229 +211 @@
 void BillboardCloud::generateBillboardCloudGroups()
 {
-        SubEntity *subEntityGroup;
-        SubEntity *subEntity;
-        Entity *entity = new Entity();
+        SubEntityPtr subEntityGroup;
+        SubEntityPtr subEntity;
+        EntityPtr entity = EntityPtr(new Entity());
         unsigned int numGeneratedBillboardClouds = 0;
 
@@ -244 +226 @@
                 subEntityGroup = entity->getSubEntity(iBillboardGroup);
 
-                BillboardGroup *billboardGroup = this->getBillboardGroup(iBillboardGroup);
+                BillboardGroupPtr billboardGroup = this->getBillboardGroup(iBillboardGroup);
 
                 Ogre::LogManager::getSingleton().logMessage("BBCG-Num.Billboards:" + Ogre::StringConverter::toString(billboardGroup->getNumBillboards()));
-                std::cin.get();
-                std::cin.get();
 
                 for (unsigned int iBillboard = 0; iBillboard < billboardGroup->getNumBillboards(); iBillboard++)
                 {
                         unsigned int billboardHandle = billboardGroup->getBillboardHandle(iBillboard);
-                        Billboard *billboard = this->getBillboard(billboardHandle);
-                        EntityCluster *entityCluster = billboard->getBillboardClusterData()->getEntityCluster();
+                        BillboardPtr billboard = this->getBillboard(billboardHandle);
+                        EntityClusterPtr entityCluster = billboard->getBillboardClusterData()->getEntityCluster();
 
                         if (entityCluster->getNumEntitiesClusterData() > 0)
@@ -318 +298 @@
         }       
 
-        delete mEntity;
         mEntity = entity;
         entity->setSubEntitiesDistinctVertexColours();
@@ -328 +307 @@
 }
 
-BillboardGroup* BillboardCloud::getBillboardGroup(unsigned int iBillboardGroup)
+BillboardGroupPtr BillboardCloud::getBillboardGroup(unsigned int iBillboardGroup)
 {
         return mBillboardGroupList[iBillboardGroup];
 }
 
-void BillboardCloud::addBillboardGroup(BillboardGroup *value) 
+void BillboardCloud::addBillboardGroup(BillboardGroupPtr value) 
 {
         mBillboardGroupList.push_back(value);
@@ -340 +319 @@
 void BillboardCloud::removeBillboardGroup(unsigned int value) 
 {
-        BillboardGroup *billboardGroup = mBillboardGroupList[value];
+        BillboardGroupPtr billboardGroup = mBillboardGroupList[value];
         mBillboardGroupList.erase(mBillboardGroupList.begin() + value);
-        delete billboardGroup;
-}
-
-}
+}
+
+}