Showing the changes to libraries/entities/src/EntityScriptingInterface.cpp (1 of 41 files). Show all
Unified · Split
| @@ -1066,9 +1066,9 @@ QScriptValue RayToEntityIntersectionResultToScriptValue(QScriptEngine* engine, c · 1065 unmodified lines | |||
| 1066 | obj.setProperty("distance", value.distance); | 1066 | obj.setProperty("distance", value.distance); |
| 1067 | obj.setProperty("face", boxFaceToString(value.face)); | 1067 | obj.setProperty("face", boxFaceToString(value.face)); |
| 1068 | 1068 | ||
| 1069 | QScriptValue intersection = vec3FloatToScriptValue(engine, value.intersection); | 1069 | QScriptValue intersection = vec3ToScriptValue(engine, value.intersection); |
| 1070 | obj.setProperty("intersection", intersection); | 1070 | obj.setProperty("intersection", intersection); |
| 1071 | QScriptValue surfaceNormal = vec3FloatToScriptValue(engine, value.surfaceNormal); | 1071 | QScriptValue surfaceNormal = vec3ToScriptValue(engine, value.surfaceNormal); |
| 1072 | obj.setProperty("surfaceNormal", surfaceNormal); | 1072 | obj.setProperty("surfaceNormal", surfaceNormal); |
| 1073 | obj.setProperty("extraInfo", engine->toScriptValue(value.extraInfo)); | 1073 | obj.setProperty("extraInfo", engine->toScriptValue(value.extraInfo)); |
| 1074 | return obj; | 1074 | return obj; |
| @@ -1084,11 +1084,11 @@ void RayToEntityIntersectionResultFromScriptValue(const QScriptValue& object, Ra · 9 unmodified lines | |||
| 1084 | 1084 | ||
| 1085 | QScriptValue intersection = object.property("intersection"); | 1085 | QScriptValue intersection = object.property("intersection"); |
| 1086 | if (intersection.isValid()) { | 1086 | if (intersection.isValid()) { |
| 1087 | vec3FloatFromScriptValue(intersection, value.intersection); | 1087 | vec3FromScriptValue(intersection, value.intersection); |
| 1088 | } | 1088 | } |
| 1089 | QScriptValue surfaceNormal = object.property("surfaceNormal"); | 1089 | QScriptValue surfaceNormal = object.property("surfaceNormal"); |
| 1090 | if (surfaceNormal.isValid()) { | 1090 | if (surfaceNormal.isValid()) { |
| 1091 | vec3FloatFromScriptValue(surfaceNormal, value.surfaceNormal); | 1091 | vec3FromScriptValue(surfaceNormal, value.surfaceNormal); |
| 1092 | } | 1092 | } |
| 1093 | value.extraInfo = object.property("extraInfo").toVariant().toMap(); | 1093 | value.extraInfo = object.property("extraInfo").toVariant().toMap(); |
| 1094 | } | 1094 | } |