[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14090] branches/ndof: final (??) work on NDOF branch
JLuc Peuriere
jlp at nerim.net
Thu Mar 13 16:40:42 CET 2008
Revision: 14090
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14090
Author: lukep
Date: 2008-03-13 16:40:24 +0100 (Thu, 13 Mar 2008)
Log Message:
-----------
final (??) work on NDOF branch
it is now in a state where it can be safely
merged with trunk.
Note: basic icons were provided but I'm not
an icondesigner and working in a 16x15 grid
is way too small for me, so feel free to
change them.
Modified Paths:
--------------
branches/ndof/intern/ghost/GHOST_C-api.h
branches/ndof/intern/ghost/GHOST_ISystem.h
branches/ndof/intern/ghost/intern/GHOST_C-api.cpp
branches/ndof/intern/ghost/intern/GHOST_NDOFManager.cpp
branches/ndof/intern/ghost/intern/GHOST_NDOFManager.h
branches/ndof/intern/ghost/intern/GHOST_System.cpp
branches/ndof/intern/ghost/intern/GHOST_System.h
branches/ndof/release/datafiles/blenderbuttons
branches/ndof/source/blender/blenkernel/BKE_global.h
branches/ndof/source/blender/include/BIF_resources.h
branches/ndof/source/blender/include/blendef.h
branches/ndof/source/blender/makesdna/DNA_view3d_types.h
branches/ndof/source/blender/src/blenderbuttons.c
branches/ndof/source/blender/src/ghostwinlay.c
branches/ndof/source/blender/src/header_view3d.c
Modified: branches/ndof/intern/ghost/GHOST_C-api.h
===================================================================
--- branches/ndof/intern/ghost/GHOST_C-api.h 2008-03-13 15:12:19 UTC (rev 14089)
+++ branches/ndof/intern/ghost/GHOST_C-api.h 2008-03-13 15:40:24 UTC (rev 14090)
@@ -272,15 +272,12 @@
/**
* Open N-degree of freedom devices
*/
-extern void GHOST_OpenNDOF(GHOST_SystemHandle systemhandle,
+extern 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);
/***************************************************************************************
** Cursor management functionality
Modified: branches/ndof/intern/ghost/GHOST_ISystem.h
===================================================================
--- branches/ndof/intern/ghost/GHOST_ISystem.h 2008-03-13 15:12:19 UTC (rev 14089)
+++ branches/ndof/intern/ghost/GHOST_ISystem.h 2008-03-13 15:40:24 UTC (rev 14090)
@@ -302,7 +302,7 @@
/**
* Starts the N-degree of freedom device manager
*/
- virtual void openNDOF(GHOST_IWindow*,
+ virtual int openNDOF(GHOST_IWindow*,
GHOST_NDOFLibraryInit_fp setNdofLibraryInit,
GHOST_NDOFLibraryShutdown_fp setNdofLibraryShutdown,
GHOST_NDOFDeviceOpen_fp setNdofDeviceOpen
Modified: branches/ndof/intern/ghost/intern/GHOST_C-api.cpp
===================================================================
--- branches/ndof/intern/ghost/intern/GHOST_C-api.cpp 2008-03-13 15:12:19 UTC (rev 14089)
+++ branches/ndof/intern/ghost/intern/GHOST_C-api.cpp 2008-03-13 15:40:24 UTC (rev 14090)
@@ -259,7 +259,7 @@
return system->addEventConsumer((GHOST_CallbackEventConsumer*)consumerhandle);
}
-void GHOST_OpenNDOF(GHOST_SystemHandle systemhandle, GHOST_WindowHandle windowhandle,
+int GHOST_OpenNDOF(GHOST_SystemHandle systemhandle, GHOST_WindowHandle windowhandle,
GHOST_NDOFLibraryInit_fp setNdofLibraryInit,
GHOST_NDOFLibraryShutdown_fp setNdofLibraryShutdown,
GHOST_NDOFDeviceOpen_fp setNdofDeviceOpen)
Modified: branches/ndof/intern/ghost/intern/GHOST_NDOFManager.cpp
===================================================================
--- branches/ndof/intern/ghost/intern/GHOST_NDOFManager.cpp 2008-03-13 15:12:19 UTC (rev 14089)
+++ branches/ndof/intern/ghost/intern/GHOST_NDOFManager.cpp 2008-03-13 15:40:24 UTC (rev 14090)
@@ -57,19 +57,22 @@
}
-void
+int
GHOST_NDOFManager::deviceOpen(GHOST_IWindow* window,
GHOST_NDOFLibraryInit_fp setNdofLibraryInit,
GHOST_NDOFLibraryShutdown_fp setNdofLibraryShutdown,
GHOST_NDOFDeviceOpen_fp setNdofDeviceOpen)
{
+ int Pid;
+
ndofLibraryInit = setNdofLibraryInit;
ndofLibraryShutdown = setNdofLibraryShutdown;
ndofDeviceOpen = setNdofDeviceOpen;
if (ndofLibraryInit && ndofDeviceOpen)
{
- printf("%i client \n", ndofLibraryInit());
+ Pid= ndofLibraryInit();
+ printf("%i client \n", Pid);
#if defined(_WIN32) || defined(__APPLE__)
m_DeviceHandle = ndofDeviceOpen((void *)¤tNdofValues);
#else
@@ -78,26 +81,13 @@
void *ndofInfo = sys->prepareNdofInfo(¤tNdofValues);
m_DeviceHandle = ndofDeviceOpen(ndofInfo);
#endif
- }
+ return (Pid > 0) ? 0 : 1;
+
+ } else
+ return 1;
}
-/** original patch only */
-/*
-GHOST_TEventNDOFData*
-GHOST_NDOFManager::handle(unsigned int message, unsigned int* wParam, unsigned long* lParam)
-{
- static GHOST_TEventNDOFData sbdata;
- int handled = 0;
- if (ndofEventHandler && m_DeviceHandle != 0)
- {
- handled = ndofEventHandler(&sbdata.tx, m_DeviceHandle, message, wParam, lParam);
- }
- printf("handled %i\n", handled);
- return handled ? &sbdata : 0;
-}
-*/
-
bool
GHOST_NDOFManager::available() const
{
Modified: branches/ndof/intern/ghost/intern/GHOST_NDOFManager.h
===================================================================
--- branches/ndof/intern/ghost/intern/GHOST_NDOFManager.h 2008-03-13 15:12:19 UTC (rev 14089)
+++ branches/ndof/intern/ghost/intern/GHOST_NDOFManager.h 2008-03-13 15:40:24 UTC (rev 14090)
@@ -34,7 +34,7 @@
GHOST_NDOFManager();
virtual ~GHOST_NDOFManager();
- void deviceOpen(GHOST_IWindow* window,
+ int deviceOpen(GHOST_IWindow* window,
GHOST_NDOFLibraryInit_fp setNdofLibraryInit,
GHOST_NDOFLibraryShutdown_fp setNdofLibraryShutdown,
GHOST_NDOFDeviceOpen_fp setNdofDeviceOpen);
Modified: branches/ndof/intern/ghost/intern/GHOST_System.cpp
===================================================================
--- branches/ndof/intern/ghost/intern/GHOST_System.cpp 2008-03-13 15:12:19 UTC (rev 14089)
+++ branches/ndof/intern/ghost/intern/GHOST_System.cpp 2008-03-13 15:40:24 UTC (rev 14090)
@@ -240,18 +240,15 @@
return success;
}
-void GHOST_System::openNDOF(GHOST_IWindow* w,
+int GHOST_System::openNDOF(GHOST_IWindow* w,
GHOST_NDOFLibraryInit_fp setNdofLibraryInit,
GHOST_NDOFLibraryShutdown_fp setNdofLibraryShutdown,
GHOST_NDOFDeviceOpen_fp setNdofDeviceOpen)
-// original patch only
-// GHOST_NDOFEventHandler_fp setNdofEventHandler)
{
- m_ndofManager->deviceOpen(w,
+ return m_ndofManager->deviceOpen(w,
setNdofLibraryInit,
setNdofLibraryShutdown,
setNdofDeviceOpen);
- // setNdofEventHandler);
}
Modified: branches/ndof/intern/ghost/intern/GHOST_System.h
===================================================================
--- branches/ndof/intern/ghost/intern/GHOST_System.h 2008-03-13 15:12:19 UTC (rev 14089)
+++ branches/ndof/intern/ghost/intern/GHOST_System.h 2008-03-13 15:40:24 UTC (rev 14090)
@@ -193,8 +193,9 @@
/** Inherited from GHOST_ISystem
* Opens the N-degree of freedom device manager
+ * return 0 if device found, 1 otherwise
*/
- virtual void openNDOF(GHOST_IWindow* w,
+ virtual int openNDOF(GHOST_IWindow* w,
GHOST_NDOFLibraryInit_fp setNdofLibraryInit,
GHOST_NDOFLibraryShutdown_fp setNdofLibraryShutdown,
GHOST_NDOFDeviceOpen_fp setNdofDeviceOpen);
Modified: branches/ndof/release/datafiles/blenderbuttons
===================================================================
(Binary files differ)
Modified: branches/ndof/source/blender/blenkernel/BKE_global.h
===================================================================
--- branches/ndof/source/blender/blenkernel/BKE_global.h 2008-03-13 15:12:19 UTC (rev 14089)
+++ branches/ndof/source/blender/blenkernel/BKE_global.h 2008-03-13 15:40:24 UTC (rev 14090)
@@ -145,6 +145,9 @@
int compat; /* toggle compatibility mode for edge rendering */
int notonlysolid;/* T-> also edge-render transparent faces */
+ /* ndof device found ? */
+ int ndofdevice;
+
/* confusing... G.f and G.flags */
int flags;
Modified: branches/ndof/source/blender/include/BIF_resources.h
===================================================================
--- branches/ndof/source/blender/include/BIF_resources.h 2008-03-13 15:12:19 UTC (rev 14089)
+++ branches/ndof/source/blender/include/BIF_resources.h 2008-03-13 15:40:24 UTC (rev 14090)
@@ -58,10 +58,10 @@
ICON_SPACE4,
ICON_TRIA_LEFT,
ICON_TRIA_UP,
- ICON_BLANK3,
- ICON_BLANK4,
- ICON_BLANK5,
- ICON_BLANK6,
+ ICON_NDOF_TURN,
+ ICON_NDOF_FLY,
+ ICON_NDOF_TRANS,
+ ICON_NDOF_DOM,
ICON_ORTHO,
ICON_PERSP,
Modified: branches/ndof/source/blender/include/blendef.h
===================================================================
--- branches/ndof/source/blender/include/blendef.h 2008-03-13 15:12:19 UTC (rev 14089)
+++ branches/ndof/source/blender/include/blendef.h 2008-03-13 15:40:24 UTC (rev 14090)
@@ -232,6 +232,7 @@
#define B_MAN_SCALE 163
#define B_HEMESHBROWSE 164
#define B_HEMESHLOCAL 165
+#define B_NDOF 166
/* IPO: 200 */
#define B_IPOHOME 201
Modified: branches/ndof/source/blender/makesdna/DNA_view3d_types.h
===================================================================
--- branches/ndof/source/blender/makesdna/DNA_view3d_types.h 2008-03-13 15:12:19 UTC (rev 14089)
+++ branches/ndof/source/blender/makesdna/DNA_view3d_types.h 2008-03-13 15:40:24 UTC (rev 14090)
@@ -139,7 +139,7 @@
short snap_target;
- char ndofmode; /* mode of transform for 6DOF devices 0 normal, 1 fly, 2 ob transform */
+ char ndofmode; /* mode of transform for 6DOF devices -1 not found, 0 normal, 1 fly, 2 ob transform */
char ndoffilter; /*filter for 6DOF devices 0 normal, 1 dominant */
void *properties_storage; /* Nkey panel stores stuff here, not in file */
Modified: branches/ndof/source/blender/src/blenderbuttons.c
===================================================================
--- branches/ndof/source/blender/src/blenderbuttons.c 2008-03-13 15:12:19 UTC (rev 14089)
+++ branches/ndof/source/blender/src/blenderbuttons.c 2008-03-13 15:40:24 UTC (rev 14090)
@@ -1,2115 +1,16429 @@
-/* DataToC output of file <blenderbuttons> */
+/* DataToC output of file <blenderbuttons_png> */
-int datatoc_blenderbuttons_size= 67487;
+int datatoc_blenderbuttons_size= 525518;
char datatoc_blenderbuttons[]= {
-137, 80, 78, 71, 13, 10, 26, 10, 0, 0, 0, 13, 73, 72, 68, 82, 0, 0, 2, 0, 0, 0, 1, 0, 8, 6, 0, 0, 0,197,144,
-206,103, 0, 0, 0, 9,112, 72, 89,115, 0, 0, 11, 19, 0, 0, 11, 19, 1, 0,154,156, 24, 0, 0, 10, 77,105, 67, 67, 80, 80,
-104,111,116,111,115,104,111,112, 32, 73, 67, 67, 32,112,114,111,102,105,108,101, 0, 0,120,218,157, 83,119, 88,147,247, 22, 62,
-223,247,101, 15, 86, 66,216,240,177,151,108,129, 0, 34, 35,172, 8,200, 16, 89,162, 16,146, 0, 97,132, 16, 18, 64,197,133,136,
- 10, 86, 20, 21, 17,156, 72, 85,196,130,213, 10, 72,157,136,226,160, 40,184,103, 65,138,136, 90,139, 85, 92, 56,238, 31,220,167,
-181,125,122,239,237,237,251,215,251,188,231,156,231,252,206,121,207, 15,128, 17, 18, 38,145,230,162,106, 0, 57, 82,133, 60, 58,
-216, 31,143, 79, 72,196,201,189,128, 2, 21, 72,224, 4, 32, 16,230,203,194,103, 5,197, 0, 0,240, 3,121,120,126,116,176, 63,
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list