Commit 18b7b4a5 authored by hybrid's avatar hybrid

Optimized texture matrix setting.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2193 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 9f47c2ee
...@@ -644,9 +644,14 @@ void CD3D9Driver::setTransform(E_TRANSFORMATION_STATE state, ...@@ -644,9 +644,14 @@ void CD3D9Driver::setTransform(E_TRANSFORMATION_STATE state,
case ETS_TEXTURE_1: case ETS_TEXTURE_1:
case ETS_TEXTURE_2: case ETS_TEXTURE_2:
case ETS_TEXTURE_3: case ETS_TEXTURE_3:
pID3DDevice->SetTextureStageState( state - ETS_TEXTURE_0, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2 ); if (mat.isIdentity())
pID3DDevice->SetTransform((D3DTRANSFORMSTATETYPE)(D3DTS_TEXTURE0+ ( state - ETS_TEXTURE_0 )), pID3DDevice->SetTextureStageState( state - ETS_TEXTURE_0, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_DISABLE );
(D3DMATRIX*)((void*)mat.pointer())); else
{
pID3DDevice->SetTextureStageState( state - ETS_TEXTURE_0, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2 );
pID3DDevice->SetTransform((D3DTRANSFORMSTATETYPE)(D3DTS_TEXTURE0+ ( state - ETS_TEXTURE_0 )),
(D3DMATRIX*)((void*)mat.pointer()));
}
break; break;
case ETS_COUNT: case ETS_COUNT:
break; break;
...@@ -1763,7 +1768,7 @@ void CD3D9Driver::setBasicRenderStates(const SMaterial& material, const SMateria ...@@ -1763,7 +1768,7 @@ void CD3D9Driver::setBasicRenderStates(const SMaterial& material, const SMateria
// specular highlights // specular highlights
if (resetAllRenderstates || !core::equals(lastmaterial.Shininess,material.Shininess)) if (resetAllRenderstates || !core::equals(lastmaterial.Shininess,material.Shininess))
{ {
bool enable = (material.Shininess!=0.0f); const bool enable = (material.Shininess!=0.0f);
pID3DDevice->SetRenderState(D3DRS_SPECULARENABLE, enable); pID3DDevice->SetRenderState(D3DRS_SPECULARENABLE, enable);
pID3DDevice->SetRenderState(D3DRS_SPECULARMATERIALSOURCE, D3DMCS_MATERIAL); pID3DDevice->SetRenderState(D3DRS_SPECULARMATERIALSOURCE, D3DMCS_MATERIAL);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment