Skip to content

refactor(dx8): Replace unsafe Matrix4/D3DMATRIX casts with explicit conversions #1852

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 12 commits into
base: main
Choose a base branch
from
Draft

refactor(dx8): Replace unsafe Matrix4/D3DMATRIX casts with explicit conversions #1852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
17a4b39
Replace unsafe Matrix4/D3DMATRIX casts in DX8Wrapper for Generals
bobtista Nov 13, 2025
f1b9bbd
Replace unsafe Matrix4/D3DMATRIX casts in DX8Wrapper for GeneralsMD
bobtista Nov 13, 2025
cb27f83
Replace unsafe Matrix4/D3DMATRIX casts in sortingrenderer for GeneralsMD
bobtista Nov 13, 2025
ebff2db
Replace unsafe Matrix4/D3DMATRIX cast in W3DVolumetricShadow for Gene…
bobtista Nov 13, 2025
ec36633
Replace unsafe Matrix4/D3DMATRIX casts in W3DShaderManager for Generals
bobtista Nov 13, 2025
bdd37cc
Replace unsafe Matrix4/D3DMATRIX casts in W3DWater for Generals
bobtista Nov 13, 2025
0dfe140
Replace unsafe Matrix4/D3DMATRIX casts in TerrainTex for Generals
bobtista Nov 13, 2025
ca8771c
Replace unsafe Matrix4/D3DMATRIX casts in W3DShaderManager for Genera…
bobtista Nov 13, 2025
cbb3ae7
Replace unsafe Matrix4/D3DMATRIX casts in W3DWater for GeneralsMD
bobtista Nov 13, 2025
fa2fff2
Replace unsafe Matrix4/D3DMATRIX casts in TerrainTex for GeneralsMD
bobtista Nov 13, 2025
6f40a0e
Add Build_D3DXMATRIX helper to simplify Matrix4x4 conversions
bobtista Nov 13, 2025
531dab3
Use Build_D3DXMATRIX helper in all remaining files
bobtista Nov 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Shadow/W3DVolumetricShadow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1907,7 +1907,19 @@ void W3DVolumetricShadow::updateMeshVolume(Int meshIndex, Int lightIndex, const
// system change, not the translations
//
Real det;
D3DXMatrixInverse((D3DXMATRIX*)&worldToObject, &det, (D3DXMATRIX*)&objectToWorld);
D3DXMATRIX d3dObjectToWorld(
objectToWorld[0][0], objectToWorld[0][1], objectToWorld[0][2], objectToWorld[0][3],
objectToWorld[1][0], objectToWorld[1][1], objectToWorld[1][2], objectToWorld[1][3],
objectToWorld[2][0], objectToWorld[2][1], objectToWorld[2][2], objectToWorld[2][3],
objectToWorld[3][0], objectToWorld[3][1], objectToWorld[3][2], objectToWorld[3][3]
);
D3DXMATRIX d3dWorldToObject;
D3DXMatrixInverse(&d3dWorldToObject, &det, &d3dObjectToWorld);
for (int i = 0; i < 4; i++) {
for (int j = 0; j < 4; j++) {
worldToObject[i][j] = d3dWorldToObject.m[i][j];
}
}

// find out light position in object space
Matrix4x4::Transform_Vector(worldToObject,lightPosWorld,&lightPosObject);
Expand Down
11 changes: 6 additions & 5 deletions Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/TerrainTex.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,14 +788,15 @@ void LightMapTerrainTextureClass::Apply(unsigned int stage)

D3DXMATRIX inv;
float det;
D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
D3DXMATRIX d3dCurView = Build_D3DXMATRIX(curView);
D3DXMatrixInverse(&inv, &det, &d3dCurView);
D3DXMATRIX scale;
D3DXMatrixScaling(&scale, STRETCH_FACTOR, STRETCH_FACTOR,1);
inv *=scale;
if (stage==0) {
DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE0, *((Matrix4x4*)&inv));
DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE0, inv);
} if (stage==1) {
DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE1, *((Matrix4x4*)&inv));
DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE1, inv);
}


