History

Merge remote-tracking branch 'highfidelity/master' into zip_project

elisa-lj11 committed 10 years ago

Commit cdc5dde2 parents 137f795 21bc06f22 files · +1078 −329Browse files

Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 22 files). Show all

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+15−15
@@ -727,9 +727,9 @@ void ScriptEngine::addEventHandler(const EntityItemID& entityID, const QString& · 726 unmodified lines
727 };727 };
728 };728 };
729 729
730 using MouseHandler = std::function<void(const EntityItemID&, const MouseEvent&)>;730 using PointerHandler = std::function<void(const EntityItemID&, const PointerEvent&)>;
731 auto makeMouseHandler = [this](QString eventName) -> MouseHandler {731 auto makePointerHandler = [this](QString eventName) -> PointerHandler {
732 return [this, eventName](const EntityItemID& entityItemID, const MouseEvent& event) {732 return [this, eventName](const EntityItemID& entityItemID, const PointerEvent& event) {
733 forwardHandlerCall(entityItemID, eventName, { entityItemID.toScriptValue(this), event.toScriptValue(this) });733 forwardHandlerCall(entityItemID, eventName, { entityItemID.toScriptValue(this), event.toScriptValue(this) });
734 };734 };
735 };735 };
@@ -745,17 +745,17 @@ void ScriptEngine::addEventHandler(const EntityItemID& entityID, const QString& · 9 unmodified lines
745 connect(entities.data(), &EntityScriptingInterface::enterEntity, this, makeSingleEntityHandler("enterEntity"));745 connect(entities.data(), &EntityScriptingInterface::enterEntity, this, makeSingleEntityHandler("enterEntity"));
746 connect(entities.data(), &EntityScriptingInterface::leaveEntity, this, makeSingleEntityHandler("leaveEntity"));746 connect(entities.data(), &EntityScriptingInterface::leaveEntity, this, makeSingleEntityHandler("leaveEntity"));
747 747
748 connect(entities.data(), &EntityScriptingInterface::mousePressOnEntity, this, makeMouseHandler("mousePressOnEntity"));748 connect(entities.data(), &EntityScriptingInterface::mousePressOnEntity, this, makePointerHandler("mousePressOnEntity"));
749 connect(entities.data(), &EntityScriptingInterface::mouseMoveOnEntity, this, makeMouseHandler("mouseMoveOnEntity"));749 connect(entities.data(), &EntityScriptingInterface::mouseMoveOnEntity, this, makePointerHandler("mouseMoveOnEntity"));
750 connect(entities.data(), &EntityScriptingInterface::mouseReleaseOnEntity, this, makeMouseHandler("mouseReleaseOnEntity"));750 connect(entities.data(), &EntityScriptingInterface::mouseReleaseOnEntity, this, makePointerHandler("mouseReleaseOnEntity"));
751 751
752 connect(entities.data(), &EntityScriptingInterface::clickDownOnEntity, this, makeMouseHandler("clickDownOnEntity"));752 connect(entities.data(), &EntityScriptingInterface::clickDownOnEntity, this, makePointerHandler("clickDownOnEntity"));
753 connect(entities.data(), &EntityScriptingInterface::holdingClickOnEntity, this, makeMouseHandler("holdingClickOnEntity"));753 connect(entities.data(), &EntityScriptingInterface::holdingClickOnEntity, this, makePointerHandler("holdingClickOnEntity"));
754 connect(entities.data(), &EntityScriptingInterface::clickReleaseOnEntity, this, makeMouseHandler("clickReleaseOnEntity"));754 connect(entities.data(), &EntityScriptingInterface::clickReleaseOnEntity, this, makePointerHandler("clickReleaseOnEntity"));
755 755
756 connect(entities.data(), &EntityScriptingInterface::hoverEnterEntity, this, makeMouseHandler("hoverEnterEntity"));756 connect(entities.data(), &EntityScriptingInterface::hoverEnterEntity, this, makePointerHandler("hoverEnterEntity"));
757 connect(entities.data(), &EntityScriptingInterface::hoverOverEntity, this, makeMouseHandler("hoverOverEntity"));757 connect(entities.data(), &EntityScriptingInterface::hoverOverEntity, this, makePointerHandler("hoverOverEntity"));
758 connect(entities.data(), &EntityScriptingInterface::hoverLeaveEntity, this, makeMouseHandler("hoverLeaveEntity"));758 connect(entities.data(), &EntityScriptingInterface::hoverLeaveEntity, this, makePointerHandler("hoverLeaveEntity"));
759 759
760 connect(entities.data(), &EntityScriptingInterface::collisionWithEntity, this, makeCollisionHandler("collisionWithEntity"));760 connect(entities.data(), &EntityScriptingInterface::collisionWithEntity, this, makeCollisionHandler("collisionWithEntity"));
761 }761 }
@@ -1550,7 +1550,7 @@ void ScriptEngine::callEntityScriptMethod(const EntityItemID& entityID, const QS · 788 unmodified lines
1550 }1550 }
1551}1551}
1552 1552
1553void ScriptEngine::callEntityScriptMethod(const EntityItemID& entityID, const QString& methodName, const MouseEvent& event) {1553void ScriptEngine::callEntityScriptMethod(const EntityItemID& entityID, const QString& methodName, const PointerEvent& event) {
1554 if (QThread::currentThread() != thread()) {1554 if (QThread::currentThread() != thread()) {
1555#ifdef THREAD_DEBUGGING1555#ifdef THREAD_DEBUGGING
1556 qDebug() << "*** WARNING *** ScriptEngine::callEntityScriptMethod() called on wrong thread [" << QThread::currentThread() << "], invoking on correct thread [" << thread() << "] "1556 qDebug() << "*** WARNING *** ScriptEngine::callEntityScriptMethod() called on wrong thread [" << QThread::currentThread() << "], invoking on correct thread [" << thread() << "] "
@@ -1560,12 +1560,12 @@ void ScriptEngine::callEntityScriptMethod(const EntityItemID& entityID, const QS · 3 unmodified lines
1560 QMetaObject::invokeMethod(this, "callEntityScriptMethod",1560 QMetaObject::invokeMethod(this, "callEntityScriptMethod",
1561 Q_ARG(const EntityItemID&, entityID),1561 Q_ARG(const EntityItemID&, entityID),
1562 Q_ARG(const QString&, methodName),1562 Q_ARG(const QString&, methodName),
1563 Q_ARG(const MouseEvent&, event));1563 Q_ARG(const PointerEvent&, event));
1564 return;1564 return;
1565 }1565 }
1566#ifdef THREAD_DEBUGGING1566#ifdef THREAD_DEBUGGING
1567 qDebug() << "ScriptEngine::callEntityScriptMethod() called on correct thread [" << thread() << "] "1567 qDebug() << "ScriptEngine::callEntityScriptMethod() called on correct thread [" << thread() << "] "
1568 "entityID:" << entityID << "methodName:" << methodName << "event: mouseEvent";1568 "entityID:" << entityID << "methodName:" << methodName << "event: pointerEvent";
1569#endif1569#endif
1570 1570
1571 refreshFileScript(entityID);1571 refreshFileScript(entityID);