From c4110830576bbc4d6330ea25c4cc035a6aaa3ed4 Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Thu, 9 May 2013 14:30:50 -0700 Subject: [PATCH] Working on adding an "add voxel in front of avatar" command. --- interface/src/main.cpp | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/interface/src/main.cpp b/interface/src/main.cpp index 80adef9e37..a6ffe14ad1 100644 --- a/interface/src/main.cpp +++ b/interface/src/main.cpp @@ -1487,6 +1487,20 @@ void setupPaintingVoxel() { shiftPaintingColor(); } +void addVoxel(VoxelDetail& detail) { + unsigned char* bufferOut; + int sizeOut; + + if (createVoxelEditMessage(PACKET_HEADER_SET_VOXEL, 0, 1, &detail, bufferOut, sizeOut)){ + AgentList::getInstance()->broadcastToAgents(bufferOut, sizeOut, &AGENT_TYPE_VOXEL, 1); + delete bufferOut; + } +} + +void addVoxelInFrontOfAvatar() { + +} + void addVoxelUnderCursor() { glm::vec3 origin, direction; viewFrustum.computePickRay(mouseX / (float)WIDTH, mouseY / (float)HEIGHT, origin, direction); @@ -1521,13 +1535,7 @@ void addVoxelUnderCursor() { detail.z += detail.s; break; } - unsigned char* bufferOut; - int sizeOut; - - if (createVoxelEditMessage(PACKET_HEADER_SET_VOXEL, 0, 1, &detail, bufferOut, sizeOut)){ - AgentList::getInstance()->broadcastToAgents(bufferOut, sizeOut, &AGENT_TYPE_VOXEL, 1); - delete bufferOut; - } + addVoxel(detail); } } @@ -1668,6 +1676,7 @@ void key(unsigned char k, int x, int y) { if (k == '%') ::sendVoxelServerAddScene(); // sends add scene command to voxel server if (k == '1') ::mouseMode = ADD_VOXELS; if (k == '2') ::mouseMode = DELETE_VOXELS; + if (k == '3') addVoxelInFrontOfAvatar(); if (k == 'n' || k == 'N') { noiseOn = !noiseOn; // Toggle noise