From e35df7904b4484df63e550e0da2249aa2deb672a Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Sun, 9 Feb 2014 12:32:12 -0800 Subject: [PATCH] cleanup bad merge --- interface/src/Application.cpp | 5 ----- libraries/script-engine/src/EventTypes.cpp | 3 +-- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 95fa6ebfdd..1e960bb5a8 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -1218,11 +1218,6 @@ void Application::mouseMoveEvent(QMouseEvent* event) { } } -const bool MAKE_SOUND_ON_VOXEL_HOVER = false; -const bool MAKE_SOUND_ON_VOXEL_CLICK = true; -const float HOVER_VOXEL_FREQUENCY = 7040.f; -const float HOVER_VOXEL_DECAY = 0.999f; - void Application::mousePressEvent(QMouseEvent* event) { _controllerScriptingInterface.emitMousePressEvent(event); // send events to any registered scripts diff --git a/libraries/script-engine/src/EventTypes.cpp b/libraries/script-engine/src/EventTypes.cpp index e522456dce..963912fd34 100644 --- a/libraries/script-engine/src/EventTypes.cpp +++ b/libraries/script-engine/src/EventTypes.cpp @@ -347,8 +347,7 @@ TouchEvent::TouchEvent(const QTouchEvent& event) : initWithQTouchEvent(event); } -TouchEvent::TouchEvent(const QTouchEvent& event, const TouchEvent& other) -{ +TouchEvent::TouchEvent(const QTouchEvent& event, const TouchEvent& other) { initWithQTouchEvent(event); calculateMetaAttributes(other); }