[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11277] branches/ndof/intern/ghost/intern: commiting fixes from Ettore for building on linux & win 32

[JLuc Peuriere]

Revision: 11277
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11277
Author:   lukep
Date:     2007-07-15 16:30:09 +0200 (Sun, 15 Jul 2007)

Log Message:
-----------
commiting fixes from Ettore for building on linux & win 32

Modified Paths:
--------------
    branches/ndof/intern/ghost/intern/GHOST_NDOFManager.cpp
    branches/ndof/intern/ghost/intern/GHOST_NDOFManager.h
    branches/ndof/intern/ghost/intern/GHOST_SystemWin32.cpp
    branches/ndof/intern/ghost/intern/GHOST_SystemX11.cpp

Modified: branches/ndof/intern/ghost/intern/GHOST_NDOFManager.cpp
===================================================================
--- branches/ndof/intern/ghost/intern/GHOST_NDOFManager.cpp	2007-07-15 07:05:24 UTC (rev 11276)
+++ branches/ndof/intern/ghost/intern/GHOST_NDOFManager.cpp	2007-07-15 14:30:09 UTC (rev 11277)
@@ -70,9 +70,6 @@
     if (ndofLibraryInit  && ndofDeviceOpen)
     {
        printf("%i client \n", ndofLibraryInit());
-		
-		m_DeviceHandle = ndofDeviceOpen((void *)&currentNdofValues);    
-		
 		#if defined(_WIN32) || defined(__APPLE__)
 			m_DeviceHandle = ndofDeviceOpen((void *)&currentNdofValues);    
 		#else

Modified: branches/ndof/intern/ghost/intern/GHOST_NDOFManager.h
===================================================================
--- branches/ndof/intern/ghost/intern/GHOST_NDOFManager.h	2007-07-15 07:05:24 UTC (rev 11276)
+++ branches/ndof/intern/ghost/intern/GHOST_NDOFManager.h	2007-07-15 14:30:09 UTC (rev 11277)
@@ -31,14 +31,7 @@
 class GHOST_NDOFManager
 {
 public:
-	/**
-	 * Constructor.
-	 */
 	GHOST_NDOFManager();
-
-	/**
-	 * Destructor.
-	 */
 	virtual ~GHOST_NDOFManager();
 
     void deviceOpen(GHOST_IWindow* window,

Modified: branches/ndof/intern/ghost/intern/GHOST_SystemWin32.cpp
===================================================================
--- branches/ndof/intern/ghost/intern/GHOST_SystemWin32.cpp	2007-07-15 07:05:24 UTC (rev 11276)
+++ branches/ndof/intern/ghost/intern/GHOST_SystemWin32.cpp	2007-07-15 14:30:09 UTC (rev 11277)
@@ -843,6 +843,17 @@
 					 * In GHOST, we let DefWindowProc call the timer callback.
 					 */
 					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 {
@@ -855,17 +866,6 @@
 			   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 {

Modified: branches/ndof/intern/ghost/intern/GHOST_SystemX11.cpp
===================================================================
--- branches/ndof/intern/ghost/intern/GHOST_SystemX11.cpp	2007-07-15 07:05:24 UTC (rev 11276)
+++ branches/ndof/intern/ghost/intern/GHOST_SystemX11.cpp	2007-07-15 14:30:09 UTC (rev 11277)
@@ -484,7 +484,6 @@
 			} else {
 				/* Unknown client message, ignore */
 			}
-#endif
 			break;
 		}
 			
@@ -543,7 +542,7 @@
 {
 	const vector<GHOST_IWindow*>& v(m_windowManager->getWindows());
 	if (v.size() > 0)
-	sNdofInfo.window = static_cast<GHOST_WindowX11*>(v[0])->getXWindow();
+		sNdofInfo.window = static_cast<GHOST_WindowX11*>(v[0])->getXWindow();
 	sNdofInfo.display = m_display;
 	sNdofInfo.currValues = currentNdofValues;
 	return (void*)&sNdofInfo;