Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-08 22:37:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove voxel glow on local add

Browse source
This commit is contained in:
Philip Rosedale 2013-12-10 17:00:53 -08:00
parent c9f96d1adf
commit 132b313c9c
2 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
interface/src/Application.cpp
View file

@ -1504,18 +1504,7 @@ void Application::makeVoxel(glm::vec3 position,
_voxels.createVoxel(voxel.x, voxel.y, voxel.z, voxel.s, _voxels.createVoxel(voxel.x, voxel.y, voxel.z, voxel.s,
voxel.red, voxel.green, voxel.blue, voxel.red, voxel.green, voxel.blue,
isDestructive); 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) { const glm::vec3 Application::getMouseVoxelWorldCoordinates(const VoxelDetail _mouseVoxel) {
return glm::vec3((_mouseVoxel.x + _mouseVoxel.s / 2.f) * TREE_SCALE, return glm::vec3((_mouseVoxel.x + _mouseVoxel.s / 2.f) * TREE_SCALE,

3
interface/src/avatar/MyAvatar.cpp
View file

@ -667,7 +667,7 @@ void MyAvatar::updateThrust(float deltaTime, Transmitter * transmitter) {
// Add thrust and rotation from hand controllers // Add thrust and rotation from hand controllers
const float THRUST_MAG_HAND_JETS = THRUST_MAG_FWD; const float THRUST_MAG_HAND_JETS = THRUST_MAG_FWD;
const float JOYSTICK_YAW_MAG = YAW_MAG; 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 THRUST_CONTROLLER = 0;
const int VIEW_CONTROLLER = 1; const int VIEW_CONTROLLER = 1;
for (size_t i = 0; i < getHand().getPalms().size(); ++i) { 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]; FingerData& finger = palm.getFingers()[0];
if (finger.isActive()) { if (finger.isActive()) {
} }
//glm::vec3 thrustDirection = glm::normalize(finger.getTipPosition() - palm.getPosition());
_thrust += front * _scale * THRUST_MAG_HAND_JETS * palm.getJoystickY() * _thrustMultiplier * deltaTime; _thrust += front * _scale * THRUST_MAG_HAND_JETS * palm.getJoystickY() * _thrustMultiplier * deltaTime;
} }
if (palm.getJoystickX() != 0.f) { if (palm.getJoystickX() != 0.f) {