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

Timestamp:

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

Author:

igarcia

Message:

 

Location:

GTP/trunk/Lib/Illum/IBRBillboardCloudTrees/OGRE/include

Files:

• IBRBillboardCloudTreeFrameListener.h (modified) (1 diff)
• LBBC/LBBCBillboardViewMode.h (modified) (7 diffs)
• LBBC/LBBCClusterViewMode.h (modified) (1 diff)

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

@@ -11 +11 @@
 
 public:
-        IBRBillboardCloudTreeFrameListener(Ogre::RenderWindow *win, bool useBufferedInputKeys = false, bool useBufferedInputMouse = false)
-        : OgreFrameListener(win, useBufferedInputKeys, useBufferedInputMouse)
-    {
-    }
+        IBRBillboardCloudTreeFrameListener(Ogre::RenderWindow *win, bool useBufferedInputKeys = false, bool useBufferedInputMouse = false);
 
-        ~IBRBillboardCloudTreeFrameListener()        
-    {
-    }
+        ~IBRBillboardCloudTreeFrameListener();        
 
-        bool frameStarted(const Ogre::FrameEvent& evt)
-    {
-        // Call default
-        return OgreFrameListener::frameStarted(evt);        
-    }
+        bool frameStarted(const Ogre::FrameEvent& evt);
+
+        bool processUnbufferedKeyInput(const Ogre::FrameEvent& evt);
 
 };

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

@@ -16 +16 @@
                         epsilonX = 0.0;
                         epsilonY = 0.0;
-                        factor = 1.0 / 255.0;
+                        factor = 0.125;
                 }
 
@@ -35 +35 @@
                 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_RIGHT))
+                        {
+                                epsilonX = epsilonX + (factor * evt.timeSinceLastFrame);                                
+                        }
+
+                        if (mInputDevice->isKeyDown(Ogre::KC_LEFT))
+                        {
+                                epsilonX = epsilonX - (factor * evt.timeSinceLastFrame);
+                        }
+
+                        if (mInputDevice->isKeyDown(Ogre::KC_UP))
+                        {
+                                epsilonY = epsilonY + (factor * evt.timeSinceLastFrame);
                         }
                         
-                        if (mInputDevice->isKeyDown(Ogre::KC_4))
-                        {
-                                epsilonY = epsilonY - factor;
+                        if (mInputDevice->isKeyDown(Ogre::KC_DOWN))
+                        {
+                                epsilonY = epsilonY - (factor * evt.timeSinceLastFrame);
                         }
 
                         mFragParams = mBillboardCloudEntity->getSubEntity(0)->getMaterial()->getBestTechnique()->getPass(0)->getFragmentProgramParameters();
+
                         mFragParams->setNamedConstant("epsilonX", epsilonX);
                         mFragParams->setNamedConstant("epsilonY", epsilonY);
@@ -71 +72 @@
                         }
 
+                        ///* 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;
+                        //}
+
                         /* Move camera forward by keypress. */
-                        if (mInputDevice->isKeyDown(Ogre::KC_UP) || mInputDevice->isKeyDown(Ogre::KC_W) )
+                        if (mInputDevice->isKeyDown(Ogre::KC_W) )
                         {
                                 mTranslateVector.z = -mMoveScale;
@@ -78 +91 @@
 
                         /* Move camera backward by keypress. */
-                        if (mInputDevice->isKeyDown(Ogre::KC_DOWN) || mInputDevice->isKeyDown(Ogre::KC_S) )
+                        if (mInputDevice->isKeyDown(Ogre::KC_S) )
                         {
                                 mTranslateVector.z = mMoveScale;
@@ -95 +108 @@
                         }
 
-                        if (mInputDevice->isKeyDown(Ogre::KC_RIGHT))
-                        {
-                                mCamera->yaw(-mRotScale);
-                        }
-                        
-                        if (mInputDevice->isKeyDown(Ogre::KC_LEFT))
-                        {
-                                mCamera->yaw(mRotScale);
-                        }
+                        //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 
@@ -186 +199 @@
                                 mWindow->setDebugText("P: " + Ogre::StringConverter::toString(mCamera->getDerivedPosition()) + " " + 
                                         "O: " + Ogre::StringConverter::toString(mCamera->getDerivedOrientation()));
-                        }
+                        }                       
 
                         // Return true to continue rendering
@@ -201 +214 @@
 
                         Ogre::SceneNode* sNode = mSceneMgr->getRootSceneNode()->createChildSceneNode();
-                        //mBillboardCloudEntity = mSceneMgr->createEntity(mBillboardCloudMeshName, mBillboardCloudMeshName);            
-                        mBillboardCloudEntity = mSceneMgr->createEntity("chestnutLeavesBillboardCloudGrouped.mesh", "chestnutLeavesBillboardCloudGrouped.mesh");
+                        mBillboardCloudEntity = mSceneMgr->createEntity(mBillboardCloudMeshName, mBillboardCloudMeshName);              
+                        //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)));
+                        //sNode->rotate(Ogre::Vector3::UNIT_X, Ogre::Radian(Ogre::Degree(-90.0)));
                 }
 

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

@@ -38 +38 @@
 
                         Ogre::SceneNode* sNode = mSceneMgr->getRootSceneNode()->createChildSceneNode();
-                        //Ogre::Entity* eLeafClustersGrouped = mSceneMgr->createEntity(mEntityClustersMeshName, mEntityClustersMeshName);                                       
-                        Ogre::Entity* eLeafClustersGrouped = mSceneMgr->createEntity("chestnutLeafClustersGrouped.mesh", "chestnutLeafClustersGrouped.mesh");                                                           
+                        Ogre::Entity* eLeafClustersGrouped = mSceneMgr->createEntity(mEntityClustersMeshName, mEntityClustersMeshName);                                 
+                        //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)));
+                        //sNode->rotate(Ogre::Vector3::UNIT_X, Ogre::Radian(Ogre::Degree(-90.0)));
                 }
         protected: