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

Timestamp:

05/13/06 23:04:05 (19 years ago)

Author:

igarcia

Message:

 

Location:

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

Files:

• BBCColladaMeshSerializer.cpp (modified) (1 diff)
• BBCEntity.cpp (modified) (3 diffs)
• LBBCManager.cpp (modified) (1 diff)

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

@@ -103 +103 @@
                         {
                                 Ogre::ColourValue color;
-                                //color.setAsARGB(mEntity->getSubEntity(iSubEntity)->getVertexColour(iVertex) & 0xFF);
-                                color.setAsARGB(mEntity->getSubEntity(iSubEntity)->getVertexColour(iVertex));
+                                Ogre::RGBA rc = mEntity->getSubEntity(iSubEntity)->getVertexColour(iVertex);
+        
+                                color.b = (rc & 0xFF) / 255.0f;         rc >>= 8;
+                                color.g = (rc & 0xFF) / 255.0f;         rc >>= 8;
+                                color.r = (rc & 0xFF) / 255.0f;         rc >>= 8;
+                                color.a = (rc & 0xFF) / 255.0f;
+
+                                //color.setAsARGB(mEntity->getSubEntity(iSubEntity)->getVertexColour(iVertex));
                                 mFloatColorList.push_back(color.r);
                                 mFloatColorList.push_back(color.g);

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

@@ -350 +350 @@
                                         
                                                 Ogre::ColourValue colour;
-                                                //colour.setAsARGB((Ogre::ARGB)(*pSrcARGB) & 0xFF);
-                                                colour.setAsARGB((Ogre::ARGB)(pSrcARGB[0]));
+                                                Ogre::ARGB rc = *pSrcARGB++;
+                        
+                                                colour.b = (rc & 0xFF) / 255.0f;                rc >>= 8;
+                                                colour.g = (rc & 0xFF) / 255.0f;                rc >>= 8;
+                                                colour.r = (rc & 0xFF) / 255.0f;                rc >>= 8;
+                                                colour.a = (rc & 0xFF) / 255.0f;
+                                                
+                                                //colour.setAsARGB(pSrcARGB[0]);
 
                                                 if (!mergeSubMeshes)
@@ -441 +447 @@
                                                 }
                                         }
+                                        elems.clear();
 
                                         // There is _no_ baseVertexPointerToElement() which takes an Ogre::Real or a double
@@ -493 +500 @@
                                                                 this->getSubEntity(0)->addTextureCoordSet(dimBaseTexCoord);
                                                         }
-                                                }
+                                                }                                               
                                         }       
                                 }                       

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

@@ -536 +536 @@
                                 BBC::UniqueVertex vertex;
 
-                                LeafKMeansClusterData *leafKMeansClusterData = (LeafKMeansClusterData*)entityCluster->getEntityClusterData(iLeaf).get();
-                                Leaf *leaf = (Leaf*)leafKMeansClusterData->getEntity().get();
+                                //LeafKMeansClusterData *leafKMeansClusterData = (LeafKMeansClusterData*)entityCluster->getEntityClusterData(iLeaf).get();
+                                //Leaf *leaf = (Leaf*)leafKMeansClusterData->getEntity().get();
+                                BBC::EntityClusterData* entityClusterData = entityCluster->getEntityClusterData(iLeaf).get();
+                                Leaf *leaf = (Leaf*)entityClusterData->getEntity().get();
                                 vertex.position = leaf->getPosition();
 
-                                hDistance = 0.0;
-                                wDistance = 0.0;
-
-                                p1 = billboard->getBillboardClusterData()->getQuadTopRightCorner();
-                                p2 = billboard->getBillboardClusterData()->getQuadBottomRightCorner();
-                                p3 = leaf->getPosition();
-                                p4 = leaf->getPosition() + billboard->getBillboardClusterData()->getAxisY();
-
-                                if (BBC::Util::lineLineIntersect(p1, p2, p3, p4, &pa, &pb, &mua, &mub))
-                                {
-                                        hDistance = Ogre::Vector3(pa - p1).length();
-                                }
-                                else
-                                {
-                                        Ogre::LogManager::getSingleton().logMessage("Error with intersection: no solution exists.");
-                                }
-
-                                p1 = billboard->getBillboardClusterData()->getQuadTopLeftCorner();
-                                p2 = billboard->getBillboardClusterData()->getQuadTopRightCorner();
-                                p3 = leaf->getPosition();
-                                p4 = leaf->getPosition() + billboard->getBillboardClusterData()->getAxisX();
-
-                                if (BBC::Util::lineLineIntersect(p1, p2, p3, p4, &pa, &pb, &mua, &mub))
-                                {
-                                        wDistance = Ogre::Vector3(pa - p2).length();
-                                }
-                                else
-                                {
-                                        Ogre::LogManager::getSingleton().logMessage("Error with intersection: no solution exists.");
-                                }
+                                //hDistance = 0.0;
+                                //wDistance = 0.0;
+
+                                //p1 = billboard->getBillboardClusterData()->getQuadTopRightCorner();
+                                //p2 = billboard->getBillboardClusterData()->getQuadBottomRightCorner();
+                                //p3 = leaf->getPosition();
+                                //p4 = leaf->getPosition() + billboard->getBillboardClusterData()->getAxisY();
+
+                                //if (BBC::Util::lineLineIntersect(p1, p2, p3, p4, &pa, &pb, &mua, &mub))
+                                //{
+                                //      hDistance = Ogre::Vector3(pa - p1).length();
+                                //}
+                                //else
+                                //{
+                                //      Ogre::LogManager::getSingleton().logMessage("Error with intersection: no solution exists.");
+                                //}
+
+                                //p1 = billboard->getBillboardClusterData()->getQuadTopLeftCorner();
+                                //p2 = billboard->getBillboardClusterData()->getQuadTopRightCorner();
+                                //p3 = leaf->getPosition();
+                                //p4 = leaf->getPosition() + billboard->getBillboardClusterData()->getAxisX();
+
+                                //if (BBC::Util::lineLineIntersect(p1, p2, p3, p4, &pa, &pb, &mua, &mub))
+                                //{
+                                //      wDistance = Ogre::Vector3(pa - p2).length();
+                                //}
+                                //else
+                                //{
+                                //      Ogre::LogManager::getSingleton().logMessage("Error with intersection: no solution exists.");
+                                //}
 
                                 //Ogre::LogManager::getSingleton().logMessage("W:" + Ogre::StringConverter::toString(width) + " UW:" + Ogre::StringConverter::toString(wDistance));