Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-16 15:30:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Undo registering PropertyBinding as a meta type.

Browse source
This commit is contained in:
Zander Otavka 2015-08-06 18:54:08 -07:00
parent fa24df765d
commit 6e8c154c42
3 changed files with 8 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/src/Application.cpp
View file

@ -3750,7 +3750,6 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scri
qScriptRegisterMetaType(scriptEngine, OverlayPropertyResultToScriptValue, OverlayPropertyResultFromScriptValue);
qScriptRegisterMetaType(scriptEngine, RayToOverlayIntersectionResultToScriptValue,
RayToOverlayIntersectionResultFromScriptValue);
qScriptRegisterMetaType(scriptEngine, propertyBindingToScriptValue, propertyBindingFromScriptValue);
QScriptValue windowValue = scriptEngine->registerGlobalObject("Window", DependencyManager::get<WindowScriptingInterface>().data());
scriptEngine->registerGetterSetter("location", LocationScriptingInterface::locationGetter,

50
interface/src/ui/overlays/OverlayPanel.cpp
View file

@ -40,8 +40,6 @@ QScriptValue propertyBindingToScriptValue(QScriptEngine* engine, const PropertyB
}
void propertyBindingFromScriptValue(const QScriptValue& object, PropertyBinding& value) {
value.avatar = "";
value.entity = {};
QScriptValue avatar = object.property("avatar");
QScriptValue entity = object.property("entity");
@ -73,15 +71,6 @@ QScriptValue OverlayPanel::getProperty(const QString &property) {
return propertyBindingToScriptValue(_scriptEngine, PropertyBinding(_positionBindMyAvatar ?
"MyAvatar" : "",
_positionBindEntity));
// QScriptValue obj = _scriptEngine->newObject();
//
// if (_positionBindMyAvatar) {
// obj.setProperty("avatar", "MyAvatar");
// } else if (!_positionBindEntity.isNull()) {
// obj.setProperty("entity", _scriptEngine->newVariant(_positionBindEntity));
// }
//
// return obj;
}
if (property == "rotation") {
return quatToScriptValue(_scriptEngine, getRotation());
@ -90,15 +79,6 @@ QScriptValue OverlayPanel::getProperty(const QString &property) {
return propertyBindingToScriptValue(_scriptEngine, PropertyBinding(_rotationBindMyAvatar ?
"MyAvatar" : "",
_rotationBindEntity));
// QScriptValue obj = _scriptEngine->newObject();
//
// if (_rotationBindMyAvatar) {
// obj.setProperty("avatar", "MyAvatar");
// } else if (!_rotationBindEntity.isNull()) {
// obj.setProperty("entity", _scriptEngine->newVariant(_rotationBindEntity));
// }
//
// return obj;
}
if (property == "visible") {
return getVisible();
@ -127,17 +107,10 @@ void OverlayPanel::setProperties(const QScriptValue &properties) {
QScriptValue positionBinding = properties.property("positionBinding");
if (positionBinding.isValid()) {
_positionBindMyAvatar = false;
_positionBindEntity = QUuid();
QScriptValue avatar = positionBinding.property("avatar");
QScriptValue entity = positionBinding.property("entity");
if (avatar.isValid()) {
_positionBindMyAvatar = (avatar.toVariant().toString() == "MyAvatar");
} else if (entity.isValid() && !entity.isNull()) {
_positionBindEntity = entity.toVariant().toUuid();
}
PropertyBinding binding = {};
propertyBindingFromScriptValue(positionBinding, binding);
_positionBindMyAvatar = binding.avatar == "MyAvatar";
_positionBindEntity = binding.entity;
}
QScriptValue rotation = properties.property("rotation");
@ -151,17 +124,10 @@ void OverlayPanel::setProperties(const QScriptValue &properties) {
QScriptValue rotationBinding = properties.property("rotationBinding");
if (rotationBinding.isValid()) {
_rotationBindMyAvatar = false;
_rotationBindEntity = QUuid();
QScriptValue avatar = rotationBinding.property("avatar");
QScriptValue entity = positionBinding.property("entity");
if (avatar.isValid()) {
_rotationBindMyAvatar = (avatar.toVariant().toString() == "MyAvatar");
} else if (entity.isValid() && !entity.isNull()) {
_rotationBindEntity = entity.toVariant().toUuid();
}
PropertyBinding binding = {};
propertyBindingFromScriptValue(positionBinding, binding);
_rotationBindMyAvatar = binding.avatar == "MyAvatar";
_rotationBindEntity = binding.entity;
}
QScriptValue visible = properties.property("visible");

1
interface/src/ui/overlays/OverlayPanel.h
View file

@ -29,7 +29,6 @@ public:
QUuid entity;
};
Q_DECLARE_METATYPE(PropertyBinding);
QScriptValue propertyBindingToScriptValue(QScriptEngine* engine, const PropertyBinding& value);
void propertyBindingFromScriptValue(const QScriptValue& object, PropertyBinding& value);