Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-21 19:04:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Return entity IDs on paste

Browse source
This commit is contained in:
Ryan Huffman 2015-03-05 12:36:45 -08:00
parent a922619ebc
commit 71768ef275
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/Application.cpp
View file

@ -1683,8 +1683,8 @@ bool Application::importEntities(const QString& filename) {
return success;
}
void Application::pasteEntities(float x, float y, float z) {
_entityClipboard.sendEntities(&_entityEditSender, _entities.getTree(), x, y, z);
QVector<EntityItemID> Application::pasteEntities(float x, float y, float z) {
return _entityClipboard.sendEntities(&_entityEditSender, _entities.getTree(), x, y, z);
}
void Application::initDisplay() {

2
interface/src/Application.h
View file

@ -323,7 +323,7 @@ public slots:
void nodeKilled(SharedNodePointer node);
void packetSent(quint64 length);
void pasteEntities(float x, float y, float z);
QVector<EntityItemID> pasteEntities(float x, float y, float z);
bool exportEntities(const QString& filename, const QStringList& entityIDs);
bool exportEntities(const QString& filename, float x, float y, float z, float scale);
bool importEntities(const QString& filename);

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

@ -26,6 +26,6 @@ bool ClipboardScriptingInterface::importEntities(const QString& filename) {
return Application::getInstance()->importEntities(filename);
}
void ClipboardScriptingInterface::pasteEntities(float x, float y, float z, float s) {
Application::getInstance()->pasteEntities(x, y, z);
QVector<EntityItemID> ClipboardScriptingInterface::pasteEntities(float x, float y, float z, float s) {
return Application::getInstance()->pasteEntities(x, y, z);
}

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

@ -23,8 +23,9 @@ signals:
public slots:
bool importEntities(const QString& filename);
bool exportEntities(const QString& filename, QStringList entityIDs);
bool exportEntities(const QString& filename, float x, float y, float z, float s);
void pasteEntities(float x, float y, float z, float s);
QVector<EntityItemID> pasteEntities(float x, float y, float z, float s);
};
#endif // hifi_ClipboardScriptingInterface_h