TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-20 04:34:48 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #2342 from Azaezel/volFogFix

Browse source 
fix(es) for volumetric fog when dealing with dedicated servers.
This commit is contained in:
Areloch 2019-05-04 11:24:18 -05:00 committed by GitHub
parent 7daa243057 ed886d0bd0
commit a366f65047
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Engine/source/environment/VolumetricFog.cpp
View file

@ -244,6 +244,8 @@ bool VolumetricFog::onAdd()
mSpeed.set(mSpeed1.x, mSpeed1.y, mSpeed2.x, mSpeed2.y);
mInvScale = (1.0f / getMax(getMax(mObjScale.x, mObjScale.y), mObjScale.z));
VFRTM->IncFogObjects();
if (isClientObject())
{
conn = GameConnection::getConnectionToServer();
@ -270,8 +272,6 @@ bool VolumetricFog::onAdd()
InitTexture();
return setupRenderer();
}
VFRTM->IncFogObjects();
return true;
}
@ -288,7 +288,7 @@ void VolumetricFog::onRemove()
mGlowing = 0;
glowFX->disable();
}
_leaveFog(static_cast<ShapeBase*>(conn->getControlObject()));
_leaveFog(dynamic_cast<ShapeBase*>(conn->getControlObject()));
}
VolumetricFogRTManager::getVolumetricFogRTMResizeSignal().remove(this, &VolumetricFog::handleResize);
GuiCanvas::getCanvasSizeChangeSignal().remove(this, &VolumetricFog::handleCanvasResize);
@ -694,7 +694,9 @@ void VolumetricFog::processTick(const Move* move)
}
if (mCounter == 3)
{
ShapeBase* control = static_cast<ShapeBase*>(conn->getControlObject());
ShapeBase* control = dynamic_cast<ShapeBase*>(conn->getControlObject());
if (!control)
return;
MatrixF xfm;
control->getRenderEyeTransform(&xfm);
Point3F pos = xfm.getPosition();
@ -966,9 +968,8 @@ void VolumetricFog::prepRenderImage(SceneRenderState *state)
PROFILE_SCOPE(VolumetricFog_prepRenderImage);
// Time critical therefore static_cast
ShapeBase* control = static_cast<ShapeBase*>(conn->getControlObject());
if (control->getWaterCoverage() >= 0.9f && !mIgnoreWater)
ShapeBase* control = dynamic_cast<ShapeBase*>(conn->getControlObject());
if (!control || (control->getWaterCoverage() >= 0.9f && !mIgnoreWater))
return;
camPos = state->getCameraPosition();

9
Engine/source/environment/VolumetricFogRTManager.cpp
View file

@ -132,7 +132,14 @@ bool VolumetricFogRTManager::Init()
Con::errorf("VolumetricFogRTManager allready initialized!!");
return true;
}
if (GFX->getAdapterType() == NullDevice)
{
mIsInitialized = true;
Con::errorf("VolumetricFogRTManager - Dedicated server");
return true;
}
GuiCanvas* cv = dynamic_cast<GuiCanvas*>(Sim::findObject("Canvas"));
if (cv == NULL)
{