API tools faq
paste
Advertisement
Guest User

PLSM_2 diffs

a guest
Jun 10th, 2010
430
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
C++ 6.57 KB | None | 0 0
raw download clone embed print report
  1. --- C:/Users/****/AppData/Local/Temp/OgrePagingLandScapeOctreeNode.cpp-revBASE.svn000.tmp.cpp   Thu Jun 10 17:43:48 2010
  2.  
  3. +++ E:/Users/*****/projects/ogresrc/ogreaddons/pglandscape/pageinglandscape/PlugIns/PagingLandScape2/src/OgrePagingLandScapeOctreeNode.cpp  Thu Feb  4 23:41:10 2010
  4.  
  5. @@ -187,7 +187,7 @@
  6.  
  7.              _addBoundingBoxToQueue(queue);
  8.              
  9.          if ( mCreator->getDisplaySceneNodes())
  10. -            queue -> addRenderable( this );
  11. +            queue -> addRenderable((Renderable*)this);
  12.  
  13.      }
  14.      //-----------------------------------------------------------------------
  15.  
  16. --- C:/Users/gnulinux/AppData/Local/Temp/OgrePagingLandScapeOctreeSceneManager.cpp-revBASE.svn000.tmp.cpp   Thu Jun 10 17:47:52 2010
  17. +++ E:/Users/gnulinux/projects/ogresrc/ogreaddons/pglandscape/pageinglandscape/PlugIns/PagingLandScape2/src/OgrePagingLandScapeOctreeSceneManager.cpp   Sat Dec  5 19:16:34 2009
  18. @@ -1147,8 +1147,8 @@
  19.  
  20.         mDestRenderSystem->setCurrentPassIterationCount(1);
  21.          _setPass(r->getMaterial()->getBestTechnique()->getPass(0));
  22. -        useRenderableViewProjMode (r);
  23. -
  24. +        //useRenderableViewProjMode (r);
  25. +        useRenderableViewProjMode(r,false);
  26.          RenderOperation ro;
  27.          r->getRenderOperation (ro);
  28.          mDestRenderSystem->_render(ro);
  29.  
  30. --- C:/Users/gnulinux/AppData/Local/Temp/OgrePagingLandScapeRenderable.cpp-revBASE.svn000.tmp.cpp   Thu Jun 10 17:49:47 2010
  31.  
  32. +++ E:/Users/gnulinux/projects/ogresrc/ogreaddons/pglandscape/pageinglandscape/PlugIns/PagingLandScape2/src/OgrePagingLandScapeRenderable.cpp   Sat Dec  5 18:59:24 2009
  33.  
  34. @@ -568,7 +568,11 @@
  35.  
  36.                      && mMaterial->getNumLodLevels(MaterialManager::getSingleton()._getActiveSchemeIndex()) > 1
  37.                      )
  38.                 {
  39. -                   const unsigned short LODIndex = mMaterial->getLodIndexSquaredDepth (mDistanceToCam);
  40. +
  41. +                   //const unsigned short LODIndex = mMaterial->getLodIndexSquaredDepth (mDistanceToCam);
  42. +          
  43. +          const unsigned short LODIndex = mMaterial->getLodIndex (mDistanceToCam);
  44. +                  
  45.                     if (LODIndex != mMaterialLODIndex)
  46.                         mMaterialLODIndex = LODIndex;
  47.                 }
  48.  
  49. --- C:/Users/gnulinux/AppData/Local/Temp/OgrePagingLandScapeOptions.cpp-revBASE.svn000.tmp.cpp  Thu Jun 10 17:49:17 2010
  50.  
  51. +++ E:/Users/gnulinux/projects/ogresrc/ogreaddons/pglandscape/pageinglandscape/PlugIns/PagingLandScape2/src/OgrePagingLandScapeOptions.cpp  Sat Dec  5 19:09:20 2009
  52.  
  53. @@ -501,13 +501,15 @@
  54.  
  55.              (StringUtil::endsWith(mapName, ".cfg", true) ? StringUtil::BLANK : String(".cfg")));
  56.          if (!cfgGroupName.empty ())
  57.          {
  58. -            std::vector<Ogre::String>::iterator itFileSystem = mResourceFilesystem.begin();
  59. +            //std::vector<Ogre::String>::iterator itFileSystem = mResourceFilesystem.begin();
  60. +            Ogre::StringVector::iterator itFileSystem = mResourceFilesystem.begin();
  61.              for(; itFileSystem != mResourceFilesystem.end(); ++itFileSystem)
  62.              {
  63.                  ResourceGroupManager::getSingleton().removeResourceLocation(
  64.                      *itFileSystem, cfgGroupName);
  65.              }
  66. -            std::vector<Ogre::String>::iterator itZip = mResourceZip.begin();
  67. +            Ogre::StringVector::iterator itZip = mResourceZip.begin();
  68. +            //std::vector<Ogre::String>::iterator itZip = mResourceZip.begin();
  69.              for(; itZip != mResourceZip.end(); ++itZip)
  70.              {
  71.                  ResourceGroupManager::getSingleton().removeResourceLocation(
  72. @@ -695,7 +697,8 @@
  73.  
  74.  
  75.          //add Resources Group to Ogre if needed.
  76.         StringVector mResourceFilesystem =  mConfig->getMultiSetting("FileSystem");
  77. -        std::vector<Ogre::String>::iterator itFileSystem = mResourceFilesystem.begin();
  78. +    Ogre::StringVector::iterator itFileSystem = mResourceFilesystem.begin();  
  79. +    //std::vector<Ogre::String>::iterator itFileSystem = mResourceFilesystem.begin();
  80.          for(; itFileSystem != mResourceFilesystem.end(); ++itFileSystem)
  81.          {
  82.             String resourceFileSystem = *itFileSystem;
  83. @@ -733,7 +736,8 @@
  84.  
  85.  
  86.  
  87.          StringVector mResourceZip =  mConfig->getMultiSetting("Zip");
  88. -        std::vector<Ogre::String>::iterator itZip = mResourceZip.begin();
  89. +        //std::vector<Ogre::String>::iterator itZip = mResourceZip.begin();
  90. +        StringVector::iterator itZip = mResourceZip.begin();
  91.          for(; itZip != mResourceZip.end(); ++itZip)
  92.          {
  93.              String resourceZip  = *itZip;
  94. @@ -1702,7 +1706,8 @@
  95.  
  96.                     {
  97.                         // name to pageX, uint pageZ, uint tileX, uint tileZ
  98.                         {
  99. -                           std::vector<String> coordinates = StringUtil::split(name, "_");
  100. +                           //std::vector<String> coordinates = StringUtil::split(name, "_");
  101. +                StringVector coordinates = StringUtil::split(name, "_");
  102.  
  103.                             const uint pageX = StringConverter::parseUnsignedInt(coordinates[0]);
  104.                             const uint pageZ = StringConverter::parseUnsignedInt(coordinates[1]);
  105. @@ -1714,8 +1719,9 @@
  106.  
  107.  
  108.                         // name to LOD roughness value.
  109.                         {
  110. -                           std::vector<String> minLevelDistSqr = StringUtil::split(value, "_");
  111. -                           PLSM2_ASSERT (minLevelDistSqr.size () == numLod);
  112. +                //std::vector<String> minLevelDistSqr = StringUtil::split(value, "_");
  113. +                           StringVector minLevelDistSqr = StringUtil::split(value, "_");
  114. +                PLSM2_ASSERT (minLevelDistSqr.size () == numLod);
  115.  
  116.                             t->mMinLevelDistSqr =  new std::vector<Real>();
  117.  
  118.  
  119. --- C:/Users/gnulinux/AppData/Local/Temp/OgrePagingLandScapeOptions.h-revBASE.svn000.tmp.h  Thu Jun 10 17:51:21 2010
  120.  
  121. +++ E:/Users/gnulinux/projects/ogresrc/ogreaddons/pglandscape/pageinglandscape/PlugIns/PagingLandScape2/include/OgrePagingLandScapeOptions.h    Sat Dec  5 18:44:04 2009
  122.  
  123. @@ -23,8 +23,12 @@
  124.  
  125.  #include "OgreConfigFile.h"
  126.  #include "OgreMaterial.h"
  127.  
  128. +
  129. +
  130.  namespace Ogre
  131.  {
  132. +
  133. +  //typedef std::vector<Real> LoadDistanceList;
  134.      /**
  135.      * A simple class for encapsulating parameters passed in when initializing *
  136.      * a LandScapeRenderable
  137. @@ -158,8 +162,11 @@
  138.  
  139.             Vector3 scale;
  140.             Vector3 invScale;
  141.  
  142. -           Material::LodDistanceList lodMaterialDistanceList; //Distance for the material LOD change
  143. -           Real distanceLOD;                   //Distance for the LOD change
  144. +      Ogre::Material::LodValueList lodMaterialDistanceList;
  145. +           //Material::
  146. +          //LodDistanceList lodMaterialDistanceList; //Distance for the material LOD change
  147. +          //std::vector<Real> lodMaterialDistanceList;
  148. +          Real distanceLOD;                    //Distance for the LOD change
  149.             Real LOD_factor;
  150.              bool roughnessLod;
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!