Changeset 778

Timestamp:

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

Author:

igarcia

Message:

 

Location:

GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE

Files:

• include/BBC/BBCUtil.h (modified) (2 diffs)
• include/LBBC/LBBC.h (modified) (1 diff)
• include/LBBC/LBBCBillboardCloudDiffuseColorTextureViewMode.h (added)
• include/LBBC/LBBCBillboardCloudIndirectTextureViewMode.h (added)
• include/LBBC/LBBCBillboardCloudTextureViewMode.h (deleted)
• scripts/IBRBillboardCloudTreeGenerator.vcproj (modified) (2 diffs)
• src/BBCBillboardCloudUVMapper.cpp (modified) (1 diff)
• src/IBRBillboardCloudTreeApplication.cpp (modified) (3 diffs)
• src/LBBCBillboardCloudDiffuseColorTextureViewMode.cpp (added)
• src/LBBCBillboardCloudIndirectTextureViewMode.cpp (added)
• src/LBBCBillboardCloudTextureViewMode.cpp (deleted)
• src/LBBCManager.cpp (modified) (2 diffs)
• src/OBAOgreFrameListener.cpp (modified) (2 diffs)

GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/include/BBC/BBCUtil.h

@@ -5 +5 @@
 
 namespace BBC {
+
+const Ogre::Real EPSILON_INTERSECT = 0.00000001;
 
 class _BBCExport Util
@@ -35 +37 @@
         }
 
+        // Calculate the line segment PaPb that is the shortest route between
+        // two lines P1P2 and P3P4. Calculate also the values of mua and mub where
+        //   Pa = P1 + mua (P2 - P1)
+        //       Pb = P3 + mub (P4 - P3)
+        // Return false if no solution exists.
+
+        static int lineLineIntersect(
+                Ogre::Vector3 p1, Ogre::Vector3 p2, Ogre::Vector3 p3, Ogre::Vector3 p4, Ogre::Vector3 *pa, Ogre::Vector3 *pb,
+                Ogre::Real *mua, Ogre::Real *mub)
+        {
+                Ogre::Vector3 p13,p43,p21;
+                Ogre::Real d1343,d4321,d1321,d4343,d2121;
+                Ogre::Real numer,denom;
+
+                p13.x = p1.x - p3.x;
+                p13.y = p1.y - p3.y;
+                p13.z = p1.z - p3.z;
+                p43.x = p4.x - p3.x;
+                p43.y = p4.y - p3.y;
+                p43.z = p4.z - p3.z;
+                if (Ogre::Math::Abs(p43.x)  < EPSILON_INTERSECT && Ogre::Math::Abs(p43.y)  < EPSILON_INTERSECT && Ogre::Math::Abs(p43.z)  < EPSILON_INTERSECT)
+                {
+                        return(false);
+                }
+                p21.x = p2.x - p1.x;
+                p21.y = p2.y - p1.y;
+                p21.z = p2.z - p1.z;
+                if (Ogre::Math::Abs(p21.x)  < EPSILON_INTERSECT && Ogre::Math::Abs(p21.y)  < EPSILON_INTERSECT && Ogre::Math::Abs(p21.z)  < EPSILON_INTERSECT)
+                {
+                        return(false);
+                }
+
+                d1343 = p13.x * p43.x + p13.y * p43.y + p13.z * p43.z;
+                d4321 = p43.x * p21.x + p43.y * p21.y + p43.z * p21.z;
+                d1321 = p13.x * p21.x + p13.y * p21.y + p13.z * p21.z;
+                d4343 = p43.x * p43.x + p43.y * p43.y + p43.z * p43.z;
+                d2121 = p21.x * p21.x + p21.y * p21.y + p21.z * p21.z;
+
+                denom = d2121 * d4343 - d4321 * d4321;
+                if (Ogre::Math::Abs(denom) < EPSILON_INTERSECT)
+                {
+                        return(false);
+                }
+                numer = d1343 * d4321 - d1321 * d4343;
+
+                *mua = numer / denom;
+                *mub = (d1343 + d4321 * (*mua)) / d4343;
+
+                pa->x = p1.x + *mua * p21.x;
+                pa->y = p1.y + *mua * p21.y;
+                pa->z = p1.z + *mua * p21.z;
+                pb->x = p3.x + *mub * p43.x;
+                pb->y = p3.y + *mub * p43.y;
+                pb->z = p3.z + *mub * p43.z;
+
+                return(true);
+        }
 };
 
 /*
-extern "C" _BBCExport double fround(double n, unsigned d)
+extern "C" _BBCExport Ogre::Real fround(Ogre::Real n, unsigned d)
 { 
-        return floor(n * pow((double)10.,(int) d) + .5) / pow((double)10.,(int) d);
+        return floor(n * pow((Ogre::Real)10.,(int) d) + .5) / pow((Ogre::Real)10.,(int) d);
 }
 
-extern "C" _BBCExport int iround(double x)
+extern "C" _BBCExport int iround(Ogre::Real x)
 {
       return (int)floor(x + 0.5);

GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/include/LBBC/LBBC.h

@@ -10 +10 @@
 #include <LBBCClusterViewMode.h>
 #include <LBBCEntityTextureAtlasViewMode.h>
-#include <LBBCBillboardCloudTextureViewMode.h>
+#include <LBBCBillboardCloudDiffuseColorTextureViewMode.h>
+#include <LBBCBillboardCloudIndirectTextureViewMode.h>
 #endif

GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/scripts/IBRBillboardCloudTreeGenerator.vcproj

@@ -213 +213 @@
                                 Filter="">
                                 <File
-                                        RelativePath="..\src\LBBCBillboardCloudTextureViewMode.cpp">
+                                        RelativePath="..\src\LBBCBillboardCloudDiffuseColorTextureViewMode.cpp">
+                                </File>
+                                <File
+                                        RelativePath="..\src\LBBCBillboardCloudIndirectTextureViewMode.cpp">
                                 </File>
                                 <File
@@ -416 +419 @@
                                 </File>
                                 <File
-                                        RelativePath="..\include\Lbbc\LBBCBillboardCloudTextureViewMode.h">
+                                        RelativePath="..\include\Lbbc\LBBCBillboardCloudDiffuseColorTextureViewMode.h">
+                                </File>
+                                <File
+                                        RelativePath="..\include\Lbbc\LBBCBillboardCloudIndirectTextureViewMode.h">
                                 </File>
                                 <File

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;          
     }