Changeset 821

Timestamp:

04/25/06 13:13:16 (18 years ago)

Author:

igarcia

Message:

 

Location:

GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE

Files:

• include/LBBC/LBBCBillboardViewMode.h (modified) (4 diffs)
• include/LBBC/LBBCClusterViewMode.h (modified) (2 diffs)
• media/general/diffuseTexturing_FP20.cg (added)
• media/general/diffuseTexturing_VP20.cg (added)
• media/general/diffuse_FP20.cg (deleted)
• media/general/general.program (modified) (3 diffs)
• media/general/indirectTexturingDebugTexCoordCorrespondence_FP20.cg (modified) (1 diff)
• media/general/indirectTexturingDefault_FP20.cg (added)
• media/general/indirectTexturingDefault_VP20.cg (added)
• media/general/indirectTexturingDefault_glsl_FP20.shd (added)
• media/general/indirectTexturingDefault_glsl_VP20.shd (added)
• media/general/indirectTexturingDefault_hlsl_FP20.shd (added)
• media/general/indirectTexturingDefault_hlsl_VP20.shd (added)
• media/general/indirectTexturing_FP20.cg (deleted)
• media/general/indirectTexturing_VP20.cg (deleted)
• media/general/indirectTexturing_hlsl_FP20.shd (deleted)
• media/general/indirectTexturing_hlsl_VP20.shd (deleted)
• src/BBCBillboardCloud.cpp (modified) (8 diffs)
• src/BBCBillboardCloudUVMapper.cpp (modified) (5 diffs)
• src/IMGNodeBsp.cpp (modified) (1 diff)
• src/LBBCBillboardCloudDiffuseColorTextureViewMode.cpp (modified) (1 diff)
• src/LBBCBillboardCloudIndirectTextureViewMode.cpp (modified) (1 diff)
• src/OBAOgreFrameListener.cpp (modified) (1 diff)

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

@@ -14 +14 @@
                 {
                         showDebugOverlay(false);
-                        mReloadedTextures = false;
+                        epsilonX = 0.0;
+                        epsilonY = 0.0;
+                        factor = 1.0 / 255.0;
                 }
 
@@ -23 +25 @@
                 bool frameStarted(const Ogre::FrameEvent& evt, Ogre::InputReader *inputReader)
                 {
-                        mWindow->getViewport(0)->setBackgroundColour(Ogre::ColourValue(0.0, 0.0, 0.0, 1.0));
-
-                        //if (!mReloadedTextures)
-                        //{
-                        //      for (unsigned int iSubEntity = 0; iSubEntity < mBillboardCloudEntity->getNumSubEntities(); iSubEntity++)
-                        //      {
-                        //              Ogre::MaterialPtr materialPtr = Ogre::MaterialManager::getSingleton().getByName(mBillboardCloudEntity->getSubEntity(iSubEntity)->getMaterialName());
-                        //              Ogre::LogManager::getSingleton().logMessage("Reloading texture:" + materialPtr->getTechnique(0)->getPass(0)->getTextureUnitState(0)->getTextureName());
-
-                        //              Ogre::TexturePtr texturePtr = Ogre::TextureManager::getSingleton().getByName(materialPtr->getTechnique(0)->getPass(0)->getTextureUnitState(0)->getTextureName());
-                        //              texturePtr->reload();
-                        //              materialPtr->reload();
-                        //      }
-                        //      mReloadedTextures = true;
-                        //}
+                        showDebugOverlay(true);
+                        mWindow->getViewport(0)->setBackgroundColour(Ogre::ColourValue(0.0, 0.0, 0.0, 1.0));                    
+                        mEpsilonText = Ogre::String("Epsilon:") + Ogre::StringConverter::toString(epsilonX) + Ogre::String(",") + Ogre::StringConverter::toString(epsilonY);
+                        mWindow->setDebugText(mEpsilonText);
 
                         return OgreFrameListenerMode::frameStarted(evt, inputReader);   
                 }
 
