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

more cleanups

Browse source 
cleanup the type removing the refactor tag
materialManager restored to its original state
This commit is contained in:
marauder2k7 2025-03-27 08:59:50 +00:00
parent a8d7664fc2
commit c025ea86b4
9 changed files with 20 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/materials/materialManager.cpp
View file

@ -358,7 +358,7 @@ void MaterialManager::flushAndReInitInstances()
(*iter)->reInit();
}
void MaterialManager::_flushInstance( BaseMaterialDefinition *target )
void MaterialManager::flushInstance( BaseMaterialDefinition *target )
{
Vector<BaseMatInstance*>::iterator iter = mMatInstanceList.begin();
while ( iter != mMatInstanceList.end() )
@ -372,7 +372,7 @@ void MaterialManager::_flushInstance( BaseMaterialDefinition *target )
}
}
void MaterialManager::_reInitInstance( BaseMaterialDefinition *target )
void MaterialManager::reInitInstance( BaseMaterialDefinition *target )
{
Vector<BaseMatInstance*>::iterator iter = mMatInstanceList.begin();
for ( ; iter != mMatInstanceList.end(); iter++ )

13
Engine/source/materials/materialManager.h
View file

@ -117,20 +117,19 @@ public:
/// the active materials instances immediately.
void flushAndReInitInstances();
// Flush the instance
void flushInstance(BaseMaterialDefinition* target);
/// Re-initializes the material instances for a specific target material.
void reInitInstance(BaseMaterialDefinition* target);
protected:
// MatInstance tracks it's instances here
friend class MatInstance;
void _track(MatInstance*);
void _untrack(MatInstance*);
/// Flushes all the procedural shaders and re-initializes all
/// the active materials instances immediately.
void _flushAndReInitInstances();
// Flush the instance
void _flushInstance(BaseMaterialDefinition* target);
/// Re-initializes the material instances for a specific target material.
void _reInitInstance(BaseMaterialDefinition* target);
/// @see LightManager::smActivateSignal
void _onLMActivate( const char *lm, bool activate );