-Fixed bugs in new 'blend operation' code, the 'if' checks on EBO_NONE could...

-Fixed bugs in new 'blend operation' code, the 'if' checks on EBO_NONE could never return true, so everything was set to blend

-Fixed performance bug in CTerrainSceneNode, noticed that preRenderLODCalculations() is ran every render, instead of just when LOD data is recalculated.
  This increases the frame-rate on 'Terrain Rendering Example 12' from 410fps to 1300fps on my machine.




git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3728 dfc29bdd-3216-0410-991c-e03cc46cb475

source/Irrlicht/CD3D8Driver.cpp

@@ -1576,7 +1576,7 @@ void CD3D8Driver::setBasicRenderStates(const SMaterial& material, const SMateria
 	if (queryFeature(EVDF_BLEND_OPERATIONS) &&
 		(resetAllRenderstates|| lastmaterial.BlendOperation != material.BlendOperation))
 	{
-		if (EBO_NONE)
+		if (material.BlendOperation==EBO_NONE)
 			pID3DDevice->SetRenderState(D3DRS_ALPHABLENDENABLE, FALSE);
 		else
 		{

source/Irrlicht/CD3D9Driver.cpp

@@ -2259,7 +2259,7 @@ void CD3D9Driver::setBasicRenderStates(const SMaterial& material, const SMateria
 	if (queryFeature(EVDF_BLEND_OPERATIONS) &&
 		(resetAllRenderstates|| lastmaterial.BlendOperation != material.BlendOperation))
 	{
-		if (EBO_NONE)
+		if (material.BlendOperation==EBO_NONE)
 			pID3DDevice->SetRenderState(D3DRS_ALPHABLENDENABLE, FALSE);
 		else
 		{

source/Irrlicht/COpenGLDriver.cpp

@@ -2924,7 +2924,7 @@ void COpenGLDriver::setBasicRenderStates(const SMaterial& material, const SMater
 	if (queryFeature(EVDF_BLEND_OPERATIONS) &&
 		(resetAllRenderStates|| lastmaterial.BlendOperation != material.BlendOperation))
 	{
-		if (EBO_NONE)
+		if (material.BlendOperation==EBO_NONE)
 			glDisable(GL_BLEND);
 		else
 		{

source/Irrlicht/CTerrainSceneNode.cpp

@@ -565,23 +565,23 @@ namespace scene
 	{
 		if (!IsVisible || !SceneManager->getActiveCamera())
 			return;
-
-		preRenderLODCalculations();
-		preRenderIndicesCalculations();
+    
+    SceneManager->registerNodeForRendering(this);
+    
+    preRenderCalculationsIfNeeded();
+    
+    // Do Not call ISceneNode::OnRegisterSceneNode(), this node should have no children (luke: is this comment still true, as ISceneNode::OnRegisterSceneNode() is called?)
+    
 		ISceneNode::OnRegisterSceneNode();
 		ForceRecalculation = false;
 	}
-
-
-	void CTerrainSceneNode::preRenderLODCalculations()
-	{
-		scene::ICameraSceneNode * camera = SceneManager->getActiveCamera();
+  
+  void CTerrainSceneNode::preRenderCalculationsIfNeeded()
+  {
+    scene::ICameraSceneNode * camera = SceneManager->getActiveCamera();
 		if(!camera)
 			return;
-
-		SceneManager->registerNodeForRendering(this);
-		// Do Not call ISceneNode::OnRegisterSceneNode(), this node should have no children
-
+    
 		// Determine the camera rotation, based on the camera direction.
 		const core::vector3df cameraPosition = camera->getAbsolutePosition();
 		const core::vector3df cameraRotation = core::line3d<f32>(cameraPosition, camera->getTarget()).getVector().getHorizontalAngle();
@@ -607,13 +607,31 @@ namespace scene
 				}
 			}
 		}
-
+		
+    //we need to redo calculations...
+    
 		OldCameraPosition = cameraPosition;
 		OldCameraRotation = cameraRotation;
 		OldCameraUp = cameraUp;
 		OldCameraFOV = CameraFOV;
-
-		const SViewFrustum* frustum = SceneManager->getActiveCamera()->getViewFrustum();
+    
+    
+    preRenderLODCalculations();
+		preRenderIndicesCalculations();
+    
+    
+  }
+  
+	void CTerrainSceneNode::preRenderLODCalculations()
+	{
+    scene::ICameraSceneNode * camera = SceneManager->getActiveCamera();
+    
+    if(!camera)
+			return;
+    
+    const core::vector3df cameraPosition = camera->getAbsolutePosition();
+    
+		const SViewFrustum* frustum = camera->getViewFrustum();
 
 		// Determine each patches LOD based on distance from camera (and whether or not they are in
 		// the view frustum).

source/Irrlicht/CTerrainSceneNode.h

@@ -258,7 +258,10 @@ namespace scene
 			core::aabbox3df	BoundingBox;
 			core::array<f64> LODDistanceThreshold;
 		};
-
+    
+    
+    virtual void preRenderCalculationsIfNeeded();
+    
 		virtual void preRenderLODCalculations();
 		virtual void preRenderIndicesCalculations();