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

Merge branch 'alpha40MakeMats' of https://github.com/Azaezel/Torque3D into Preview4_0

Browse source
This commit is contained in:
Areloch 2020-03-03 10:48:07 -06:00
commit 2d015bc426
2 changed files with 15 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Engine/source/lighting/advanced/advancedLightManager.h
View file

@ -71,6 +71,7 @@ public:
/// Return the lightBinManager for this light manager. /// Return the lightBinManager for this light manager.
AdvancedLightBinManager* getLightBinManager() { return mLightBinManager; } AdvancedLightBinManager* getLightBinManager() { return mLightBinManager; }
RenderDeferredMgr* getDeferredRenderBin() { return mDeferredRenderBin; }
// LightManager // LightManager
virtual bool isCompatible() const; virtual bool isCompatible() const;

14
Engine/source/materials/materialList.cpp
View file

@ -35,6 +35,11 @@
#include "core/volume.h" #include "core/volume.h"
#include "console/simSet.h" #include "console/simSet.h"
#include "scene/reflectionManager.h"
#include "renderInstance/renderDeferredMgr.h"
#include "lighting/advanced/advancedLightManager.h"
#include "lighting/advanced/advancedLightBinManager.h"
MaterialList::MaterialList() MaterialList::MaterialList()
{ {
@ -412,6 +417,15 @@ void MaterialList::initMatInstances( const FeatureSet &features,
matInst->init( MATMGR->getDefaultFeatures(), vertexFormat ); matInst->init( MATMGR->getDefaultFeatures(), vertexFormat );
mMatInstList[ i ] = matInst; mMatInstList[ i ] = matInst;
} }
else
{
REFLECTMGR->getReflectionMaterial(matInst);
// Hunt for the pre-pass manager/target
AdvancedLightManager* lightMgr = static_cast<AdvancedLightManager*>(LIGHTMGR);
lightMgr->getDeferredRenderBin()->getDeferredMaterial(matInst);
}
} }
} }