+                virtual bool processUnbufferedKeyInput(const Ogre::FrameEvent& evt)
+                {                       
+                        if (mInputDevice->isKeyDown(Ogre::KC_1))
+                        {
+                                epsilonX = epsilonX + factor;                           
+                        }
+
+                        if (mInputDevice->isKeyDown(Ogre::KC_2))
+                        {
+                                epsilonX = epsilonX - factor;
+                        }
+
+                        if (mInputDevice->isKeyDown(Ogre::KC_3))
+                        {
+                                epsilonY = epsilonY + factor;
+                        }
+                        
+                        if (mInputDevice->isKeyDown(Ogre::KC_4))
+                        {
+                                epsilonY = epsilonY - factor;
+                        }
+
+                        mFragParams = mBillboardCloudEntity->getSubEntity(0)->getMaterial()->getBestTechnique()->getPass(0)->getFragmentProgramParameters();
+                        mFragParams->setNamedConstant("epsilonX", epsilonX);
+                        mFragParams->setNamedConstant("epsilonY", epsilonY);
+
+                        if (mInputDevice->isKeyDown(Ogre::KC_A))
+                        {
+                                // Move camera left
+                                mTranslateVector.x = -mMoveScale;
+                        }
+
+                        if (mInputDevice->isKeyDown(Ogre::KC_D))
+                        {
+                                // Move camera RIGHT
+                                mTranslateVector.x = mMoveScale;
+                        }
+
+                        /* Move camera forward by keypress. */
+                        if (mInputDevice->isKeyDown(Ogre::KC_UP) || mInputDevice->isKeyDown(Ogre::KC_W) )
+                        {
+                                mTranslateVector.z = -mMoveScale;
+                        }
+
+                        /* Move camera backward by keypress. */
+                        if (mInputDevice->isKeyDown(Ogre::KC_DOWN) || mInputDevice->isKeyDown(Ogre::KC_S) )
+                        {
+                                mTranslateVector.z = mMoveScale;
+                        }
+
+                        if (mInputDevice->isKeyDown(Ogre::KC_PGUP))
+                        {
+                                // Move camera up
+                                mTranslateVector.y = mMoveScale;
+                        }
+
+                        if (mInputDevice->isKeyDown(Ogre::KC_PGDOWN))
+                        {
+                                // Move camera down
+                                mTranslateVector.y = -mMoveScale;
+                        }
+
+                        if (mInputDevice->isKeyDown(Ogre::KC_RIGHT))
+                        {
+                                mCamera->yaw(-mRotScale);
+                        }
+                        
+                        if (mInputDevice->isKeyDown(Ogre::KC_LEFT))
+                        {
+                                mCamera->yaw(mRotScale);
+                        }
+
+                        // see if switching is on, and you want to toggle 
+                        if (mInputTypeSwitchingOn && mInputDevice->isKeyDown(Ogre::KC_M) && mTimeUntilNextToggle <= 0)
+                        {
+                                switchMouseMode();
+                                mTimeUntilNextToggle = 1;
+                        }
+
+                        if (mInputTypeSwitchingOn && mInputDevice->isKeyDown(Ogre::KC_K) && mTimeUntilNextToggle <= 0)
+                        {
+                                // must be going from immediate keyboard to buffered keyboard
+                                switchKeyMode();
+                                mTimeUntilNextToggle = 1;
+                        }
+                        if (mInputDevice->isKeyDown(Ogre::KC_F) && mTimeUntilNextToggle <= 0)
+                        {
+                                mStatsOn = !mStatsOn;
+                                showDebugOverlay(mStatsOn);
+
+                                mTimeUntilNextToggle = 1;
+                        }
+                        if (mInputDevice->isKeyDown(Ogre::KC_T) && mTimeUntilNextToggle <= 0)
+                        {
+                                switch(mFiltering)
+                                {
+                                case Ogre::TFO_BILINEAR:
+                                        mFiltering = Ogre::TFO_TRILINEAR;
+                                        mAniso = 1;
+                                        break;
+                                case Ogre::TFO_TRILINEAR:
+                                        mFiltering = Ogre::TFO_ANISOTROPIC;
+                                        mAniso = 8;
+                                        break;
+                                case Ogre::TFO_ANISOTROPIC:
+                                        mFiltering = Ogre::TFO_BILINEAR;
+                                        mAniso = 1;
+                                        break;
+                                default:
+                                        break;
+                                }
+                                Ogre::MaterialManager::getSingleton().setDefaultTextureFiltering(mFiltering);
+                                Ogre::MaterialManager::getSingleton().setDefaultAnisotropy(mAniso);
+
+
+                                showDebugOverlay(mStatsOn);
+
+                                mTimeUntilNextToggle = 1;
+                        }
+
+                        if (mInputDevice->isKeyDown(Ogre::KC_SYSRQ) && mTimeUntilNextToggle <= 0)
+                        {
+                                char tmp[20];
+                                sprintf(tmp, "screenshot_%d.png", ++mNumScreenShots);
+                                mWindow->writeContentsToFile(tmp);
+                                mTimeUntilNextToggle = 0.5;
+                                mWindow->setDebugText(Ogre::String("Wrote ") + tmp);
+                        }
+                        
+                        if (mInputDevice->isKeyDown(Ogre::KC_R) && mTimeUntilNextToggle <=0)
+                        {
+                                mSceneDetailIndex = (mSceneDetailIndex+1)%3 ;
+                                switch(mSceneDetailIndex) {
+                                        case 0 : mCamera->setPolygonMode(Ogre::PM_SOLID) ; break ;
+                                        case 1 : mCamera->setPolygonMode(Ogre::PM_WIREFRAME) ; break ;
+                                        case 2 : mCamera->setPolygonMode(Ogre::PM_POINTS) ; break ;
+                                }
+                                mTimeUntilNextToggle = 0.5;
+                        }
+
+                        static bool displayCameraDetails = false;
+                        if (mInputDevice->isKeyDown(Ogre::KC_P) && mTimeUntilNextToggle <= 0)
+                        {
+                                displayCameraDetails = !displayCameraDetails;
+                                mTimeUntilNextToggle = 0.5;
+                                if (!displayCameraDetails)
+                                        mWindow->setDebugText("");
+                        }
+                        if (displayCameraDetails)
+                        {
+                                // Print camera details
+                                mWindow->setDebugText("P: " + Ogre::StringConverter::toString(mCamera->getDerivedPosition()) + " " + 
+                                        "O: " + Ogre::StringConverter::toString(mCamera->getDerivedOrientation()));
+                        }
+
+                        // Return true to continue rendering
+                        return true;
+                }
                 void setBillboardCloudMeshName(Ogre::String billboardCloudMeshName)
                 {
@@ -55 +204 @@
                         mBillboardCloudEntity = mSceneMgr->createEntity("chestnutLeavesBillboardCloudGrouped.mesh", "chestnutLeavesBillboardCloudGrouped.mesh");
                         //mBillboardCloudEntity = mSceneMgr->createEntity("mapleLeavesBillboardCloudGrouped.mesh", "mapleLeavesBillboardCloudGrouped.mesh");            
+                        //mBillboardCloudEntity = mSceneMgr->createEntity("prunusLeavesBillboardCloudGrouped.mesh", "prunusLeavesBillboardCloudGrouped.mesh");          
                         sNode->attachObject(mBillboardCloudEntity);
                         sNode->rotate(Ogre::Vector3::UNIT_X, Ogre::Radian(Ogre::Degree(-90.0)));
@@ -64 +214 @@
                 Ogre::Entity *mBillboardCloudEntity;
 
-                bool mReloadedTextures;
+                Ogre::Real epsilonX;
+
+                Ogre::Real epsilonY;
+                
+                Ogre::Real factor;
+
+                Ogre::String mEpsilonText;
+
+                Ogre::GpuProgramParametersSharedPtr mFragParams;
 };
 

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

