Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: Compilation under Linux

Browse source 
--HG--
branch : develop
This commit is contained in:
kervala 2016-01-09 15:56:50 +01:00
parent cc0174e800
commit 9ee32071d8
3 changed files with 54 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
code/nel/tools/3d/object_viewer_widget/src/object_viewer_widget.cpp
View file

@ -51,6 +51,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
Q_EXPORT_PLUGIN2(object_viewer_widget_qt, NLQT::CObjectViewerWidget)
#endif
#if defined(NL_OS_WINDOWS)
typedef bool (*winProc)(NL3D::IDriver *driver, HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
#elif defined(NL_OS_MAC)
typedef bool (*cocoaProc)(NL3D::IDriver*, const void* e);
#else
typedef bool (*x11Proc)(NL3D::IDriver *drv, XEvent *e);
#endif
using namespace NLMISC;
using namespace NL3D;
using namespace std;
@ -735,9 +743,36 @@ namespace NLQT
_Scene->animate ( fdelta);
}
#if defined(NL_OS_WINDOWS)
#ifdef USE_QT5
typedef bool (*winProc)(NL3D::IDriver *driver, HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
bool CObjectViewerWidget::nativeEvent(const QByteArray &eventType, void *message, long *result)
{
if (getDriver() && getDriver()->isActive())
{
NL3D::IDriver *driver = dynamic_cast<NL3D::CDriverUser*>(getDriver())->getDriver();
if (driver)
{
// see what to do with result
#if defined(NL_OS_WINDOWS)
MSG *msg = (MSG*)message;
winProc proc = (winProc)driver->getWindowProc();
return proc(driver, msg->hwnd, msg->message, msg->wParam, msg->lParam);
#elif defined(NL_OS_MAC)
cocoaProc proc = (cocoaProc)driver->getWindowProc();
return proc(driver, message);
#else
x11Proc proc = (x11Proc)driver->getWindowProc();
return proc(driver, message);
#endif
}
}
return false;
}
#else
#if defined(NL_OS_WINDOWS)
bool CObjectViewerWidget::winEvent(MSG *message, long *result)
{
@ -756,8 +791,6 @@ namespace NLQT
#elif defined(NL_OS_MAC)
typedef bool (*cocoaProc)(NL3D::IDriver*, const void* e);
bool CObjectViewerWidget::macEvent(EventHandlerCallRef caller, EventRef event)
{
if(caller)
@ -778,8 +811,6 @@ namespace NLQT
#elif defined(NL_OS_UNIX)
typedef bool (*x11Proc)(NL3D::IDriver *drv, XEvent *e);
bool CObjectViewerWidget::x11Event(XEvent *event)
{
if (getDriver() && getDriver()->isActive())
@ -796,4 +827,6 @@ namespace NLQT
}
#endif
#endif
} /* namespace NLQT */

6
code/nel/tools/3d/object_viewer_widget/src/object_viewer_widget.h
View file

@ -166,12 +166,18 @@ namespace NLQT
virtual QString name() const {return ("ObjectViewerWidget");}
protected:
#ifdef USE_QT5
virtual bool nativeEvent(const QByteArray &eventType, void *message, long *result);
#else
#if defined(NL_OS_WINDOWS)
virtual bool winEvent(MSG * message, long * result);
#elif defined(NL_OS_MAC)
virtual bool macEvent(EventHandlerCallRef caller, EventRef event);
#elif defined(NL_OS_UNIX)
virtual bool x11Event(XEvent *event);
#endif
#endif
private Q_SLOTS:

8
code/nel/tools/3d/object_viewer_widget/src/stdpch.h
View file

@ -56,4 +56,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <nel/misc/types_nl.h>
#include <nel/misc/common.h>
#if defined(NL_OS_WINDOWS)
#define NOMINMAX
#include <Windows.h>
#elif defined(NL_OS_MAC)
#else
#include <X11/Xlib.h>
#endif
#endif