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

Timestamp:

04/21/06 19:56:55 (18 years ago)

Author:

igarcia

Message:

 

Location:

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

Files:

• BBCBillboardCloudUVMapper.cpp (modified) (1 diff)
• IBRBillboardCloudTreeApplication.cpp (modified) (3 diffs)
• LBBCBillboardCloudDiffuseColorTextureViewMode.cpp (added)
• LBBCBillboardCloudIndirectTextureViewMode.cpp (added)
• LBBCBillboardCloudTextureViewMode.cpp (deleted)
• LBBCManager.cpp (modified) (2 diffs)
• OBAOgreFrameListener.cpp (modified) (2 diffs)

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

@@ -152 +152 @@
         Ogre::Vector2 texCoords01,texCoords02,texCoords03,texCoords04;
 
+        // DirectX working version...
+        texCoords03[0] = min[0] / mTextureAtlasWidth;
+        texCoords03[1] = 1.0 - (min[1] / mTextureAtlasHeight);
+
+        texCoords04[0] = max[0] / mTextureAtlasWidth;
+        texCoords04[1] = 1.0 - (min[1] / mTextureAtlasHeight);
+
+        texCoords01[0] = max[0] / mTextureAtlasWidth;
+        texCoords01[1] = 1.0 - (max[1] / mTextureAtlasHeight);
+
         texCoords02[0] = min[0] / mTextureAtlasWidth;
-        texCoords02[1] = 1.0 - (min[1] / mTextureAtlasHeight);
-
-        texCoords01[0] = max[0] / mTextureAtlasWidth;
-        texCoords01[1] = 1.0 - (min[1] / mTextureAtlasHeight);
-
-        texCoords04[0] = max[0] / mTextureAtlasWidth;
-        texCoords04[1] = 1.0 - (max[1] / mTextureAtlasHeight);
-
-        texCoords03[0] = min[0] / mTextureAtlasWidth;
-        texCoords03[1] = 1.0 - (max[1] / mTextureAtlasHeight);
+        texCoords02[1] = 1.0 - (max[1] / mTextureAtlasHeight);
+
+        //texCoords02[0] = min[0] / mTextureAtlasWidth;
+        //texCoords02[1] = 1.0 - (min[1] / mTextureAtlasHeight);
+
+        //texCoords01[0] = max[0] / mTextureAtlasWidth;
+        //texCoords01[1] = 1.0 - (min[1] / mTextureAtlasHeight);
+
+        //texCoords04[0] = max[0] / mTextureAtlasWidth;
+        //texCoords04[1] = 1.0 - (max[1] / mTextureAtlasHeight);
+
+        //texCoords03[0] = min[0] / mTextureAtlasWidth;
+        //texCoords03[1] = 1.0 - (max[1] / mTextureAtlasHeight);
         
         if (groupedBillboards)

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

@@ -147 +147 @@
         mSceneMgr = mFrameListener->getEnabledFrameListenerMode()->getSceneManager();   
 
+        if (mSampleConfigFile->getBillboardCloudDiffuseColorEntityTextureAtlasGeneration())
         {
                 LBBC::EntityTextureAtlasViewMode *textureAtlasFrameListenerMode;
@@ -164 +165 @@
         }
 