@@ -22 +22 @@
                 bool frameStarted(const Ogre::FrameEvent& evt, Ogre::InputReader *inputReader)
                 {
+                        showDebugOverlay(true);
                         mWindow->getViewport(0)->setBackgroundColour(Ogre::ColourValue(0.0, 0.0, 0.0, 1.0));
 
@@ -40 +41 @@
                         Ogre::Entity* eLeafClustersGrouped = mSceneMgr->createEntity("chestnutLeafClustersGrouped.mesh", "chestnutLeafClustersGrouped.mesh");                                                           
                         //Ogre::Entity* eLeafClustersGrouped = mSceneMgr->createEntity("mapleLeafClustersGrouped.mesh", "mapleLeafClustersGrouped.mesh");                                                               
+                        //Ogre::Entity* eLeafClustersGrouped = mSceneMgr->createEntity("prunusLeafClustersGrouped.mesh", "prunusLeafClustersGrouped.mesh");                                                             
                         sNode->attachObject(eLeafClustersGrouped);                      
                         sNode->rotate(Ogre::Vector3::UNIT_X, Ogre::Radian(Ogre::Degree(-90.0)));

GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/media/general/general.program

@@ -27 +27 @@
 }
 
-fragment_program diffuse_FP20 cg
+vertex_program diffuseTexturing_VP20 cg
 {
-        source diffuse_FP20.cg
+        source diffuseTexturing_VP20.cg
+        entry_point main_vp
+        profiles arbvp1 vs_2_0
+}
+
+fragment_program diffuseTexturing_FP20 cg
+{
+        source diffuseTexturing_FP20.cg
         entry_point main_fp
         profiles ps_2_0 arbfp1
@@ -41 +48 @@
 }
 
