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

Timestamp:

04/11/06 09:20:23 (18 years ago)

Author:

igarcia

Message:

 

File:

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

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

@@ -118 +118 @@
 }
 
-void BillboardCloudUVMapper::addTextureAtlasTextureCoords(bool mergeBillboards, bool groupedBillboards, unsigned int numGeneratedBillboardClouds, unsigned int iBillboardGroup)
+void BillboardCloudUVMapper::addTextureAtlasTextureCoords(bool mergeBillboards, bool groupedBillboards, unsigned int numGeneratedBillboardClouds, unsigned int iBillboardGroup, unsigned int iBillboard)
 {
         unsigned int iUniqueVertex = 0;
@@ -130 +130 @@
         Ogre::Vector2 max = box->getMaximum();
         Ogre::Vector2 min = box->getMinimum();
+
+        Ogre::LogManager::getSingleton().logMessage("max:" + Ogre::StringConverter::toString(Ogre::Vector3(max[0], max[1], 0.0)) );
+        Ogre::LogManager::getSingleton().logMessage("min:" + Ogre::StringConverter::toString(Ogre::Vector3(min[0], min[1], 0.0)) );
+
+        Ogre::Vector2 umax;
+        umax[0] = (max[0] / mTextureAtlasWidth);
+        umax[1] = (max[1] / mTextureAtlasHeight);
+
+        Ogre::Vector2 umin;
+        umin[0] = (min[0] / mTextureAtlasWidth);
+        umin[1] = (min[1] / mTextureAtlasHeight);
+
+        umin = umin * 2.0 - 1.0;
+        umax = umax * 2.0 - 1.0;
+
+        Ogre::LogManager::getSingleton().logMessage("Umax:" + Ogre::StringConverter::toString(Ogre::Vector3(umax[0], umax[1], 0.0)) );
+        Ogre::LogManager::getSingleton().logMessage("Umin:" + Ogre::StringConverter::toString(Ogre::Vector3(umin[0], umin[1], 0.0)) );
+        
+        mBillboardCloud->getBillboard(iBillboard)->getBillboardClusterData()->addBillboardUVMapMin(umin);
+        mBillboardCloud->getBillboard(iBillboard)->getBillboardClusterData()->addBillboardUVMapMax(umax);
+
         Ogre::LogManager::getSingleton().logMessage("Max:" + Ogre::StringConverter::toString(Ogre::Vector3(max[0],max[1],0)) + 
                 "\tMin:" + Ogre::StringConverter::toString(Ogre::Vector3(min[0],min[1],0)) + 
                 "\tSize(" + Ogre::StringConverter::toString(max[0]-min[0]) +
                 "," + Ogre::StringConverter::toString(max[1]-min[1]) + ")");
+
+        Ogre::LogManager::getSingleton().logMessage(
+                "UMax:" + Ogre::StringConverter::toString(Ogre::Vector3(umax[0], umax[1],0)) + 
+                "\tUMin:" + Ogre::StringConverter::toString(Ogre::Vector3(umin[0], umin[1],0)) + 
+                "\tUSize(" + Ogre::StringConverter::toString(umax[0]-umin[0]) +
+                "," + Ogre::StringConverter::toString(umax[1]-umin[1]) + ")");
+
+        std::cin.get();
+
 
         SubEntityPtr subEntity;                                                                                         
@@ -382 +412 @@
 
                                         addTextureInBsp(iBillboardGroup, iBillboard);
-
-                                        addTextureAtlasTextureCoords(mergeBillboards, groupedBillboards, numGeneratedBillboardClouds, iBillboardGroup);
+                                        addTextureAtlasTextureCoords(mergeBillboards, groupedBillboards, numGeneratedBillboardClouds, iBillboardGroup, iBillboard);
                                         iBillboardsInGroup++;
                                 }
@@ -394 +423 @@
 
                                                 addTextureInBsp(iBillboardGroup, iBillboard);
-
-                                                addTextureAtlasTextureCoords(mergeBillboards, groupedBillboards, numGeneratedBillboardClouds, iBillboardGroup);
+                                                addTextureAtlasTextureCoords(mergeBillboards, groupedBillboards, numGeneratedBillboardClouds, iBillboardGroup, iBillboard);
                                                 iBillboardsInGroup++;
                                         }
@@ -407 +435 @@
 
                                                 addTextureInBsp(iBillboardGroup, iBillboard);
-
-                                                addTextureAtlasTextureCoords(mergeBillboards, groupedBillboards, numGeneratedBillboardClouds, iBillboardGroup);
+                                                addTextureAtlasTextureCoords(mergeBillboards, groupedBillboards, numGeneratedBillboardClouds, iBillboardGroup, iBillboard);
                                                 iBillboardsInGroup++;
                                         }