From 132b313c9c9445595c49dcebb5f8e00df19aaa26 Mon Sep 17 00:00:00 2001 From: Philip Rosedale Date: Tue, 10 Dec 2013 17:00:53 -0800 Subject: [PATCH] remove voxel glow on local add --- interface/src/Application.cpp | 13 +------------ interface/src/avatar/MyAvatar.cpp | 3 +-- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 077fd3c875..8248ba5fa6 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -1504,18 +1504,7 @@ void Application::makeVoxel(glm::vec3 position, _voxels.createVoxel(voxel.x, voxel.y, voxel.z, voxel.s, voxel.red, voxel.green, voxel.blue, isDestructive); - - // Implement voxel fade effect - VoxelFade fade(VoxelFade::FADE_OUT, 1.0f, 1.0f, 1.0f); - const float VOXEL_BOUNDS_ADJUST = 0.01f; - float slightlyBigger = voxel.s * VOXEL_BOUNDS_ADJUST; - fade.voxelDetails.x = voxel.x - slightlyBigger; - fade.voxelDetails.y = voxel.y - slightlyBigger; - fade.voxelDetails.z = voxel.z - slightlyBigger; - fade.voxelDetails.s = voxel.s + slightlyBigger + slightlyBigger; - _voxelFades.push_back(fade); - -} + } const glm::vec3 Application::getMouseVoxelWorldCoordinates(const VoxelDetail _mouseVoxel) { return glm::vec3((_mouseVoxel.x + _mouseVoxel.s / 2.f) * TREE_SCALE, diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index cf282811d1..7518d639c3 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -667,7 +667,7 @@ void MyAvatar::updateThrust(float deltaTime, Transmitter * transmitter) { // Add thrust and rotation from hand controllers const float THRUST_MAG_HAND_JETS = THRUST_MAG_FWD; const float JOYSTICK_YAW_MAG = YAW_MAG; - const float JOYSTICK_PITCH_MAG = PITCH_MAG; + const float JOYSTICK_PITCH_MAG = PITCH_MAG * 0.5f; const int THRUST_CONTROLLER = 0; const int VIEW_CONTROLLER = 1; for (size_t i = 0; i < getHand().getPalms().size(); ++i) { @@ -677,7 +677,6 @@ void MyAvatar::updateThrust(float deltaTime, Transmitter * transmitter) { FingerData& finger = palm.getFingers()[0]; if (finger.isActive()) { } - //glm::vec3 thrustDirection = glm::normalize(finger.getTipPosition() - palm.getPosition()); _thrust += front * _scale * THRUST_MAG_HAND_JETS * palm.getJoystickY() * _thrustMultiplier * deltaTime; } if (palm.getJoystickX() != 0.f) {