-vertex_program indirectTexturing_VP20 cg
+vertex_program indirectTexturingDefault_VP20 cg
 {
-        source indirectTexturing_VP20.cg
+        source indirectTexturingDefault_VP20.cg
         entry_point main_vp
-        profiles vs_2_0 arbvp1
+        profiles vs_2_0 arbvp1 
 }
 
-fragment_program indirectTexturing_FP20 cg
+fragment_program indirectTexturingDefault_FP20 cg
 {
-        source indirectTexturing_FP20.cg
+        source indirectTexturingDefault_FP20.cg
         entry_point main_fp
         profiles ps_2_0 arbfp1
 }
 
-vertex_program indirectTexturing_hlsl_VP20 hlsl
+vertex_program indirectTexturingDefault_hlsl_VP20 hlsl
 {
-        source indirectTexturing_hlsl_VP20.shd
+        source indirectTexturingDefault_hlsl_VP20.shd
         entry_point main_vp
         target vs_2_0
 }
 
-fragment_program indirectTexturing_hlsl_FP20 hlsl
+fragment_program indirectTexturingDefault_hlsl_FP20 hlsl
 {
-        source indirectTexturing_hlsl_FP20.shd
+        source indirectTexturingDefault_hlsl_FP20.shd
         entry_point main_fp
         target ps_2_0 
@@ -75 +82 @@
         profiles ps_2_0 arbfp1 
 }
+
+vertex_program indirectTexturingDefault_glsl_VP20 glsl
+{
+        source indirectTexturingDefault_glsl_VP20.shd
+}
+
+fragment_program indirectTexturingDefault_glsl_FP20 glsl
+{
+        source indirectTexturingDefault_glsl_FP20.shd
+}

GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/media/general/indirectTexturingDebugTexCoordCorrespondence_FP20.cg

@@ -1 +1 @@
 sampler indirectTexture: register(s0);
 
