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

Fixes to problems with meta-types

Browse source
This commit is contained in:
ksuprynowicz 2022-08-15 23:19:13 +02:00
parent 33c8607e15
commit 50a6a63cc3
8 changed files with 43 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
interface/src/scripting/PerformanceScriptingInterface.cpp
View file

@ -1,6 +1,7 @@
// //
// Created by Bradley Austin Davis on 2019/05/14 // Created by Bradley Austin Davis on 2019/05/14
// Copyright 2013-2019 High Fidelity, Inc. // Copyright 2013-2019 High Fidelity, Inc.
// Copyright 2022 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@ -9,15 +10,24 @@
#include "PerformanceScriptingInterface.h" #include "PerformanceScriptingInterface.h"
#include <ScriptEngineCast.h>
#include "../Application.h" #include "../Application.h"
STATIC_SCRIPT_INITIALIZER(+[](ScriptManager* manager){
auto scriptEngine = manager->engine().get();
scriptRegisterMetaType(scriptEngine, scriptValueFromEnumClass<PerformanceScriptingInterface::PerformancePreset>, scriptValueToEnumClass<PerformanceScriptingInterface::PerformancePreset>, "PerformancePreset");
scriptRegisterMetaType(scriptEngine, scriptValueFromEnumClass<PerformanceScriptingInterface::RefreshRateProfile>, scriptValueToEnumClass<PerformanceScriptingInterface::RefreshRateProfile>, "RefreshRateProfile");
});
std::once_flag PerformanceScriptingInterface::registry_flag; std::once_flag PerformanceScriptingInterface::registry_flag;
PerformanceScriptingInterface::PerformanceScriptingInterface() { PerformanceScriptingInterface::PerformanceScriptingInterface() {
std::call_once(registry_flag, [] { std::call_once(registry_flag, [] {
qmlRegisterType<PerformanceScriptingInterface>("PerformanceEnums", 1, 0, "PerformanceEnums"); qmlRegisterType<PerformanceScriptingInterface>("PerformanceEnums", 1, 0, "PerformanceEnums");
qRegisterMetaType<PerformanceScriptingInterface::PerformancePreset>("PerformanceScriptingInterface::PerformancePreset"); //qRegisterMetaType<PerformanceScriptingInterface::PerformancePreset>("PerformanceScriptingInterface::PerformancePreset");
qRegisterMetaType<PerformanceScriptingInterface::RefreshRateProfile>("PerformanceScriptingInterface::RefreshRateProfile"); //qRegisterMetaType<PerformanceScriptingInterface::RefreshRateProfile>("PerformanceScriptingInterface::RefreshRateProfile");
}); });
} }

5
interface/src/scripting/PerformanceScriptingInterface.h
View file