-        {
-                LBBC::BillboardCloudTextureViewMode *anotherFrameListenerMode;
-                anotherFrameListenerMode = new LBBC::BillboardCloudTextureViewMode(mWindow,mFrameListener->getNumFrameListenerModes());
+        if (mSampleConfigFile->getBillboardCloudDiffuseColorGroupedBillboardsTextureAtlasGeneration())
+        {
+                LBBC::BillboardCloudDiffuseColorTextureViewMode *anotherFrameListenerMode;
+                anotherFrameListenerMode = new LBBC::BillboardCloudDiffuseColorTextureViewMode(mWindow,mFrameListener->getNumFrameListenerModes());
                 anotherFrameListenerMode->chooseSceneManager();
                 anotherFrameListenerMode->createCamera();
@@ -177 +179 @@
                 anotherFrameListenerMode->setTextureAtlasFolder(mSampleConfigFile->getBillboardCloudFolder());
                 anotherFrameListenerMode->setEntityClustersGroupedName(mSampleConfigFile->getEntityClustersGroupedMeshName());
-                //anotherFrameListenerMode->setBillboardCloudSplittedName(mSampleConfigFile->getBillboardCloudSplittedMeshName());
-                anotherFrameListenerMode->setBillboardCloudSplittedName(mSampleConfigFile->getBillboardCloudIndirectPointMeshName());
+                anotherFrameListenerMode->setBillboardCloudSplittedName(mSampleConfigFile->getBillboardCloudSplittedMeshName());
                 anotherFrameListenerMode->setBillboardCloudGroupedTextureAtlasDebug(mSampleConfigFile->getBillboardCloudDiffuseColorGroupedBillboardsTextureAtlasDebug());
+                anotherFrameListenerMode->createScene();
+                mFrameListener->addFrameListenerMode(anotherFrameListenerMode);
+        }
+
+        if (mSampleConfigFile->getBillboardCloudIndirectGroupedBillboardsTextureAtlasGeneration())
+        {
+                LBBC::BillboardCloudIndirectTextureViewMode *anotherFrameListenerMode;
+                anotherFrameListenerMode = new LBBC::BillboardCloudIndirectTextureViewMode(mWindow, mFrameListener->getNumFrameListenerModes());
+                anotherFrameListenerMode->chooseSceneManager();
+                anotherFrameListenerMode->createCamera();
+                anotherFrameListenerMode->createViewports();
+                anotherFrameListenerMode->setTextureAtlasSize(mSampleConfigFile->getBillboardCloudIndirectGroupedBillboardsTextureAtlasSize());
+                anotherFrameListenerMode->setTextureSize(mSampleConfigFile->getBillboardCloudIndirectGroupedBillboardsTextureSize());
+                anotherFrameListenerMode->setTextureAtlasBitRange(mSampleConfigFile->getBillboardCloudIndirectGroupedBillboardsTextureAtlasBitRange());
+                anotherFrameListenerMode->setTextureAtlasName(mSampleConfigFile->getBillboardCloudIndirectGroupedBillboardsTextureAtlasName());
+                anotherFrameListenerMode->setTextureAtlasFolder(mSampleConfigFile->getBillboardCloudFolder());
+                anotherFrameListenerMode->setBillboardCloudPointClustersName(mSampleConfigFile->getBillboardCloudIndirectPointMeshName());
+                anotherFrameListenerMode->setBillboardCloudSplittedName(mSampleConfigFile->getBillboardCloudSplittedMeshName());
+                anotherFrameListenerMode->setEntityClustersGroupedName(mSampleConfigFile->getEntityClustersGroupedMeshName());
+                anotherFrameListenerMode->setBillboardCloudGroupedTextureAtlasDebug(mSampleConfigFile->getBillboardCloudIndirectGroupedBillboardsTextureAtlasDebug());
                 anotherFrameListenerMode->createScene();
                 mFrameListener->addFrameListenerMode(anotherFrameListenerMode);

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

@@ -497 +497 @@
                         entity->getSubEntity(numSubEntities)->setMaterialName(mSampleConfigFile->getBillboardCloudIndirectPointMaterialName());
                         entity->getSubEntity(numSubEntities)->enableNormals(false);
-                        entity->getSubEntity(numSubEntities)->enableTextureCoords(false);
+                        entity->getSubEntity(numSubEntities)->enableTextureCoords(true);
+                        entity->getSubEntity(numSubEntities)->addTextureCoordSet(2);
                         entity->getSubEntity(numSubEntities)->enableVertexColours(true);
+
+                        Ogre::Vector3 p1, p2, p3, p4, pa, pb;
+                        Ogre::Real mua, mub;
+                        Ogre::Real height, width;
+                        Ogre::Real hDistance, wDistance;
+
+                        height = Ogre::Vector3(billboard->getBillboardClusterData()->getQuadTopLeftCorner() - billboard->getBillboardClusterData()->getQuadBottomLeftCorner()).length();
+                        width = Ogre::Vector3(billboard->getBillboardClusterData()->getQuadTopLeftCorner() - billboard->getBillboardClusterData()->getQuadTopRightCorner()).length();
 
                         for (unsigned int iLeaf = 0; iLeaf < entityCluster->getNumEntitiesClusterData(); iLeaf++)
@@ -507 +516 @@
                                 Leaf *leaf = (Leaf*)leafKMeansClusterData->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.");
+                                }
+
+                                //Ogre::LogManager::getSingleton().logMessage("W:" + Ogre::StringConverter::toString(width) + " UW:" + Ogre::StringConverter::toString(wDistance));
+                                //Ogre::LogManager::getSingleton().logMessage("H:" + Ogre::StringConverter::toString(height) + " UH:" + Ogre::StringConverter::toString(hDistance));
+
+                                //vertex.uv[0] = Ogre::Vector3(wDistance / width, hDistance / height, 0.0);
+                                vertex.uv[0] = Ogre::Vector3(1.0 - (hDistance / height), 1.0 - (wDistance / width), 0.0);
                                 vertex.colour = Ogre::ColourValue(Ogre::Math::RangeRandom(0.0, 1.0), Ogre::Math::RangeRandom(0.0, 1.0), Ogre::Math::RangeRandom(0.0, 1.0), 1.0).getAsRGBA(); 
                                 entity->getSubEntity(numSubEntities)->addUniqueVertex(vertex);

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

@@ -102 +102 @@
     }
 
-        if (mInputDevice->isKeyDown(Ogre::KC_TAB) && mTimeUntilNextToggle <= 0)
+        //if (mInputDevice->isKeyDown(Ogre::KC_TAB) && mTimeUntilNextToggle <= 0)
+        if (mInputDevice->isKeyDown(Ogre::KC_TAB))
     {           
                 mCurrentOgreFrameListenerMode = (mCurrentOgreFrameListenerMode+1) % this->getNumFrameListenerModes();           
@@ -108 +109 @@
                 mWindow->setDebugText("P: " + mDefaultOgreFrameListenerMode->getSceneManager()->getName());
 
-                mTimeUntilNextToggle = 0.25;
+                //mTimeUntilNextToggle = 0.25;          
     }