TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-20 03:45:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'method_Unmangle' into PBR_PR

Browse source
This commit is contained in:
Azaezel 2018-12-12 14:54:22 -06:00
commit 1eed979a9c
632 changed files with 3935 additions and 3450 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -651,25 +651,25 @@ void Material::StageData::getFeatureSet( FeatureSet *outFeatures ) const
}
}
DefineConsoleMethod( Material, flush, void, (),,
DefineEngineMethod( Material, flush, void, (),,
"Flushes all material instances that use this material." )
{
object->flush();
}
DefineConsoleMethod( Material, reload, void, (),,
DefineEngineMethod( Material, reload, void, (),,
"Reloads all material instances that use this material." )
{
object->reload();
}
DefineConsoleMethod( Material, dumpInstances, void, (),,
DefineEngineMethod( Material, dumpInstances, void, (),,
"Dumps a formatted list of the currently allocated material instances for this material to the console." )
{
MATMGR->dumpMaterialInstances( object );
}
DefineConsoleMethod( Material, getAnimFlags, const char*, (U32 id), , "" )
DefineEngineMethod( Material, getAnimFlags, const char*, (U32 id), , "" )
{
char * animFlags = Con::getReturnBuffer(512);
@ -710,19 +710,19 @@ DefineConsoleMethod( Material, getAnimFlags, const char*, (U32 id), , "" )
return animFlags;
}
DefineConsoleMethod(Material, getFilename, const char*, (),, "Get filename of material")
DefineEngineMethod(Material, getFilename, const char*, (),, "Get filename of material")
{
SimObject *material = static_cast<SimObject *>(object);
return material->getFilename();
}
DefineConsoleMethod( Material, isAutoGenerated, bool, (),,
DefineEngineMethod( Material, isAutoGenerated, bool, (),,
"Returns true if this Material was automatically generated by MaterialList::mapMaterials()" )
{
return object->isAutoGenerated();
}
DefineConsoleMethod( Material, setAutoGenerated, void, (bool isAutoGenerated), ,
DefineEngineMethod( Material, setAutoGenerated, void, (bool isAutoGenerated), ,
"setAutoGenerated(bool isAutoGenerated): Set whether or not the Material is autogenerated." )
{
object->setAutoGenerated(isAutoGenerated);

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

@ -454,14 +454,14 @@ bool MaterialManager::_handleGFXEvent( GFXDevice::GFXDeviceEventType event_ )
return true;
}
DefineConsoleFunction( reInitMaterials, void, (),,
DefineEngineFunction( reInitMaterials, void, (),,
"@brief Flushes all procedural shaders and re-initializes all active material instances.\n\n"
"@ingroup Materials")
{
MATMGR->flushAndReInitInstances();
}
DefineConsoleFunction( addMaterialMapping, void, (const char * texName, const char * matName), , "(string texName, string matName)\n"
DefineEngineFunction( addMaterialMapping, void, (const char * texName, const char * matName), , "(string texName, string matName)\n"
"@brief Maps the given texture to the given material.\n\n"
"Generates a console warning before overwriting.\n\n"
"Material maps are used by terrain and interiors for triggering "
@ -472,7 +472,7 @@ DefineConsoleFunction( addMaterialMapping, void, (const char * texName, const ch
MATMGR->mapMaterial(texName, matName);
}
DefineConsoleFunction( getMaterialMapping, const char*, (const char * texName), , "(string texName)\n"
DefineEngineFunction( getMaterialMapping, const char*, (const char * texName), , "(string texName)\n"
"@brief Returns the name of the material mapped to this texture.\n\n"
"If no materials are found, an empty string is returned.\n\n"
"@param texName Name of the texture\n\n"
@ -481,14 +481,14 @@ DefineConsoleFunction( getMaterialMapping, const char*, (const char * texName),
return MATMGR->getMapEntry(texName).c_str();
}
DefineConsoleFunction( dumpMaterialInstances, void, (), ,
DefineEngineFunction( dumpMaterialInstances, void, (), ,
"@brief Dumps a formatted list of currently allocated material instances to the console.\n\n"
"@ingroup Materials")
{
MATMGR->dumpMaterialInstances();
}
DefineConsoleFunction( getMapEntry, const char*, (const char * texName), ,
DefineEngineFunction( getMapEntry, const char*, (const char * texName), ,
"@hide")
{
return MATMGR->getMapEntry( String(texName) );