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

Timestamp:

04/28/06 19:49:56 (18 years ago)

Author:

igarcia

Message:

 

Location:

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

Files:

• IBRBillboardCloudTreeApplication.cpp (modified) (3 diffs)
• IBRBillboardCloudTreeFrameListener.cpp (modified) (1 diff)
• LBBCBillboardCloudIndirectTextureViewMode.cpp (modified) (3 diffs)
• LBBCManager.cpp (modified) (2 diffs)

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

@@ -206 +206 @@
 
         {
+                LBBC::EntityTextureAtlasViewMode *textureAtlasFrameListenerMode;
+                textureAtlasFrameListenerMode = new LBBC::EntityTextureAtlasViewMode(mWindow,mFrameListener->getNumFrameListenerModes());
+                textureAtlasFrameListenerMode->chooseSceneManager();
+                textureAtlasFrameListenerMode->createCamera();
+                textureAtlasFrameListenerMode->createViewports();
+                textureAtlasFrameListenerMode->setTextureAtlasSize(mSampleConfigFile->getBillboardCloudDiffuseColorEntityTextureAtlasSize());
+                textureAtlasFrameListenerMode->setTextureAtlasBitRange(mSampleConfigFile->getBillboardCloudDiffuseColorEntityTextureAtlasBitRange());
+                textureAtlasFrameListenerMode->setTextureAtlasNumSamples(mSampleConfigFile->getBillboardCloudDiffuseColorEntityTextureAtlasNumSamples());
+                textureAtlasFrameListenerMode->setTextureName(mSampleConfigFile->getBillboardCloudDiffuseColorEntityTextureName());
+                textureAtlasFrameListenerMode->setTextureAtlasName(mSampleConfigFile->getBillboardCloudDiffuseColorEntityTextureAtlasName());
+                textureAtlasFrameListenerMode->setTextureAtlasFolder(mSampleConfigFile->getBillboardCloudFolder());
+
+                mFrameListener->addFrameListenerMode(textureAtlasFrameListenerMode);
+                textureAtlasFrameListenerMode->createScene();
+        }
+
+        {
                 LBBC::BillboardViewMode *anotherFrameListenerMode;
                 anotherFrameListenerMode = new LBBC::BillboardViewMode(mWindow,mFrameListener->getNumFrameListenerModes());
@@ -211 +228 @@
                 anotherFrameListenerMode->createCamera();
                 anotherFrameListenerMode->createViewports();
-                //anotherFrameListenerMode->setBillboardCloudMeshName(mSampleConfigFile->getBillboardCloudGroupedMeshName());
+                anotherFrameListenerMode->setBillboardCloudMeshName(mSampleConfigFile->getBillboardCloudGroupedMeshName());
                 anotherFrameListenerMode->createScene();
                 mFrameListener->addFrameListenerMode(anotherFrameListenerMode);
@@ -222 +239 @@
                 anotherFrameListenerMode->createCamera();
                 anotherFrameListenerMode->createViewports();
-                //anotherFrameListenerMode->setEntityClustersMeshName(mSampleConfigFile->getEntityClustersGroupedMeshName());
+                anotherFrameListenerMode->setEntityClustersMeshName(mSampleConfigFile->getEntityClustersGroupedMeshName());
                 anotherFrameListenerMode->createScene();
                 mFrameListener->addFrameListenerMode(anotherFrameListenerMode);

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

@@ -2 +2 @@
 #include "IBRBillboardCloudTreeFrameListener.h"
 
+IBRBillboardCloudTreeFrameListener::IBRBillboardCloudTreeFrameListener(Ogre::RenderWindow *win, bool useBufferedInputKeys, bool useBufferedInputMouse)
+    : OgreFrameListener(win, useBufferedInputKeys, useBufferedInputMouse)
+{
+}
+
+IBRBillboardCloudTreeFrameListener::~IBRBillboardCloudTreeFrameListener()        
+{
+}
+
+bool IBRBillboardCloudTreeFrameListener::frameStarted(const Ogre::FrameEvent& evt)
+{           
+        if (!mInputTypeSwitchingOn)
+        {
+                mInputDevice->capture();
+        }
+
+        if ( !mUseBufferedInputMouse || !mUseBufferedInputKeys)
+        {
+                // one of the input modes is immediate, so setup what is needed for immediate mouse/key movement
+                if (mTimeUntilNextToggle >= 0) 
+                {
+                        mTimeUntilNextToggle -= evt.timeSinceLastFrame;
+                }
+        }
+
+        if (mUseBufferedInputKeys)
+        {
+                // no need to do any processing here, it is handled by event processor and 
+                // you get the results as KeyEvents
+        }
+        else
+        {
+                if (processUnbufferedKeyInput(evt) == false)
+                {
+                        return false;
+                }
+        }
+
+        //mWindow->setDebugText("P: " + mDefaultOgreFrameListenerMode->getSceneManager()->getName() + " -- " + Ogre::StringConverter::toString(mTimeUntilNextToggle));
+
+        return mDefaultOgreFrameListenerMode->frameStarted(evt,mInputDevice);
+}
+
+bool IBRBillboardCloudTreeFrameListener::processUnbufferedKeyInput(const Ogre::FrameEvent& evt)
+{
+        if( mInputDevice->isKeyDown(Ogre::KC_ESCAPE) )
+        {            
+                return false;
+        }
+
+        if (mInputDevice->isKeyDown(Ogre::KC_F1))
+        {               
+                mCurrentOgreFrameListenerMode = 0;              
+                this->setEnabledFrameListenerMode(mCurrentOgreFrameListenerMode);
+                mWindow->setDebugText("P: " + mDefaultOgreFrameListenerMode->getSceneManager()->getName());
+
+                //mTimeUntilNextToggle = 0.25;          
+        }
+
+        if (mInputDevice->isKeyDown(Ogre::KC_F2))
+        {               
+                mCurrentOgreFrameListenerMode = 1;              
+                this->setEnabledFrameListenerMode(mCurrentOgreFrameListenerMode);
+                mWindow->setDebugText("P: " + mDefaultOgreFrameListenerMode->getSceneManager()->getName());
+
+                //mTimeUntilNextToggle = 0.25;          
+        }
+
+        if (mInputDevice->isKeyDown(Ogre::KC_F3))
+        {               
+                mCurrentOgreFrameListenerMode = 2;
+                this->setEnabledFrameListenerMode(mCurrentOgreFrameListenerMode);
+                mWindow->setDebugText("P: " + mDefaultOgreFrameListenerMode->getSceneManager()->getName());
+
+                //mTimeUntilNextToggle = 0.25;          
+        }
+
+        if (mInputDevice->isKeyDown(Ogre::KC_F4))
+        {               
+                mCurrentOgreFrameListenerMode = 3;
+                this->setEnabledFrameListenerMode(mCurrentOgreFrameListenerMode);
+                mWindow->setDebugText("P: " + mDefaultOgreFrameListenerMode->getSceneManager()->getName());
+
+                //mTimeUntilNextToggle = 0.25;          
+        }
+
+        if (mInputDevice->isKeyDown(Ogre::KC_F5))
+        {               
+                mCurrentOgreFrameListenerMode = 4;
+                this->setEnabledFrameListenerMode(mCurrentOgreFrameListenerMode);
+                mWindow->setDebugText("P: " + mDefaultOgreFrameListenerMode->getSceneManager()->getName());
+
+                //mTimeUntilNextToggle = 0.25;          
+        }
+
+        // Return true to continue rendering
+        return true;
+}

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

@@ -164 +164 @@
         Ogre::GpuProgramParametersSharedPtr fragParams;
         
-        fragParams = mBillboardCloudPointClusters->getSubEntity(mCurrentTexture % mBillboardCloudPointClusters->getNumSubEntities())->getMaterial()->getTechnique(0)->getPass(0)->getFragmentProgramParameters();
-        fragParams->setNamedConstant("textureSize", (Ogre::Real)mTextureSize);
-        mBillboardCloudPointClusters->getSubEntity(mCurrentTexture % mBillboardCloudPointClusters->getNumSubEntities())->getMaterial()->reload();
-        
         if (mDebugTextureAtlasGeneration)
         {
@@ -403 +399 @@
 
         mTextureAtlas = IMG::TextureAtlasPtr( new IMG::TextureAtlas() );
-        mTextureAtlas->create("IndirectTextureAtlas", mTextureAtlasSize, mTextureAtlasSize, mSrcPixelFormat, mCamera, Ogre::ColourValue(0.0, 0.0, 0.0));
+        mTextureAtlas->create("IndirectTextureAtlas", mTextureAtlasSize, mTextureAtlasSize, mSrcPixelFormat, mCamera, Ogre::ColourValue(0.0, 0.0, 0.0, 0.0));
         mTextureAtlas->setTextureAtlasSceneNode(mBillboardCloudPointClustersSceneNode);
         Ogre::MaterialPtr materialPtr1 = Ogre::MaterialManager::getSingleton().create("IndirectTextureAtlasMaterial", Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);         
@@ -415 +411 @@
 
         mClusterTexture = IMG::TexturePtr( new IMG::Texture() );
-        mClusterTexture->create("ClusterIndirectTexture", mTextureSize, mTextureSize, mSrcPixelFormat, mCamera, Ogre::ColourValue(0.0, 0.0, 0.0));
+        mClusterTexture->create("ClusterIndirectTexture", mTextureSize, mTextureSize, mSrcPixelFormat, mCamera, Ogre::ColourValue(0.0, 0.0, 0.0, 0.0));
         Ogre::MaterialPtr materialPtr = Ogre::MaterialManager::getSingleton().create("IndirectTextureMaterial", Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);                       
         if (!mDebugTextureAtlasGeneration)

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

@@ -192 +192 @@
 void LBBCManager::generateEntityDistribution()
 {
-        if (mSampleConfigFile->getEntityDistributionGeneration())
-        {
-                createEntityDistribution();
-                saveEntityDistributionSplitted();
-                saveEntityDistributionXML();
-        }
+        createEntityDistribution();
+        saveEntityDistributionSplitted();
+        saveEntityDistributionXML();
 }
 
@@ -552 +549 @@
 
                                 //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.uv[0] = Ogre::Vector3(1.0 - (hDistance / height), 1.0 - (wDistance / width), 0.0);
+                                Ogre::Real numSamples = mSampleConfigFile->getBillboardCloudDiffuseColorEntityTextureAtlasNumSamples();
+                                Ogre::Real randomInt = Ogre::Math::Ceil(Ogre::Math::RangeRandom(0.5,numSamples));
+
+                                Ogre::Vector2 topLeftCorner[16];
+                                topLeftCorner[0] = Ogre::Vector2(0.0,  0.0);
+                                topLeftCorner[1] = Ogre::Vector2(0.25, 0.0);
+                                topLeftCorner[2] = Ogre::Vector2(0.5,  0.0);
+                                topLeftCorner[3] = Ogre::Vector2(0.75, 0.0);
+                                topLeftCorner[4] = Ogre::Vector2(0.0,  0.25);
+                                topLeftCorner[5] = Ogre::Vector2(0.25, 0.25);
+                                topLeftCorner[6] = Ogre::Vector2(0.5,  0.25);
+                                topLeftCorner[7] = Ogre::Vector2(0.75, 0.25);
+                                topLeftCorner[8] = Ogre::Vector2(0.0,  0.5);
+                                topLeftCorner[9] = Ogre::Vector2(0.25, 0.5);
+                                topLeftCorner[10] = Ogre::Vector2(0.5,  0.5);
+                                topLeftCorner[11] = Ogre::Vector2(0.75, 0.5);
+                                topLeftCorner[12] = Ogre::Vector2(0.0,  0.75);
+                                topLeftCorner[13] = Ogre::Vector2(0.25, 0.75);
+                                topLeftCorner[14] = Ogre::Vector2(0.5,  0.75);
+                                topLeftCorner[15] = Ogre::Vector2(0.75, 0.75);
+
+                                //vertex.uv[0] = Ogre::Vector3(randomInt / numSamples, 0.0, 0.0);
+                                
+                                vertex.uv[0] = Ogre::Vector3(1.0 - topLeftCorner[(unsigned int)randomInt-1][0], 1.0 - topLeftCorner[(unsigned int)randomInt-1][1], 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);