History

Move global position and path functionality into exportEntities

Ada committed 1 year ago

Commit 0af8f651 parent d6e64614 files · +110 −136Browse files

Showing the changes to interface/src/scripting/ClipboardScriptingInterface.cpp (1 of 4 files). Show all

Unified · Split

interface/src/scripting/ClipboardScriptingInterface.cpp+7−13
@@ -25,16 +25,18 @@ float ClipboardScriptingInterface::getClipboardContentsLargestDimension() { · 24 unmodified lines
25 return qApp->getEntityClipboard()->getContentsLargestDimension();25 return qApp->getEntityClipboard()->getContentsLargestDimension();
26}26}
27 27
28bool ClipboardScriptingInterface::exportEntities(const QString& filename, const QVector<QUuid>& entityIDs) {28bool ClipboardScriptingInterface::exportEntities(const QString& filename, const QVector<QUuid>& entityIDs, const QVariantMap& options) {
29 bool retVal;29 bool retVal;
30 BLOCKING_INVOKE_METHOD(qApp, "exportEntities",30 BLOCKING_INVOKE_METHOD(qApp, "exportEntities",
31 Q_RETURN_ARG(bool, retVal),31 Q_RETURN_ARG(bool, retVal),
32 Q_ARG(const QString&, filename),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 return retVal;36 return retVal;
35}37}
36 38
37bool ClipboardScriptingInterface::exportEntities(const QString& filename, float x, float y, float z, float scale) {39bool ClipboardScriptingInterface::exportEntities(const QString& filename, float x, float y, float z, float scale, const QVariantMap& options) {
38 bool retVal;40 bool retVal;
39 BLOCKING_INVOKE_METHOD(qApp, "exportEntities",41 BLOCKING_INVOKE_METHOD(qApp, "exportEntities",
40 Q_RETURN_ARG(bool, retVal),42 Q_RETURN_ARG(bool, retVal),
@@ -42,16 +44,8 @@ bool ClipboardScriptingInterface::exportEntities(const QString& filename, float · 1 unmodified line
42 Q_ARG(float, x),44 Q_ARG(float, x),
43 Q_ARG(float, y),45 Q_ARG(float, y),
44 Q_ARG(float, z),46 Q_ARG(float, z),
45 Q_ARG(float, scale));47 Q_ARG(float, scale),
46 return retVal;48 Q_ARG(const QVariantMap&, options));
47}
48
49bool 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));
55 return retVal;49 return retVal;
56}50}
57 51