Showing the changes to interface/src/scripting/ClipboardScriptingInterface.cpp (1 of 4 files). Show all
Unified · Split
| @@ -25,16 +25,18 @@ float ClipboardScriptingInterface::getClipboardContentsLargestDimension() { · 24 unmodified lines | ||
| 25 | 25 | return qApp->getEntityClipboard()->getContentsLargestDimension(); |
| 26 | 26 | } |
| 27 | 27 | |
| 28 | −bool ClipboardScriptingInterface::exportEntities(const QString& filename, const QVector<QUuid>& entityIDs) { | |
| 28 | +bool ClipboardScriptingInterface::exportEntities(const QString& filename, const QVector<QUuid>& entityIDs, const QVariantMap& options) { | |
| 29 | 29 | bool retVal; |
| 30 | 30 | BLOCKING_INVOKE_METHOD(qApp, "exportEntities", |
| 31 | 31 | Q_RETURN_ARG(bool, retVal), |
| 32 | 32 | Q_ARG(const QString&, filename), |
| 33 | − Q_ARG(const QVector<QUuid>&, entityIDs)); | |
| 33 | + Q_ARG(const QVector<QUuid>&, entityIDs), | |
| 34 | + Q_ARG(const glm::vec3*, nullptr), | |
| 35 | + Q_ARG(const QVariantMap&, options)); | |
| 34 | 36 | return retVal; |
| 35 | 37 | } |
| 36 | 38 | |
| 37 | −bool ClipboardScriptingInterface::exportEntities(const QString& filename, float x, float y, float z, float scale) { | |
| 39 | +bool ClipboardScriptingInterface::exportEntities(const QString& filename, float x, float y, float z, float scale, const QVariantMap& options) { | |
| 38 | 40 | bool retVal; |
| 39 | 41 | BLOCKING_INVOKE_METHOD(qApp, "exportEntities", |
| 40 | 42 | Q_RETURN_ARG(bool, retVal), |
| @@ -42,16 +44,8 @@ bool ClipboardScriptingInterface::exportEntities(const QString& filename, float · 1 unmodified line | ||
| 42 | 44 | Q_ARG(float, x), |
| 43 | 45 | Q_ARG(float, y), |
| 44 | 46 | Q_ARG(float, z), |
| 45 | − Q_ARG(float, scale)); | |
| 46 | − return retVal; | |
| 47 | −} | |
| 48 | − | |
| 49 | −bool ClipboardScriptingInterface::exportWorldEntities(const QString& filename, const QVector<QString>& propertiesToPrune) { | |
| 50 | − bool retVal; | |
| 51 | − BLOCKING_INVOKE_METHOD(qApp, "exportWorldEntities", | |
| 52 | − Q_RETURN_ARG(bool, retVal), | |
| 53 | − Q_ARG(const QString&, filename), | |
| 54 | − Q_ARG(const QVector<QString>&, propertiesToPrune)); | |
| 47 | + Q_ARG(float, scale), | |
| 48 | + Q_ARG(const QVariantMap&, options)); | |
| 55 | 49 | return retVal; |
| 56 | 50 | } |
| 57 | 51 | |