Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-29 20:42:56 +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 454e26a91b
commit 4a9c64d3a7
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

@ -21,6 +21,7 @@ RenderScriptingInterface::RenderScriptingInterface() {
std::call_once(registry_flag, [] { std::call_once(registry_flag, [] {
qmlRegisterType<RenderScriptingInterface>("RenderEnums", 1, 0, "RenderEnums"); qmlRegisterType<RenderScriptingInterface>("RenderEnums", 1, 0, "RenderEnums");
qRegisterMetaType<RenderScriptingInterface::RenderMethod>("RenderScriptingInterface::RenderMethod"); 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 * @typedef {number} Render.RenderMethod
*/ */
// RenderMethod enum type // RenderMethod enum type
enum class RenderMethod { //enum class RenderMethod {
enum RenderMethod {
DEFERRED = render::Args::RenderMethod::DEFERRED, DEFERRED = render::Args::RenderMethod::DEFERRED,
FORWARD = render::Args::RenderMethod::FORWARD, FORWARD = render::Args::RenderMethod::FORWARD,
}; };

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

@ -185,6 +185,8 @@ void ScriptObjectQtProxy::investigate() {
continue; continue;
} }
break; break;
default:
;
} }
QScriptString name = _engine->toStringHandle(QString::fromLatin1(szName)); QScriptString name = _engine->toStringHandle(QString::fromLatin1(szName));
@ -207,6 +209,13 @@ void ScriptObjectQtProxy::investigate() {
} }
} else { } else {
int parameterCount = method.parameterCount(); 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()) { if (nameLookup == methodNames.end()) {
MethodDef& methodDef = _methods.insert(idx, MethodDef()).value(); MethodDef& methodDef = _methods.insert(idx, MethodDef()).value();
methodDef.name = name; methodDef.name = name;
@ -317,6 +326,13 @@ QScriptValue ScriptObjectQtProxy::property(const QScriptValue& object, const QSc
MethodDefMap::const_iterator lookup = _methods.find(methodId); MethodDefMap::const_iterator lookup = _methods.find(methodId);
if (lookup == _methods.cend()) return QScriptValue(); if (lookup == _methods.cend()) return QScriptValue();
const MethodDef& methodDef = lookup.value(); 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( return static_cast<QScriptEngine*>(_engine)->newObject(
new ScriptMethodQtProxy(_engine, qobject, object, methodDef.methods, methodDef.numMaxParms)); new ScriptMethodQtProxy(_engine, qobject, object, methodDef.methods, methodDef.numMaxParms));
} }
@ -592,9 +608,7 @@ int ScriptSignalQtProxy::qt_metacall(QMetaObject::Call call, int id, void** argu
QList<Connection> connections; QList<Connection> connections;
withReadLock([&]{ withReadLock([&]{
for (ConnectionList::iterator iter = _connections.begin(); iter != _connections.end(); ++iter) { connections = _connections;
connections.push_back(*iter);
}
}); });
for (ConnectionList::iterator iter = connections.begin(); iter != connections.end(); ++iter) { for (ConnectionList::iterator iter = connections.begin(); iter != connections.end(); ++iter) {
@ -713,7 +727,7 @@ void ScriptSignalQtProxy::disconnect(QScriptValue arg0, QScriptValue arg1) {
} }
// remove it from our internal list of connections // remove it from our internal list of connections
withReadLock([&]{ withWriteLock([&]{
_connections.erase(lookup); _connections.erase(lookup);
}); });