-void main_fp(float2 posS: TEXCOORD0, 
-             float2 posT: TEXCOORD1,
+void main_fp(float2 texCoord: TEXCOORD0, 
+             float2 subTexCoord: TEXCOORD1,
              out float4 ocolor: COLOR,
              uniform sampler2D indirectTexture)
 {
 
-   float2 coords = posS + (float2(1.0, 1.0) - tex2D(indirectTexture, posT).xy); 
+   float2 coords = texCoord + (float2(1.0, 1.0) - tex2D(indirectTexture, subTexCoord).xy); 
    ocolor = float4(coords, 0.0, 1.0);
 }

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

@@ -62 +62 @@
 
         unsigned int numGeneratedBillboardClouds = 0;
+        bool mergeBillboardCloudTexCoordGenerated = false;
+
         for (unsigned int iBillboard = 0; iBillboard < getNumBillboards(); iBillboard++)
         {
@@ -73 +75 @@
                         {
                                 subEntity = mEntity->getSubEntity(0);
+
+                                if (!mergeBillboardCloudTexCoordGenerated)
+                                {
+                                        subEntity->enableVertexColours(true);
+
+                                        mergeBillboardCloudTexCoordGenerated = true;
+                                }
+
                                 unsigned int offset = subEntity->getNumFaces() * 3;
                                 Ogre::Vector3 indicesA = Ogre::Vector3(offset, offset + 1, offset + 2);
@@ -90 +100 @@
                                 Ogre::Vector3 indices = Ogre::Vector3(0,1,2);
                                 subEntity = mEntity->getSubEntity(numGeneratedBillboardClouds);
-                                subEntity->addTextureCoordSet(2);
-
-                                Ogre::LogManager::getSingleton().logMessage("BBC-SubEntity(" + Ogre::StringConverter::toString(numGeneratedBillboardClouds) + ") - Num.Tex.Coord.Sets:" + Ogre::StringConverter::toString(subEntity->getNumTexCoordSets()));
+        
+                                subEntity->enableVertexColours(true);
+
+                                //Ogre::LogManager::getSingleton().logMessage("BBC-SubEntity(" + Ogre::StringConverter::toString(numGeneratedBillboardClouds) + ") - Num.Tex.Coord.Sets:" + Ogre::StringConverter::toString(subEntity->getNumTexCoordSets()));
 
                                 subEntity->addFaceVerticesIDs(indices);
@@ -101 +112 @@
                         // Face A of the billboard quad
                         vFaceA1.position = billboard->getBillboardClusterData()->getQuadTopLeftCorner();
+                        vFaceA2.position = billboard->getBillboardClusterData()->getQuadTopRightCorner();
+                        vFaceA3.position = billboard->getBillboardClusterData()->getQuadBottomRightCorner();
+
                         vFaceA1.normal = billboard->getBillboardClusterData()->getNormal();
-                        vFaceA1.uv[0] = Ogre::Vector3(1.0 , 0.0, 0.0);
-                        vFaceA2.position = billboard->getBillboardClusterData()->getQuadTopRightCorner();
                         vFaceA2.normal = billboard->getBillboardClusterData()->getNormal();
-                        vFaceA2.uv[0] = Ogre::Vector3(0.0, 0.0, 0.0);
-                        vFaceA3.position = billboard->getBillboardClusterData()->getQuadBottomRightCorner();
                         vFaceA3.normal = billboard->getBillboardClusterData()->getNormal();
-                        vFaceA3.uv[0] = Ogre::Vector3(0.0 ,1.0 ,0.0);
+
+                        vFaceA1.colour = Ogre::ColourValue(1.0 , 0.0, 0.0, 0.0).getAsARGB();
+                        vFaceA2.colour = Ogre::ColourValue(0.0, 0.0, 0.0, 0.0).getAsARGB();
+                        vFaceA3.colour = Ogre::ColourValue(0.0, 1.0 ,0.0, 0.0).getAsARGB();
 
                         // Face B of the billboard quad
                         UniqueVertex vFaceB1,vFaceB2,vFaceB3;
                         vFaceB1.position = billboard->getBillboardClusterData()->getQuadBottomRightCorner();
+                        vFaceB2.position = billboard->getBillboardClusterData()->getQuadBottomLeftCorner();
+                        vFaceB3.position = billboard->getBillboardClusterData()->getQuadTopLeftCorner();
+
                         vFaceB1.normal = billboard->getBillboardClusterData()->getNormal();
-                        vFaceB1.uv[0] = Ogre::Vector3(0.0, 1.0 ,0.0);
-                        vFaceB2.position = billboard->getBillboardClusterData()->getQuadBottomLeftCorner();
                         vFaceB2.normal = billboard->getBillboardClusterData()->getNormal();
-                        vFaceB2.uv[0] = Ogre::Vector3(1.0, 1.0, 0.0);
-                        vFaceB3.position = billboard->getBillboardClusterData()->getQuadTopLeftCorner();
                         vFaceB3.normal = billboard->getBillboardClusterData()->getNormal();
-                        vFaceB3.uv[0] = Ogre::Vector3(1.0, 0.0, 0.0);
+
+                        vFaceB1.colour = Ogre::ColourValue(0.0, 1.0 ,0.0, 0.0).getAsARGB();
+                        vFaceB2.colour = Ogre::ColourValue(1.0, 1.0, 0.0, 0.0).getAsARGB();
+                        vFaceB3.colour = Ogre::ColourValue(1.0, 0.0, 0.0, 0.0).getAsARGB();
 
                         subEntity->addUniqueVertex(vFaceA1);
@@ -231 +246 @@
                 BillboardGroupPtr billboardGroup = this->getBillboardGroup(iBillboardGroup);
 
-                Ogre::LogManager::getSingleton().logMessage("BBCG-Num.Billboards:" + Ogre::StringConverter::toString(billboardGroup->getNumBillboards()));
+                //Ogre::LogManager::getSingleton().logMessage("BBCG-Num.Billboards:" + Ogre::StringConverter::toString(billboardGroup->getNumBillboards()));
 
                 for (unsigned int iBillboard = 0; iBillboard < billboardGroup->getNumBillboards(); iBillboard++)
@@ -252 +267 @@
                                                 subEntityGroup->addTextureCoordSet(subEntity->getTexCoordDimensions(subEntityGroup->getNumTexCoordSets()));
                                         }
+
+                                        subEntityGroup->enableVertexColours(subEntity->hasVertexColours());
 
                                         unsigned int offset = subEntityGroup->getNumFaces() * 3;
@@ -261 +278 @@
 
                                         UniqueVertex vFaceA1,vFaceA2,vFaceA3;
+
                                         // Face A of the billboard quad
                                         vFaceA1.position = billboard->getBillboardClusterData()->getQuadTopLeftCorner();
+                                        vFaceA2.position = billboard->getBillboardClusterData()->getQuadTopRightCorner();
+                                        vFaceA3.position = billboard->getBillboardClusterData()->getQuadBottomRightCorner();
+
                                         vFaceA1.normal = billboard->getBillboardClusterData()->getNormal();
-
-                                        vFaceA2.position = billboard->getBillboardClusterData()->getQuadTopRightCorner();
                                         vFaceA2.normal = billboard->getBillboardClusterData()->getNormal();
+                                        vFaceA3.normal = billboard->getBillboardClusterData()->getNormal();
+
+                                        if (subEntity->hasVertexColours())
+                                        {
+                                                vFaceA1.colour = subEntity->getVertexColour(0);
+                                                vFaceA2.colour = subEntity->getVertexColour(1);
+                                                vFaceA3.colour = subEntity->getVertexColour(2);
+                                        }
                                         
-                                        vFaceA3.position = billboard->getBillboardClusterData()->getQuadBottomRightCorner();
-                                        vFaceA3.normal = billboard->getBillboardClusterData()->getNormal();
-                                        
+                                        UniqueVertex vFaceB1,vFaceB2,vFaceB3;
+
                                         // Face B of the billboard quad
-                                        UniqueVertex vFaceB1,vFaceB2,vFaceB3;
                                         vFaceB1.position = billboard->getBillboardClusterData()->getQuadBottomRightCorner();
+                                        vFaceB2.position = billboard->getBillboardClusterData()->getQuadBottomLeftCorner();
+                                        vFaceB3.position = billboard->getBillboardClusterData()->getQuadTopLeftCorner();
+
                                         vFaceB1.normal = billboard->getBillboardClusterData()->getNormal();
-                                        
-                                        vFaceB2.position = billboard->getBillboardClusterData()->getQuadBottomLeftCorner();
                                         vFaceB2.normal = billboard->getBillboardClusterData()->getNormal();
-                                        
-                                        vFaceB3.position = billboard->getBillboardClusterData()->getQuadTopLeftCorner();
                                         vFaceB3.normal = billboard->getBillboardClusterData()->getNormal();
                                         
-                                        Ogre::LogManager::getSingleton().logMessage("BBCG-SubEntity(" + Ogre::StringConverter::toString(numGeneratedBillboardClouds) + ") - Num.Tex.Coord.Sets:"+ Ogre::StringConverter::toString(subEntity->getNumTexCoordSets()));
+                                        if (subEntity->hasVertexColours())
+                                        {
+                                                vFaceB1.colour = subEntity->getVertexColour(3);
+                                                vFaceB2.colour = subEntity->getVertexColour(4);
+                                                vFaceB3.colour = subEntity->getVertexColour(5);
+                                        }
+
+                                        //Ogre::LogManager::getSingleton().logMessage("BBCG-SubEntity(" + Ogre::StringConverter::toString(numGeneratedBillboardClouds) + ") - Num.Tex.Coord.Sets:"+ Ogre::StringConverter::toString(subEntity->getNumTexCoordSets()));
 
                                         for (unsigned int iTexCoordSet = 0; iTexCoordSet < subEntityGroup->getNumTexCoordSets(); iTexCoordSet++)
@@ -308 +339 @@
 
         mEntity = entity;
-        entity->setSubEntitiesDistinctVertexColours();
 }
 

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

@@ -196 +196 @@
                 subEntity->setTexCoord(iUniqueVertex+2, subEntity->getNumTexCoordSets()-1, Ogre::Vector3(texCoords03[0],texCoords03[1],0));
 
-                Ogre::ColourValue subEntityColour01 = Ogre::ColourValue(0, texCoords01[0],texCoords01[1]);
-                Ogre::ColourValue subEntityColour02 = Ogre::ColourValue(0, texCoords02[0],texCoords02[1]);
-                Ogre::ColourValue subEntityColour03 = Ogre::ColourValue(0, texCoords03[0],texCoords03[1]);
-
-                subEntity->setVertexColour(iUniqueVertex, subEntityColour01.getAsRGBA());
-                subEntity->setVertexColour(iUniqueVertex+1, subEntityColour02.getAsRGBA());
-                subEntity->setVertexColour(iUniqueVertex+2, subEntityColour03.getAsRGBA());
+                //Ogre::ColourValue subEntityColour01 = Ogre::ColourValue(0, texCoords01[0],texCoords01[1]);
+                //Ogre::ColourValue subEntityColour02 = Ogre::ColourValue(0, texCoords02[0],texCoords02[1]);
+                //Ogre::ColourValue subEntityColour03 = Ogre::ColourValue(0, texCoords03[0],texCoords03[1]);
+
+                //subEntity->setVertexColour(iUniqueVertex, subEntityColour01.getAsRGBA());
+                //subEntity->setVertexColour(iUniqueVertex+1, subEntityColour02.getAsRGBA());
+                //subEntity->setVertexColour(iUniqueVertex+2, subEntityColour03.getAsRGBA());
 
                 // Face B
@@ -212 +212 @@
                 subEntity->setTexCoord(iUniqueVertex+5, subEntity->getNumTexCoordSets()-1, Ogre::Vector3(texCoords01[0],texCoords01[1],0));
 
-                Ogre::ColourValue subEntityColour04 = Ogre::ColourValue(0, texCoords03[0],texCoords03[1]);
-                Ogre::ColourValue subEntityColour05 = Ogre::ColourValue(0, texCoords04[0],texCoords04[1]);
-                Ogre::ColourValue subEntityColour06 = Ogre::ColourValue(0, texCoords01[0],texCoords01[1]);
-
-                subEntity->setVertexColour(iUniqueVertex+3, subEntityColour04.getAsRGBA());
-                subEntity->setVertexColour(iUniqueVertex+4, subEntityColour05.getAsRGBA());
-                subEntity->setVertexColour(iUniqueVertex+5, subEntityColour06.getAsRGBA());
+                //Ogre::ColourValue subEntityColour04 = Ogre::ColourValue(0, texCoords03[0],texCoords03[1]);
+                //Ogre::ColourValue subEntityColour05 = Ogre::ColourValue(0, texCoords04[0],texCoords04[1]);
+                //Ogre::ColourValue subEntityColour06 = Ogre::ColourValue(0, texCoords01[0],texCoords01[1]);
+
+                //subEntity->setVertexColour(iUniqueVertex+3, subEntityColour04.getAsRGBA());
+                //subEntity->setVertexColour(iUniqueVertex+4, subEntityColour05.getAsRGBA());
+                //subEntity->setVertexColour(iUniqueVertex+5, subEntityColour06.getAsRGBA());
         }
         else
