[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30617] branches/soc-2010-merwin/intern/ ghost: removed some NDOF plugin-related code

[Mike Erwin]

Revision: 30617
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30617
Author:   merwin
Date:     2010-07-22 09:15:00 +0200 (Thu, 22 Jul 2010)

Log Message:
-----------
removed some NDOF plugin-related code

Modified Paths:
--------------
    branches/soc-2010-merwin/intern/ghost/GHOST_C-api.h
    branches/soc-2010-merwin/intern/ghost/GHOST_ISystem.h
    branches/soc-2010-merwin/intern/ghost/intern/GHOST_C-api.cpp
    branches/soc-2010-merwin/intern/ghost/intern/GHOST_System.cpp
    branches/soc-2010-merwin/intern/ghost/intern/GHOST_System.h

Modified: branches/soc-2010-merwin/intern/ghost/GHOST_C-api.h
===================================================================
--- branches/soc-2010-merwin/intern/ghost/GHOST_C-api.h	2010-07-22 07:10:57 UTC (rev 30616)
+++ branches/soc-2010-merwin/intern/ghost/GHOST_C-api.h	2010-07-22 07:15:00 UTC (rev 30617)
@@ -280,22 +280,8 @@
  * @param windowhandle The handle to the window
  */
 extern GHOST_TSuccess GHOST_EndProgressBar(GHOST_WindowHandle windowhandle);
-	
-	
-/***************************************************************************************
- ** N-degree of freedom device management functionality
- ***************************************************************************************/
- 
-/**
-* Open N-degree of freedom devices
- */
-extern int GHOST_OpenNDOF(GHOST_SystemHandle systemhandle, 
-                           GHOST_WindowHandle windowhandle,
-                          GHOST_NDOFLibraryInit_fp setNdofLibraryInit, 
-                          GHOST_NDOFLibraryShutdown_fp setNdofLibraryShutdown,
-                          GHOST_NDOFDeviceOpen_fp setNdofDeviceOpen
-                          );
 
+
 /***************************************************************************************
  ** Cursor management functionality
  ***************************************************************************************/

Modified: branches/soc-2010-merwin/intern/ghost/GHOST_ISystem.h
===================================================================
--- branches/soc-2010-merwin/intern/ghost/GHOST_ISystem.h	2010-07-22 07:10:57 UTC (rev 30616)
+++ branches/soc-2010-merwin/intern/ghost/GHOST_ISystem.h	2010-07-22 07:15:00 UTC (rev 30617)
@@ -295,23 +295,8 @@
 	 * @return Indication of success.
 	 */
 	virtual GHOST_TSuccess addEventConsumer(GHOST_IEventConsumer* consumer) = 0;
-	
-	 /***************************************************************************************
-	 ** N-degree of freedom device management functionality
-	 ***************************************************************************************/
 
-   /**
-    * Starts the N-degree of freedom device manager
-    */
-   virtual int openNDOF(GHOST_IWindow*,
-       GHOST_NDOFLibraryInit_fp setNdofLibraryInit, 
-       GHOST_NDOFLibraryShutdown_fp setNdofLibraryShutdown,
-       GHOST_NDOFDeviceOpen_fp setNdofDeviceOpen
-       // original patch only
-      // GHOST_NDOFEventHandler_fp setNdofEventHandler
-       ) = 0;
 
-
 	/***************************************************************************************
 	 ** Cursor management functionality
 	 ***************************************************************************************/

Modified: branches/soc-2010-merwin/intern/ghost/intern/GHOST_C-api.cpp
===================================================================
--- branches/soc-2010-merwin/intern/ghost/intern/GHOST_C-api.cpp	2010-07-22 07:10:57 UTC (rev 30616)
+++ branches/soc-2010-merwin/intern/ghost/intern/GHOST_C-api.cpp	2010-07-22 07:15:00 UTC (rev 30617)
@@ -263,23 +263,7 @@
 }
 
 
