Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
10e2bbd
refactor(ww3d2): Route shader and material state via Renderer
bobtista Oct 4, 2026
08c2a81
refactor(ww3d2): Route terrain particle shader and material state via…
bobtista Nov 15, 2026
3b10be5
refactor(ww3d2): Route shader and material state via Renderer in Gene…
bobtista Nov 17, 2026
cbdaabe
refactor(ww3d2): Route texture binding via Renderer
bobtista Oct 4, 2026
2fe1e08
refactor(ww3d2): Route terrain particle texture binding via Renderer
bobtista Nov 15, 2026
cf9e317
refactor(ww3d2): Route texture binding via Renderer in Generals
bobtista Nov 17, 2026
7068450
refactor(ww3d2): Route buffers and draw calls via Renderer
bobtista Oct 4, 2026
9f706cc
refactor(ww3d2): Route terrain particle buffers and draw calls via Re…
bobtista Nov 15, 2026
cf88c4e
refactor(ww3d2): Route buffers and draw calls via Renderer in Generals
bobtista Nov 17, 2026
a84d927
refactor(ww3d2): Route render-target binding via Renderer
bobtista Oct 4, 2026
9821cf6
refactor(ww3d2): Route render-target binding via Renderer in Generals
bobtista Nov 17, 2026
1938453
refactor(ww3d2): Widen Renderer draw arguments to 32 bits
bobtista Oct 4, 2026
8f7085a
refactor(ww3d2): Route capability queries via Renderer
bobtista Nov 19, 2026
fc026e7
refactor(ww3d2): Route capability queries via Renderer in Generals
bobtista Nov 19, 2026
f34a748
refactor(ww3d2): Route texture stage transforms via Renderer
bobtista Nov 19, 2026
a4dbdeb
refactor(ww3d2): Route fill mode and color write mask via Renderer
bobtista Nov 19, 2026
b9e8616
refactor(ww3d2): Route fill mode and color write mask via Renderer in…
bobtista Nov 19, 2026
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
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
#include "W3DDevice/GameClient/HeightMap.h"
#include "W3DDevice/GameClient/W3DShroud.h"
#include "WW3D2/texture.h"
#include "WW3D2/dx8caps.h"
#include "WW3D2/Renderer.h"
#include "WWMath/vector2i.h"


Expand Down Expand Up @@ -81,7 +81,7 @@ static WW3DFormat findFormat(const WW3DFormat formats[])
for( Int i = 0; formats[ i ] != WW3D_FORMAT_UNKNOWN; i++ )
{

if( DX8Wrapper::Get_Current_Caps()->Support_Texture_Format( formats[ i ] ) )
if( Renderer::Supports_Texture_Format( formats[ i ] ) )
{

return formats[ i ];
Expand Down
38 changes: 19 additions & 19 deletions Core/GameEngineDevice/Source/W3DDevice/GameClient/BaseHeightMap.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2318,14 +2318,14 @@ void BaseHeightMapRenderObjClass::renderShoreLines(CameraClass *pCamera)

ShaderClass unlitShader=ShaderClass::_PresetOpaque2DShader;
unlitShader.Set_Depth_Compare(ShaderClass::PASS_LEQUAL);
DX8Wrapper::Set_Shader(unlitShader);
Renderer::Set_Shader(unlitShader);
VertexMaterialClass *vmat=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
DX8Wrapper::Set_Material(vmat);
Renderer::Set_Material(vmat);
REF_PTR_RELEASE(vmat);
DX8Wrapper::Set_Texture(0,m_destAlphaTexture);
Renderer::Set_Texture(0,m_destAlphaTexture);
Renderer::Set_Transform(RenderTransform_World,Matrix3D(true));
//Enabled writes to destination alpha only
DX8Wrapper::Set_DX8_Render_State(D3DRS_COLORWRITEENABLE,D3DCOLORWRITEENABLE_ALPHA);
Renderer::Set_Color_Write_Mask(RenderColorWrite_Alpha);
DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_TEXCOORDINDEX, 0);


Expand All @@ -2341,7 +2341,7 @@ void BaseHeightMapRenderObjClass::renderShoreLines(CameraClass *pCamera)
DynamicIBAccessClass::WriteLockClass lockib(&ib_access);
UnsignedShort *ib=lockib.Get_Index_Array();
if (!ib || !vb)
{ DX8Wrapper::Set_DX8_Render_State(D3DRS_COLORWRITEENABLE,D3DCOLORWRITEENABLE_BLUE|D3DCOLORWRITEENABLE_GREEN|D3DCOLORWRITEENABLE_RED);
{ Renderer::Set_Color_Write_Mask(RenderColorWrite_RGB);
return;
}

Expand Down Expand Up @@ -2439,9 +2439,9 @@ void BaseHeightMapRenderObjClass::renderShoreLines(CameraClass *pCamera)

if (indexCount > 0 && vertexCount > 0)
{
DX8Wrapper::Set_Index_Buffer(ib_access,0);
DX8Wrapper::Set_Vertex_Buffer(vb_access);
DX8Wrapper::Draw_Triangles( 0,indexCount/3, 0, vertexCount); //draw a quad, 2 triangles, 4 verts
Renderer::Set_Index_Buffer(ib_access,0);
Renderer::Set_Vertex_Buffer(vb_access);
Renderer::Draw_Triangles( 0,indexCount/3, 0, vertexCount); //draw a quad, 2 triangles, 4 verts
m_numVisibleShoreLineTiles += indexCount/6;
}

Expand All @@ -2450,7 +2450,7 @@ void BaseHeightMapRenderObjClass::renderShoreLines(CameraClass *pCamera)
}

//Disable writes to destination alpha
DX8Wrapper::Set_DX8_Render_State(D3DRS_COLORWRITEENABLE,D3DCOLORWRITEENABLE_BLUE|D3DCOLORWRITEENABLE_GREEN|D3DCOLORWRITEENABLE_RED);
Renderer::Set_Color_Write_Mask(RenderColorWrite_RGB);
ShaderClass::Invalidate();
}

Expand Down Expand Up @@ -2504,14 +2504,14 @@ void BaseHeightMapRenderObjClass::renderShoreLinesSorted(CameraClass *pCamera)

ShaderClass unlitShader=ShaderClass::_PresetOpaque2DShader;
unlitShader.Set_Depth_Compare(ShaderClass::PASS_LEQUAL);
DX8Wrapper::Set_Shader(unlitShader);
Renderer::Set_Shader(unlitShader);
VertexMaterialClass *vmat=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
DX8Wrapper::Set_Material(vmat);
Renderer::Set_Material(vmat);
REF_PTR_RELEASE(vmat);
DX8Wrapper::Set_Texture(0,m_destAlphaTexture);
Renderer::Set_Texture(0,m_destAlphaTexture);
Renderer::Set_Transform(RenderTransform_World,Matrix3D(true));
//Enabled writes to destination alpha only
DX8Wrapper::Set_DX8_Render_State(D3DRS_COLORWRITEENABLE,D3DCOLORWRITEENABLE_ALPHA);
Renderer::Set_Color_Write_Mask(RenderColorWrite_Alpha);
DX8Wrapper::Set_DX8_Texture_Stage_State(0, D3DTSS_TEXCOORDINDEX, 0);

Bool isDone=FALSE;
Expand All @@ -2529,7 +2529,7 @@ void BaseHeightMapRenderObjClass::renderShoreLinesSorted(CameraClass *pCamera)
DynamicIBAccessClass::WriteLockClass lockib(&ib_access);
UnsignedShort *ib=lockib.Get_Index_Array();
if (!ib || !vb)
{ DX8Wrapper::Set_DX8_Render_State(D3DRS_COLORWRITEENABLE,D3DCOLORWRITEENABLE_BLUE|D3DCOLORWRITEENABLE_GREEN|D3DCOLORWRITEENABLE_RED);
{ Renderer::Set_Color_Write_Mask(RenderColorWrite_RGB);
return;
}

Expand Down Expand Up @@ -2782,9 +2782,9 @@ void BaseHeightMapRenderObjClass::renderShoreLinesSorted(CameraClass *pCamera)

if (indexCount > 0 && vertexCount > 0)
{
DX8Wrapper::Set_Index_Buffer(ib_access,0);
DX8Wrapper::Set_Vertex_Buffer(vb_access);
DX8Wrapper::Draw_Triangles( 0,indexCount/3, 0, vertexCount); //draw a quad, 2 triangles, 4 verts
Renderer::Set_Index_Buffer(ib_access,0);
Renderer::Set_Vertex_Buffer(vb_access);
Renderer::Draw_Triangles( 0,indexCount/3, 0, vertexCount); //draw a quad, 2 triangles, 4 verts
m_numVisibleShoreLineTiles += indexCount/6;
}

Expand All @@ -2793,7 +2793,7 @@ void BaseHeightMapRenderObjClass::renderShoreLinesSorted(CameraClass *pCamera)
}

//Disable writes to destination alpha
DX8Wrapper::Set_DX8_Render_State(D3DRS_COLORWRITEENABLE,D3DCOLORWRITEENABLE_BLUE|D3DCOLORWRITEENABLE_GREEN|D3DCOLORWRITEENABLE_RED);
Renderer::Set_Color_Write_Mask(RenderColorWrite_RGB);
ShaderClass::Invalidate();
}

