History

vec3FromScriptValue replacement attempt

ksuprynowicz committed 3 years ago

Commit dba09251 parent 3a2075012 files · +133 −10Browse files

Showing the changes to libraries/script-engine/src/ScriptValueUtils.cpp (1 of 12 files). Show all

Unified · Split

libraries/script-engine/src/ScriptValueUtils.cpp+12−5
@@ -33,12 +33,7 @@ · 32 unmodified lines
33#include "ScriptEngineCast.h"33#include "ScriptEngineCast.h"
34#include "ScriptValueIterator.h"34#include "ScriptValueIterator.h"
35#include "ScriptEngineLogging.h"35#include "ScriptEngineLogging.h"
36
37#define CONVERSIONS_OPTIMIZED_FOR_V8
38
39#ifdef CONVERSIONS_OPTIMIZED_FOR_V8
40#include "v8/FastScriptValueUtils.h"36#include "v8/FastScriptValueUtils.h"
41#endif
42 37
43bool isListOfStrings(const ScriptValue& arg) {38bool isListOfStrings(const ScriptValue& arg) {
44 if (!arg.isArray()) {39 if (!arg.isArray()) {
@@ -136,7 +131,11 @@ ScriptValue qVector3DToScriptValue(ScriptEngine* engine, const QVector3D& qVecto · 91 unmodified lines
136 131
137bool qVector3DFromScriptValue(const ScriptValue& object, QVector3D& qVector3D) {132bool qVector3DFromScriptValue(const ScriptValue& object, QVector3D& qVector3D) {
138 glm::vec3 vec3;133 glm::vec3 vec3;
134#ifdef CONVERSIONS_OPTIMIZED_FOR_V8
135 if (vec3FromScriptValueFast(object, vec3)) {
136#else
139 if (vec3FromScriptValue(object, vec3)) {137 if (vec3FromScriptValue(object, vec3)) {
138#endif
140 qVector3D.setX(vec3.x);139 qVector3D.setX(vec3.x);
141 qVector3D.setY(vec3.y);140 qVector3D.setY(vec3.y);
142 qVector3D.setZ(vec3.z);141 qVector3D.setZ(vec3.z);
@@ -485,7 +484,11 @@ QVector<glm::vec3> qVectorVec3FromScriptValue(const ScriptValue& array) { · 342 unmodified lines
485 484
486 for (int i = 0; i < length; i++) {485 for (int i = 0; i < length; i++) {
487 glm::vec3 newVec3 = glm::vec3();486 glm::vec3 newVec3 = glm::vec3();
487#ifdef CONVERSIONS_OPTIMIZED_FOR_V8
488 vec3FromScriptValueFast(array.property(i), newVec3);
489#else
488 vec3FromScriptValue(array.property(i), newVec3);490 vec3FromScriptValue(array.property(i), newVec3);
491#endif
489 newVector << newVec3;492 newVector << newVec3;
490 }493 }
491 return newVector;494 return newVector;
@@ -496,7 +499,11 @@ bool qVectorVec3FromScriptValue(const ScriptValue& array, QVector<glm::vec3>& ve · 4 unmodified lines
496 499
497 for (int i = 0; i < length; i++) {500 for (int i = 0; i < length; i++) {
498 glm::vec3 newVec3 = glm::vec3();501 glm::vec3 newVec3 = glm::vec3();
502#ifdef CONVERSIONS_OPTIMIZED_FOR_V8
503 vec3FromScriptValueFast(array.property(i), newVec3);
504#else
499 vec3FromScriptValue(array.property(i), newVec3);505 vec3FromScriptValue(array.property(i), newVec3);
506#endif
500 vector << newVec3;507 vector << newVec3;
501 }508 }
502 return true;509 return true;