Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 08:21:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

cleanup bad merge

Browse source
This commit is contained in:
ZappoMan 2014-02-09 12:32:12 -08:00
parent fe1a6b8f29
commit e35df7904b
2 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/src/Application.cpp
View file

@ -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) { void Application::mousePressEvent(QMouseEvent* event) {
_controllerScriptingInterface.emitMousePressEvent(event); // send events to any registered scripts _controllerScriptingInterface.emitMousePressEvent(event); // send events to any registered scripts

3
libraries/script-engine/src/EventTypes.cpp
View file

@ -347,8 +347,7 @@ TouchEvent::TouchEvent(const QTouchEvent& event) :
initWithQTouchEvent(event); initWithQTouchEvent(event);
} }
TouchEvent::TouchEvent(const QTouchEvent& event, const TouchEvent& other) TouchEvent::TouchEvent(const QTouchEvent& event, const TouchEvent& other) {
{
initWithQTouchEvent(event); initWithQTouchEvent(event);
calculateMetaAttributes(other); calculateMetaAttributes(other);
} }