Changeset 1053 for OGRE/trunk/ogre_changes/Ogre1.2/RenderSystems/Direct3D9

Timestamp:

06/26/06 09:33:12 (18 years ago)

Author:

szirmay

Message:

 

Location:

OGRE/trunk/ogre_changes/Ogre1.2/RenderSystems/Direct3D9

Files:

• include/OgreD3D9Mappings.h (added)
• include/OgreD3D9RenderSystem.h (modified) (1 diff)
• src/OgreD3D9RenderSystem.cpp (modified) (2 diffs)

OGRE/trunk/ogre_changes/Ogre1.2/RenderSystems/Direct3D9/include/OgreD3D9RenderSystem.h

@@ -241 +241 @@
         void _setTextureBorderColour(size_t stage, const ColourValue& colour);
                 void _setTextureMatrix( size_t unit, const Matrix4 &xform );
+#ifdef GAMETOOLS_ILLUMINATION_MODULE
+                virtual void _setSceneBlending(SceneBlendFactor sourceFactor,
+                                                                                SceneBlendFactor destFactor,
+                                                                                SceneBlendOperation blendOp = SBOP_ADD,
+                                                                                bool separateAlpha = false,
+                                                                                SceneBlendFactor sourceFactorAlpha = SBF_ONE,
+                                                                                SceneBlendFactor destFactorAlpha = SBF_ZERO,
+                                                                                SceneBlendOperation blendOpAlpha = SBOP_ADD);
+#else
                 void _setSceneBlending( SceneBlendFactor sourceFactor, SceneBlendFactor destFactor );
+#endif
                 void _setAlphaRejectSettings( CompareFunction func, unsigned char value );
                 void _setViewport( Viewport *vp );

OGRE/trunk/ogre_changes/Ogre1.2/RenderSystems/Direct3D9/src/OgreD3D9RenderSystem.cpp

@@ -1912 +1912 @@
                 }
         }
+        
+#ifdef GAMETOOLS_ILLUMINATION_MODULE
+
+        void D3D9RenderSystem::_setSceneBlending(SceneBlendFactor sourceFactor,
+                                                                                SceneBlendFactor destFactor,
+                                                                                SceneBlendOperation blendOp,
+                                                                                bool separateAlpha,
+                                                                                SceneBlendFactor sourceFactorAlpha,
+                                                                                SceneBlendFactor destFactorAlpha,
+                                                                                SceneBlendOperation blendOpAlpha)
+        {
+                HRESULT hr;
+                if( sourceFactor == SBF_ONE && destFactor == SBF_ZERO &&
+                        sourceFactorAlpha == SBF_ONE && destFactorAlpha == SBF_ZERO)
+                {
+                        if (FAILED(hr = __SetRenderState(D3DRS_ALPHABLENDENABLE, FALSE)))
+                                OGRE_EXCEPT( hr, "Failed to set alpha blending option", "D3D9RenderSystem::_setSceneBlending" );
+                }
+                else
+                {
+                        if (FAILED(hr = __SetRenderState(D3DRS_ALPHABLENDENABLE, TRUE)))
+                                OGRE_EXCEPT( hr, "Failed to set alpha blending option", "D3D9RenderSystem::_setSceneBlending" );
+                                        
+                        if(separateAlpha)
+                        {
+                                if (FAILED(hr = __SetRenderState(D3DRS_SEPARATEALPHABLENDENABLE, TRUE)))
+                                        OGRE_EXCEPT( hr, "Failed to set alpha blending option", "D3D9RenderSystem::_setSceneBlending" );
+                                
+                                if (FAILED(hr = __SetRenderState(D3DRS_BLENDOPALPHA, D3D9Mappings::get(blendOp))))
+                                        OGRE_EXCEPT( hr, "Failed to set alpha blending option", "D3D9RenderSystem::_setSceneBlending" );
+
+                                if( FAILED( hr = __SetRenderState( D3DRS_SRCBLENDALPHA, D3D9Mappings::get(sourceFactor) ) ) )
+                                        OGRE_EXCEPT( hr, "Failed to set source blend", "D3D9RenderSystem::_setSceneBlending" );
+                                if( FAILED( hr = __SetRenderState( D3DRS_DESTBLENDALPHA, D3D9Mappings::get(destFactor) ) ) )
+                                        OGRE_EXCEPT( hr, "Failed to set destination blend", "D3D9RenderSystem::_setSceneBlending" );
+                
+                        }
+                        else
+                        {
+                                if (FAILED(hr = __SetRenderState(D3DRS_SEPARATEALPHABLENDENABLE, FALSE)))
+                                        OGRE_EXCEPT( hr, "Failed to set alpha blending option", "D3D9RenderSystem::_setSceneBlending" );
+                        }
+                        
+                        if (FAILED(hr = __SetRenderState(D3DRS_BLENDOP, D3D9Mappings::get(blendOpAlpha))))
+                                        OGRE_EXCEPT( hr, "Failed to set alpha blending option", "D3D9RenderSystem::_setSceneBlending" );
+                        if( FAILED( hr = __SetRenderState( D3DRS_SRCBLEND, D3D9Mappings::get(sourceFactor) ) ) )
+                                OGRE_EXCEPT( hr, "Failed to set source blend", "D3D9RenderSystem::_setSceneBlending" );
+                        if( FAILED( hr = __SetRenderState( D3DRS_DESTBLEND, D3D9Mappings::get(destFactor) ) ) )
+                                OGRE_EXCEPT( hr, "Failed to set destination blend", "D3D9RenderSystem::_setSceneBlending" );                    
+                }
+        }
+#else
         //---------------------------------------------------------------------
         void D3D9RenderSystem::_setSceneBlending( SceneBlendFactor sourceFactor, SceneBlendFactor destFactor )
@@ -1931 +1983 @@
                 }
         }
+#endif
         //---------------------------------------------------------------------
         void D3D9RenderSystem::_setAlphaRejectSettings( CompareFunction func, unsigned char value )