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

Merge pull request #621 from BeamNG/glsl_shadergen

Browse source 
Update GLSL Shadergen.
This commit is contained in:
Thomas Fischer 2014-05-23 07:52:35 +02:00
commit c850d60a4f
22 changed files with 1946 additions and 1127 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Engine/source/materials/processedMaterial.cpp
View file

@ -41,7 +41,10 @@ RenderPassData::RenderPassData()
void RenderPassData::reset()
{
for( U32 i = 0; i < Material::MAX_TEX_PER_PASS; ++ i )
{
destructInPlace( &mTexSlot[ i ] );
mSamplerNames[ i ].clear();
}
dMemset( &mTexSlot, 0, sizeof(mTexSlot) );
dMemset( &mTexType, 0, sizeof(mTexType) );

1
Engine/source/materials/processedMaterial.h
View file

@ -68,6 +68,7 @@ public:
} mTexSlot[Material::MAX_TEX_PER_PASS];
U32 mTexType[Material::MAX_TEX_PER_PASS];
String mSamplerNames[Material::MAX_TEX_PER_PASS];
/// The cubemap to use when the texture type is
/// set to Material::Cube.