Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-13 05:48:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #14665 from SamGondelman/exportFix

Browse source 
Case 20533: Fix export entities
This commit is contained in:
Sam Gondelman 2019-01-07 15:47:01 -08:00 committed by GitHub
commit 2c0b2e13ab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/scripting/ClipboardScriptingInterface.cpp
View file

@ -25,12 +25,12 @@ float ClipboardScriptingInterface::getClipboardContentsLargestDimension() {
return qApp->getEntityClipboard()->getContentsLargestDimension(); return qApp->getEntityClipboard()->getContentsLargestDimension();
} }
bool ClipboardScriptingInterface::exportEntities(const QString& filename, const QVector<EntityItemID>& entityIDs) { bool ClipboardScriptingInterface::exportEntities(const QString& filename, const QVector<QUuid>& entityIDs) {
bool retVal; bool retVal;
BLOCKING_INVOKE_METHOD(qApp, "exportEntities", BLOCKING_INVOKE_METHOD(qApp, "exportEntities",
Q_RETURN_ARG(bool, retVal), Q_RETURN_ARG(bool, retVal),
Q_ARG(const QString&, filename), Q_ARG(const QString&, filename),
Q_ARG(const QVector<EntityItemID>&, entityIDs)); Q_ARG(const QVector<QUuid>&, entityIDs));
return retVal; return retVal;
} }

2
interface/src/scripting/ClipboardScriptingInterface.h
View file

@ -63,7 +63,7 @@ public:
* @param {Uuid[]} entityIDs Array of IDs of the entities to export. * @param {Uuid[]} entityIDs Array of IDs of the entities to export.
* @returns {boolean} <code>true</code> if the export was successful, otherwise <code>false</code>. * @returns {boolean} <code>true</code> if the export was successful, otherwise <code>false</code>.
*/ */
Q_INVOKABLE bool exportEntities(const QString& filename, const QVector<EntityItemID>& entityIDs); Q_INVOKABLE bool exportEntities(const QString& filename, const QVector<QUuid>& entityIDs);
/**jsdoc /**jsdoc
* Export the entities with centers within a cube to a JSON file. * Export the entities with centers within a cube to a JSON file.