@@ -238 +238 @@
                         subEntity->setTexCoord(iUniqueVertex+2, subEntity->getNumTexCoordSets()-1, Ogre::Vector3(texCoords03[0],texCoords03[1],0));
 
-                        Ogre::ColourValue subEntityColour01 = Ogre::ColourValue(0, texCoords01[0],texCoords01[1]);
-                        Ogre::ColourValue subEntityColour02 = Ogre::ColourValue(0, texCoords02[0],texCoords02[1]);
-                        Ogre::ColourValue subEntityColour03 = Ogre::ColourValue(0, texCoords03[0],texCoords03[1]);
-
-                        subEntity->setVertexColour(iUniqueVertex, subEntityColour01.getAsRGBA());
-                        subEntity->setVertexColour(iUniqueVertex+1, subEntityColour02.getAsRGBA());
-                        subEntity->setVertexColour(iUniqueVertex+2, subEntityColour03.getAsRGBA());
+                        //Ogre::ColourValue subEntityColour01 = Ogre::ColourValue(0, texCoords01[0],texCoords01[1]);
+                        //Ogre::ColourValue subEntityColour02 = Ogre::ColourValue(0, texCoords02[0],texCoords02[1]);
+                        //Ogre::ColourValue subEntityColour03 = Ogre::ColourValue(0, texCoords03[0],texCoords03[1]);
+
+                        //subEntity->setVertexColour(iUniqueVertex, subEntityColour01.getAsRGBA());
+                        //subEntity->setVertexColour(iUniqueVertex+1, subEntityColour02.getAsRGBA());
+                        //subEntity->setVertexColour(iUniqueVertex+2, subEntityColour03.getAsRGBA());
 
                         // Face B