Expand Down Expand Up @@ -1066,7 +1067,7 @@ void CloudMapTerrainTextureClass::Apply(unsigned int stage)
DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1 );
DX8Wrapper::Set_DX8_Texture_Stage_State( 0, D3DTSS_ALPHAOP, D3DTOP_DISABLE );

DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE0, *((Matrix4x4*)&inv));
DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE0, inv);

// Disable 3rd stage just in case.
DX8Wrapper::Set_DX8_Texture_Stage_State( 2, D3DTSS_COLOROP, D3DTOP_DISABLE );
Expand All @@ -1085,7 +1086,7 @@ void CloudMapTerrainTextureClass::Apply(unsigned int stage)
DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAARG1, D3DTA_CURRENT );
DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP, D3DTOP_SELECTARG1 );

DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE1, *((Matrix4x4*)&inv));
DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE1, inv);
}
}

Expand Down
102 changes: 60 additions & 42 deletions Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1096,7 +1096,8 @@ Int ShroudTextureShader::set(Int stage)
Matrix4x4 curView;
DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView);

D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
D3DXMATRIX d3dCurView = Build_D3DXMATRIX(curView);
D3DXMatrixInverse(&inv, &det, &d3dCurView);

D3DXMATRIX scale,offset;

Expand All @@ -1119,8 +1120,8 @@ Int ShroudTextureShader::set(Int stage)
width = 1.0f/(width*shroud->getTextureWidth());
height = 1.0f/(height*shroud->getTextureHeight());
D3DXMatrixScaling(&scale, width, height, 1);
*((D3DXMATRIX *)&curView) = (inv * offset) * scale;
DX8Wrapper::_Set_DX8_Transform((D3DTRANSFORMSTATETYPE )(D3DTS_TEXTURE0+stage), *((Matrix4x4*)&curView));
D3DXMATRIX texTransform = (inv * offset) * scale;
DX8Wrapper::_Set_DX8_Transform((D3DTRANSFORMSTATETYPE )(D3DTS_TEXTURE0+stage), texTransform);
}
m_stageOfSet=stage;
return TRUE;
Expand Down Expand Up @@ -1188,8 +1189,8 @@ Int MaskTextureShader::set(Int pass)
D3DXMATRIX inv;
float det;

//Get inverse view matrix so we can transform camera space points back to world space
D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
D3DXMATRIX d3dCurView = Build_D3DXMATRIX(curView);
D3DXMatrixInverse(&inv, &det, &d3dCurView);

D3DXMATRIX scale,offset,offsetTextureCenter;
Coord3D centerPos;
Expand All @@ -1215,18 +1216,19 @@ Int MaskTextureShader::set(Int pass)
Real worldTexelHeight=(1.0f-fadeLevel)*25.0f;

///@todo: Fix this to work with non 128x128 textures.
D3DXMATRIX texTransform;
if (worldTexelWidth != 0 && worldTexelHeight != 0)
{ Real widthScale = 1.0f/(worldTexelWidth*128.0f);
Real heightScale = 1.0f/(worldTexelHeight*128.0f);
D3DXMatrixScaling(&scale, widthScale, heightScale, 1);
*((D3DXMATRIX *)&curView) = ((inv * offset) * scale)*offsetTextureCenter;
texTransform = ((inv * offset) * scale)*offsetTextureCenter;
}
else
{ D3DXMatrixScaling(&scale, 0, 0, 1); //scaling by 0 will set uv coordinates to 0,0
*((D3DXMATRIX *)&curView) = ((inv * offset) * scale);
texTransform = ((inv * offset) * scale);
}

DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE0, *((Matrix4x4*)&curView));
DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE0, texTransform);

return TRUE;
}
Expand Down Expand Up @@ -1450,24 +1452,27 @@ Int TerrainShader2Stage::set(Int pass)
D3DXMATRIX inv;
float det;

D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
D3DXMATRIX d3dCurView = Build_D3DXMATRIX(curView);
D3DXMatrixInverse(&inv, &det, &d3dCurView);

