Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 11:42:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Mulitple independent handlers for same entity/event.

Browse source
This commit is contained in:
Howard Stearns 2015-05-24 11:48:11 -07:00
parent b884d3cf90
commit a0d09c0a6d
2 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
libraries/script-engine/src/ScriptEngine.cpp
View file

@ -395,20 +395,27 @@ void ScriptEngine::generalHandler(const EntityItemID& entityID, const QString& e
const RegisteredEventHandlers& handlersOnEntity = _registeredHandlers[entityID]; const RegisteredEventHandlers& handlersOnEntity = _registeredHandlers[entityID];
if (!handlersOnEntity.contains(eventName)) return; if (!handlersOnEntity.contains(eventName)) return;
// FIXME: Need one more level of indirection. We need to allow multiple handlers per event, registered by different scripts. // FIXME: Need one more level of indirection. We need to allow multiple handlers per event, registered by different scripts.
QScriptValue handlerForEvent = handlersOnEntity[eventName]; QScriptValueList handlersForEvent = handlersOnEntity[eventName];
if (handlerForEvent.isValid()) { if (!handlersForEvent.isEmpty()) {
QScriptValueList args = argGenerator(); QScriptValueList args = argGenerator();
handlerForEvent.call(QScriptValue(), args); for (int i = 0; i < handlersForEvent.count(); ++i) {
handlersForEvent[i].call(QScriptValue(), args);
}
} }
} }
// Unregister the handler for this eventName and entityID. // Unregister the handlers for this eventName and entityID.
void ScriptEngine::removeEntityEventHandler(const EntityItemID& entityID, const QString& eventName, QScriptValue handler) { void ScriptEngine::removeEntityEventHandler(const EntityItemID& entityID, const QString& eventName, QScriptValue handler) {
if (!_registeredHandlers.contains(entityID)) return; if (!_registeredHandlers.contains(entityID)) return;
RegisteredEventHandlers& handlersOnEntity = _registeredHandlers[entityID]; RegisteredEventHandlers& handlersOnEntity = _registeredHandlers[entityID];
if (!handlersOnEntity.contains(eventName)) return; QScriptValueList& handlersForEvent = handlersOnEntity[eventName];
handlersOnEntity.remove(eventName); // QScriptValue does not have operator==(), so we can't use QList::removeOne and friends. So iterate.
for (int i = 0; i < handlersForEvent.count(); ++i) {
if (handlersForEvent[i].equals(handler)) {
handlersForEvent.removeAt(i);
return; // Design choice: since comparison is relatively expensive, just remove the first matching handler.
}
}
} }
// FIXME: deletingEntity, changingEntityID
// Register the handler. // Register the handler.
void ScriptEngine::addEntityEventHandler(const EntityItemID& entityID, const QString& eventName, QScriptValue handler) { void ScriptEngine::addEntityEventHandler(const EntityItemID& entityID, const QString& eventName, QScriptValue handler) {
if (_registeredHandlers.count() == 0) { // First time any per-entity handler has been added in this script... if (_registeredHandlers.count() == 0) { // First time any per-entity handler has been added in this script...
@ -466,7 +473,8 @@ void ScriptEngine::addEntityEventHandler(const EntityItemID& entityID, const QSt
if (!_registeredHandlers.contains(entityID)) { if (!_registeredHandlers.contains(entityID)) {
_registeredHandlers[entityID] = RegisteredEventHandlers(); _registeredHandlers[entityID] = RegisteredEventHandlers();
} }
_registeredHandlers[entityID][eventName] = handler; QScriptValueList& handlersForEvent = _registeredHandlers[entityID][eventName];
handlersForEvent << handler; // Note that the same handler can be added many times. See removeEntityEventHandler().
} }

2
libraries/script-engine/src/ScriptEngine.h
View file

@ -37,7 +37,7 @@ const QString NO_SCRIPT("");
const unsigned int SCRIPT_DATA_CALLBACK_USECS = floor(((1.0 / 60.0f) * 1000 * 1000) + 0.5); const unsigned int SCRIPT_DATA_CALLBACK_USECS = floor(((1.0 / 60.0f) * 1000 * 1000) + 0.5);
typedef QHash<QString, QScriptValue> RegisteredEventHandlers; typedef QHash<QString, QScriptValueList> RegisteredEventHandlers;
class ScriptEngine : public QScriptEngine, public ScriptUser { class ScriptEngine : public QScriptEngine, public ScriptUser {
Q_OBJECT Q_OBJECT