@@ -254 +254 @@
                         subEntity->setTexCoord(iUniqueVertex+5, subEntity->getNumTexCoordSets()-1, Ogre::Vector3(texCoords01[0],texCoords01[1],0));
 
-                        Ogre::ColourValue subEntityColour04 = Ogre::ColourValue(0, texCoords03[0],texCoords03[1]);
-                        Ogre::ColourValue subEntityColour05 = Ogre::ColourValue(0, texCoords04[0],texCoords04[1]);
-                        Ogre::ColourValue subEntityColour06 = Ogre::ColourValue(0, texCoords01[0],texCoords01[1]);
-
-                        subEntity->setVertexColour(iUniqueVertex+3, subEntityColour04.getAsRGBA());
-                        subEntity->setVertexColour(iUniqueVertex+4, subEntityColour05.getAsRGBA());
-                        subEntity->setVertexColour(iUniqueVertex+5, subEntityColour06.getAsRGBA());
+                        //Ogre::ColourValue subEntityColour04 = Ogre::ColourValue(0, texCoords03[0],texCoords03[1]);
+                        //Ogre::ColourValue subEntityColour05 = Ogre::ColourValue(0, texCoords04[0],texCoords04[1]);
+                        //Ogre::ColourValue subEntityColour06 = Ogre::ColourValue(0, texCoords01[0],texCoords01[1]);
+
+                        //subEntity->setVertexColour(iUniqueVertex+3, subEntityColour04.getAsRGBA());
+                        //subEntity->setVertexColour(iUniqueVertex+4, subEntityColour05.getAsRGBA());
+                        //subEntity->setVertexColour(iUniqueVertex+5, subEntityColour06.getAsRGBA());
 
                 }
