Changeset 950 for GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/src

Timestamp:

05/11/06 15:39:05 (19 years ago)

Author:

igarcia

Message:

 

Location:

GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/src

Files:

• BBCColladaMeshSerializer.cpp (added)
• BBCEntity.cpp (modified) (1 diff)
• IBRBillboardCloudTreeApplication.cpp (modified) (1 diff)
• LBBCManager.cpp (modified) (10 diffs)

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

@@ -350 +350 @@
                                         
                                                 Ogre::ColourValue colour;
-                                                colour.setAsARGB((Ogre::ARGB)(*pSrcARGB));
+                                                //colour.setAsARGB((Ogre::ARGB)(*pSrcARGB) & 0xFF);
+                                                colour.setAsARGB((Ogre::ARGB)(pSrcARGB[0]));
 
                                                 if (!mergeSubMeshes)

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

@@ -48 +48 @@
                         mLBBCManager->generateBillboardCloud();
                 }
-
+        
                 mLBBCManager->shutdown();
                 delete mLBBCManager;
+
                 mOgreBase->shutdown();          
                 delete mOgreBase;
+
                 //----------------------------------------------------------------------------
                 this->setup(true,"IBR Billboard Cloud Tree Generator", 512, 512, false);

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

@@ -13 +13 @@
         mBillboardCloudUVMapper = new BBC::BillboardCloudUVMapper();
         mOgreMeshSerializer = new BBC::OgreMeshSerializer();
+        mColladaMeshSerializer = new BBC::ColladaMeshSerializer();
 }
 
 LBBCManager::~LBBCManager() 
 {
+        if (mColladaMeshSerializer)
+        {
+                delete mColladaMeshSerializer;
+        }
         if (mOgreMeshSerializer)
         {
@@ -204 +209 @@
                 subEntity->setMaterialName(mSampleConfigFile->getBillboardCloudGroupedIndirectTexturingMaterialName() + Ogre::StringConverter::toString(iSubEntity));
         }
-        mOgreMeshSerializer->setEntity(mLeaves->getBillboardCloud()->getEntityGrouped());
    
         Ogre::LogManager::getSingleton().logMessage("Num.SubEntities:" + Ogre::StringConverter::toString(mLeaves->getBillboardCloud()->getEntityGrouped()->getNumSubEntities()));
+
+        mOgreMeshSerializer->setEntity(mLeaves->getBillboardCloud()->getEntityGrouped());
         mOgreMeshSerializer->exportMesh(mSampleConfigFile->getBillboardCloudFolder() +
-                                mSampleConfigFile->getBillboardCloudGroupedIndirectTexturingMeshName(),false, false);
+                                mSampleConfigFile->getBillboardCloudGroupedIndirectTexturingMeshName(), false, false);
+
         OBA::OgreBase::getSingleton().getMeshSerializer()->exportMesh(mLeaves->getBillboardCloud()->getEntityGrouped()->getMesh()->get(), mSampleConfigFile->getBillboardCloudFolder() + mSampleConfigFile->getBillboardCloudGroupedIndirectTexturingMeshName());
         //OBA::OgreBase::getSingleton().getXMLMeshSerializer()->exportMesh(mLeaves->getBillboardCloud()->getEntityGrouped()->getMesh()->get(), mSampleConfigFile->getBillboardCloudFolder() + mSampleConfigFile->getBillboardCloudGroupedIndirectTexturingMeshName() + ".xml");
+
+        mColladaMeshSerializer->setEntity(mLeaves->getBillboardCloud()->getEntityGrouped());
+        mColladaMeshSerializer->exportMesh(mSampleConfigFile->getBillboardCloudFolder() +
+                                mSampleConfigFile->getBillboardCloudGroupedIndirectTexturingMeshName(), false, false);
 }
 
@@ -222 +233 @@
         }
 
+        Ogre::LogManager::getSingleton().logMessage("Num.SubEntities:" + Ogre::StringConverter::toString(mLeaves->getBillboardCloud()->getEntity()->getNumSubEntities()));
+
         mOgreMeshSerializer->setEntity(mLeaves->getBillboardCloud()->getEntity());
-
-        Ogre::LogManager::getSingleton().logMessage("Num.SubEntities:" + Ogre::StringConverter::toString(mLeaves->getBillboardCloud()->getEntity()->getNumSubEntities()));
-
         mOgreMeshSerializer->exportMesh(mSampleConfigFile->getBillboardCloudFolder() +
                                 mSampleConfigFile->getBillboardCloudSplittedMeshName(),false, false);
@@ -231 +241 @@
         OBA::OgreBase::getSingleton().getMeshSerializer()->exportMesh(mLeaves->getBillboardCloud()->getEntity()->getMesh()->get(), mSampleConfigFile->getBillboardCloudFolder() + mSampleConfigFile->getBillboardCloudSplittedMeshName());
         //OBA::OgreBase::getSingleton().getXMLMeshSerializer()->exportMesh(mLeaves->getBillboardCloud()->getEntity()->getMesh()->get(), mSampleConfigFile->getBillboardCloudFolder() + mSampleConfigFile->getBillboardCloudSplittedMeshName() + ".xml");
+
+        mColladaMeshSerializer->setEntity(mLeaves->getBillboardCloud()->getEntity());
+        mColladaMeshSerializer->exportMesh(mSampleConfigFile->getBillboardCloudFolder() +
+                                mSampleConfigFile->getBillboardCloudSplittedMeshName(),false, false);
 }
 
@@ -240 +254 @@
                 subEntity->setMaterialName(mSampleConfigFile->getBillboardCloudGroupedDiffuseColorMaterialName() + Ogre::StringConverter::toString(iSubEntity));
         }
