History

More work on editVoxel.js

Clement committed 12 years ago

Commit dcaef451 parent ca0cd2d9 files · +273 −138Browse files

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

Unified · Split

interface/src/ClipboardScriptingInterface.cpp+10−4
@@ -9,6 +9,7 @@ · 8 unmodified lines
9#include "ClipboardScriptingInterface.h"9#include "ClipboardScriptingInterface.h"
10 10
11ClipboardScriptingInterface::ClipboardScriptingInterface() {11ClipboardScriptingInterface::ClipboardScriptingInterface() {
12 connect(this, SIGNAL(readyToImport()), Application::getInstance(), SLOT(importVoxels()));
12}13}
13 14
14void ClipboardScriptingInterface::cutVoxel(const VoxelDetail& sourceVoxel) {15void ClipboardScriptingInterface::cutVoxel(const VoxelDetail& sourceVoxel) {
@@ -70,12 +71,17 @@ void ClipboardScriptingInterface::exportVoxel(float x, float y, float z, float s · 55 unmodified lines
70 z / (float)TREE_SCALE, 71 z / (float)TREE_SCALE,
71 s / (float)TREE_SCALE };72 s / (float)TREE_SCALE };
72 73
73 QMetaObject::invokeMethod(Application::getInstance(), "exportVoxels",74 Application::getInstance()->exportVoxels(sourceVoxel);
74 Q_ARG(const VoxelDetail&, sourceVoxel));
75}75}
76 76
77void ClipboardScriptingInterface::importVoxels() {77bool ClipboardScriptingInterface::importVoxels() {
78 QMetaObject::invokeMethod(Application::getInstance(), "importVoxels");78 qDebug() << "[DEBUG] Importing ... ";
79 QEventLoop loop;
80 connect(Application::getInstance(), SIGNAL(importDone(int)), &loop, SLOT(quit()));
81 emit readyToImport();
82 int returnCode = loop.exec();
83
84 return returnCode;
79}85}
80 86
81void ClipboardScriptingInterface::nudgeVoxel(const VoxelDetail& sourceVoxel, const glm::vec3& nudgeVec) {87void ClipboardScriptingInterface::nudgeVoxel(const VoxelDetail& sourceVoxel, const glm::vec3& nudgeVec) {