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/entities/src/EntityScriptingInterface.cpp (1 of 12 files). Show all

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+1−14
@@ -1698,14 +1698,9 @@ ScriptValue RayToEntityIntersectionResultToScriptValue(ScriptEngine* engine, con · 1697 unmodified lines
16981698 obj.setProperty("face", boxFaceToString(value.face));
16991699 Q_ASSERT(value.face < 7);
17001700
1701−#ifdef CONVERSIONS_OPTIMIZED_FOR_V8
1702− ScriptValue intersection = vec3ToScriptValueFast(engine, value.intersection);
1703− ScriptValue surfaceNormal = vec3ToScriptValueFast(engine, value.surfaceNormal);
1704−#else
17051701 ScriptValue intersection = vec3ToScriptValue(engine, value.intersection);
1706− ScriptValue surfaceNormal = vec3ToScriptValue(engine, value.surfaceNormal);
1707−#endif
17081702 obj.setProperty("intersection", intersection);
1703+ ScriptValue surfaceNormal = vec3ToScriptValue(engine, value.surfaceNormal);
17091704 obj.setProperty("surfaceNormal", surfaceNormal);
17101705 obj.setProperty("extraInfo", engine->toScriptValue(value.extraInfo));
17111706 return obj;
@@ -1722,19 +1717,11 @@ bool RayToEntityIntersectionResultFromScriptValue(const ScriptValue& object, Ray · 10 unmodified lines
17221717
17231718 ScriptValue intersection = object.property("intersection");
17241719 if (intersection.isValid()) {
1725−#ifdef CONVERSIONS_OPTIMIZED_FOR_V8
1726− vec3FromScriptValueFast(intersection, value.intersection);
1727−#else
17281720 vec3FromScriptValue(intersection, value.intersection);
1729−#endif
17301721 }
17311722 ScriptValue surfaceNormal = object.property("surfaceNormal");
17321723 if (surfaceNormal.isValid()) {
1733−#ifdef CONVERSIONS_OPTIMIZED_FOR_V8
1734− vec3FromScriptValueFast(surfaceNormal, value.surfaceNormal);
1735−#else
17361724 vec3FromScriptValue(surfaceNormal, value.surfaceNormal);
1737−#endif
17381725 }
17391726 value.extraInfo = object.property("extraInfo").toVariant().toMap();
17401727 return true;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t