Expand All @@ -2814,7 +2814,7 @@ void BaseHeightMapRenderObjClass::renderTrees(CameraClass * camera)
if (Scene==nullptr) return;
if (m_treeBuffer) {
Renderer::Set_Transform(RenderTransform_World,Transform);
DX8Wrapper::Set_Material(m_vertexMaterialClass);
Renderer::Set_Material(m_vertexMaterialClass);
RTS3DScene *pMyScene = (RTS3DScene *)Scene;
RefRenderObjListIterator pDynamicLightsIterator(pMyScene->getDynamicLights());
m_treeBuffer->drawTrees(camera, &pDynamicLightsIterator);
Expand Down
38 changes: 19 additions & 19 deletions Core/GameEngineDevice/Source/W3DDevice/GameClient/FlatHeightMap.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -490,15 +490,15 @@ void FlatHeightMapRenderObjClass::Render(RenderInfoClass & rinfo)

// Force shaders to update.
m_stageTwoTexture->restore();
DX8Wrapper::Set_Texture(0,nullptr);
DX8Wrapper::Set_Texture(1,nullptr);
Renderer::Set_Texture(0,nullptr);
Renderer::Set_Texture(1,nullptr);
ShaderClass::Invalidate();

Renderer::Set_Transform(RenderTransform_World,Transform);


DX8Wrapper::Set_Material(m_vertexMaterialClass);
DX8Wrapper::Set_Shader(m_shaderClass);
Renderer::Set_Material(m_vertexMaterialClass);
Renderer::Set_Shader(m_shaderClass);

st=W3DShaderManager::ST_FLAT_TERRAIN_BASE; //set default shader

Expand Down Expand Up @@ -539,7 +539,7 @@ void FlatHeightMapRenderObjClass::Render(RenderInfoClass & rinfo)
W3DShaderManager::setTexture(3,m_stageThreeTexture);//noise
//Disable writes to destination alpha channel (if there is one)
if (Renderer::Get_Back_Buffer_Format() == WW3D_FORMAT_A8R8G8B8) {
DX8Wrapper::Set_DX8_Render_State(D3DRS_COLORWRITEENABLE,D3DCOLORWRITEENABLE_BLUE|D3DCOLORWRITEENABLE_GREEN|D3DCOLORWRITEENABLE_RED);
Renderer::Set_Color_Write_Mask(RenderColorWrite_RGB);
}

Int pass;
Expand All @@ -550,8 +550,8 @@ void FlatHeightMapRenderObjClass::Render(RenderInfoClass & rinfo)
for (pass=0; pass<devicePasses; pass++) {
Bool disableTex = m_disableTextures;
if (m_disableTextures ) {
DX8Wrapper::Set_Shader(ShaderClass::_PresetOpaque2DShader);
DX8Wrapper::Set_Texture(0,nullptr);
Renderer::Set_Shader(ShaderClass::_PresetOpaque2DShader);
Renderer::Set_Texture(0,nullptr);
} else {
W3DShaderManager::setShader(st, pass);
}
Expand Down Expand Up @@ -590,13 +590,13 @@ void FlatHeightMapRenderObjClass::Render(RenderInfoClass & rinfo)
renderShoreLines(&rinfo.Camera);

#ifdef DO_ROADS
DX8Wrapper::Set_Texture(0,nullptr);
DX8Wrapper::Set_Texture(1,nullptr);
Renderer::Set_Texture(0,nullptr);
Renderer::Set_Texture(1,nullptr);
m_stageTwoTexture->restore();

ShaderClass::Invalidate();
if (!ShaderClass::Is_Backface_Culling_Inverted()) {
DX8Wrapper::Set_Material(m_vertexMaterialClass);
Renderer::Set_Material(m_vertexMaterialClass);
if (Scene) {
RTS3DScene *pMyScene = (RTS3DScene *)Scene;
RefRenderObjListIterator pDynamicLightsIterator(pMyScene->getDynamicLights());
Expand All @@ -606,36 +606,36 @@ void FlatHeightMapRenderObjClass::Render(RenderInfoClass & rinfo)
}
#endif

DX8Wrapper::Set_Texture(0,nullptr);
DX8Wrapper::Set_Texture(1,nullptr);
Renderer::Set_Texture(0,nullptr);
Renderer::Set_Texture(1,nullptr);
m_stageTwoTexture->restore();

drawScorches();

DX8Wrapper::Set_Texture(0,nullptr);
DX8Wrapper::Set_Texture(1,nullptr);
Renderer::Set_Texture(0,nullptr);
Renderer::Set_Texture(1,nullptr);
m_stageTwoTexture->restore();
ShaderClass::Invalidate();
DX8Wrapper::Apply_Render_State_Changes();
Renderer::Apply_Render_State_Changes();

m_bridgeBuffer->drawBridges(&rinfo.Camera, m_disableTextures, m_stageTwoTexture);

if (TheTerrainTracksRenderObjClassSystem)
TheTerrainTracksRenderObjClassSystem->flush();

ShaderClass::Invalidate();
DX8Wrapper::Apply_Render_State_Changes();
Renderer::Apply_Render_State_Changes();

m_waypointBuffer->drawWaypoints(rinfo);

m_bibBuffer->renderBibs();
#endif
// We do some custom blending, so tell the shader class to reset everything.
DX8Wrapper::Set_Texture(0,nullptr);
DX8Wrapper::Set_Texture(1,nullptr);
Renderer::Set_Texture(0,nullptr);
Renderer::Set_Texture(1,nullptr);
m_stageTwoTexture->restore();
ShaderClass::Invalidate();
DX8Wrapper::Set_Material(nullptr);
Renderer::Set_Material(nullptr);

}

Loading
Loading