From 2456c26207b24b825a8181db224706d57d98ad07 Mon Sep 17 00:00:00 2001 From: Philip Rosedale Date: Sun, 1 Dec 2013 20:46:42 -0800 Subject: [PATCH] changed function name so less confusing --- interface/src/Application.cpp | 54 ++++++++++++----------------------- interface/src/Application.h | 7 ++++- interface/src/avatar/Hand.cpp | 8 ++++-- 3 files changed, 31 insertions(+), 38 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 5885603314..dbef4f050d 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -1487,18 +1487,20 @@ void Application::doKillLocalVoxels() { _wantToKillLocalVoxels = true; } -void Application::createVoxel(glm::vec3 position, - float scale, - glm::vec3 color, - bool isDestructive) { +void Application::makeVoxel(glm::vec3 position, + float scale, + unsigned char red, + unsigned char green, + unsigned char blue, + bool isDestructive) { VoxelDetail voxel; voxel.x = position.x / TREE_SCALE; voxel.y = position.y / TREE_SCALE; voxel.z = position.z / TREE_SCALE; voxel.s = scale / TREE_SCALE; - voxel.red = color.x; - voxel.green = color.y; - voxel.blue = color.z; + voxel.red = red; + voxel.green = green; + voxel.blue = blue; PACKET_TYPE message = isDestructive ? PACKET_TYPE_SET_VOXEL_DESTRUCTIVE : PACKET_TYPE_SET_VOXEL; _voxelEditSender.sendVoxelEditMessage(message, voxel); @@ -1518,11 +1520,6 @@ void Application::createVoxel(glm::vec3 position, fade.voxelDetails.s = voxel.s + slightlyBigger + slightlyBigger; _voxelFades.push_back(fade); - // inject a sound effect - injectVoxelAddedSoundEffect(); - - // remember the position for drag detection - _justEditedVoxel = true; } const glm::vec3 Application::getMouseVoxelWorldCoordinates(const VoxelDetail _mouseVoxel) { @@ -4129,31 +4126,18 @@ bool Application::maybeEditVoxelUnderCursor() { if (Menu::getInstance()->isOptionChecked(MenuOption::VoxelAddMode) || Menu::getInstance()->isOptionChecked(MenuOption::VoxelColorMode)) { if (_mouseVoxel.s != 0) { - PACKET_TYPE message = Menu::getInstance()->isOptionChecked(MenuOption::DestructiveAddVoxel) - ? PACKET_TYPE_SET_VOXEL_DESTRUCTIVE - : PACKET_TYPE_SET_VOXEL; - _voxelEditSender.sendVoxelEditMessage(message, _mouseVoxel); - - // create the voxel locally so it appears immediately - printf("create voxel from mouse %.4f, %.4f, %.4f, scale %.6f \n", _mouseVoxel.x, _mouseVoxel.y, _mouseVoxel.z, _mouseVoxel.s); - - _voxels.createVoxel(_mouseVoxel.x, _mouseVoxel.y, _mouseVoxel.z, _mouseVoxel.s, - _mouseVoxel.red, _mouseVoxel.green, _mouseVoxel.blue, - Menu::getInstance()->isOptionChecked(MenuOption::DestructiveAddVoxel)); - - // Implement voxel fade effect - VoxelFade fade(VoxelFade::FADE_OUT, 1.0f, 1.0f, 1.0f); - const float VOXEL_BOUNDS_ADJUST = 0.01f; - float slightlyBigger = _mouseVoxel.s * VOXEL_BOUNDS_ADJUST; - fade.voxelDetails.x = _mouseVoxel.x - slightlyBigger; - fade.voxelDetails.y = _mouseVoxel.y - slightlyBigger; - fade.voxelDetails.z = _mouseVoxel.z - slightlyBigger; - fade.voxelDetails.s = _mouseVoxel.s + slightlyBigger + slightlyBigger; - _voxelFades.push_back(fade); - + makeVoxel(glm::vec3(_mouseVoxel.x * TREE_SCALE, + _mouseVoxel.y * TREE_SCALE, + _mouseVoxel.z * TREE_SCALE), + _mouseVoxel.s * TREE_SCALE, + _mouseVoxel.red, + _mouseVoxel.green, + _mouseVoxel.blue, + Menu::getInstance()->isOptionChecked(MenuOption::DestructiveAddVoxel)); + // inject a sound effect injectVoxelAddedSoundEffect(); - + // remember the position for drag detection _justEditedVoxel = true; diff --git a/interface/src/Application.h b/interface/src/Application.h index 09ee24ba2a..cfef871e3c 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -117,7 +117,12 @@ public: void wheelEvent(QWheelEvent* event); - void createVoxel(glm::vec3 position, float scale, glm::vec3 color, bool isDestructive); + void makeVoxel(glm::vec3 position, + float scale, + unsigned char red, + unsigned char green, + unsigned char blue, + bool isDestructive); const glm::vec3 getMouseVoxelWorldCoordinates(const VoxelDetail _mouseVoxel); QGLWidget* getGLWidget() { return _glWidget; } diff --git a/interface/src/avatar/Hand.cpp b/interface/src/avatar/Hand.cpp index 0d51768247..2c9262fd04 100755 --- a/interface/src/avatar/Hand.cpp +++ b/interface/src/avatar/Hand.cpp @@ -72,8 +72,12 @@ void Hand::simulate(float deltaTime, bool isMine) { glm::vec3 newVoxelPosition = finger.getTipPosition(); if (glm::length(newVoxelPosition - _lastFingerVoxel) > (FINGERTIP_VOXEL_SIZE / 2.f)) { QColor paintColor = Menu::getInstance()->getActionForOption(MenuOption::VoxelPaintColor)->data().value(); - glm::vec3 newVoxelColor(paintColor.red(), paintColor.green(), paintColor.blue()); - Application::getInstance()->createVoxel(newVoxelPosition, FINGERTIP_VOXEL_SIZE, newVoxelColor, true); + Application::getInstance()->makeVoxel(newVoxelPosition, + FINGERTIP_VOXEL_SIZE, + paintColor.red(), + paintColor.green(), + paintColor.blue(), + true); _lastFingerVoxel = newVoxelPosition; } }