mirror of
https://github.com/overte-org/overte.git
synced 2025-08-09 10:29:01 +02:00
cleanup bad merge
This commit is contained in:
parent
fe1a6b8f29
commit
e35df7904b
2 changed files with 1 additions and 7 deletions
|
@ -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
|
||||||
|
|
||||||
|
|
|
@ -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);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue