More TSpriteMaterial{,HAL} Progress

Author: AdventureT

Toshi/Shaders/TSpriteShader/Include/D3D/TSpriteShaderD3D.h

@@ -8,18 +8,21 @@ TOSHI_NAMESPACE_BEGIN
 
 class TSPRITESHADERD3D_EXPORTS TSpriteMaterialHAL : public TSpriteMaterial
 {
+	DECLARE_DYNAMIC(TSpriteMaterialHAL, TSpriteMaterial)
 public:
 
+	TSpriteMaterialHAL()
+	{
+		m_pTexture[0] = TNULL;
+	}
+
 	TRenderD3DInterface* GetRenderer() const
 	{
 		return TSTATICCAST(TRenderD3DInterface *, m_pRenderer);
 	}
 
 	virtual void PreRender() override;
 	virtual void PostRender() override;
-
-private:
-	TTextureResourceHAL *m_pTexture; // 0x40
 };
 
 class TSPRITESHADERD3D_EXPORTS TSpriteMeshHAL

Toshi/Shaders/TSpriteShader/Include/TSpriteShader.h

@@ -6,7 +6,19 @@ TOSHI_NAMESPACE_BEGIN
 
 class TSpriteMaterial : public TMaterial
 {
+	DECLARE_DYNAMIC(TSpriteMaterial, TMaterial)
 
+public:
+	TSpriteMaterial()
+	{
+		m_pTexture[0] = TNULL;
+		m_pTexture[1] = TNULL;
+		m_eBlendMode  = 0;
+	}
+
+protected:
+	TTextureResourceHAL *m_pTexture[2]; // 0x40
+	TINT                 m_eBlendMode;  // 0x48
 };
 
 class TSpriteShader : public TShader

Toshi/Shaders/TSpriteShader/Source/D3D/TSpriteShaderD3D.cpp

@@ -3,28 +3,42 @@
 
 TOSHI_NAMESPACE_BEGIN
 
+IMPLEMENT_DYNCREATE(TSpriteMaterialHAL, TSpriteMaterial)
+
 void TSpriteMaterialHAL::PreRender()
 {
 	TRenderD3DInterface *pRenderer = GetRenderer();
 	IDirect3DDevice8    *pDevice   = pRenderer->GetD3DDevice();
 	if (m_pTexture) {
-		m_pTexture->Validate();
-		if (m_pTexture->GetD3DTexture()) {
-			pDevice->SetTexture(0, m_pTexture->GetD3DTexture());
-			pRenderer->SetTextureAddressMode(0, m_pTexture->GetAddressMode());
+		m_pTexture[0]->Validate();
+		if (m_pTexture[0]->GetD3DTexture()) {
+			pDevice->SetTexture(0, m_pTexture[0]->GetD3DTexture());
+			pRenderer->SetTextureAddressMode(0, m_pTexture[0]->GetAddressMode());
 		}
 	}
 	else {
 		pDevice->SetTexture(0, TNULL);
 	}
+	if (m_Flags & FLAGS_VALID) {
+		pDevice->SetRenderState(D3DRS_CULLMODE, D3DCULL_NONE);
+	}
+	switch (m_eBlendMode)
+	{
+		case 0:
+			pDevice->SetRenderState(D3DRS_SRCBLEND, D3DBLEND_SRCALPHA);
+			pDevice->SetRenderState(D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA);
+			pDevice->SetRenderState(D3DRS_ZWRITEENABLE, FALSE);
+		default:
+			break;
+	}
 }
 
 void TSpriteMaterialHAL::PostRender()
 {
 	TRenderD3DInterface *pRenderer = GetRenderer();
 	IDirect3DDevice8    *pDevice   = pRenderer->GetD3DDevice();
 	if (m_Flags & FLAGS_VALID) {
-		pDevice->SetRenderState(D3DRS_CULLMODE, 2);
+		pDevice->SetRenderState(D3DRS_CULLMODE, D3DCULL_CW);
 	}
 	pRenderer->SetTextureAddressMode(0, TTextureResource::ADDRESSMODE_WRAP);
 	pDevice->SetTexture(0, TNULL);

Toshi/Shaders/TSpriteShader/Source/TSpriteShader.cpp

@@ -0,0 +1,7 @@
+#include "TSpriteShader.h"
+
+TOSHI_NAMESPACE_BEGIN
+
+IMPLEMENT_DYNAMIC(TSpriteMaterial, TMaterial)
+
+TOSHI_NAMESPACE_END