-int GHOST_OpenNDOF(GHOST_SystemHandle systemhandle, GHOST_WindowHandle windowhandle,
-   GHOST_NDOFLibraryInit_fp setNdofLibraryInit, 
-    GHOST_NDOFLibraryShutdown_fp setNdofLibraryShutdown,
-    GHOST_NDOFDeviceOpen_fp setNdofDeviceOpen)
-  //original patch only
-  /*  GHOST_NDOFEventHandler_fp setNdofEventHandler)*/
-{
-	GHOST_ISystem* system = (GHOST_ISystem*) systemhandle;
 
-    return system->openNDOF((GHOST_IWindow*) windowhandle,
-        setNdofLibraryInit, setNdofLibraryShutdown, setNdofDeviceOpen);
-//	original patch
-//        setNdofLibraryInit, setNdofLibraryShutdown, setNdofDeviceOpen, setNdofEventHandler);
-}
-
-
-
 GHOST_TStandardCursor GHOST_GetCursorShape(GHOST_WindowHandle windowhandle)
 {
 	GHOST_IWindow* window = (GHOST_IWindow*) windowhandle;
@@ -701,7 +685,7 @@
 	return window->invalidate();
 }
 
-
+// [mce] this is going away soon
 extern const GHOST_TabletData* GHOST_GetTabletData(GHOST_WindowHandle windowhandle)
 {
 	return ((GHOST_IWindow*)windowhandle)->GetTabletData();

Modified: branches/soc-2010-merwin/intern/ghost/intern/GHOST_System.cpp
===================================================================
--- branches/soc-2010-merwin/intern/ghost/intern/GHOST_System.cpp	2010-07-22 07:10:57 UTC (rev 30616)
+++ branches/soc-2010-merwin/intern/ghost/intern/GHOST_System.cpp	2010-07-22 07:15:00 UTC (rev 30617)
@@ -237,18 +237,7 @@
 	return success;
 }
 
-int GHOST_System::openNDOF(GHOST_IWindow* w,
-        GHOST_NDOFLibraryInit_fp setNdofLibraryInit, 
-        GHOST_NDOFLibraryShutdown_fp setNdofLibraryShutdown,
-        GHOST_NDOFDeviceOpen_fp setNdofDeviceOpen)
-{
- return   m_ndofManager->deviceOpen(w,
-        setNdofLibraryInit, 
-        setNdofLibraryShutdown,
-        setNdofDeviceOpen);
-}
 
-
 GHOST_TSuccess GHOST_System::getModifierKeyState(GHOST_TModifierKeyMask mask, bool& isDown) const
 {
 	GHOST_ModifierKeys keys;
@@ -284,7 +273,8 @@
 	m_timerManager = new GHOST_TimerManager ();
 	m_windowManager = new GHOST_WindowManager ();
 	m_eventManager = new GHOST_EventManager ();
-    m_ndofManager = new GHOST_NDOFManager();
+//	m_ndofManager = new GHOST_NDOFManager();
+// Each platform now has their own NDOFManager subclass
 
 #ifdef GHOST_DEBUG
 	if (m_eventManager) {

Modified: branches/soc-2010-merwin/intern/ghost/intern/GHOST_System.h
===================================================================
--- branches/soc-2010-merwin/intern/ghost/intern/GHOST_System.h	2010-07-22 07:10:57 UTC (rev 30616)
+++ branches/soc-2010-merwin/intern/ghost/intern/GHOST_System.h	2010-07-22 07:15:00 UTC (rev 30617)
@@ -184,27 +184,7 @@
 	virtual GHOST_TSuccess addEventConsumer(GHOST_IEventConsumer* consumer);
 
 
-
 	/***************************************************************************************
-	 ** N-degree of freedom devcice management functionality
-	 ***************************************************************************************/
-
-	/** Inherited from GHOST_ISystem
-     *  Opens the N-degree of freedom device manager
-	 * return 0 if device found, 1 otherwise
-     */
-    virtual int openNDOF(GHOST_IWindow* w,        
-        GHOST_NDOFLibraryInit_fp setNdofLibraryInit, 
-        GHOST_NDOFLibraryShutdown_fp setNdofLibraryShutdown,
-        GHOST_NDOFDeviceOpen_fp setNdofDeviceOpen);
-        
-// original patch only        
-//        GHOST_NDOFEventHandler_fp setNdofEventHandler);
-
-
-
-
-	/***************************************************************************************
 	 ** Cursor management functionality
 	 ***************************************************************************************/