if (W3DShaderManager::getCurrentShader() == W3DShaderManager::ST_TERRAIN_BASE_NOISE12)
{
//setup cloud pass
DX8Wrapper::_Get_D3D_Device8()->SetTexture(0, W3DShaderManager::getShaderTexture(2)->Peek_D3D_Texture());

updateNoise1(((D3DXMATRIX*)&curView),&inv); //update curView with texture matrix
DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE0, curView);
D3DXMATRIX texTransform;
terrainShader2Stage.updateNoise1(&texTransform,&inv);
DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE0, texTransform);
//clouds always need bilinear filtering
DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);

//setup noise pass
DX8Wrapper::_Get_D3D_Device8()->SetTexture(1, W3DShaderManager::getShaderTexture(3)->Peek_D3D_Texture());

updateNoise2(((D3DXMATRIX*)&curView),&inv);
DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE1, curView);
D3DXMATRIX texTransform2;
terrainShader2Stage.updateNoise2(&texTransform2,&inv);
DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE1, texTransform2);
//noise always needs point/linear filtering. Why point!?
DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MINFILTER, D3DTEXF_POINT);
DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
Expand All @@ -1486,25 +1491,26 @@ Int TerrainShader2Stage::set(Int pass)
else
{ //only 1 noise or cloud texture
// Now setup the texture pipeline.
D3DXMATRIX texTransform3;
if (W3DShaderManager::getCurrentShader() == W3DShaderManager::ST_TERRAIN_BASE_NOISE1)
{ //setup cloud pass
DX8Wrapper::_Get_D3D_Device8()->SetTexture(0, W3DShaderManager::getShaderTexture(2)->Peek_D3D_Texture());
updateNoise1(((D3DXMATRIX*)&curView),&inv); //update curView with texture matrix
terrainShader2Stage.updateNoise1(&texTransform3,&inv);
DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
}
else
{
//setup noise pass
DX8Wrapper::_Get_D3D_Device8()->SetTexture(0, W3DShaderManager::getShaderTexture(3)->Peek_D3D_Texture());
updateNoise2(((D3DXMATRIX*)&curView),&inv); //update curView with texture matrix
terrainShader2Stage.updateNoise2(&texTransform3,&inv);
DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MINFILTER, D3DTEXF_POINT);
DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
}

DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_COLOROP, D3DTOP_DISABLE );
DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP, D3DTOP_DISABLE );
DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE0, *((Matrix4x4*)&curView));
DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE0, texTransform3);
}
break;
}
Expand Down Expand Up @@ -1776,7 +1782,8 @@ Int TerrainShaderPixelShader::set(Int pass)

D3DXMATRIX inv;
float det;
D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
D3DXMATRIX d3dCurView = Build_D3DXMATRIX(curView);
D3DXMatrixInverse(&inv, &det, &d3dCurView);

DX8Wrapper::Set_DX8_Texture_Stage_State(2, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
// Two output coordinates are used.
Expand All @@ -1799,11 +1806,13 @@ Int TerrainShaderPixelShader::set(Int pass)
DX8Wrapper::Set_DX8_Texture_Stage_State(3, D3DTSS_MINFILTER, D3DTEXF_POINT);
DX8Wrapper::Set_DX8_Texture_Stage_State(3, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);

terrainShader2Stage.updateNoise1(((D3DXMATRIX*)&curView),&inv); //update curView with texture matrix
DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE2, curView);
D3DXMATRIX texTransform1;
terrainShader2Stage.updateNoise1(&texTransform1,&inv);
DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE2, texTransform1);

terrainShader2Stage.updateNoise2(((D3DXMATRIX*)&curView),&inv); //update curView with texture matrix
DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE3, curView);
D3DXMATRIX texTransform2;
terrainShader2Stage.updateNoise2(&texTransform2,&inv);
DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE3, texTransform2);

