TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 11:43:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1371 from Azaezel/afxZodiacFindings

Browse source 
Afx zodiac findings
This commit is contained in:
Brian Roberts 2025-01-27 18:57:28 -06:00 • committed by GitHub
commit cd2213de36
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
20 changed files with 107 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/afx/afxZodiacGroundPlaneRenderer_T3D.cpp
View file

@ -108,7 +108,7 @@ void afxZodiacGroundPlaneRenderer::initShader()
d.zDefined = false;
d.zEnable = true;
d.zWriteEnable = false;
d.zFunc = GFXCmpLessEqual;
d.zFunc = GFXCmpGreaterEqual;
d.zSlopeBias = 0;
d.alphaDefined = true;
d.alphaTestEnable = true;

6
Engine/source/afx/afxZodiacMeshRoadRenderer_T3D.cpp
View file

@ -105,10 +105,8 @@ void afxZodiacMeshRoadRenderer::initShader()
d.cullDefined = true;
d.blendDefined = true;
d.blendEnable = true;
d.zDefined = false;
d.zEnable = true;
d.zWriteEnable = false;
d.zFunc = GFXCmpLessEqual;
d.setZReadWrite(true, false);
d.zFunc = GFXCmpGreaterEqual;
d.zSlopeBias = 0;
d.alphaDefined = true;
d.alphaTestEnable = true;

6
Engine/source/afx/afxZodiacPolysoupRenderer_T3D.cpp
View file

@ -105,10 +105,8 @@ void afxZodiacPolysoupRenderer::initShader()
d.cullDefined = true;
d.blendDefined = true;
d.blendEnable = true;
d.zDefined = false;
d.zEnable = true;
d.zWriteEnable = false;
d.zFunc = GFXCmpLessEqual;
d.setZReadWrite(true, false);
d.zFunc = GFXCmpGreaterEqual;
d.zSlopeBias = 0;
d.alphaDefined = true;
d.alphaTestEnable = true;

6
Engine/source/afx/afxZodiacTerrainRenderer_T3D.cpp
View file

@ -115,10 +115,8 @@ void afxZodiacTerrainRenderer::initShader()
d.cullDefined = true;
d.blendDefined = true;
d.blendEnable = true;
d.zDefined = false;
d.zEnable = true;
d.zWriteEnable = false;
d.zFunc = GFXCmpLessEqual;
d.setZReadWrite(true, false);
d.zFunc = GFXCmpGreaterEqual;
d.zSlopeBias = 0;
d.alphaDefined = true;
d.alphaTestEnable = true;

6
Engine/source/afx/arcaneFX.cpp
View file

@ -108,9 +108,9 @@ U32 arcaneFX::sTargetSelectionTimeoutMS = 500;
bool arcaneFX::sClickToTargetSelf = false;
U32 arcaneFX::sMissileCollisionMask = 0;
StringTableEntry arcaneFX::sParameterFieldPrefix = 0;
F32 arcaneFX::sTerrainZodiacZBias = -0.00025f;
F32 arcaneFX::sInteriorZodiacZBias = -0.0001f;
F32 arcaneFX::sPolysoupZodiacZBias = -0.0001f;
F32 arcaneFX::sTerrainZodiacZBias = 0.00025f;
F32 arcaneFX::sInteriorZodiacZBias = 0.0001f;
F32 arcaneFX::sPolysoupZodiacZBias = 0.0001f;
U32 arcaneFX::master_choreographer_id = 1;
U16 arcaneFX::master_scope_id = 1;
bool arcaneFX::is_shutdown = true;

5
Engine/source/afx/ce/afxBillboard_T3D.cpp
View file

@ -67,9 +67,8 @@ void afxBillboard::_renderBillboard(ObjectRenderInst *ri, SceneRenderState* stat
desc.alphaTestRef = 1;
desc.alphaTestFunc = GFXCmpGreaterEqual;
desc.setZReadWrite(true);
desc.zFunc = GFXCmpLessEqual;
desc.zWriteEnable = false;
desc.setZReadWrite(true, false);
desc.zFunc = GFXCmpGreaterEqual;
desc.samplersDefined = true;

16
Engine/source/afx/ce/afxZodiac.cpp
View file

@ -326,6 +326,22 @@ bool afxZodiacData::preload(bool server, String &errorStr)
if (vert_range.x == 0.0f && vert_range.y == 0.0f)
vert_range.x = vert_range.y = radius_xy;
if (mTextureAssetId != StringTable->EmptyString())
{
mTextureAsset = mTextureAssetId;
if (mTextureAsset.notNull())
{
if (getTexture() != StringTable->EmptyString() && mTextureName != StringTable->insert("texhandle"))
{
if (mTextureAsset.notNull())
{
mTextureAsset->getChangedSignal().notify(this, &afxZodiacData::onImageChanged);
}
mTexture.set(getTexture(), mTextureProfile, avar("%s() - mTextureObject (line %d)", __FUNCTION__, __LINE__));
}
}
}
return true;
}

2
Engine/source/afx/ce/afxZodiacPlane_T3D.cpp
View file

@ -125,7 +125,7 @@ void afxZodiacPlane::_renderZodiacPlane(ObjectRenderInst *ri, SceneRenderState*
desc.setAlphaTest(true, GFXCmpGreater, 0);
desc.setZReadWrite(true);
desc.zFunc = GFXCmpLessEqual;
desc.zFunc = GFXCmpGreaterEqual;
desc.zWriteEnable = false;
desc.samplersDefined = true;