mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-02-14 04:03:46 +00:00
Begun hook-in of skylight into array
Reworked the reflection reference offset/scale behavior to re-integrate into the editor interface via button(and work) Hid irrelevent fields from given probe types. Filter out editPosOffset and bake button fields from being saved to avoid weird loading behavior
This commit is contained in:
parent
2c91ca69fc
commit
8f94d09e6e
11 changed files with 199 additions and 48 deletions
|
|
@ -333,8 +333,8 @@ void RenderProbeMgr::_setupStaticParameters()
|
|||
if (!curEntry.mIrradianceCubemap->isInitialised())
|
||||
continue;
|
||||
|
||||
if (curEntry.mIsSkylight)
|
||||
continue;
|
||||
//if (curEntry.mIsSkylight)
|
||||
// continue;
|
||||
|
||||
mMipCount = curEntry.mCubemap.getPointer()->getMipMapLevels();
|
||||
|
||||
|
|
@ -350,7 +350,7 @@ void RenderProbeMgr::_setupStaticParameters()
|
|||
probeBBMinData[mEffectiveProbeCount] = Point4F(bbMin.x, bbMin.y, bbMin.z, 0);
|
||||
probeBBMaxData[mEffectiveProbeCount] = Point4F(bbMax.x, bbMax.y, bbMax.z, 0);
|
||||
|
||||
probeConfigData[mEffectiveProbeCount] = Point4F(curEntry.mProbeShapeType == ProbeRenderInst::Sphere ? 1 : 0,
|
||||
probeConfigData[mEffectiveProbeCount] = Point4F(curEntry.mProbeShapeType,
|
||||
curEntry.mRadius,
|
||||
attenuation,
|
||||
1);
|
||||
|
|
@ -690,6 +690,8 @@ void RenderProbeMgr::bakeProbe(ReflectionProbe *probe)
|
|||
{
|
||||
GFXDEBUGEVENT_SCOPE(RenderProbeMgr_Bake, ColorI::WHITE);
|
||||
|
||||
bool serverObj = probe->isServerObject();
|
||||
|
||||
Con::warnf("RenderProbeMgr::bakeProbe() - Beginning bake!");
|
||||
U32 startMSTime = Platform::getRealMilliseconds();
|
||||
|
||||
|
|
@ -700,6 +702,9 @@ void RenderProbeMgr::bakeProbe(ReflectionProbe *probe)
|
|||
|
||||
ReflectionProbe *clientProbe = static_cast<ReflectionProbe*>(probe->getClientObject());
|
||||
|
||||
if (clientProbe == nullptr)
|
||||
return;
|
||||
|
||||
String probePrefilterPath = clientProbe->getPrefilterMapPath();
|
||||
String probeIrradPath = clientProbe->getIrradianceMapPath();
|
||||
|
||||
|
|
|
|||
|
|
@ -88,8 +88,9 @@ struct ProbeRenderInst : public SystemInterface<ProbeRenderInst>
|
|||
|
||||
enum ProbeShapeType
|
||||
{
|
||||
Sphere = 0, ///< Sphere shaped
|
||||
Box = 1, ///< Box-based shape
|
||||
Box = 0, ///< Sphere shaped
|
||||
Sphere = 1, ///< Box-based shape
|
||||
Skylight = 2
|
||||
};
|
||||
|
||||
ProbeShapeType mProbeShapeType;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue