TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-11 14:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'development' into Xenon_Removal

Browse source
This commit is contained in:
Areloch 2017-04-18 20:47:43 -05:00 • committed by GitHub
commit c443e7a4ae
124 changed files with 663 additions and 653 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/T3D/decal/decalManager.cpp
View file

@ -1214,7 +1214,7 @@ void DecalManager::prepRenderImage( SceneRenderState* state )
// Make it the sort distance the max distance so that
// it renders after all the other opaque geometry in
// the prepass bin.
// the deferred bin.
baseRenderInst.sortDistSq = F32_MAX;
Vector<DecalBatch> batches;

2
Engine/source/T3D/fx/groundCover.cpp
View file

@ -47,7 +47,7 @@
#include "materials/sceneData.h"
#include "materials/materialFeatureTypes.h"
#include "materials/matInstance.h"
#include "renderInstance/renderPrePassMgr.h"
#include "renderInstance/renderDeferredMgr.h"
#include "console/engineAPI.h"
/// This is used for rendering ground cover billboards.

2
Engine/source/T3D/levelInfo.cpp
View file

@ -353,7 +353,7 @@ void LevelInfo::_onLMActivate(const char *lm, bool enable)
{
AssertFatal(dynamic_cast<AdvancedLightManager *>(LIGHTMGR), "Bad light manager type!");
AdvancedLightManager *lightMgr = static_cast<AdvancedLightManager *>(LIGHTMGR);
lightMgr->getLightBinManager()->MRTLightmapsDuringPrePass(mAdvancedLightmapSupport);
lightMgr->getLightBinManager()->MRTLightmapsDuringDeferred(mAdvancedLightmapSupport);
}
#endif
}