Changeset 11

Timestamp:

06/28/09 03:57:15 (3 years ago)

Author:

nktug

Message:

Add code to handle PSLM plugin
Change type mask use by RaySceneQuery?

Location:

trunk

Files:

• config/objects.txt (modified) (2 diffs)
• src/LevelEditor.cc (modified) (6 diffs)
• src/dreamforge/GameEngine.cc (modified) (6 diffs)

trunk/config/objects.txt

@@ -6 +6 @@
         OgreHead        ogrehead.mesh           MSTR    Ogre3D head mesh use for test
         Ninja           ninja.mesh              NPC     Ogre3D ninja mesh use for test
+    Monstre             
+        Drako   dragon.mesh             MSTR    Ogre3D head mesh use for test    
 Flore                   
     Plantes             
@@ -19 +21 @@
     Elements            
         Rock            Rock1_1.mesh            BLD     test
+    Armes               
+        EPEE            epee.mesh               BLD     test
+        BOUCLIER                bouclier.mesh           BLD     test 

trunk/src/LevelEditor.cc

@@ -275 +275 @@
         Ogre::RaySceneQuery* tempRayQuery = mSceneMgr->createRayQuery(Ogre::Ray(node->getPosition(), Ogre::Vector3::NEGATIVE_UNIT_Y));
         Ogre::Ray tempRay;
+  tempRayQuery->setQueryTypeMask(Ogre::SceneManager::WORLD_GEOMETRY_TYPE_MASK);
+        tempRayQuery->setWorldFragmentType(Ogre::SceneQuery::WFT_SINGLE_INTERSECTION);
         tempRay.setOrigin(node->getPosition());
         tempRay.setDirection(Ogre::Vector3::NEGATIVE_UNIT_Y);
@@ -291 +293 @@
 void LevelEdWidget::createScene( void )
 {
-        
+        /*
         std::string terrain_cfg("terrain.cfg");
         mSceneMgr -> setWorldGeometry( terrain_cfg );
@@ -298 +300 @@
         {
                 mCamera->setFarClipDistance(0);
-        }
-
+        }*/
+  mSceneMgr->setWorldGeometry( Ogre::String("terrain_mainMenu.cfg") );
         // Define the required skyplane
         Ogre::Plane plane;
@@ -343 +345 @@
   
         mCamera = mSceneMgr->createCamera("LEVELCAM");
-        mCamera->setPosition(Ogre::Vector3(17519,913,16033));
-        mCamera->lookAt(Ogre::Vector3(16073,0,16600));  
+        mCamera->setPosition(Ogre::Vector3(750,913,750));
+        mCamera->lookAt(Ogre::Vector3(850,0,950));  
         mCamera->setAutoAspectRatio(true);
         mCamera->setNearClipDistance(1);
@@ -668 +670 @@
   Ogre::Ray mouseRay = mCamera->getCameraToViewportRay((double)evt->pos().x()/(double)width(), (double)evt->pos().y()/(double)height());
   Ogre::RaySceneQuery* mRaySceneQuery = mSceneMgr->createRayQuery(Ogre::Ray());;
+  mRaySceneQuery->setQueryTypeMask(Ogre::SceneManager::WORLD_GEOMETRY_TYPE_MASK);
+        mRaySceneQuery->setWorldFragmentType(Ogre::SceneQuery::WFT_SINGLE_INTERSECTION);
   mRaySceneQuery->setRay(mouseRay);
   //mRaySceneQuery->setSortByDistance(true);
@@ -690 +694 @@
       Ogre::Ray mouseRay = mCamera->getCameraToViewportRay((double)evt->pos().x()/(double)width(), (double)evt->pos().y()/(double)height());
       Ogre::RaySceneQuery* mRaySceneQuery = mSceneMgr->createRayQuery(Ogre::Ray());;
+      mRaySceneQuery->setQueryTypeMask(Ogre::SceneManager::WORLD_GEOMETRY_TYPE_MASK || Ogre::SceneManager::ENTITY_TYPE_MASK);
+      mRaySceneQuery->setWorldFragmentType(Ogre::SceneQuery::WFT_SINGLE_INTERSECTION);      
       mRaySceneQuery->setRay(mouseRay);
       

trunk/src/dreamforge/GameEngine.cc

@@ -22 +22 @@
 
 #include "freequest/log/Logger.hh"
-
+#include "dreamforge/Exceptions.hh"
 #include "dreamforge/GameEngine.hh"
 
@@ -74 +74 @@
   //mRoot->loadPlugin("/usr/lib/OGRE/Plugin_CgProgramManager.so");
   mRoot->loadPlugin("/usr/lib/OGRE/Plugin_ParticleFX.so"); 
-  mRoot->loadPlugin("/usr/lib/OGRE/Plugin_OctreeSceneManager.so"); 
+  //mRoot->loadPlugin("/usr/lib/OGRE/Plugin_OctreeSceneManager.so"); 
+  mRoot->loadPlugin("/usr/lib/OGRE/Plugin_PagingLandScapeSceneManager2.so");
 #elif defined __TARGET_WINDOWS__
   mRoot->loadPlugin("RenderSystem_GL");
@@ -80 +81 @@
   mRoot->loadPlugin("Plugin_CgProgramManager");
   mRoot->loadPlugin("Plugin_ParticleFX");
-  mRoot->loadPlugin("Plugin_OctreeSceneManager");
+  //mRoot->loadPlugin("Plugin_OctreeSceneManager");
+  mRoot->loadPlugin("Plugin_PagingLandScapeSceneManager2");
 #else
 #error Plateform Not Implemented
@@ -123 +125 @@
                 Ogre::ResourceGroupManager::getSingleton().addResourceLocation("../../data", "FileSystem", "General");
                 Ogre::ResourceGroupManager::getSingleton().addResourceLocation("../../data/fonts", "FileSystem", "General");
+                Ogre::ResourceGroupManager::getSingleton().addResourceLocation("../../data/gui", "FileSystem", "General");
                 Ogre::ResourceGroupManager::getSingleton().addResourceLocation("../../data/models", "FileSystem", "General");
                 Ogre::ResourceGroupManager::getSingleton().addResourceLocation("../../data/models/mesh", "FileSystem", "General");
@@ -130 +133 @@
                 Ogre::ResourceGroupManager::getSingleton().addResourceLocation("../../data/models/humain", "FileSystem", "General");
     Ogre::ResourceGroupManager::getSingleton().addResourceLocation("../../data/models/armes", "FileSystem", "General"); 
-    //Ogre::ResourceGroupManager::getSingleton().addResourceLocation("../../data/models/test", "FileSystem", "General"); 
                 Ogre::ResourceGroupManager::getSingleton().addResourceLocation("../../data/terrain", "FileSystem", "General");
-                Ogre::ResourceGroupManager::getSingleton().addResourceLocation("../../data/terrain/ET", "FileSystem", "General");    
                 Ogre::ResourceGroupManager::getSingleton().addResourceLocation("../../data/world", "FileSystem", "General");
+    
                 Ogre::ResourceGroupManager::getSingleton().addResourceLocation("../../data/OgreCore.zip", "Zip", "Bootstrap");
+    Ogre::ResourceGroupManager::getSingleton().addResourceLocation("../../data/models/montres/dragon.zip", "Zip", "Bootstrap"); 
+        
+    Ogre::ResourceGroupManager::getSingleton().addResourceLocation("../../data/terrain/PLSM/terrains/collision", "FileSystem", "COL");
+    
+    Ogre::ResourceGroupManager::getSingleton().addResourceLocation("../../data/terrain/PLSM", "FileSystem", "PLSM2");
+    Ogre::ResourceGroupManager::getSingleton().addResourceLocation("../../data/terrain/PLSM/scripts", "FileSystem", "PLSM2");
+    Ogre::ResourceGroupManager::getSingleton().addResourceLocation("../../data/terrain/PLSM/textures", "FileSystem", "PLSM2");
+    Ogre::ResourceGroupManager::getSingleton().addResourceLocation("../../data/terrain/PLSM/programs", "FileSystem", "PLSM2");
+    Ogre::ResourceGroupManager::getSingleton().addResourceLocation("../../data/terrain/PLSM/terrains", "FileSystem", "PLSM2");
+    Ogre::ResourceGroupManager::getSingleton().addResourceLocation("../../data/terrain/PLSM/datasrcs", "FileSystem", "PLSM2");
+    Ogre::ResourceGroupManager::getSingleton().addResourceLocation("../../data/terrain/PLSM/overlays", "FileSystem", "PLSM2");
+    Ogre::ResourceGroupManager::getSingleton().addResourceLocation("../../data/terrain/PLSM/models","FileSystem", "PLSM2");
         }
          catch( Ogre::Exception& e )    // TODO : Next time use our Exception
@@ -161 +175 @@
 {
         LOG_INFO( Logger::getLogger("dreamforge"), " == Create Scene manager and Camera == ");
-        // Create a generic scene manager and our main camera
-        mSceneMgr = mRoot->createSceneManager("TerrainSceneManager", "LEVELSCMGR");
+  bool notFound = true;
+  // Get the SceneManager, in this case the Paging LandScape specialization
+  Ogre::SceneManagerEnumerator::MetaDataIterator it = mRoot->getSceneManagerMetaDataIterator();
+  while (it.hasMoreElements ())
+  {
+      const Ogre::SceneManagerMetaData* metaData = it.getNext ();
+
+      /// A mask describing which sorts of scenes this manager can handle
+      if (metaData->sceneTypeMask == Ogre::ST_EXTERIOR_REAL_FAR && 
+          metaData->worldGeometrySupported == true &&
+          metaData->typeName == "PagingLandScapeSceneManager")
+      {
+          notFound = false;
+          break;
+      }
+  }
+  if (notFound)
+  {
+    THROW_EXCEPTION(Exception, "Could not find Paging Landscape plugin.");
+    //LOG_ERROR(Logger::getLogger("freequest.game"), "====! Could not find Paging Landscape plugin. !====");
+    //Ogre::OGRE_EXCEPT(Exception::ERR_ITEM_NOT_FOUND, "Could not find Paging Landscape plugin. Check if it's in plugins.cfg.","chooseSceneManager");
+  }
+
+  // Create a generic scene manager and our main camera
+        //mSceneMgr = mRoot->createSceneManager(Ogre::ST_EXTERIOR_CLOSE, "EXTERIOR SCENE");
+  
+  mSceneMgr = mRoot->createSceneManager(Ogre::ST_EXTERIOR_REAL_FAR, "LEVELSCMGR" );
+  //mSceneMgr = mRoot->createSceneManager("PagingLandScapeSceneManager", "EXTERIOR SCENE" );    
+  // Create a generic scene manager and our main camera
+        //mSceneMgr = mRoot->createSceneManager("TerrainSceneManager", "LEVELSCMGR");
 }