forked from bartvdbraak/blender
committing Ettore Pasquini MS windows support
for NDOF devices I applied the patch but cant test so please let me know if any problem. the plugin itself can be found either on Ettore site http://cubelogic/blender/ or on my site http://jlp.nerim.net/dev/6dof/ on my site there is also the source of mac plugin
This commit is contained in:
parent
edc6512ba6
commit
a75f431cd3
@ -39,6 +39,10 @@ typedef unsigned short GHOST_TUns16;
|
|||||||
typedef int GHOST_TInt32;
|
typedef int GHOST_TInt32;
|
||||||
typedef unsigned int GHOST_TUns32;
|
typedef unsigned int GHOST_TUns32;
|
||||||
|
|
||||||
|
#ifdef WIN32
|
||||||
|
#define WM_BLND_3DX WM_USER + 1
|
||||||
|
#endif
|
||||||
|
|
||||||
#if defined(WIN32) && !defined(FREE_WINDOWS)
|
#if defined(WIN32) && !defined(FREE_WINDOWS)
|
||||||
typedef __int64 GHOST_TInt64;
|
typedef __int64 GHOST_TInt64;
|
||||||
typedef unsigned __int64 GHOST_TUns64;
|
typedef unsigned __int64 GHOST_TUns64;
|
||||||
|
@ -64,10 +64,12 @@
|
|||||||
#include "GHOST_EventCursor.h"
|
#include "GHOST_EventCursor.h"
|
||||||
#include "GHOST_EventKey.h"
|
#include "GHOST_EventKey.h"
|
||||||
#include "GHOST_EventWheel.h"
|
#include "GHOST_EventWheel.h"
|
||||||
|
#include "GHOST_EventNDOF.h"
|
||||||
#include "GHOST_TimerTask.h"
|
#include "GHOST_TimerTask.h"
|
||||||
#include "GHOST_TimerManager.h"
|
#include "GHOST_TimerManager.h"
|
||||||
#include "GHOST_WindowManager.h"
|
#include "GHOST_WindowManager.h"
|
||||||
#include "GHOST_WindowWin32.h"
|
#include "GHOST_WindowWin32.h"
|
||||||
|
#include "GHOST_NDOFManager.h"
|
||||||
|
|
||||||
// Key code values not found in winuser.h
|
// Key code values not found in winuser.h
|
||||||
#ifndef VK_MINUS
|
#ifndef VK_MINUS
|
||||||
@ -853,6 +855,17 @@ 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 {
|
||||||
|
@ -280,6 +280,9 @@ ECHO Done
|
|||||||
<File
|
<File
|
||||||
RelativePath="..\..\intern\GHOST_EventManager.h">
|
RelativePath="..\..\intern\GHOST_EventManager.h">
|
||||||
</File>
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath="..\..\intern\GHOST_EventNDOF.h">
|
||||||
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\..\intern\GHOST_EventPrinter.h">
|
RelativePath="..\..\intern\GHOST_EventPrinter.h">
|
||||||
</File>
|
</File>
|
||||||
@ -292,6 +295,9 @@ ECHO Done
|
|||||||
<File
|
<File
|
||||||
RelativePath="..\..\intern\GHOST_ModifierKeys.h">
|
RelativePath="..\..\intern\GHOST_ModifierKeys.h">
|
||||||
</File>
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath="..\..\intern\GHOST_NDOFManager.cpp">
|
||||||
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\..\intern\GHOST_System.h">
|
RelativePath="..\..\intern\GHOST_System.h">
|
||||||
</File>
|
</File>
|
||||||
@ -373,6 +379,9 @@ ECHO Done
|
|||||||
<File
|
<File
|
||||||
RelativePath="..\..\intern\GHOST_ModifierKeys.cpp">
|
RelativePath="..\..\intern\GHOST_ModifierKeys.cpp">
|
||||||
</File>
|
</File>
|
||||||
|
<File
|
||||||
|
RelativePath="..\..\intern\GHOST_NDOFManager.cpp">
|
||||||
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath="..\..\intern\GHOST_Rect.cpp">
|
RelativePath="..\..\intern\GHOST_Rect.cpp">
|
||||||
</File>
|
</File>
|
||||||
|
Loading…
Reference in New Issue
Block a user