Showing the changes to libraries/entities/src/EntityScriptingInterface.cpp (1 of 63 files). Show all
Unified · Split
| @@ -1690,7 +1690,7 @@ ScriptValue RayToEntityIntersectionResultToScriptValue(ScriptEngine* engine, con · 1689 unmodified lines | |||
| 1690 | return obj; | 1690 | return obj; |
| 1691 | } | 1691 | } |
| 1692 | 1692 | ||
| 1693 | void RayToEntityIntersectionResultFromScriptValue(const ScriptValue& object, RayToEntityIntersectionResult& value) { | 1693 | bool RayToEntityIntersectionResultFromScriptValue(const ScriptValue& object, RayToEntityIntersectionResult& value) { |
| 1694 | value.intersects = object.property("intersects").toVariant().toBool(); | 1694 | value.intersects = object.property("intersects").toVariant().toBool(); |
| 1695 | value.accurate = object.property("accurate").toVariant().toBool(); | 1695 | value.accurate = object.property("accurate").toVariant().toBool(); |
| 1696 | ScriptValue entityIDValue = object.property("entityID"); | 1696 | ScriptValue entityIDValue = object.property("entityID"); |
| @@ -1707,6 +1707,7 @@ void RayToEntityIntersectionResultFromScriptValue(const ScriptValue& object, Ray · 10 unmodified lines | |||
| 1707 | vec3FromScriptValue(surfaceNormal, value.surfaceNormal); | 1707 | vec3FromScriptValue(surfaceNormal, value.surfaceNormal); |
| 1708 | } | 1708 | } |
| 1709 | value.extraInfo = object.property("extraInfo").toVariant().toMap(); | 1709 | value.extraInfo = object.property("extraInfo").toVariant().toMap(); |
| 1710 | return true; | ||
| 1710 | } | 1711 | } |
| 1711 | 1712 | ||
| 1712 | bool EntityScriptingInterface::polyVoxWorker(QUuid entityID, std::function<bool(PolyVoxEntityItem&)> actor) { | 1713 | bool EntityScriptingInterface::polyVoxWorker(QUuid entityID, std::function<bool(PolyVoxEntityItem&)> actor) { |