-        mOgreMeshSerializer->setEntity(mLeaves->getBillboardCloud()->getEntityGrouped());
    
         Ogre::LogManager::getSingleton().logMessage("Num.SubEntities:" + Ogre::StringConverter::toString(mLeaves->getBillboardCloud()->getEntityGrouped()->getNumSubEntities()));
+
+        mOgreMeshSerializer->setEntity(mLeaves->getBillboardCloud()->getEntityGrouped());
         mOgreMeshSerializer->exportMesh(mSampleConfigFile->getBillboardCloudFolder() +
                                 mSampleConfigFile->getBillboardCloudGroupedDiffuseColorMeshName(),false, false);
+
         OBA::OgreBase::getSingleton().getMeshSerializer()->exportMesh(mLeaves->getBillboardCloud()->getEntityGrouped()->getMesh()->get(), mSampleConfigFile->getBillboardCloudFolder() + mSampleConfigFile->getBillboardCloudGroupedDiffuseColorMeshName());    
         //OBA::OgreBase::getSingleton().getXMLMeshSerializer()->exportMesh(mLeaves->getBillboardCloud()->getEntityGrouped()->getMesh()->get(), mSampleConfigFile->getBillboardCloudFolder() + mSampleConfigFile->getBillboardCloudGroupedDiffuseColorMeshName() + ".xml");      
+
+        mColladaMeshSerializer->setEntity(mLeaves->getBillboardCloud()->getEntityGrouped());
+        mColladaMeshSerializer->exportMesh(mSampleConfigFile->getBillboardCloudFolder() +
+                                mSampleConfigFile->getBillboardCloudGroupedDiffuseColorMeshName(),false, false);
 }
 
@@ -331 +351 @@
                                 BBC::EntityPtr entityClusterized = entityCluster->getEntity();
                                 entityClusterized->getSubEntity(0)->setMaterialName(mSampleConfigFile->getEntityClustersSplittedMaterialName());
+                                
                                 mOgreMeshSerializer->setEntity(entityClusterized);
                                 mOgreMeshSerializer->exportMesh(mSampleConfigFile->getEntityDistributionFolder() +
                                         mSampleConfigFile->getEntityClustersSplittedMeshName() +
                                         Ogre::StringConverter::toString(numSerializedBillboards) + ".mesh", !(mSampleConfigFile->getEntityClustersSplittedClusters()), false);
+                                
                                 OBA::OgreBase::getSingleton().getMeshSerializer()->exportMesh(entityClusterized->getMesh()->get(),
                                         mSampleConfigFile->getEntityClustersFolder() +
@@ -341 +363 @@
                                 //OBA::OgreBase::getSingleton().getXMLMeshSerializer()->exportMesh(entityClusterized->getMesh(), entityClusterized->getMesh()->getName() + ".xml");
 
+                                //mColladaMeshSerializer->setEntity(entityClusterized);
+                                //mColladaMeshSerializer->exportMesh(mSampleConfigFile->getEntityDistributionFolder() +
+                                //      mSampleConfigFile->getEntityClustersSplittedMeshName() +
+                                //      Ogre::StringConverter::toString(numSerializedBillboards) + ".mesh", !(mSampleConfigFile->getEntityClustersSplittedClusters()), false);
+
                                 numSerializedBillboards++;
                         }
@@ -388 +415 @@
                 OBA::OgreBase::getSingleton().getMeshSerializer()->exportMesh(entity->getMesh()->get(), mSampleConfigFile->getEntityClustersFolder() + mSampleConfigFile->getEntityClustersGroupedMeshName());
                 //OBA::OgreBase::getSingleton().getXMLMeshSerializer()->exportMesh(entity->getMesh(), mSampleConfigFile->getEntityClustersFolder() + mSampleConfigFile->getEntityClustersMeshPrefixName() + "Merged.mesh" + ".xml");
+
+                //mColladaMeshSerializer->setEntity(entity);
+                //mColladaMeshSerializer->exportMesh(mSampleConfigFile->getEntityClustersFolder() +
+                //      mSampleConfigFile->getEntityClustersGroupedMeshName(), false, false);
         }
 }
@@ -405 +436 @@
         BBC::EntityPtr entityLeaf = mLeaves->getDistribution()->getEntity(2);
         entityLeaf->getSubEntity(0)->setMaterialName(mSampleConfigFile->getEntitySampleMaterialName());
+        
         mOgreMeshSerializer->setEntity(entityLeaf);
         mOgreMeshSerializer->exportMesh(mSampleConfigFile->getEntityDistributionFolder() +
                 mSampleConfigFile->getEntitySampleMeshName(), false, false);
+
         OBA::OgreBase::getSingleton().getMeshSerializer()->exportMesh(entityLeaf->getMesh()->get(), mSampleConfigFile->getEntityDistributionFolder() + mSampleConfigFile->getEntitySampleMeshName());
         //OBA::OgreBase::getSingleton().getXMLMeshSerializer()->exportMesh(entityLeaf->getMesh()->get(), mSampleConfigFile->getEntityDistributionFolder() + mSampleConfigFile->getEntitySampleMeshName() + ".xml");     
+
+        mColladaMeshSerializer->setEntity(entityLeaf);
+        mColladaMeshSerializer->exportMesh(mSampleConfigFile->getEntityDistributionFolder() +
+                mSampleConfigFile->getEntitySampleMeshName(), false, false);
 }
 
@@ -452 +489 @@
                 mLeaves->getBillboardCloud()->generateBillboardCloudGroups();
                 saveBillboardCloudGroupedIndirectTexturing();
-                saveBillboardCloudGroupedIndirectTexturingXML();                
+                saveBillboardCloudGroupedIndirectTexturingXML();
         }