Showing the changes to libraries/entities/src/EntityScriptingInterface.cpp (1 of 197 files). Show all
Unified · Split
| @@ -538,7 +538,7 @@ QUuid EntityScriptingInterface::editEntity(QUuid id, const EntityItemProperties& · 537 unmodified lines | |||
| 538 | NestableType nestableType = nestable->getNestableType(); | 538 | NestableType nestableType = nestable->getNestableType(); |
| 539 | if (nestableType == NestableType::Overlay || nestableType == NestableType::Avatar) { | 539 | if (nestableType == NestableType::Overlay || nestableType == NestableType::Avatar) { |
| 540 | qCWarning(entities) << "attempted edit on non-entity: " << id << nestable->getName(); | 540 | qCWarning(entities) << "attempted edit on non-entity: " << id << nestable->getName(); |
| 541 | return QUuid(); // null UUID to indicate failure | 541 | return QUuid(); // null script value to indicate failure |
| 542 | } | 542 | } |
| 543 | } | 543 | } |
| 544 | } | 544 | } |
| @@ -1017,6 +1017,25 @@ QScriptValue RayToEntityIntersectionResultToScriptValue(QScriptEngine* engine, c · 472 unmodified lines | |||
| 1017 | 1017 | ||
| 1018 | QString faceName = ""; | 1018 | QString faceName = ""; |
| 1019 | // handle BoxFace | 1019 | // handle BoxFace |
| 1020 | /**jsdoc | ||
| 1021 | * <p>A <code>BoxFace</code> specifies the face of an axis-aligned (AA) box. | ||
| 1022 | * <table> | ||
| 1023 | * <thead> | ||
| 1024 | * <tr><th>Value</th><th>Description</th></tr> | ||
| 1025 | * </thead> | ||
| 1026 | * <tbody> | ||
| 1027 | * <tr><td><code>"MIN_X_FACE"</code></td><td>The minimum x-axis face.</td></tr> | ||
| 1028 | * <tr><td><code>"MAX_X_FACE"</code></td><td>The maximum x-axis face.</td></tr> | ||
| 1029 | * <tr><td><code>"MIN_Y_FACE"</code></td><td>The minimum y-axis face.</td></tr> | ||
| 1030 | * <tr><td><code>"MAX_Y_FACE"</code></td><td>The maximum y-axis face.</td></tr> | ||
| 1031 | * <tr><td><code>"MIN_Z_FACE"</code></td><td>The minimum z-axis face.</td></tr> | ||
| 1032 | * <tr><td><code>"MAX_Z_FACE"</code></td><td>The maximum z-axis face.</td></tr> | ||
| 1033 | * <tr><td><code>"UNKNOWN_FACE"</code></td><td>Unknown value.</td></tr> | ||
| 1034 | * </tbody> | ||
| 1035 | * </table> | ||
| 1036 | * @typedef {string} BoxFace | ||
| 1037 | */ | ||
| 1038 | // FIXME: Move enum to string function to BoxBase.cpp. | ||
| 1020 | switch (value.face) { | 1039 | switch (value.face) { |
| 1021 | case MIN_X_FACE: | 1040 | case MIN_X_FACE: |
| 1022 | faceName = "MIN_X_FACE"; | 1041 | faceName = "MIN_X_FACE"; |