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

Eliminate DefineConsoleMethod

Browse source
This commit is contained in:
Lukas Joergensen 2018-04-17 21:01:50 +02:00
parent 5bde18143f
commit 3c99ef73a9
77 changed files with 483 additions and 483 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Engine/source/util/messaging/eventManager.cpp
View file

@ -420,7 +420,7 @@ void EventManager::dumpSubscribers()
//-----------------------------------------------------------------------------
// Console Methods
//-----------------------------------------------------------------------------
DefineConsoleMethod( EventManager, registerEvent, bool, ( const char * evt ), , "( String event )\n"
DefineEngineMethod( EventManager, registerEvent, bool, ( const char * evt ), , "( String event )\n"
"Register an event with the event manager.\n"
"@param event The event to register.\n"
"@return Whether or not the event was registered successfully." )
@ -428,14 +428,14 @@ DefineConsoleMethod( EventManager, registerEvent, bool, ( const char * evt ), ,
return object->registerEvent( evt );
}
DefineConsoleMethod( EventManager, unregisterEvent, void, ( const char * evt ), , "( String event )\n"
DefineEngineMethod( EventManager, unregisterEvent, void, ( const char * evt ), , "( String event )\n"
"Remove an event from the EventManager.\n"
"@param event The event to remove.\n" )
{
object->unregisterEvent( evt );
}
DefineConsoleMethod( EventManager, isRegisteredEvent, bool, ( const char * evt ), , "( String event )\n"
DefineEngineMethod( EventManager, isRegisteredEvent, bool, ( const char * evt ), , "( String event )\n"
"Check if an event is registered or not.\n"
"@param event The event to check.\n"
"@return Whether or not the event exists." )
@ -443,7 +443,7 @@ DefineConsoleMethod( EventManager, isRegisteredEvent, bool, ( const char * evt )
return object->isRegisteredEvent( evt );
}
DefineConsoleMethod( EventManager, postEvent, bool, ( const char * evt, const char * data ), (""), "( String event, String data )\n"
DefineEngineMethod( EventManager, postEvent, bool, ( const char * evt, const char * data ), (""), "( String event, String data )\n"
"~Trigger an event.\n"
"@param event The event to trigger.\n"
"@param data The data associated with the event.\n"
@ -458,7 +458,7 @@ DefineConsoleMethod( EventManager, postEvent, bool, ( const char * evt, const ch
return object->postEvent( evt, data );
}
DefineConsoleMethod( EventManager, subscribe, bool, ( const char * listenerName, const char * evt, const char * callback ), (""), "( SimObject listener, String event, String callback )\n\n"
DefineEngineMethod( EventManager, subscribe, bool, ( const char * listenerName, const char * evt, const char * callback ), (""), "( SimObject listener, String event, String callback )\n\n"
"Subscribe a listener to an event.\n"
"@param listener The listener to subscribe.\n"
"@param event The event to subscribe to.\n"
@ -476,7 +476,7 @@ DefineConsoleMethod( EventManager, subscribe, bool, ( const char * listenerName,
return object->subscribe( cbObj, evt, callback );
}
DefineConsoleMethod( EventManager, remove, void, ( const char * listenerName, const char * evt), , "( SimObject listener, String event )\n\n"
DefineEngineMethod( EventManager, remove, void, ( const char * listenerName, const char * evt), , "( SimObject listener, String event )\n\n"
"Remove a listener from an event.\n"
"@param listener The listener to remove.\n"
"@param event The event to be removed from.\n")
@ -487,7 +487,7 @@ DefineConsoleMethod( EventManager, remove, void, ( const char * listenerName, co
object->remove( listener, evt );
}
DefineConsoleMethod( EventManager, removeAll, void, ( const char * listenerName ), , "( SimObject listener )\n\n"
DefineEngineMethod( EventManager, removeAll, void, ( const char * listenerName ), , "( SimObject listener )\n\n"
"Remove a listener from all events.\n"
"@param listener The listener to remove.\n")
{
@ -498,13 +498,13 @@ DefineConsoleMethod( EventManager, removeAll, void, ( const char * listenerName
object->removeAll( listener );
}
DefineConsoleMethod( EventManager, dumpEvents, void, (), , "()\n\n"
DefineEngineMethod( EventManager, dumpEvents, void, (), , "()\n\n"
"Print all registered events to the console." )
{
object->dumpEvents();
}
DefineConsoleMethod( EventManager, dumpSubscribers, void, ( const char * listenerName ), (""), "( String event )\n\n"
DefineEngineMethod( EventManager, dumpSubscribers, void, ( const char * listenerName ), (""), "( String event )\n\n"
"Print all subscribers to an event to the console.\n"
"@param event The event whose subscribers are to be printed. If this parameter isn't specified, all events will be dumped." )
{

6
Engine/source/util/messaging/message.cpp
View file

@ -155,19 +155,19 @@ const char *Message::getType()
// Console Methods
//-----------------------------------------------------------------------------
DefineConsoleMethod(Message, getType, const char *, (), , "() Get message type (script class name or C++ class name if no script defined class)")
DefineEngineMethod(Message, getType, const char *, (), , "() Get message type (script class name or C++ class name if no script defined class)")
{
return object->getType();
}
//-----------------------------------------------------------------------------
DefineConsoleMethod(Message, addReference, void, (), , "() Increment the reference count for this message")
DefineEngineMethod(Message, addReference, void, (), , "() Increment the reference count for this message")
{
object->addReference();
}
DefineConsoleMethod(Message, freeReference, void, (), , "() Decrement the reference count for this message")
DefineEngineMethod(Message, freeReference, void, (), , "() Decrement the reference count for this message")
{
object->freeReference();
}

22
Engine/source/util/settings.cpp
View file

@ -482,12 +482,12 @@ const char* Settings::findNextValue()
}
// make sure to replace the strings
DefineConsoleMethod(Settings, findFirstValue, const char*, ( const char* pattern, bool deepSearch, bool includeDefaults ), ("", false, false), "settingObj.findFirstValue();")
DefineEngineMethod(Settings, findFirstValue, const char*, ( const char* pattern, bool deepSearch, bool includeDefaults ), ("", false, false), "settingObj.findFirstValue();")
{
return object->findFirstValue( pattern, deepSearch, includeDefaults );
}
DefineConsoleMethod(Settings, findNextValue, const char*, (), , "settingObj.findNextValue();")
DefineEngineMethod(Settings, findNextValue, const char*, (), , "settingObj.findNextValue();")
{
return object->findNextValue();
}
@ -644,7 +644,7 @@ void SettingSaveNode::buildDocument(SimXMLDocument *document, bool skipWrite)
document->popElement();
}
DefineConsoleMethod(Settings, setValue, void, (const char * settingName, const char * value), (""), "settingObj.setValue(settingName, value);")
DefineEngineMethod(Settings, setValue, void, (const char * settingName, const char * value), (""), "settingObj.setValue(settingName, value);")
{
StringTableEntry fieldName = StringTable->insert( settingName );
@ -654,13 +654,13 @@ DefineConsoleMethod(Settings, setValue, void, (const char * settingName, const c
object->setValue( fieldName );
}
DefineConsoleMethod(Settings, setDefaultValue, void, (const char * settingName, const char * value), , "settingObj.setDefaultValue(settingName, value);")
DefineEngineMethod(Settings, setDefaultValue, void, (const char * settingName, const char * value), , "settingObj.setDefaultValue(settingName, value);")
{
StringTableEntry fieldName = StringTable->insert( settingName );
object->setDefaultValue( fieldName, value );
}
DefineConsoleMethod(Settings, value, const char*, (const char * settingName, const char * defaultValue), (""), "settingObj.value(settingName, defaultValue);")
DefineEngineMethod(Settings, value, const char*, (const char * settingName, const char * defaultValue), (""), "settingObj.value(settingName, defaultValue);")
{
StringTableEntry fieldName = StringTable->insert( settingName );
@ -672,7 +672,7 @@ DefineConsoleMethod(Settings, value, const char*, (const char * settingName, con
return "";
}
DefineConsoleMethod(Settings, remove, void, (const char * settingName, bool includeDefaults), (false), "settingObj.remove(settingName, includeDefaults = false);")
DefineEngineMethod(Settings, remove, void, (const char * settingName, bool includeDefaults), (false), "settingObj.remove(settingName, includeDefaults = false);")
{
// there's a problem with some fields not being removed properly, but works if you run it twice,
// a temporary solution for now is simply to call the remove twice
@ -687,27 +687,27 @@ ConsoleMethod(Settings, write, bool, 2, 2, "%success = settingObj.write();")
return object->write();
}
DefineConsoleMethod(Settings, read, bool, (), , "%success = settingObj.read();")
DefineEngineMethod(Settings, read, bool, (), , "%success = settingObj.read();")
{
return object->read();
}
DefineConsoleMethod(Settings, beginGroup, void, (const char * groupName, bool includeDefaults), (false), "settingObj.beginGroup(groupName, fromStart = false);")
DefineEngineMethod(Settings, beginGroup, void, (const char * groupName, bool includeDefaults), (false), "settingObj.beginGroup(groupName, fromStart = false);")
{
object->beginGroup( groupName, includeDefaults );
}
DefineConsoleMethod(Settings, endGroup, void, (), , "settingObj.endGroup();")
DefineEngineMethod(Settings, endGroup, void, (), , "settingObj.endGroup();")
{
object->endGroup();
}
DefineConsoleMethod(Settings, clearGroups, void, (), , "settingObj.clearGroups();")
DefineEngineMethod(Settings, clearGroups, void, (), , "settingObj.clearGroups();")
{
object->clearGroups();
}
DefineConsoleMethod(Settings, getCurrentGroups, const char*, (), , "settingObj.getCurrentGroups();")
DefineEngineMethod(Settings, getCurrentGroups, const char*, (), , "settingObj.getCurrentGroups();")
{
return object->getCurrentGroups();
}

34
Engine/source/util/undo.cpp
View file

@ -145,7 +145,7 @@ void CompoundUndoAction::onDeleteNotify( SimObject* object )
Parent::onDeleteNotify( object );
}
DefineConsoleMethod( CompoundUndoAction, addAction, void, (const char * objName), , "addAction( UndoAction )" )
DefineEngineMethod( CompoundUndoAction, addAction, void, (const char * objName), , "addAction( UndoAction )" )
{
UndoAction *action;
if ( Sim::findObject( objName, action ) )
@ -206,7 +206,7 @@ UndoManager& UndoManager::getDefaultManager()
return *defaultMan;
}
DefineConsoleMethod(UndoManager, clearAll, void, (),, "Clears the undo manager.")
DefineEngineMethod(UndoManager, clearAll, void, (),, "Clears the undo manager.")
{
object->clearAll();
}
@ -344,7 +344,7 @@ void UndoManager::redo()
(*react).redo();
}
DefineConsoleMethod(UndoManager, getUndoCount, S32, (),, "")
DefineEngineMethod(UndoManager, getUndoCount, S32, (),, "")
{
return object->getUndoCount();
}
@ -354,7 +354,7 @@ S32 UndoManager::getUndoCount()
return mUndoStack.size();
}
DefineConsoleMethod(UndoManager, getUndoName, const char*, (S32 index), , "(index)")
DefineEngineMethod(UndoManager, getUndoName, const char*, (S32 index), , "(index)")
{
return object->getUndoName(index);
}
@ -367,7 +367,7 @@ const char* UndoManager::getUndoName(S32 index)
return NULL;
}
DefineConsoleMethod(UndoManager, getUndoAction, S32, (S32 index), , "(index)")
DefineEngineMethod(UndoManager, getUndoAction, S32, (S32 index), , "(index)")
{
UndoAction * action = object->getUndoAction(index);
if ( !action )
@ -386,7 +386,7 @@ UndoAction* UndoManager::getUndoAction(S32 index)
return NULL;
}
DefineConsoleMethod(UndoManager, getRedoCount, S32, (),, "")
DefineEngineMethod(UndoManager, getRedoCount, S32, (),, "")
{
return object->getRedoCount();
}
@ -396,7 +396,7 @@ S32 UndoManager::getRedoCount()
return mRedoStack.size();
}
DefineConsoleMethod(UndoManager, getRedoName, const char*, (S32 index), , "(index)")
DefineEngineMethod(UndoManager, getRedoName, const char*, (S32 index), , "(index)")
{
return object->getRedoName(index);
}
@ -409,7 +409,7 @@ const char* UndoManager::getRedoName(S32 index)
return NULL;
}
DefineConsoleMethod(UndoManager, getRedoAction, S32, (S32 index), , "(index)")
DefineEngineMethod(UndoManager, getRedoAction, S32, (S32 index), , "(index)")
{
UndoAction * action = object->getRedoAction(index);
@ -501,7 +501,7 @@ void UndoManager::popCompound( bool discard )
}
//-----------------------------------------------------------------------------
DefineConsoleMethod(UndoAction, addToManager, void, (const char * undoManager), (""), "action.addToManager([undoManager])")
DefineEngineMethod(UndoAction, addToManager, void, (const char * undoManager), (""), "action.addToManager([undoManager])")
{
UndoManager *theMan = NULL;
if (!String::isEmpty(undoManager))
@ -515,32 +515,32 @@ DefineConsoleMethod(UndoAction, addToManager, void, (const char * undoManager),
//-----------------------------------------------------------------------------
DefineConsoleMethod( UndoAction, undo, void, (),, "() - Undo action contained in undo." )
DefineEngineMethod( UndoAction, undo, void, (),, "() - Undo action contained in undo." )
{
object->undo();
}
//-----------------------------------------------------------------------------
DefineConsoleMethod( UndoAction, redo, void, (),, "() - Reo action contained in undo." )
DefineEngineMethod( UndoAction, redo, void, (),, "() - Reo action contained in undo." )
{
object->redo();
}
//-----------------------------------------------------------------------------
DefineConsoleMethod(UndoManager, undo, void, (),, "UndoManager.undo();")
DefineEngineMethod(UndoManager, undo, void, (),, "UndoManager.undo();")
{
object->undo();
}
//-----------------------------------------------------------------------------
DefineConsoleMethod(UndoManager, redo, void, (),, "UndoManager.redo();")
DefineEngineMethod(UndoManager, redo, void, (),, "UndoManager.redo();")
{
object->redo();
}
//-----------------------------------------------------------------------------
DefineConsoleMethod(UndoManager, getNextUndoName, const char *, (),, "UndoManager.getNextUndoName();")
DefineEngineMethod(UndoManager, getNextUndoName, const char *, (),, "UndoManager.getNextUndoName();")
{
const char *name = object->getNextUndoName();
if(!name)
@ -552,7 +552,7 @@ DefineConsoleMethod(UndoManager, getNextUndoName, const char *, (),, "UndoManage
}
//-----------------------------------------------------------------------------
DefineConsoleMethod(UndoManager, getNextRedoName, const char *, (),, "UndoManager.getNextRedoName();")
DefineEngineMethod(UndoManager, getNextRedoName, const char *, (),, "UndoManager.getNextRedoName();")
{
const char *name = object->getNextRedoName();
if(!name)
@ -565,7 +565,7 @@ DefineConsoleMethod(UndoManager, getNextRedoName, const char *, (),, "UndoManage
//-----------------------------------------------------------------------------
DefineConsoleMethod( UndoManager, pushCompound, const char*, ( String name ), ("\"\""), "( string name=\"\" ) - Push a CompoundUndoAction onto the compound stack for assembly." )
DefineEngineMethod( UndoManager, pushCompound, const char*, ( String name ), ("\"\""), "( string name=\"\" ) - Push a CompoundUndoAction onto the compound stack for assembly." )
{
CompoundUndoAction* action = object->pushCompound( name );
@ -580,7 +580,7 @@ DefineConsoleMethod( UndoManager, pushCompound, const char*, ( String name ), ("
//-----------------------------------------------------------------------------
DefineConsoleMethod( UndoManager, popCompound, void, ( bool discard ), (false), "( bool discard=false ) - Pop the current CompoundUndoAction off the stack." )
DefineEngineMethod( UndoManager, popCompound, void, ( bool discard ), (false), "( bool discard=false ) - Pop the current CompoundUndoAction off the stack." )
{
if( !object->getCompoundStackDepth() )
{