diff --git a/Engine/source/afx/afxZodiacGroundPlaneRenderer_T3D.cpp b/Engine/source/afx/afxZodiacGroundPlaneRenderer_T3D.cpp index 0e1ad2a71..9dd7d018d 100644 --- a/Engine/source/afx/afxZodiacGroundPlaneRenderer_T3D.cpp +++ b/Engine/source/afx/afxZodiacGroundPlaneRenderer_T3D.cpp @@ -103,7 +103,6 @@ void afxZodiacGroundPlaneRenderer::initShader() GFXStateBlockDesc d; d.cullDefined = true; - d.ffLighting = false; d.blendDefined = true; d.blendEnable = true; d.zDefined = false; diff --git a/Engine/source/afx/afxZodiacMeshRoadRenderer_T3D.cpp b/Engine/source/afx/afxZodiacMeshRoadRenderer_T3D.cpp index 30af55b02..5d754084b 100644 --- a/Engine/source/afx/afxZodiacMeshRoadRenderer_T3D.cpp +++ b/Engine/source/afx/afxZodiacMeshRoadRenderer_T3D.cpp @@ -103,7 +103,6 @@ void afxZodiacMeshRoadRenderer::initShader() GFXStateBlockDesc d; d.cullDefined = true; - d.ffLighting = false; d.blendDefined = true; d.blendEnable = true; d.zDefined = false; diff --git a/Engine/source/afx/afxZodiacPolysoupRenderer_T3D.cpp b/Engine/source/afx/afxZodiacPolysoupRenderer_T3D.cpp index 63e17b12e..d34da0f03 100644 --- a/Engine/source/afx/afxZodiacPolysoupRenderer_T3D.cpp +++ b/Engine/source/afx/afxZodiacPolysoupRenderer_T3D.cpp @@ -103,7 +103,6 @@ void afxZodiacPolysoupRenderer::initShader() GFXStateBlockDesc d; d.cullDefined = true; - d.ffLighting = false; d.blendDefined = true; d.blendEnable = true; d.zDefined = false; diff --git a/Engine/source/afx/afxZodiacTerrainRenderer_T3D.cpp b/Engine/source/afx/afxZodiacTerrainRenderer_T3D.cpp index aafc17020..6e82b97a3 100644 --- a/Engine/source/afx/afxZodiacTerrainRenderer_T3D.cpp +++ b/Engine/source/afx/afxZodiacTerrainRenderer_T3D.cpp @@ -113,7 +113,6 @@ void afxZodiacTerrainRenderer::initShader() GFXStateBlockDesc d; d.cullDefined = true; - d.ffLighting = false; d.blendDefined = true; d.blendEnable = true; d.zDefined = false; diff --git a/Engine/source/afx/ce/afxBillboard.cpp b/Engine/source/afx/ce/afxBillboard.cpp index f7f4db780..85f816962 100644 --- a/Engine/source/afx/ce/afxBillboard.cpp +++ b/Engine/source/afx/ce/afxBillboard.cpp @@ -60,7 +60,6 @@ afxBillboardData::afxBillboardData() blendStyle = BlendUndefined; srcBlendFactor = BLEND_UNDEFINED; dstBlendFactor = BLEND_UNDEFINED; - texFunc = TexFuncModulate; } afxBillboardData::afxBillboardData(const afxBillboardData& other, bool temp_clone) @@ -77,7 +76,6 @@ afxBillboardData::afxBillboardData(const afxBillboardData& other, bool temp_clon blendStyle = other.blendStyle; srcBlendFactor = other.srcBlendFactor; dstBlendFactor = other.dstBlendFactor; - texFunc = other.texFunc; } #define myOffset(field) Offset(field, afxBillboardData) @@ -92,12 +90,6 @@ ImplementEnumType( afxBillboard_BlendStyle, "Possible blending types.\n" "@ingro { afxBillboardData::BlendPremultAlpha, "PREMULTALPHA", "..." }, EndImplementEnumType; -ImplementEnumType( afxBillboard_TexFuncType, "Possible texture function types.\n" "@ingroup afxBillboard\n\n" ) - { afxBillboardData::TexFuncReplace, "replace", "..." }, - { afxBillboardData::TexFuncModulate, "modulate", "..." }, - { afxBillboardData::TexFuncAdd, "add", "..." }, -EndImplementEnumType; - void afxBillboardData::initPersistFields() { addField("color", TypeColorF, myOffset(color), @@ -123,11 +115,6 @@ void afxBillboardData::initPersistFields() "Specifies destination blend factor when blendStyle is set to 'user'.\n" "Possible values: GFXBlendZero, GFXBlendOne, GFXBlendSrcColor, GFXBlendInvSrcColor, GFXBlendSrcAlpha, GFXBlendInvSrcAlpha, GFXBlendDestAlpha, or GFXBlendInvDestAlpha"); - addField("textureFunction", TYPEID(), myOffset(texFunc), - "Selects a texture function that determines how the texture pixels are combined " - "with the shaded color of the billboard's quadrangle geometry.\n" - "Possible values: replace, modulate, or add."); - Parent::initPersistFields(); } @@ -145,7 +132,6 @@ void afxBillboardData::packData(BitStream* stream) stream->writeInt(srcBlendFactor, 4); stream->writeInt(dstBlendFactor, 4); - stream->writeInt(texFunc, 4); } void afxBillboardData::unpackData(BitStream* stream) @@ -163,7 +149,6 @@ void afxBillboardData::unpackData(BitStream* stream) srcBlendFactor = (GFXBlend) stream->readInt(4); dstBlendFactor = (GFXBlend) stream->readInt(4); - texFunc = stream->readInt(4); } bool afxBillboardData::preload(bool server, String &errorStr) @@ -291,4 +276,4 @@ void afxBillboard::onRemove() Parent::onRemove(); } -//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// \ No newline at end of file +//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// diff --git a/Engine/source/afx/ce/afxBillboard.h b/Engine/source/afx/ce/afxBillboard.h index 1c5d2e36b..208b8b0f0 100644 --- a/Engine/source/afx/ce/afxBillboard.h +++ b/Engine/source/afx/ce/afxBillboard.h @@ -46,12 +46,6 @@ public: BlendUser, }; - enum TexFuncType { - TexFuncReplace, - TexFuncModulate, - TexFuncAdd, - }; - public: StringTableEntry txr_name; GFXTexHandle txr; @@ -62,7 +56,6 @@ public: S32 blendStyle; GFXBlend srcBlendFactor; GFXBlend dstBlendFactor; - S32 texFunc; public: /*C*/ afxBillboardData(); @@ -84,8 +77,6 @@ public: typedef afxBillboardData::BlendStyle afxBillboard_BlendStyle; DefineEnumType( afxBillboard_BlendStyle ); -typedef afxBillboardData::TexFuncType afxBillboard_TexFuncType; -DefineEnumType( afxBillboard_TexFuncType ); //~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// // afxBillboard diff --git a/Engine/source/afx/ce/afxBillboard_T3D.cpp b/Engine/source/afx/ce/afxBillboard_T3D.cpp index 429a4f51a..2162f7143 100644 --- a/Engine/source/afx/ce/afxBillboard_T3D.cpp +++ b/Engine/source/afx/ce/afxBillboard_T3D.cpp @@ -72,20 +72,6 @@ void afxBillboard::_renderBillboard(ObjectRenderInst *ri, SceneRenderState* stat desc.zWriteEnable = false; desc.samplersDefined = true; - switch (mDataBlock->texFunc) - { - case afxBillboardData::TexFuncReplace: - desc.samplers[0].textureColorOp = GFXTOPDisable; - break; - case afxBillboardData::TexFuncModulate: - desc.samplers[0].textureColorOp = GFXTOPModulate; - break; - case afxBillboardData::TexFuncAdd: - desc.samplers[0].textureColorOp = GFXTOPAdd; - break; - } - - desc.samplers[1].textureColorOp = GFXTOPDisable; normal_sb = GFX->createStateBlock(desc); @@ -142,4 +128,4 @@ void afxBillboard::_renderBillboard(ObjectRenderInst *ri, SceneRenderState* stat PrimBuild::end(); } -//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// \ No newline at end of file +//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// diff --git a/Engine/source/afx/ce/afxMooring_T3D.cpp b/Engine/source/afx/ce/afxMooring_T3D.cpp index cf1512cfe..5d097491f 100644 --- a/Engine/source/afx/ce/afxMooring_T3D.cpp +++ b/Engine/source/afx/ce/afxMooring_T3D.cpp @@ -60,7 +60,6 @@ void afxMooring::_renderAxisLines(ObjectRenderInst *ri, SceneRenderState* state, desc.blendEnable = false; desc.cullDefined = true; desc.cullMode = GFXCullNone; - desc.ffLighting = false; desc.zDefined = true; desc.zWriteEnable = false; @@ -85,4 +84,4 @@ void afxMooring::_renderAxisLines(ObjectRenderInst *ri, SceneRenderState* state, PrimBuild::end(); } -//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// \ No newline at end of file +//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~//~~~~~~~~~~~~~~~~~~~~~// diff --git a/Engine/source/afx/ce/afxZodiacPlane_T3D.cpp b/Engine/source/afx/ce/afxZodiacPlane_T3D.cpp index 2bf0bcfbc..476f353c3 100644 --- a/Engine/source/afx/ce/afxZodiacPlane_T3D.cpp +++ b/Engine/source/afx/ce/afxZodiacPlane_T3D.cpp @@ -128,8 +128,6 @@ void afxZodiacPlane::_renderZodiacPlane(ObjectRenderInst *ri, SceneRenderState* desc.zFunc = GFXCmpLessEqual; desc.zWriteEnable = false; desc.samplersDefined = true; - desc.samplers[0].textureColorOp = GFXTOPModulate; - desc.samplers[1].textureColorOp = GFXTOPDisable; normal_sb = GFX->createStateBlock(desc); if (mDataBlock->double_sided)