forked from bartvdbraak/blender
commiting fixes from Ettore for building on linux & win 32
This commit is contained in:
parent
1104a39f11
commit
603da178b9
@ -70,9 +70,6 @@ GHOST_NDOFManager::deviceOpen(GHOST_IWindow* window,
|
|||||||
if (ndofLibraryInit && ndofDeviceOpen)
|
if (ndofLibraryInit && ndofDeviceOpen)
|
||||||
{
|
{
|
||||||
printf("%i client \n", ndofLibraryInit());
|
printf("%i client \n", ndofLibraryInit());
|
||||||
|
|
||||||
m_DeviceHandle = ndofDeviceOpen((void *)¤tNdofValues);
|
|
||||||
|
|
||||||
#if defined(_WIN32) || defined(__APPLE__)
|
#if defined(_WIN32) || defined(__APPLE__)
|
||||||
m_DeviceHandle = ndofDeviceOpen((void *)¤tNdofValues);
|
m_DeviceHandle = ndofDeviceOpen((void *)¤tNdofValues);
|
||||||
#else
|
#else
|
||||||
|
@ -31,14 +31,7 @@
|
|||||||
class GHOST_NDOFManager
|
class GHOST_NDOFManager
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
/**
|
|
||||||
* Constructor.
|
|
||||||
*/
|
|
||||||
GHOST_NDOFManager();
|
GHOST_NDOFManager();
|
||||||
|
|
||||||
/**
|
|
||||||
* Destructor.
|
|
||||||
*/
|
|
||||||
virtual ~GHOST_NDOFManager();
|
virtual ~GHOST_NDOFManager();
|
||||||
|
|
||||||
void deviceOpen(GHOST_IWindow* window,
|
void deviceOpen(GHOST_IWindow* window,
|
||||||
|
@ -843,6 +843,17 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam,
|
|||||||
* In GHOST, we let DefWindowProc call the timer callback.
|
* In GHOST, we let DefWindowProc call the timer callback.
|
||||||
*/
|
*/
|
||||||
break;
|
break;
|
||||||
|
case WM_BLND_3DX:
|
||||||
|
{
|
||||||
|
GHOST_TEventNDOFData ndofdata;
|
||||||
|
system->m_ndofManager->GHOST_NDOFGetDatas(ndofdata);
|
||||||
|
system->m_eventManager->
|
||||||
|
pushEvent(new GHOST_EventNDOF(
|
||||||
|
system->getMilliSeconds(),
|
||||||
|
GHOST_kEventNDOFMotion,
|
||||||
|
window, ndofdata));
|
||||||
|
}
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
@ -855,17 +866,6 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam,
|
|||||||
WM_CREATE 0x01
|
WM_CREATE 0x01
|
||||||
We let DefWindowProc do the work.
|
We let DefWindowProc do the work.
|
||||||
*/
|
*/
|
||||||
case WM_BLND_3DX:
|
|
||||||
{
|
|
||||||
GHOST_TEventNDOFData ndofdata;
|
|
||||||
system->m_ndofManager->GHOST_NDOFGetDatas(ndofdata);
|
|
||||||
system->m_eventManager->
|
|
||||||
pushEvent(new GHOST_EventNDOF(
|
|
||||||
system->getMilliSeconds(),
|
|
||||||
GHOST_kEventNDOFMotion,
|
|
||||||
window, ndofdata));
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
@ -484,7 +484,6 @@ GHOST_SystemX11::processEvent(XEvent *xe)
|
|||||||
} else {
|
} else {
|
||||||
/* Unknown client message, ignore */
|
/* Unknown client message, ignore */
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user