From 521bf6023e40b137c10fb997a2da41155f4bd657 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Wed, 30 Jul 2014 18:38:09 -0700 Subject: [PATCH] Implement pasteModels in Clipboard --- interface/src/scripting/ClipboardScriptingInterface.cpp | 6 +++--- interface/src/scripting/ClipboardScriptingInterface.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/interface/src/scripting/ClipboardScriptingInterface.cpp b/interface/src/scripting/ClipboardScriptingInterface.cpp index 39b5db9418..d75e29e423 100644 --- a/interface/src/scripting/ClipboardScriptingInterface.cpp +++ b/interface/src/scripting/ClipboardScriptingInterface.cpp @@ -103,13 +103,13 @@ void ClipboardScriptingInterface::nudgeVoxel(float x, float y, float z, float s, void ClipboardScriptingInterface::exportModels(const QString& filename, float x, float y, float z, float s) { - Application::getInstance()->exportModels(filename, x / TREE_SCALE, y / TREE_SCALE, z / TREE_SCALE, s / TREE_SCALE); + Application::getInstance()->exportModels(filename, x / (float)TREE_SCALE, y / (float)TREE_SCALE, z / (float)TREE_SCALE, s / (float)TREE_SCALE); } void ClipboardScriptingInterface::importModels(const QString& filename) { Application::getInstance()->importModels(filename); } -void ClipboardScriptingInterface::pasteModels() { - // TODO +void ClipboardScriptingInterface::pasteModels(float x, float y, float z, float s) { + Application::getInstance()->pasteModels(x, y, z); } diff --git a/interface/src/scripting/ClipboardScriptingInterface.h b/interface/src/scripting/ClipboardScriptingInterface.h index 2ff287b29f..373a7308ae 100644 --- a/interface/src/scripting/ClipboardScriptingInterface.h +++ b/interface/src/scripting/ClipboardScriptingInterface.h @@ -45,7 +45,7 @@ public slots: void importModels(const QString& filename); void exportModels(const QString& filename, float x, float y, float z, float s); - void pasteModels(); + void pasteModels(float x, float y, float z, float s); }; #endif // hifi_ClipboardScriptingInterface_h