DX8Wrapper::Set_DX8_Texture_Stage_State(3, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
// Two output coordinates are used.
Expand All @@ -1813,21 +1822,22 @@ Int TerrainShaderPixelShader::set(Int pass)
{ //single noise texture shader
DX8Wrapper::_Get_D3D_Device8()->SetPixelShader(m_dwBaseNoise1PixelShader);

D3DXMATRIX texTransform3;
if (W3DShaderManager::getCurrentShader() == W3DShaderManager::ST_TERRAIN_BASE_NOISE1)
{ //cloud map
DX8Wrapper::_Get_D3D_Device8()->SetTexture(2, W3DShaderManager::getShaderTexture(2)->Peek_D3D_Texture());
terrainShader2Stage.updateNoise1(((D3DXMATRIX*)&curView),&inv); //update curView with texture matrix
terrainShader2Stage.updateNoise1(&texTransform3,&inv);
DX8Wrapper::Set_DX8_Texture_Stage_State(2, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
DX8Wrapper::Set_DX8_Texture_Stage_State(2, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
}
else
{ //light map
DX8Wrapper::_Get_D3D_Device8()->SetTexture(2, W3DShaderManager::getShaderTexture(3)->Peek_D3D_Texture());
terrainShader2Stage.updateNoise2(((D3DXMATRIX*)&curView),&inv); //update curView with texture matrix
terrainShader2Stage.updateNoise2(&texTransform3,&inv);
DX8Wrapper::Set_DX8_Texture_Stage_State(2, D3DTSS_MINFILTER, D3DTEXF_POINT);
DX8Wrapper::Set_DX8_Texture_Stage_State(2, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
}
DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE2, curView);
DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE2, texTransform3);
}
}
else
Expand Down Expand Up @@ -1897,14 +1907,15 @@ Int CloudTextureShader::set(Int stage)
D3DXMATRIX inv;
float det;

D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
D3DXMATRIX d3dCurView = Build_D3DXMATRIX(curView);
D3DXMatrixInverse(&inv, &det, &d3dCurView);

//Get a texture matrix that applies the current cloud position
terrainShader2Stage.updateNoise1(((D3DXMATRIX*)&curView),&inv,false); //update curView with texture matrix
D3DXMATRIX texTransform;
terrainShader2Stage.updateNoise1(&texTransform,&inv,false);
DX8Wrapper::_Set_DX8_Transform((D3DTRANSFORMSTATETYPE )(D3DTS_TEXTURE0+stage), texTransform);

DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT2);
DX8Wrapper::_Set_DX8_Transform((D3DTRANSFORMSTATETYPE )(D3DTS_TEXTURE0+stage), curView);
DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
DX8Wrapper::Set_DX8_Texture_Stage_State(stage, D3DTSS_ADDRESSU, D3DTADDRESS_WRAP);
Expand Down Expand Up @@ -2036,7 +2047,8 @@ Int RoadShaderPixelShader::set(Int pass)

D3DXMATRIX inv;
float det;
D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
D3DXMATRIX d3dCurView = Build_D3DXMATRIX(curView);
D3DXMatrixInverse(&inv, &det, &d3dCurView);

if (TheGlobalData && TheGlobalData->m_trilinearTerrainTex)
{ DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
Expand Down Expand Up @@ -2066,11 +2078,13 @@ Int RoadShaderPixelShader::set(Int pass)
DX8Wrapper::Set_DX8_Texture_Stage_State(2, D3DTSS_MINFILTER, D3DTEXF_POINT);
DX8Wrapper::Set_DX8_Texture_Stage_State(2, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);

terrainShader2Stage.updateNoise1(((D3DXMATRIX*)&curView),&inv, false); //get texture projection matrix
DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE1, curView);
D3DXMATRIX texTransform1;
terrainShader2Stage.updateNoise1(&texTransform1,&inv, false);
DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE1, texTransform1);

terrainShader2Stage.updateNoise2(((D3DXMATRIX*)&curView),&inv, false); //get texture projection matrix
DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE2, curView);
D3DXMATRIX texTransform2;
terrainShader2Stage.updateNoise2(&texTransform2,&inv, false);
DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE2, texTransform2);

DX8Wrapper::Set_DX8_Texture_Stage_State(2, D3DTSS_TEXCOORDINDEX, D3DTSS_TCI_CAMERASPACEPOSITION);
// Two output coordinates are used.
Expand Down Expand Up @@ -2159,7 +2173,8 @@ Int RoadShader2Stage::set(Int pass)

