openmw1.5-ogre1.8.patch

diff -crB zinnschlag-openmw-94498f5/apps/openmw/mwrender/terrain.cpp zinnschlag-openmw-94498f5-mod/apps/openmw/mwrender/terrain.cpp
*** zinnschlag-openmw-94498f5/apps/openmw/mwrender/terrain.cpp  Mon May 21 06:54:23 2012
--- zinnschlag-openmw-94498f5-mod/apps/openmw/mwrender/terrain.cpp  Mon Jun 18 07:37:06 2012
***************
*** 22,51 ****
      TerrainManager::TerrainManager(Ogre::SceneManager* mgr, RenderingManager* rend) :
           mTerrainGroup(TerrainGroup(mgr, Terrain::ALIGN_X_Z, mLandSize, mWorldSize)), mRendering(rend)
      {
!
          TerrainMaterialGeneratorPtr matGen;
          TerrainMaterialGeneratorB* matGenP = new TerrainMaterialGeneratorB();
          matGen.bind(matGenP);
!         mTerrainGlobals.setDefaultMaterialGenerator(matGen);

          TerrainMaterialGenerator::Profile* const activeProfile =
!             mTerrainGlobals.getDefaultMaterialGenerator()
                             ->getActiveProfile();
          mActiveProfile = static_cast<TerrainMaterialGeneratorB::SM2Profile*>(activeProfile);

          //The pixel error should be as high as possible without it being noticed
          //as it governs how fast mesh quality decreases.
!         mTerrainGlobals.setMaxPixelError(8);

!         mTerrainGlobals.setLayerBlendMapSize(32);
!         mTerrainGlobals.setDefaultGlobalColourMapSize(65);

          //10 (default) didn't seem to be quite enough
!         mTerrainGlobals.setSkirtSize(128);

          //due to the sudden flick between composite and non composite textures,
          //this seemed the distance where it wasn't too noticeable
!         mTerrainGlobals.setCompositeMapDistance(mWorldSize*2);

          mActiveProfile->setLightmapEnabled(false);
          mActiveProfile->setLayerSpecularMappingEnabled(false);
--- 22,51 ----
      TerrainManager::TerrainManager(Ogre::SceneManager* mgr, RenderingManager* rend) :
           mTerrainGroup(TerrainGroup(mgr, Terrain::ALIGN_X_Z, mLandSize, mWorldSize)), mRendering(rend)
      {
!   mTerrainGlobals = OGRE_NEW TerrainGlobalOptions();
          TerrainMaterialGeneratorPtr matGen;
          TerrainMaterialGeneratorB* matGenP = new TerrainMaterialGeneratorB();
          matGen.bind(matGenP);
!         mTerrainGlobals->setDefaultMaterialGenerator(matGen);

          TerrainMaterialGenerator::Profile* const activeProfile =
!             mTerrainGlobals->getDefaultMaterialGenerator()
                             ->getActiveProfile();
          mActiveProfile = static_cast<TerrainMaterialGeneratorB::SM2Profile*>(activeProfile);

          //The pixel error should be as high as possible without it being noticed
          //as it governs how fast mesh quality decreases.
!         mTerrainGlobals->setMaxPixelError(8);

!         mTerrainGlobals->setLayerBlendMapSize(32);
!         mTerrainGlobals->setDefaultGlobalColourMapSize(65);

          //10 (default) didn't seem to be quite enough
!         mTerrainGlobals->setSkirtSize(128);

          //due to the sudden flick between composite and non composite textures,
          //this seemed the distance where it wasn't too noticeable
!         mTerrainGlobals->setCompositeMapDistance(mWorldSize*2);

          mActiveProfile->setLightmapEnabled(false);
          mActiveProfile->setLayerSpecularMappingEnabled(false);
***************
*** 92,105 ****

      void TerrainManager::setDiffuse(const ColourValue& diffuse)
      {
!         mTerrainGlobals.setCompositeMapDiffuse(diffuse);
      }

      //----------------------------------------------------------------------------------------------

      void TerrainManager::setAmbient(const ColourValue& ambient)
      {
!         mTerrainGlobals.setCompositeMapAmbient(ambient);
      }

      //----------------------------------------------------------------------------------------------
--- 92,105 ----

      void TerrainManager::setDiffuse(const ColourValue& diffuse)
      {
!         mTerrainGlobals->setCompositeMapDiffuse(diffuse);
      }

      //----------------------------------------------------------------------------------------------

      void TerrainManager::setAmbient(const ColourValue& ambient)
      {
!         mTerrainGlobals->setCompositeMapAmbient(ambient);
      }

      //----------------------------------------------------------------------------------------------
diff -crB zinnschlag-openmw-94498f5/apps/openmw/mwrender/terrain.hpp zinnschlag-openmw-94498f5-mod/apps/openmw/mwrender/terrain.hpp
*** zinnschlag-openmw-94498f5/apps/openmw/mwrender/terrain.hpp  Mon May 21 06:54:23 2012
--- zinnschlag-openmw-94498f5-mod/apps/openmw/mwrender/terrain.hpp  Mon Jun 18 07:37:46 2012
***************
*** 33,39 ****
          void cellAdded(MWWorld::Ptr::CellStore* store);
          void cellRemoved(MWWorld::Ptr::CellStore* store);
      private:
!         Ogre::TerrainGlobalOptions mTerrainGlobals;
          Ogre::TerrainGroup mTerrainGroup;

          RenderingManager* mRendering;
--- 33,39 ----
          void cellAdded(MWWorld::Ptr::CellStore* store);
          void cellRemoved(MWWorld::Ptr::CellStore* store);
      private:
!         Ogre::TerrainGlobalOptions* mTerrainGlobals;
          Ogre::TerrainGroup mTerrainGroup;

          RenderingManager* mRendering;
diff -crB zinnschlag-openmw-94498f5/files/gbuffer/gbuffer.compositor zinnschlag-openmw-94498f5-mod/files/gbuffer/gbuffer.compositor
*** zinnschlag-openmw-94498f5/files/gbuffer/gbuffer.compositor  Mon May 21 06:54:23 2012
--- zinnschlag-openmw-94498f5-mod/files/gbuffer/gbuffer.compositor  Mon Jun 18 07:39:26 2012
***************
*** 11,21 ****
              input none
              pass clear
              {
!                 clear
!                 {
!                     // make sure to set this to the viewport background color from outside
!                     colour_value 0 0 0 1
!                 }
              }
              pass render_scene
              {
--- 11,18 ----
              input none
              pass clear
              {
!                 // make sure to set this to the viewport background color from outside
!                 colour_value 0 0 0 1
              }
              pass render_scene
              {
***************
*** 59,69 ****
              shadows off
              pass clear
              {
!                 clear
!                 {
!                     buffers colour
!                     colour_value 0 0 0 0
!                 }
              }
              pass render_quad
              {
--- 56,63 ----
              shadows off
              pass clear
              {
!                 buffers colour
!                 colour_value 0 0 0 0
              }
              pass render_quad
              {
***************
*** 81,89 ****
              input none
              pass clear
              {
-                 clear
-                 {
-                 }
              }
              pass render_quad
              {
--- 75,80 ----