@@ -341 +341 @@
         for (unsigned int iBillboard = 0; iBillboard < mBillboardCloud->getNumBillboards(); iBillboard++)
         {
-                Ogre::LogManager::getSingleton().logMessage("id:" + Ogre::StringConverter::toString(mBillboardCloud->getBillboard(iBillboard)->getBillboardHandle()));
+                //Ogre::LogManager::getSingleton().logMessage("id:" + Ogre::StringConverter::toString(mBillboardCloud->getBillboard(iBillboard)->getBillboardHandle()));
 
                 BillboardClusterData *billboardClusterData = mBillboardCloud->getBillboard(iBillboard)->getBillboardClusterData().get();                

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

@@ -109 +109 @@
         float width, height;
         
-        bound.print();
+        //bound.print();
+
         min = bound.getMinimum();
         max = bound.getMaximum();

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

@@ -255 +255 @@
 bool BillboardCloudDiffuseColorTextureViewMode::frameStarted(const Ogre::FrameEvent& evt, Ogre::InputReader *inputReader)
 {
+        showDebugOverlay(false);
         initializeEntityClustersGrouped();
     initializeBillboardCloudSplitted();

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

@@ -257 +257 @@
 bool BillboardCloudIndirectTextureViewMode::frameStarted(const Ogre::FrameEvent& evt, Ogre::InputReader *inputReader)
 {
+        showDebugOverlay(false);
         initializeEntityClustersGrouped();
     initializeBillboardCloudSplitted();

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

@@ -90 +90 @@
     }
 
-        mWindow->setDebugText("P: " + mDefaultOgreFrameListenerMode->getSceneManager()->getName() + " -- " + Ogre::StringConverter::toString(mTimeUntilNextToggle));
+        //mWindow->setDebugText("P: " + mDefaultOgreFrameListenerMode->getSceneManager()->getName() + " -- " + Ogre::StringConverter::toString(mTimeUntilNextToggle));
 
         return mDefaultOgreFrameListenerMode->frameStarted(evt,mInputDevice);