History

Revert "vec3FromScriptValue replacement attempt"

This reverts commit 584e4be0082c07c62b6ad1f17d4258878ce3223c.

ksuprynowicz committed 3 years ago

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