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

Attempt to debug broken enums in scripting

Browse source
This commit is contained in:
ksuprynowicz 2022-08-14 22:05:50 +02:00
parent ece2b8096b
commit 95434a26a8
3 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/src/scripting/RenderScriptingInterface.cpp
View file

@ -23,6 +23,7 @@ RenderScriptingInterface::RenderScriptingInterface() {
std::call_once(registry_flag, [] {
qmlRegisterType<RenderScriptingInterface>("RenderEnums", 1, 0, "RenderEnums");
qRegisterMetaType<RenderScriptingInterface::RenderMethod>("RenderScriptingInterface::RenderMethod");
qDebug() << "qRegisterMetaType<RenderScriptingInterface::RenderMethod>(\"RenderScriptingInterface::RenderMethod\")";
});
}

3
interface/src/scripting/RenderScriptingInterface.h
View file

@ -61,7 +61,8 @@ public:
* @typedef {number} Render.RenderMethod
*/
// RenderMethod enum type
enum class RenderMethod {
//enum class RenderMethod {
enum RenderMethod {
DEFERRED = render::Args::RenderMethod::DEFERRED,
FORWARD = render::Args::RenderMethod::FORWARD,
};

28
libraries/script-engine/src/qtscript/ScriptObjectQtProxy.cpp
View file

@ -185,6 +185,8 @@ void ScriptObjectQtProxy::investigate() {
continue;
}
break;
default:
;
}
QScriptString name = _engine->toStringHandle(QString::fromLatin1(szName));
@ -207,6 +209,13 @@ void ScriptObjectQtProxy::investigate() {
}
} else {
int parameterCount = method.parameterCount();
if (name.toString() == "getRenderMethod"){
qDebug() << name << " " << QMetaType(method.returnType()).name();
if(method.returnType() == QMetaType::UnknownType) {
qDebug() << "Method with QMetaType::UnknownType";
}
printf("getRenderMethod");
}
if (nameLookup == methodNames.end()) {
MethodDef& methodDef = _methods.insert(idx, MethodDef()).value();
methodDef.name = name;
@ -317,6 +326,13 @@ QScriptValue ScriptObjectQtProxy::property(const QScriptValue& object, const QSc
MethodDefMap::const_iterator lookup = _methods.find(methodId);
if (lookup == _methods.cend()) return QScriptValue();
const MethodDef& methodDef = lookup.value();
for (auto iter = methodDef.methods.begin(); iter != methodDef.methods.end(); iter++ ) {
//qDebug() << (*iter).returnType();
if((*iter).returnType() == QMetaType::UnknownType) {
qDebug() << "Method with QMetaType::UnknownType " << metaObject->className() << " " << (*iter).name();
printf("Method with QMetaType::UnknownType");
}
}
return static_cast<QScriptEngine*>(_engine)->newObject(
new ScriptMethodQtProxy(_engine, qobject, object, methodDef.methods, methodDef.numMaxParms));
}
@ -589,19 +605,17 @@ int ScriptSignalQtProxy::qt_metacall(QMetaObject::Call call, int id, void** argu
QVariant argValue(methodArgTypeId, arguments[arg+1]);
args.append(_engine->castVariantToValue(argValue));
}
QList<Connection> connections;
withReadLock([&]{
for (ConnectionList::iterator iter = _connections.begin(); iter != _connections.end(); ++iter) {
connections.push_back(*iter);
}
connections = _connections;
});
for (ConnectionList::iterator iter = connections.begin(); iter != connections.end(); ++iter) {
Connection& conn = *iter;
conn.callback.call(conn.thisValue, args);
}
return -1;
}
@ -713,7 +727,7 @@ void ScriptSignalQtProxy::disconnect(QScriptValue arg0, QScriptValue arg1) {
}
// remove it from our internal list of connections
withReadLock([&]{
withWriteLock([&]{
_connections.erase(lookup);
});