diff options
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/ghost/GHOST_Types.h | 4 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_SystemWin32.cpp | 13 | ||||
| -rw-r--r-- | intern/ghost/make/msvc_7_0/ghost.vcproj | 9 |
3 files changed, 26 insertions, 0 deletions
diff --git a/intern/ghost/GHOST_Types.h b/intern/ghost/GHOST_Types.h index 9b8a402a195..0de4c162ab8 100644 --- a/intern/ghost/GHOST_Types.h +++ b/intern/ghost/GHOST_Types.h @@ -39,6 +39,10 @@ typedef unsigned short GHOST_TUns16; typedef int GHOST_TInt32; typedef unsigned int GHOST_TUns32; +#ifdef WIN32 +#define WM_BLND_3DX WM_USER + 1 +#endif + #if defined(WIN32) && !defined(FREE_WINDOWS) typedef __int64 GHOST_TInt64; typedef unsigned __int64 GHOST_TUns64; diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp index ec6d0d355b5..bfd41e29946 100644 --- a/intern/ghost/intern/GHOST_SystemWin32.cpp +++ b/intern/ghost/intern/GHOST_SystemWin32.cpp @@ -64,10 +64,12 @@ #include "GHOST_EventCursor.h" #include "GHOST_EventKey.h" #include "GHOST_EventWheel.h" +#include "GHOST_EventNDOF.h" #include "GHOST_TimerTask.h" #include "GHOST_TimerManager.h" #include "GHOST_WindowManager.h" #include "GHOST_WindowWin32.h" +#include "GHOST_NDOFManager.h" // Key code values not found in winuser.h #ifndef VK_MINUS @@ -853,6 +855,17 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam, WM_CREATE 0x01 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 { diff --git a/intern/ghost/make/msvc_7_0/ghost.vcproj b/intern/ghost/make/msvc_7_0/ghost.vcproj index 9d0aef451e7..e5b2e09a678 100644 --- a/intern/ghost/make/msvc_7_0/ghost.vcproj +++ b/intern/ghost/make/msvc_7_0/ghost.vcproj @@ -281,6 +281,9 @@ ECHO Done RelativePath="..\..\intern\GHOST_EventManager.h"> </File> <File + RelativePath="..\..\intern\GHOST_EventNDOF.h"> + </File> + <File RelativePath="..\..\intern\GHOST_EventPrinter.h"> </File> <File @@ -293,6 +296,9 @@ ECHO Done RelativePath="..\..\intern\GHOST_ModifierKeys.h"> </File> <File + RelativePath="..\..\intern\GHOST_NDOFManager.cpp"> + </File> + <File RelativePath="..\..\intern\GHOST_System.h"> </File> <File @@ -374,6 +380,9 @@ ECHO Done RelativePath="..\..\intern\GHOST_ModifierKeys.cpp"> </File> <File + RelativePath="..\..\intern\GHOST_NDOFManager.cpp"> + </File> + <File RelativePath="..\..\intern\GHOST_Rect.cpp"> </File> <File |