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

Timestamp:

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

Author:

igarcia

Message:

 

File:

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

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

@@ -14 +14 @@
 BillboardCloudUVMapper::~BillboardCloudUVMapper()
 {
-        clear(); 
+        shutdown(); 
 }
 
@@ -21 +21 @@
 }
 
-void BillboardCloudUVMapper::clear() 
-{
-        Ogre::LogManager::getSingleton().logMessage("Init.BSP:" + Ogre::StringConverter::toString(getNumBsp()));
-
+void BillboardCloudUVMapper::shutdown() 
+{
         while (getNumBsp() > 0)
         {
@@ -30 +28 @@
         }
 
-        Ogre::LogManager::getSingleton().logMessage("Clear.BSP:" + Ogre::StringConverter::toString(getNumBsp()));
-
-        Ogre::LogManager::getSingleton().logMessage("Init.CL:" + Ogre::StringConverter::toString(getNumClusterLists()));
-
-        //while (getNumClusterLists() > 0)
-        //{
-        //      removeBsp(getNumClusterLists()-1);
-        //}
-        mClusterLists.clear();
-
-        Ogre::LogManager::getSingleton().logMessage("Clear.CL:" + Ogre::StringConverter::toString(getNumClusterLists()));
+        while (getNumClusterLists() > 0)
+        {
+                removeClusterList(getNumClusterLists()-1);
+        }       
 }
 
@@ -82 +73 @@
 void BillboardCloudUVMapper::removeClusterList(unsigned int iClusterList)
 {
-        //mClusterLists.erase(mClusterLists.begin() + iClusterList);
+        IMG::ClusterList *clusterList = mClusterLists[iClusterList];
+        mClusterLists.erase(mClusterLists.begin() + iClusterList);
+        delete clusterList;
 }
 
@@ -142 +135 @@
                 "," + Ogre::StringConverter::toString(max[1]-min[1]) + ")");
 
-        SubEntity *subEntity;                                                                                           
+        SubEntityPtr subEntity;                                                                                         
         
         Ogre::Vector2 texCoords01,texCoords02,texCoords03,texCoords04;
@@ -160 +153 @@
         {
                 Ogre::LogManager::getSingleton().logMessage("DontMerge");
-                subEntity = subEntity = mBillboardCloud->getEntity()->getSubEntity(iBillboardGroup);                            
+                subEntity = mBillboardCloud->getEntity()->getSubEntity(iBillboardGroup);                                
                 
                 // Face A
@@ -285 +278 @@
 void BillboardCloudUVMapper::addTextureInBsp(unsigned int iBillboardGroup, unsigned int iBillboard)
 {
-        IMG::NodeBsp *nodeDest;
+        IMG::NodeBspPtr nodeDest;
         IMG::Cluster cluster;
         Ogre::LogManager::getSingleton().logMessage("w:" + Ogre::StringConverter::toString(mTextureWidth));
@@ -304 +297 @@
         for (unsigned int iBillboard = 0; iBillboard < mBillboardCloud->getNumBillboards(); iBillboard++)
         {
-                Billboard *billboard = mBillboardCloud->getBillboard(iBillboard);               
-                EntityCluster *entityCluster = billboard->getBillboardClusterData()->getEntityCluster();
+                BillboardPtr billboard = mBillboardCloud->getBillboard(iBillboard);             
+                EntityClusterPtr entityCluster = billboard->getBillboardClusterData()->getEntityCluster();
 
                 if (entityCluster->getNumEntitiesClusterData() > 0)
@@ -313 +306 @@
                                 if (!enabledTextureCoordSet)
                                 {
-                                        SubEntity *subEntity = mBillboardCloud->getEntity()->getSubEntity(0);   
+                                        SubEntityPtr subEntity = mBillboardCloud->getEntity()->getSubEntity(0); 
                                         subEntity->addTextureCoordSet(2);
                                         subEntity->enableVertexColours(true);
@@ -323 +316 @@
                                 if (groupedBillboards)
                                 {
-                                        SubEntity *subEntity = mBillboardCloud->getEntity()->getSubEntity(numGeneratedBillboardClouds); 
+                                        SubEntityPtr subEntity = mBillboardCloud->getEntity()->getSubEntity(numGeneratedBillboardClouds);       
                                         subEntity->addTextureCoordSet(2);
                                         subEntity->enableVertexColours(true);
@@ -355 +348 @@
         unsigned int iBillboardGroup;
         for (iBillboardGroup = 0; iBillboardGroup < numBillboardGroups; iBillboardGroup++)
-        {
-                
-                IMG::NodeBsp *node = new IMG::NodeBsp;
+        {               
                 IMG::Bsp *bsp = new IMG::Bsp();
-                IMG::Box2d *box = new IMG::Box2d;
                 IMG::ClusterList *clusterList = new IMG::ClusterList();
-
-                box->SetBoundBox(0, 0, mTextureAtlasWidth, mTextureAtlasHeight);
-                node->SetBound(box);
+                IMG::NodeBspPtr node = IMG::NodeBspPtr(new IMG::NodeBsp);
+
+                node->GetBound()->SetBoundBox(0, 0, mTextureAtlasWidth, mTextureAtlasHeight);
                 bsp->SetRoot(node);     
+
                 addBsp(bsp);
                 addClusterList(clusterList);
@@ -375 +366 @@
                 Ogre::LogManager::getSingleton().logMessage("id:" + Ogre::StringConverter::toString(mBillboardCloud->getBillboard(iBillboard)->getBillboardHandle()));
 
-                BillboardClusterData *billboardClusterData = mBillboardCloud->getBillboard(iBillboard)->getBillboardClusterData();              
+                BillboardClusterData *billboardClusterData = mBillboardCloud->getBillboard(iBillboard)->getBillboardClusterData().get();                
                 
                 if (billboardClusterData != NULL)
                 {
                         Ogre::LogManager::getSingleton().logMessage("billboardData");
-                        EntityCluster *entityCluster = billboardClusterData->getEntityCluster();
+                        EntityClusterPtr entityCluster = billboardClusterData->getEntityCluster();
                         if (entityCluster->getNumEntitiesClusterData() > 0)
                         {