teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Removed workaround for OSG input handling in RenderWidget.

Browse source
This commit is contained in:
Aesylwinn 2016-03-09 15:31:38 -05:00
parent 48047beb9a
commit 38059593a7
2 changed files with 0 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
apps/opencs/view/render/scenewidget.cpp
View file

@ -100,26 +100,6 @@ void RenderWidget::setVisibilityMask(int mask)
mView->getCamera()->setCullMask(mask | Mask_ParticleSystem | Mask_Lighting); mView->getCamera()->setCullMask(mask | Mask_ParticleSystem | Mask_Lighting);
} }
bool RenderWidget::eventFilter(QObject* obj, QEvent* event)
{
// handle event in this widget, is there a better way to do this?
if (event->type() == QEvent::MouseButtonPress)
mousePressEvent(static_cast<QMouseEvent*>(event));
if (event->type() == QEvent::MouseButtonRelease)
mouseReleaseEvent(static_cast<QMouseEvent*>(event));
if (event->type() == QEvent::MouseMove)
mouseMoveEvent(static_cast<QMouseEvent*>(event));
if (event->type() == QEvent::KeyPress)
keyPressEvent(static_cast<QKeyEvent*>(event));
if (event->type() == QEvent::KeyRelease)
keyReleaseEvent(static_cast<QKeyEvent*>(event));
if (event->type() == QEvent::Wheel)
wheelEvent(static_cast<QWheelEvent *>(event));
// Always pass the event on to GLWidget, i.e. to OSG event queue
return QObject::eventFilter(obj, event);
}
osg::Camera *RenderWidget::getCamera() osg::Camera *RenderWidget::getCamera()
{ {
return mView->getCamera(); return mView->getCamera();

2
apps/opencs/view/render/scenewidget.hpp
View file

@ -46,8 +46,6 @@ namespace CSVRender
void setVisibilityMask(int mask); void setVisibilityMask(int mask);
bool eventFilter(QObject *, QEvent *);
osg::Camera *getCamera(); osg::Camera *getCamera();
protected: protected: