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

Replaced a ton of ConsoleMethods with the DefineConsoleMethod Macro.

Browse source
This commit is contained in:
Vincent Gee 2014-11-03 22:42:51 -05:00
parent 378a933894
commit acb192e2a5
133 changed files with 1716 additions and 2087 deletions
Download patch file Download diff file Expand all files Collapse all files

35
Engine/source/util/messaging/dispatcher.cpp
View file

@ -26,6 +26,7 @@
#include "platform/threads/mutex.h"
#include "core/tSimpleHashTable.h"
#include "core/util/safeDelete.h"
#include "console/engineAPI.h"
namespace Dispatcher
{
@ -330,67 +331,67 @@ extern void unlockDispatcherMutex()
using namespace Dispatcher;
ConsoleFunction(isQueueRegistered, bool, 2, 2, "(string queueName)"
DefineConsoleFunction( isQueueRegistered, bool, (const char * queueName), , "(string queueName)"
"@brief Determines if a dispatcher queue exists\n\n"
"@param queueName String containing the name of queue\n"
"@ingroup Messaging")
{
return isQueueRegistered(argv[1]);
return Dispatcher::isQueueRegistered(queueName);
}
ConsoleFunction(registerMessageQueue, void, 2, 2, "(string queueName)"
DefineConsoleFunction( registerMessageQueue, void, (const char *queueName), , "(string queueName)"
"@brief Registeres a dispatcher queue\n\n"
"@param queueName String containing the name of queue\n"
"@ingroup Messaging")
{
return registerMessageQueue(argv[1]);
return Dispatcher::registerMessageQueue(queueName);
}
ConsoleFunction(unregisterMessageQueue, void, 2, 2, "(string queueName)"
DefineConsoleFunction( unregisterMessageQueue, void, (const char *queueName), , "(string queueName)"
"@brief Unregisters a dispatcher queue\n\n"
"@param queueName String containing the name of queue\n"
"@ingroup Messaging")
{
return unregisterMessageQueue(argv[1]);
return Dispatcher::unregisterMessageQueue(queueName);
}
//-----------------------------------------------------------------------------
ConsoleFunction(registerMessageListener, bool, 3, 3, "(string queueName, string listener)"
DefineConsoleFunction( registerMessageListener, bool, (const char *queueName, const char *listenerName), , "(string queueName, string listener)"
"@brief Registers an event message\n\n"
"@param queueName String containing the name of queue to attach listener to\n"
"@param listener Name of event messenger\n"
"@ingroup Messaging")
{
IMessageListener *listener = dynamic_cast<IMessageListener *>(Sim::findObject(argv[2]));
Dispatcher::IMessageListener *listener = dynamic_cast<Dispatcher::IMessageListener *>(Sim::findObject(listenerName));
if(listener == NULL)
{
Con::errorf("registerMessageListener - Unable to find listener object, not an IMessageListener ?!");
return false;
}
return registerMessageListener(argv[1], listener);
return Dispatcher::registerMessageListener(queueName, listener);
}
ConsoleFunction(unregisterMessageListener, void, 3, 3, "(string queueName, string listener)"
DefineConsoleFunction( unregisterMessageListener, void, (const char *queueName, const char *listenerName), , "(string queueName, string listener)"
"@brief Unregisters an event message\n\n"
"@param queueName String containing the name of queue\n"
"@param listener Name of event messenger\n"
"@ingroup Messaging")
{
IMessageListener *listener = dynamic_cast<IMessageListener *>(Sim::findObject(argv[2]));
Dispatcher::IMessageListener *listener = dynamic_cast<Dispatcher::IMessageListener *>(Sim::findObject(listenerName));
if(listener == NULL)
{
Con::errorf("unregisterMessageListener - Unable to find listener object, not an IMessageListener ?!");
return;
}
unregisterMessageListener(argv[1], listener);
Dispatcher::unregisterMessageListener(queueName, listener);
}
//-----------------------------------------------------------------------------
ConsoleFunction(dispatchMessage, bool, 3, 4, "(string queueName, string message, string data)"
DefineConsoleFunction( dispatchMessage, bool, (const char *queueName, const char *message, const char *data), (""), "(string queueName, string message, string data)"
"@brief Dispatch a message to a queue\n\n"
"@param queueName Queue to dispatch the message to\n"
"@param message Message to dispatch\n"
@ -399,10 +400,10 @@ ConsoleFunction(dispatchMessage, bool, 3, 4, "(string queueName, string message,
"@see dispatchMessageObject\n"
"@ingroup Messaging")
{
return dispatchMessage(argv[1], argv[2], argc > 3 ? argv[3] : "" );
return Dispatcher::dispatchMessage(queueName, message, data);
}
ConsoleFunction(dispatchMessageObject, bool, 3, 3, "(string queueName, string message)"
DefineConsoleFunction( dispatchMessageObject, bool, (const char *queueName, const char *message), ("", ""), "(string queueName, string message)"
"@brief Dispatch a message object to a queue\n\n"
"@param queueName Queue to dispatch the message to\n"
"@param message Message to dispatch\n"
@ -410,12 +411,12 @@ ConsoleFunction(dispatchMessageObject, bool, 3, 3, "(string queueName, string me
"@see dispatchMessage\n"
"@ingroup Messaging")
{
Message *msg = dynamic_cast<Message *>(Sim::findObject(argv[2]));
Message *msg = dynamic_cast<Message *>(Sim::findObject(message));
if(msg == NULL)
{
Con::errorf("dispatchMessageObject - Unable to find message object");
return false;
}
return dispatchMessageObject(argv[1], msg);
return Dispatcher::dispatchMessageObject(queueName, msg);
}

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

@ -23,6 +23,7 @@
#include "platform/platform.h"
#include "util/messaging/eventManager.h"
#include "console/engineAPI.h"
#include "console/consoleTypes.h"
#include "console/consoleInternal.h"
@ -418,30 +419,30 @@ void EventManager::dumpSubscribers()
//-----------------------------------------------------------------------------
// Console Methods
//-----------------------------------------------------------------------------
ConsoleMethod( EventManager, registerEvent, bool, 3, 3, "( String event )\n"
DefineConsoleMethod( 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." )
{
return object->registerEvent( argv[2] );
return object->registerEvent( evt );
}
ConsoleMethod( EventManager, unregisterEvent, void, 3, 3, "( String event )\n"
DefineConsoleMethod( 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( argv[2] );
object->unregisterEvent( evt );
}
ConsoleMethod( EventManager, isRegisteredEvent, bool, 3, 3, "( String event )\n"
DefineConsoleMethod( 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." )
{
return object->isRegisteredEvent( argv[2] );
return object->isRegisteredEvent( evt );
}
ConsoleMethod( EventManager, postEvent, bool, 3, 4, "( String event, String data )\n"
DefineConsoleMethod( 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"
@ -453,10 +454,10 @@ ConsoleMethod( EventManager, postEvent, bool, 3, 4, "( String event, String data
return false;
}
return object->postEvent( argv[2], argc > 3 ? argv[3] : "" );
return object->postEvent( evt, data );
}
ConsoleMethod( EventManager, subscribe, bool, 4, 5, "( SimObject listener, String event, String callback )\n\n"
DefineConsoleMethod( 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"
@ -464,49 +465,50 @@ ConsoleMethod( EventManager, subscribe, bool, 4, 5, "( SimObject listener, Strin
"@return Whether or not the subscription was successful." )
{
// Find the listener object.
SimObject *cbObj = dynamic_cast<SimObject *>(Sim::findObject(argv[2]));
SimObject *cbObj = dynamic_cast<SimObject *>(Sim::findObject(listenerName));
if( cbObj == NULL )
{
Con::warnf( "EventManager::subscribe - Invalid listener." );
return false;
}
return object->subscribe( cbObj, argv[3], argc > 4 ? (const char*)argv[4] : NULL );
return object->subscribe( cbObj, evt, callback );
}
ConsoleMethod( EventManager, remove, void, 4, 4, "( SimObject listener, String event )\n\n"
DefineConsoleMethod( 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")
{
// Find the listener object.
SimObject * listener = dynamic_cast< SimObject * >( Sim::findObject( argv[2] ) );
SimObject * listener = dynamic_cast< SimObject * >( Sim::findObject( listenerName ) );
if( listener )
object->remove( listener, argv[3] );
object->remove( listener, evt );
}
ConsoleMethod( EventManager, removeAll, void, 3, 3, "( SimObject listener )\n\n"
DefineConsoleMethod( EventManager, removeAll, void, ( const char * listenerName ), , "( SimObject listener )\n\n"
"Remove a listener from all events.\n"
"@param listener The listener to remove.\n")
{
// Find the listener object.
SimObject * listener = dynamic_cast< SimObject * >( Sim::findObject( argv[2] ) );
SimObject * listener = dynamic_cast< SimObject * >( Sim::findObject( listenerName ) );
if( listener )
object->removeAll( listener );
}
ConsoleMethod( EventManager, dumpEvents, void, 2, 2, "()\n\n"
DefineConsoleMethod( EventManager, dumpEvents, void, (), , "()\n\n"
"Print all registered events to the console." )
{
object->dumpEvents();
}
ConsoleMethod( EventManager, dumpSubscribers, void, 2, 3, "( String event )\n\n"
DefineConsoleMethod( 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." )
{
if( argc > 2 )
object->dumpSubscribers( argv[2] );
if( listenerName != "" )
object->dumpSubscribers( listenerName );
else
object->dumpSubscribers();
}

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

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