Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-06 01:02:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add hasProperty for checking whether a property exists

Browse source
This commit is contained in:
Dale Glass 2023-01-09 22:20:36 +01:00 committed by ksuprynowicz
parent 5f2c13da52
commit ac7ebe2888
6 changed files with 47 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/script-engine/src/ScriptValue.cpp
View file

@ -44,6 +44,7 @@ public:
virtual ScriptValue property(quint32 arrayIndex,
const ScriptValue::ResolveFlags& mode = ScriptValue::ResolvePrototype) const override;
virtual void setData(const ScriptValue& val) override;
virtual bool hasProperty(const QString &name) const override;
virtual void setProperty(const QString& name,
const ScriptValue& value,
const ScriptValue::PropertyFlags& flags = ScriptValue::KeepExistingFlags) override;
@ -178,6 +179,13 @@ void ScriptValueProxyNull::setData(const ScriptValue& val) {
qCWarning(scriptengine_script, "ScriptValue::setData called on empty value");
}
bool ScriptValueProxyNull::hasProperty(const QString& name) const {
Q_ASSERT(false);
qCWarning(scriptengine_script, "ScriptValue::hasProperty called on empty value");
return false;
}
void ScriptValueProxyNull::setProperty(const QString& name,
const ScriptValue& value, const ScriptValue::PropertyFlags& flags) {
Q_ASSERT(false);

8
libraries/script-engine/src/ScriptValue.h
View file

@ -88,6 +88,7 @@ public:
inline ScriptValue property(const QString& name, const ResolveFlags& mode = ResolvePrototype) const;
inline ScriptValue property(quint32 arrayIndex, const ResolveFlags& mode = ResolvePrototype) const;
inline void setData(const ScriptValue& val);
inline bool hasProperty(const QString &name) const;
inline void setProperty(const QString& name,
const ScriptValue& value,
const PropertyFlags& flags = KeepExistingFlags);
@ -152,6 +153,7 @@ public:
virtual ScriptValue property(quint32 arrayIndex,
const ScriptValue::ResolveFlags& mode = ScriptValue::ResolvePrototype) const = 0;
virtual void setData(const ScriptValue& val) = 0;
virtual bool hasProperty(const QString &name) const = 0;
virtual void setProperty(const QString& name,
const ScriptValue& value,
const ScriptValue::PropertyFlags& flags = ScriptValue::KeepExistingFlags) = 0;
@ -318,6 +320,12 @@ void ScriptValue::setData(const ScriptValue& val) {
return _proxy->setData(val);
}
bool ScriptValue::hasProperty(const QString& name) const {
Q_ASSERT(_proxy != nullptr);
return _proxy->hasProperty(name);
}
void ScriptValue::setProperty(const QString& name, const ScriptValue& value, const PropertyFlags& flags) {
Q_ASSERT(_proxy != nullptr);
return _proxy->setProperty(name, value, flags);

8
libraries/script-engine/src/ScriptValueUtils.cpp
View file

@ -140,7 +140,7 @@ bool vec2FromScriptValue(const ScriptValue& object, glm::vec2& vec2) {
ScriptValue vec3ToScriptValue(ScriptEngine* engine, const glm::vec3& vec3) {
auto prototype = engine->globalObject().property("__hifi_vec3__");
if (!prototype.property("defined").toBool()) {
if (!prototype.hasProperty("defined") || !prototype.property("defined").toBool()) {
prototype = engine->evaluate(
"__hifi_vec3__ = Object.defineProperties({}, { "
"defined: { value: true },"
@ -648,7 +648,7 @@ ScriptValue qColorToScriptValue(ScriptEngine* engine, const QColor& color) {
}
/**jsdoc
* An axis-aligned cube, defined as the bottom right near (minimum axes values) corner of the cube plus the dimension of its
* An axis-aligned cube, defined as the bottom right near (minimum axes values) corner of the cube plus the dimension of its
* sides.
* @typedef {object} AACube
* @property {number} x - X coordinate of the brn corner of the cube.
@ -812,8 +812,8 @@ bool qSizeFFromScriptValue(const ScriptValue& object, QSizeF& qSizeF) {
* The details of an animation that is playing.
* @typedef {object} Avatar.AnimationDetails
* @property {string} role - <em>Not used.</em>
* @property {string} url - The URL to the animation file. Animation files need to be in glTF or FBX format but only need to
* contain the avatar skeleton and animation data. glTF models may be in JSON or binary format (".gltf" or ".glb" URLs
* @property {string} url - The URL to the animation file. Animation files need to be in glTF or FBX format but only need to
* contain the avatar skeleton and animation data. glTF models may be in JSON or binary format (".gltf" or ".glb" URLs
* respectively).
* <p><strong>Warning:</strong> glTF animations currently do not always animate correctly.</p>
* @property {number} fps - The frames per second(FPS) rate for the animation playback. 30 FPS is normal speed.

22
libraries/script-engine/src/v8/ScriptValueV8Wrapper.cpp
View file

@ -172,6 +172,28 @@ ScriptValueIteratorPointer ScriptValueV8Wrapper::newIterator() const {
return std::make_shared<ScriptValueIteratorV8Wrapper>(_engine, _value);
}
bool ScriptValueV8Wrapper::hasProperty(const QString& name) const {
auto isolate = _engine->getIsolate();
v8::Locker locker(_engine->getIsolate());
v8::Isolate::Scope isolateScope(_engine->getIsolate());
v8::HandleScope handleScope(isolate);
v8::Context::Scope contextScope(_engine->getContext());
if (_value.constGet()->IsObject()) {
//V8TODO: what about flags?
v8::Local<v8::Value> resultLocal;
v8::Local<v8::String> key = v8::String::NewFromUtf8(_engine->getIsolate(), name.toStdString().c_str(),v8::NewStringType::kNormal).ToLocalChecked();
const v8::Local<v8::Object> object = v8::Local<v8::Object>::Cast(_value.constGet());
if (object->Get(_value.constGetContext(), key).ToLocal(&resultLocal)) {
return true;
} else {
return false;
}
}
return false;
}
ScriptValue ScriptValueV8Wrapper::property(const QString& name, const ScriptValue::ResolveFlags &mode) const {
auto isolate = _engine->getIsolate();
v8::Locker locker(_engine->getIsolate());

3
libraries/script-engine/src/v8/ScriptValueV8Wrapper.h
View file

@ -54,6 +54,9 @@ public: // ScriptValue implementation
virtual ScriptValue property(quint32 arrayIndex,
const ScriptValue::ResolveFlags& mode = ScriptValue::ResolvePrototype) const override;
virtual void setData(const ScriptValue& val) override;
virtual bool hasProperty(const QString &name) const;
virtual void setProperty(const QString& name,
const ScriptValue& value,
const ScriptValue::PropertyFlags& flags = ScriptValue::KeepExistingFlags) override;

3
tests/script-engine/src/ScriptEngineTests.cpp
View file

@ -87,7 +87,8 @@ void ScriptEngineTests::scriptTest() {
qInfo() << "Running test script: " << script;
ac->loadOneScript(script);
}*/
ac->loadOneScript("tests/script-engine/tests/003_vector_math.js");
ac->loadOneScript("tests/003_vector_math.js");
ac->loadOneScript("tests/004_require.js");
qDebug() << ac->getRunning();