History

added Clipboard.nudgeVoxel() and added support for calling clipboard opertations with VoxelDetail as well as xyzs

ZappoMan committed 12 years ago

Commit 0e8cab71 parent 91d79f65 files · +72 −20Browse files

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

Unified · Split

interface/src/ClipboardScriptingInterface.cpp+38−5
@@ -11,7 +11,11 @@ · 10 unmodified lines
11ClipboardScriptingInterface::ClipboardScriptingInterface() {11ClipboardScriptingInterface::ClipboardScriptingInterface() {
12}12}
13 13
14void ClipboardScriptingInterface::cutVoxels(float x, float y, float z, float s) {14void ClipboardScriptingInterface::cutVoxel(const VoxelDetail& sourceVoxel) {
15 cutVoxel(sourceVoxel.x, sourceVoxel.y, sourceVoxel.z, sourceVoxel.s);
16}
17
18void ClipboardScriptingInterface::cutVoxel(float x, float y, float z, float s) {
15 VoxelDetail sourceVoxel = { x / (float)TREE_SCALE,19 VoxelDetail sourceVoxel = { x / (float)TREE_SCALE,
16 y / (float)TREE_SCALE, 20 y / (float)TREE_SCALE,
17 z / (float)TREE_SCALE, 21 z / (float)TREE_SCALE,
@@ -19,7 +23,11 @@ void ClipboardScriptingInterface::cutVoxels(float x, float y, float z, float s) · 1 unmodified line
19 Application::getInstance()->cutVoxels(sourceVoxel);23 Application::getInstance()->cutVoxels(sourceVoxel);
20}24}
21 25
22void ClipboardScriptingInterface::copyVoxels(float x, float y, float z, float s) {26void ClipboardScriptingInterface::copyVoxel(const VoxelDetail& sourceVoxel) {
27 copyVoxel(sourceVoxel.x, sourceVoxel.y, sourceVoxel.z, sourceVoxel.s);
28}
29
30void ClipboardScriptingInterface::copyVoxel(float x, float y, float z, float s) {
23 VoxelDetail sourceVoxel = { x / (float)TREE_SCALE,31 VoxelDetail sourceVoxel = { x / (float)TREE_SCALE,
24 y / (float)TREE_SCALE, 32 y / (float)TREE_SCALE,
25 z / (float)TREE_SCALE, 33 z / (float)TREE_SCALE,
@@ -27,7 +35,11 @@ void ClipboardScriptingInterface::copyVoxels(float x, float y, float z, float s) · 1 unmodified line
27 Application::getInstance()->copyVoxels(sourceVoxel);35 Application::getInstance()->copyVoxels(sourceVoxel);
28}36}
29 37
30void ClipboardScriptingInterface::pasteVoxels(float x, float y, float z, float s) {38void ClipboardScriptingInterface::pasteVoxel(const VoxelDetail& destinationVoxel) {
39 pasteVoxel(destinationVoxel.x, destinationVoxel.y, destinationVoxel.z, destinationVoxel.s);
40}
41
42void ClipboardScriptingInterface::pasteVoxel(float x, float y, float z, float s) {
31 VoxelDetail sourceVoxel = { x / (float)TREE_SCALE, 43 VoxelDetail sourceVoxel = { x / (float)TREE_SCALE,
32 y / (float)TREE_SCALE, 44 y / (float)TREE_SCALE,
33 z / (float)TREE_SCALE, 45 z / (float)TREE_SCALE,
@@ -36,7 +48,11 @@ void ClipboardScriptingInterface::pasteVoxels(float x, float y, float z, float s · 2 unmodified lines
36 Application::getInstance()->pasteVoxels(sourceVoxel);48 Application::getInstance()->pasteVoxels(sourceVoxel);
37}49}
38 50
39void ClipboardScriptingInterface::deleteVoxels(float x, float y, float z, float s) {51void ClipboardScriptingInterface::deleteVoxel(const VoxelDetail& sourceVoxel) {
52 deleteVoxel(sourceVoxel.x, sourceVoxel.y, sourceVoxel.z, sourceVoxel.s);
53}
54
55void ClipboardScriptingInterface::deleteVoxel(float x, float y, float z, float s) {
40 VoxelDetail sourceVoxel = { x / (float)TREE_SCALE,56 VoxelDetail sourceVoxel = { x / (float)TREE_SCALE,
41 y / (float)TREE_SCALE, 57 y / (float)TREE_SCALE,
42 z / (float)TREE_SCALE, 58 z / (float)TREE_SCALE,
@@ -44,7 +60,11 @@ void ClipboardScriptingInterface::deleteVoxels(float x, float y, float z, float · 1 unmodified line
44 Application::getInstance()->deleteVoxels(sourceVoxel);60 Application::getInstance()->deleteVoxels(sourceVoxel);
45}61}
46 62
47void ClipboardScriptingInterface::exportVoxels(float x, float y, float z, float s) {63void ClipboardScriptingInterface::exportVoxel(const VoxelDetail& sourceVoxel) {
64 exportVoxel(sourceVoxel.x, sourceVoxel.y, sourceVoxel.z, sourceVoxel.s);
65}
66
67void ClipboardScriptingInterface::exportVoxel(float x, float y, float z, float s) {
48 VoxelDetail sourceVoxel = { x / (float)TREE_SCALE,68 VoxelDetail sourceVoxel = { x / (float)TREE_SCALE,
49 y / (float)TREE_SCALE, 69 y / (float)TREE_SCALE,
50 z / (float)TREE_SCALE, 70 z / (float)TREE_SCALE,
@@ -58,4 +78,17 @@ void ClipboardScriptingInterface::importVoxels() { · 7 unmodified lines
58 QMetaObject::invokeMethod(Application::getInstance(), "importVoxels");78 QMetaObject::invokeMethod(Application::getInstance(), "importVoxels");
59}79}
60 80
81void ClipboardScriptingInterface::nudgeVoxel(const VoxelDetail& sourceVoxel, const glm::vec3& nudgeVec) {
82 nudgeVoxel(sourceVoxel.x, sourceVoxel.y, sourceVoxel.z, sourceVoxel.s, nudgeVec);
83}
84
85void ClipboardScriptingInterface::nudgeVoxel(float x, float y, float z, float s, const glm::vec3& nudgeVec) {
86 glm::vec3 nudgeVecInTreeSpace = nudgeVec / (float)TREE_SCALE;
87 VoxelDetail sourceVoxel = { x / (float)TREE_SCALE,
88 y / (float)TREE_SCALE,
89 z / (float)TREE_SCALE,
90 s / (float)TREE_SCALE };
91
92 Application::getInstance()->nudgeVoxelsByVector(sourceVoxel, nudgeVecInTreeSpace);
93}
61 94