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

added custom type support

Browse source
This commit is contained in:
Heather Anderson 2021-08-31 21:28:06 -07:00 committed by ksuprynowicz
parent 45ef458af4
commit 5f2b2c90a2
2 changed files with 64 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
libraries/script-engine/src/qtscript/ScriptEngineQtScript.cpp
View file

@ -1013,25 +1013,70 @@ bool ScriptEngineQtScript::raiseException(const ScriptValuePointer& exception) {
} }
ScriptValuePointer ScriptEngineQtScript::create(int type, const void* ptr) { ScriptValuePointer ScriptEngineQtScript::create(int type, const void* ptr) {
// first we'll try custom types registered with us
ScriptEngine::MarshalFunction marshalFunc = nullptr;
ScriptValuePointer prototype;
{
std::lock_guard<std::mutex> guard(_customTypeProtect);
TCustomTypeMap::const_iterator loc = _customTypes.find(type);
if (loc != _customTypes.end()) {
const CustomTypeInfo& typeInfo = loc->second;
marshalFunc = typeInfo.marshalFunc;
prototype = typeInfo.prototype;
}
}
if (marshalFunc) {
ScriptValuePointer result = marshalFunc(this, ptr);
if (result && prototype) {
result->setPrototype(prototype);
}
return result;
}
// falling back to having QtScript handle it
QScriptValue result = qScriptValueFromValue_helper(this, type, ptr); QScriptValue result = qScriptValueFromValue_helper(this, type, ptr);
return ScriptValuePointer(new ScriptValueQtWrapper(const_cast<ScriptEngineQtScript*>(this), std::move(result))); return ScriptValuePointer(new ScriptValueQtWrapper(const_cast<ScriptEngineQtScript*>(this), std::move(result)));
} }
bool ScriptEngineQtScript::convert(const ScriptValuePointer& value, int type, void* ptr) { bool ScriptEngineQtScript::convert(const ScriptValuePointer& value, int type, void* ptr) {
// first we'll try custom types registered with us
ScriptEngine::DemarshalFunction demarshalFunc = nullptr;
{
std::lock_guard<std::mutex> guard(_customTypeProtect);
TCustomTypeMap::const_iterator loc = _customTypes.find(type);
if (loc != _customTypes.end()) {
demarshalFunc = loc->second.demarshalFunc;
}
}
if (demarshalFunc) {
demarshalFunc(value, ptr);
return true;
}
// falling back to having QtScript handle it
ScriptValueQtWrapper* unwrapped = ScriptValueQtWrapper::unwrap(value); ScriptValueQtWrapper* unwrapped = ScriptValueQtWrapper::unwrap(value);
if (unwrapped == nullptr) { if (unwrapped == nullptr) {
return false; return false;
} }
return qscriptvalue_cast_helper(unwrapped->toQtValue(), type, ptr); return qscriptvalue_cast_helper(unwrapped->toQtValue(), type, ptr);
} }
/*
void ScriptEngineQtScript::registerCustomType(int type, void ScriptEngineQtScript::registerCustomType(int type,
ScriptEngine::MarshalFunction mf, ScriptEngine::MarshalFunction marshalFunc,
ScriptEngine::DemarshalFunction df, ScriptEngine::DemarshalFunction demarshalFunc,
const ScriptValuePointer& prototype) { const ScriptValuePointer& prototype)
{
ScriptValueQtWrapper* unwrapped = ScriptValueQtWrapper::unwrap(prototype); ScriptValueQtWrapper* unwrapped = ScriptValueQtWrapper::unwrap(prototype);
if (unwrapped != nullptr) { if (unwrapped == nullptr) {
qScriptRegisterMetaType_helper(this, type, mf, df, unwrapped->toQtValue()); return;
} }
std::lock_guard<std::mutex> guard(_customTypeProtect);
TCustomTypeMap::iterator loc = _customTypes.find(type);
if(loc == _customTypes.end()) {
_customTypes.insert(TCustomTypeMap::value_type(type, CustomTypeInfo())).first;
}
CustomTypeInfo& typeInfo = loc->second;
typeInfo.marshalFunc = marshalFunc;
typeInfo.demarshalFunc = demarshalFunc;
} }
*/

13
libraries/script-engine/src/qtscript/ScriptEngineQtScript.h
View file

@ -382,7 +382,8 @@ signals:
public: // not for public use, but I don't like how Qt strings this along with private friend functions public: // not for public use, but I don't like how Qt strings this along with private friend functions
virtual ScriptValuePointer create(int type, const void* ptr); virtual ScriptValuePointer create(int type, const void* ptr);
virtual bool convert(const ScriptValuePointer& value, int type, void* ptr); virtual bool convert(const ScriptValuePointer& value, int type, void* ptr);
virtual void registerCustomType(int type, ScriptEngine::MarshalFunction mf, ScriptEngine::DemarshalFunction df, const ScriptValuePointer& prototype); virtual void registerCustomType(int type, ScriptEngine::MarshalFunction marshalFunc,
ScriptEngine::DemarshalFunction demarshalFunc, const ScriptValuePointer& prototype);
protected: protected:
// like `newFunction`, but allows mapping inline C++ lambdas with captures as callable QScriptValues // like `newFunction`, but allows mapping inline C++ lambdas with captures as callable QScriptValues
@ -403,6 +404,16 @@ protected:
*/ */
Q_INVOKABLE void executeOnScriptThread(std::function<void()> function, const Qt::ConnectionType& type = Qt::QueuedConnection ); Q_INVOKABLE void executeOnScriptThread(std::function<void()> function, const Qt::ConnectionType& type = Qt::QueuedConnection );
// store for handling custom type marshaling/demarshaling
struct CustomTypeInfo {
ScriptEngine::MarshalFunction marshalFunc;
ScriptEngine::DemarshalFunction demarshalFunc;
ScriptValuePointer prototype;
};
typedef std::map<int, CustomTypeInfo> TCustomTypeMap;
TCustomTypeMap _customTypes;
std::mutex _customTypeProtect;
QPointer<ScriptManager> _manager; QPointer<ScriptManager> _manager;
ScriptValuePointer _nullValue; ScriptValuePointer _nullValue;