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

Merge branch 'PBR_ProbeArrayWIP' of https://github.com/Areloch/Torque3D into PBR_ProbeArrayWIP

Browse source 
# Conflicts:
#	Templates/Full/game/shaders/common/lighting/advanced/reflectionProbeArrayP.hlsl
This commit is contained in:
Azaezel 2019-03-18 00:18:49 -05:00
commit caf73ea84f
5 changed files with 67 additions and 190 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/renderInstance/renderProbeMgr.cpp
View file

@ -353,7 +353,7 @@ void RenderProbeMgr::_setupStaticParameters()
probeWorldToObjData[mEffectiveProbeCount] = transform;// curEntry.getTransform();
Point3F bbMin = refPos - curEntry.mProbeRefScale/2;
Point3F bbMax = refPos + curEntry.mProbeRefScale/2;
Point3F bbMax = curEntry.mExtents/4;
probeBBMinData[mEffectiveProbeCount] = Point4F(bbMin.x, bbMin.y, bbMin.z, 0);
probeBBMaxData[mEffectiveProbeCount] = Point4F(bbMax.x, bbMax.y, bbMax.z, 0);

1
Engine/source/renderInstance/renderProbeMgr.h
View file

@ -66,6 +66,7 @@ struct ProbeRenderInst : public SystemInterface<ProbeRenderInst>
bool mDirty;
Box3F mBounds;
Point3F mExtents;
Point3F mPosition;
Point3F mProbeRefOffset;
Point3F mProbeRefScale;