D3DXMATRIX inv;
float det;
D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
D3DXMATRIX d3dCurView = Build_D3DXMATRIX(curView);
D3DXMatrixInverse(&inv, &det, &d3dCurView);

if (TheGlobalData && TheGlobalData->m_trilinearTerrainTex)
DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
Expand All @@ -2180,33 +2195,33 @@ Int RoadShader2Stage::set(Int pass)
DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAARG2, D3DTA_CURRENT );
DX8Wrapper::Set_DX8_Texture_Stage_State( 1, D3DTSS_ALPHAOP, D3DTOP_MODULATE );

D3DXMATRIX texTransform3;
if (W3DShaderManager::getCurrentShader() == W3DShaderManager::ST_ROAD_BASE_NOISE12)
{ //full shader, apply noise 1 in pass 0.
DX8Wrapper::_Get_D3D_Device8()->SetTexture(1, W3DShaderManager::getShaderTexture(1)->Peek_D3D_Texture());
DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);

terrainShader2Stage.updateNoise1(((D3DXMATRIX*)&curView),&inv, false); //get texture projection matrix
DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE1, curView);
terrainShader2Stage.updateNoise1(&texTransform3,&inv, false);
}
else
{ //single noise texture shader
if (W3DShaderManager::getCurrentShader() == W3DShaderManager::ST_ROAD_BASE_NOISE1)
{ //cloud map
DX8Wrapper::_Get_D3D_Device8()->SetTexture(1, W3DShaderManager::getShaderTexture(1)->Peek_D3D_Texture());
terrainShader2Stage.updateNoise1(((D3DXMATRIX*)&curView),&inv, false); //update curView with texture matrix
terrainShader2Stage.updateNoise1(&texTransform3,&inv, false);
DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MINFILTER, D3DTEXF_LINEAR);
DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
}
else
{ //light map
DX8Wrapper::_Get_D3D_Device8()->SetTexture(1, W3DShaderManager::getShaderTexture(2)->Peek_D3D_Texture());
terrainShader2Stage.updateNoise2(((D3DXMATRIX*)&curView),&inv, false); //update curView with texture matrix
terrainShader2Stage.updateNoise2(&texTransform3,&inv, false);
DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MINFILTER, D3DTEXF_POINT);
DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);
}
DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE1, curView);
}
DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE1, texTransform3);
}
else
{ //just base texturing
Expand All @@ -2221,7 +2236,8 @@ Int RoadShader2Stage::set(Int pass)

D3DXMATRIX inv;
float det;
D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView);
D3DXMATRIX d3dCurView = Build_D3DXMATRIX(curView);
D3DXMatrixInverse(&inv, &det, &d3dCurView);

if (TheGlobalData && TheGlobalData->m_trilinearTerrainTex)
DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MIPFILTER, D3DTEXF_LINEAR);
Expand All @@ -2230,7 +2246,9 @@ Int RoadShader2Stage::set(Int pass)

DX8Wrapper::_Get_D3D_Device8()->SetTexture(1, W3DShaderManager::getShaderTexture(2)->Peek_D3D_Texture());

terrainShader2Stage.updateNoise2(((D3DXMATRIX*)&curView),&inv, false); //update curView with texture matrix
D3DXMATRIX texTransform;
terrainShader2Stage.updateNoise2(&texTransform,&inv, false);
DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE1, texTransform);
DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MINFILTER, D3DTEXF_POINT);
DX8Wrapper::Set_DX8_Texture_Stage_State(1, D3DTSS_MAGFILTER, D3DTEXF_LINEAR);

Expand Down Expand Up @@ -2262,7 +2280,7 @@ Int RoadShader2Stage::set(Int pass)
DX8Wrapper::Set_DX8_Render_State(D3DRS_SRCBLEND,D3DBLEND_ZERO);
DX8Wrapper::Set_DX8_Render_State(D3DRS_DESTBLEND,D3DBLEND_SRCCOLOR);

DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE0, curView);
DX8Wrapper::_Set_DX8_Transform(D3DTS_TEXTURE0, texTransform);
}

return TRUE;
Expand Down
Loading
Loading