OGRE (O-O Graphics Rendering Engine)

Update of /cvsroot/ogre/ogrenew/PlugIns/OctreeSceneManager/src
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17154/PlugIns/OctreeSceneManager/src

Modified Files:
      Tag: v1-4
	OgreTerrainSceneManager.cpp 
Log Message:
[ 1885490 ] Report an exception when terrain isn't found rather than just asserting

Index: OgreTerrainSceneManager.cpp
===================================================================
RCS file: /cvsroot/ogre/ogrenew/PlugIns/OctreeSceneManager/src/OgreTerrainSceneManager.cpp,v
retrieving revision 1.64.2.1
retrieving revision 1.64.2.2
diff -C2 -d -r1.64.2.1 -r1.64.2.2
*** OgreTerrainSceneManager.cpp	5 May 2007 11:44:01 -0000	1.64.2.1
--- OgreTerrainSceneManager.cpp	12 Mar 2008 22:15:18 -0000	1.64.2.2
***************
*** 389,392 ****
--- 389,397 ----
              mOptions.terrainMaterial = 
                  MaterialManager::getSingleton().getByName(mCustomMaterialName);
+ 			if (mOptions.terrainMaterial.isNull()){
+ 				OGRE_EXCEPT(Exception::ERR_ITEM_NOT_FOUND, 
+ 					"Material " + mCustomMaterialName + " not found.", 
+ 					"TerrainSceneManager::setupTerrainMaterial");
+ 			}
              mOptions.terrainMaterial->load();

Update of /cvsroot/ogre/ogrenew/OgreMain/src
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv15980/OgreMain/src

Modified Files:
	OgreSceneManager.cpp 
Log Message:
[ 1885099 ] Edge-case performance upgrade - Renderable can now return 0 from getWorldTransforms to not update the world transform and use the currently bound one.

Index: OgreSceneManager.cpp
===================================================================
RCS file: /cvsroot/ogre/ogrenew/OgreMain/src/OgreSceneManager.cpp,v
retrieving revision 1.345
retrieving revision 1.346
diff -C2 -d -r1.345 -r1.346
*** OgreSceneManager.cpp	27 Feb 2008 14:36:57 -0000	1.345
--- OgreSceneManager.cpp	12 Mar 2008 22:12:32 -0000	1.346
***************
*** 2767,2781 ****
  
      // Set world transformation
-     rend->getWorldTransforms(mTempXform);
      numMatrices = rend->getNumWorldTransforms();
!     if (numMatrices > 1)
!     {
!         mDestRenderSystem->_setWorldMatrices(mTempXform, numMatrices);
!     }
!     else
!     {
!         mDestRenderSystem->_setWorldMatrix(*mTempXform);
!     }
! 
      // Issue view / projection changes if any
      useRenderableViewProjMode(rend);
--- 2767,2785 ----
  
      // Set world transformation
      numMatrices = rend->getNumWorldTransforms();
! 	
! 	if (numMatrices > 0)
! 	{
! 	    rend->getWorldTransforms(mTempXform);
! 		
! 		if (numMatrices > 1)
! 		{
! 			mDestRenderSystem->_setWorldMatrices(mTempXform, numMatrices);
! 		}
! 		else
! 		{
! 			mDestRenderSystem->_setWorldMatrix(*mTempXform);
! 		}
! 	}
      // Issue view / projection changes if any
      useRenderableViewProjMode(rend);

Update of /cvsroot/ogre/ogrenew/PlugIns/OctreeSceneManager/src
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv30961/PlugIns/OctreeSceneManager/src

Modified Files:
      Tag: v1-4
	OgreTerrainRenderable.cpp 
Log Message:
[ 1880838 ] Allow creation of terrain before any camera/viewport

Index: OgreTerrainRenderable.cpp
===================================================================
RCS file: /cvsroot/ogre/ogrenew/PlugIns/OctreeSceneManager/src/OgreTerrainRenderable.cpp,v
retrieving revision 1.67.2.1
retrieving revision 1.67.2.2
diff -C2 -d -r1.67.2.1 -r1.67.2.2
*** OgreTerrainRenderable.cpp	21 Dec 2007 23:57:06 -0000	1.67.2.1
--- OgreTerrainRenderable.cpp	12 Mar 2008 21:30:24 -0000	1.67.2.2
***************
*** 49,52 ****
--- 49,53 ----
  #include "OgreViewport.h"
  #include "OgreException.h"
+ #include "OgreRenderSystem.h"
  
  namespace Ogre
***************
*** 655,676 ****
      Real TerrainRenderable::_calculateCFactor()
      {
!         Real A, T;
  
!         if (!mOptions->primaryCamera)
!         {
!             OGRE_EXCEPT(Exception::ERR_ITEM_NOT_FOUND, 
!                 "You have not created a camera yet!", 
!                 "TerrainRenderable::_calculateCFactor");
!         }
  
!         //A = 1 / Math::Tan(Math::AngleUnitsToRadians(opts.primaryCamera->getFOVy()));
!         // Turn off detail compression at higher FOVs
!         A = 1.0f;
  
!         int vertRes = mOptions->primaryCamera->getViewport()->getActualHeight();
  
-         T = 2 * ( Real ) mOptions->maxPixelError / ( Real ) vertRes;
  
!         return A / T;
      }
      //-----------------------------------------------------------------------
--- 656,687 ----
      Real TerrainRenderable::_calculateCFactor()
      {
! 		Real A, T;
  
! 		A = 1.0f;
  
! 		int vertRes = 0;
! 		if (mOptions->primaryCamera && mOptions->primaryCamera->getViewport())
! 		{
! 			vertRes = mOptions->primaryCamera->getViewport()->getActualHeight();
! 		}
! 		else
! 		{
! 			// default to first render target
! 			RenderSystem* rsys = Root::getSingleton().getRenderSystem();
! 			if (rsys->getRenderTargetIterator().hasMoreElements())
! 				vertRes = Root::getSingleton().getRenderSystem()->getRenderTargetIterator().getNext()->getHeight();
! 			else
! 				// oh, just guess
! 				vertRes = 768;
! 		}
  
! 		//A = 1 / Math::Tan(Math::AngleUnitsToRadians(opts.primaryCamera->getFOVy()));
! 		// Turn off detail compression at higher FOVs
  
  
! 
! 		T = 2 * ( Real ) mOptions->maxPixelError / ( Real ) vertRes;
! 
! 		return A / T;
      }
      //-----------------------------------------------------------------------