@ -1,6 +1,7 @@
// //
// Created by Bradley Austin Davis on 2019/05/14 // Created by Bradley Austin Davis on 2019/05/14
// Copyright 2013-2019 High Fidelity, Inc. // Copyright 2013-2019 High Fidelity, Inc.
// Copyright 2022 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@ -55,7 +56,7 @@ public:
* @typedef {number} Performance.PerformancePreset * @typedef {number} Performance.PerformancePreset
*/ */
// PerformanceManager PerformancePreset tri state level enums // PerformanceManager PerformancePreset tri state level enums
enum PerformancePreset { enum class PerformancePreset {
UNKNOWN = PerformanceManager::PerformancePreset::UNKNOWN, UNKNOWN = PerformanceManager::PerformancePreset::UNKNOWN,
LOW_POWER = PerformanceManager::PerformancePreset::LOW_POWER, LOW_POWER = PerformanceManager::PerformancePreset::LOW_POWER,
LOW = PerformanceManager::PerformancePreset::LOW, LOW = PerformanceManager::PerformancePreset::LOW,
@ -82,7 +83,7 @@ public:
* @typedef {number} Performance.RefreshRateProfile * @typedef {number} Performance.RefreshRateProfile
*/ */
// Must match RefreshRateManager enums // Must match RefreshRateManager enums
enum RefreshRateProfile { enum class RefreshRateProfile {
ECO = RefreshRateManager::RefreshRateProfile::ECO, ECO = RefreshRateManager::RefreshRateProfile::ECO,
INTERACTIVE = RefreshRateManager::RefreshRateProfile::INTERACTIVE, INTERACTIVE = RefreshRateManager::RefreshRateProfile::INTERACTIVE,
REALTIME = RefreshRateManager::RefreshRateProfile::REALTIME, REALTIME = RefreshRateManager::RefreshRateProfile::REALTIME,

8
interface/src/scripting/PlatformInfoScriptingInterface.cpp
View file

@ -1,6 +1,7 @@
// //
// Created by Nissim Hadar on 2018/12/28 // Created by Nissim Hadar on 2018/12/28
// Copyright 2013-2016 High Fidelity, Inc. // Copyright 2013-2016 High Fidelity, Inc.
// Copyright 2022 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@ -12,6 +13,7 @@
#include <platform/Platform.h> #include <platform/Platform.h>
#include <platform/Profiler.h> #include <platform/Profiler.h>
#include <ScriptEngineCast.h>
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
#include <Windows.h> #include <Windows.h>
@ -19,6 +21,12 @@
#include <sstream> #include <sstream>
#endif #endif
STATIC_SCRIPT_INITIALIZER(+[](ScriptManager* manager){
auto scriptEngine = manager->engine().get();
scriptRegisterMetaType(scriptEngine, scriptValueFromEnumClass<PlatformInfoScriptingInterface::PlatformTier>, scriptValueToEnumClass<PlatformInfoScriptingInterface::PlatformTier>, "PlatformTier");
});
PlatformInfoScriptingInterface* PlatformInfoScriptingInterface::getInstance() { PlatformInfoScriptingInterface* PlatformInfoScriptingInterface::getInstance() {
static PlatformInfoScriptingInterface sharedInstance; static PlatformInfoScriptingInterface sharedInstance;
return &sharedInstance; return &sharedInstance;

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

@ -1,6 +1,7 @@
// //
// Created by Nissim Hadar on 2018/12/28 // Created by Nissim Hadar on 2018/12/28
// Copyright 2013-2016 High Fidelity, Inc. // Copyright 2013-2016 High Fidelity, Inc.
// Copyright 2022 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@ -45,7 +46,7 @@ public:
* @typedef {number} PlatformInfo.PlatformTier * @typedef {number} PlatformInfo.PlatformTier
*/ */
// Platform tier enum type // Platform tier enum type
enum PlatformTier { enum class PlatformTier {
UNKNOWN = platform::Profiler::Tier::UNKNOWN, UNKNOWN = platform::Profiler::Tier::UNKNOWN,
LOW = platform::Profiler::Tier::LOW, LOW = platform::Profiler::Tier::LOW,
MID = platform::Profiler::Tier::MID, MID = platform::Profiler::Tier::MID,

13
libraries/script-engine/src/EventTypes.cpp
View file

@ -4,6 +4,7 @@
// //
// Created by Brad Hefta-Gaub on 1/28/14. // Created by Brad Hefta-Gaub on 1/28/14.
// Copyright 2014 High Fidelity, Inc. // Copyright 2014 High Fidelity, Inc.
// Copyright 2022 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@ -21,10 +22,10 @@
#include "WheelEvent.h" #include "WheelEvent.h"
void registerEventTypes(ScriptEngine* engine) { void registerEventTypes(ScriptEngine* engine) {
scriptRegisterMetaType(engine, KeyEvent::toScriptValue, KeyEvent::fromScriptValue); scriptRegisterMetaType(engine, KeyEvent::toScriptValue, KeyEvent::fromScriptValue, "KeyEvent");
scriptRegisterMetaType(engine, MouseEvent::toScriptValue, MouseEvent::fromScriptValue); scriptRegisterMetaType(engine, MouseEvent::toScriptValue, MouseEvent::fromScriptValue, "MouseEvent");
scriptRegisterMetaType(engine, PointerEvent::toScriptValue, PointerEvent::fromScriptValue); scriptRegisterMetaType(engine, PointerEvent::toScriptValue, PointerEvent::fromScriptValue, "PointerEvent");
scriptRegisterMetaType(engine, TouchEvent::toScriptValue, TouchEvent::fromScriptValue); scriptRegisterMetaType(engine, TouchEvent::toScriptValue, TouchEvent::fromScriptValue, "TouchEvent");
scriptRegisterMetaType(engine, WheelEvent::toScriptValue, WheelEvent::fromScriptValue); scriptRegisterMetaType(engine, WheelEvent::toScriptValue, WheelEvent::fromScriptValue, "WheelEvent");
scriptRegisterMetaType(engine, SpatialEvent::toScriptValue, SpatialEvent::fromScriptValue); scriptRegisterMetaType(engine, SpatialEvent::toScriptValue, SpatialEvent::fromScriptValue, "SpatialEvent");
} }

5
libraries/script-engine/src/MIDIEvent.cpp
View file

@ -4,6 +4,7 @@
// //
// Created by Stephen Birarda on 2014-06-30. // Created by Stephen Birarda on 2014-06-30.
// Copyright 2014 High Fidelity, Inc. // Copyright 2014 High Fidelity, Inc.
// Copyright 2022 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@ -18,7 +19,7 @@
#include "ScriptValue.h" #include "ScriptValue.h"
void registerMIDIMetaTypes(ScriptEngine* engine) { void registerMIDIMetaTypes(ScriptEngine* engine) {
scriptRegisterMetaType(engine, midiEventToScriptValue, midiEventFromScriptValue); scriptRegisterMetaType(engine, midiEventToScriptValue, midiEventFromScriptValue, "MIDIEvent");
} }
const QString MIDI_DELTA_TIME_PROP_NAME = "deltaTime"; const QString MIDI_DELTA_TIME_PROP_NAME = "deltaTime";
@ -41,4 +42,4 @@ bool midiEventFromScriptValue(const ScriptValue &object, MIDIEvent& event) {
event.data1 = object.property(MIDI_DATA_1_PROP_NAME).toVariant().toUInt(); event.data1 = object.property(MIDI_DATA_1_PROP_NAME).toVariant().toUInt();
event.data2 = object.property(MIDI_DATA_2_PROP_NAME).toVariant().toUInt(); event.data2 = object.property(MIDI_DATA_2_PROP_NAME).toVariant().toUInt();
return true; return true;
} }

3
libraries/script-engine/src/MenuItemProperties.cpp
View file

@ -4,6 +4,7 @@
// //
// Created by Brad Hefta-Gaub on 1/28/14. // Created by Brad Hefta-Gaub on 1/28/14.
// Copyright 2014 High Fidelity, Inc. // Copyright 2014 High Fidelity, Inc.
// Copyright 2022 Overte e.V.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@ -44,7 +45,7 @@ MenuItemProperties::MenuItemProperties(const QString& menuName, const QString& m
} }
void registerMenuItemProperties(ScriptEngine* engine) { void registerMenuItemProperties(ScriptEngine* engine) {
scriptRegisterMetaType(engine, menuItemPropertiesToScriptValue, menuItemPropertiesFromScriptValue); scriptRegisterMetaType(engine, menuItemPropertiesToScriptValue, menuItemPropertiesFromScriptValue, "MenuItemProperties");
} }
ScriptValue menuItemPropertiesToScriptValue(ScriptEngine* engine, const MenuItemProperties& properties) { ScriptValue menuItemPropertiesToScriptValue(ScriptEngine* engine, const MenuItemProperties& properties) {

7
libraries/script-engine/src/ScriptEngineCast.h
View file

@ -76,7 +76,12 @@ int scriptRegisterMetaType(ScriptEngine* eng,
if (strlen(name) > 0) { // make sure it's registered if (strlen(name) > 0) { // make sure it's registered
id = qRegisterMetaType<T>(name); id = qRegisterMetaType<T>(name);
} else { } else {
id = qRegisterMetaType<T>(); if (!QMetaType::fromType<T>().name().isNull()) {
qDebug() << "scriptRegisterMetaType: " << QMetaType::fromType<T>().name();
id = qRegisterMetaType<T>(QMetaType::fromType<T>().name());
}else{
id = qRegisterMetaType<T>();
}
} }
eng->registerCustomType(id, reinterpret_cast<ScriptEngine::MarshalFunction>(toScriptValue), eng->registerCustomType(id, reinterpret_cast<ScriptEngine::MarshalFunction>(toScriptValue),
reinterpret_cast<ScriptEngine::DemarshalFunction>(fromScriptValue)); reinterpret_cast<ScriptEngine::DemarshalFunction>(fromScriptValue));