Revision: 38912
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38912
Author: campbellbarton
Date: 2011-08-02 05:52:27 +0000 (Tue, 02 Aug 2011)
Log Message:
-----------
NDOF related edits
- fix for building without NDOF on X11
- quiet some warnings
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/build_files/cmake/macros.cmake
trunk/blender/intern/ghost/CMakeLists.txt
trunk/blender/intern/ghost/SConscript
trunk/blender/intern/ghost/intern/GHOST_System.cpp
trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp
trunk/blender/source/blender/editors/space_image/image_ops.c
trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2011-08-02 05:49:11 UTC (rev 38911)
+++ trunk/blender/CMakeLists.txt 2011-08-02 05:52:27 UTC (rev 38912)
@@ -179,7 +179,7 @@
option(WITH_LZMA "Enable best LZMA compression, (used for
pointcache)" ON)
# Misc
-option(WITH_NDOF "Enable NDOF input devices (SpaceNavigator and friends)" ON)
+option(WITH_INPUT_NDOF "Enable NDOF input devices (SpaceNavigator and
friends)" ON)
option(WITH_RAYOPTIMIZATION "Enable use of SIMD (SSE) optimizations for the
raytracer" ON)
if(UNIX AND NOT APPLE)
option(WITH_INSTALL_PORTABLE "Install redistributeable runtime,
otherwise install into CMAKE_INSTALL_PREFIX" ON)
@@ -453,7 +453,7 @@
endif()
endif()
- if (WITH_NDOF)
+ if (WITH_INPUT_NDOF)
if(CMAKE_SYSTEM_NAME MATCHES "Linux")
set(NDOF /usr)
set(NDOF_INC ${NDOF}/include)
@@ -1039,7 +1039,7 @@
set(TIFF_LIBPATH ${TIFF}/lib)
endif()
- if (WITH_NDOF)
+ if (WITH_INPUT_NDOF)
# linker needs "-weak_framework 3DconnexionClient"
endif()
Modified: trunk/blender/build_files/cmake/macros.cmake
===================================================================
--- trunk/blender/build_files/cmake/macros.cmake 2011-08-02 05:49:11 UTC
(rev 38911)
+++ trunk/blender/build_files/cmake/macros.cmake 2011-08-02 05:52:27 UTC
(rev 38912)
@@ -193,7 +193,7 @@
if(WITH_MEM_JEMALLOC)
link_directories(${JEMALLOC_LIBPATH})
endif()
- if(WITH_NDOF)
+ if(WITH_INPUT_NDOF)
link_directories(${NDOF_LIBPATH})
endif()
@@ -317,7 +317,7 @@
if(WITH_MEM_JEMALLOC)
target_link_libraries(${target} ${JEMALLOC_LIBRARIES})
endif()
- if(WITH_NDOF)
+ if(WITH_INPUT_NDOF)
target_link_libraries(${target} ${NDOF_LIBRARY})
endif()
Modified: trunk/blender/intern/ghost/CMakeLists.txt
===================================================================
--- trunk/blender/intern/ghost/CMakeLists.txt 2011-08-02 05:49:11 UTC (rev
38911)
+++ trunk/blender/intern/ghost/CMakeLists.txt 2011-08-02 05:52:27 UTC (rev
38912)
@@ -97,6 +97,9 @@
add_definitions(-DWITH_GHOST_DEBUG)
endif()
+if(WITH_INPUT_NDOF)
+ add_definitions(-DWITH_INPUT_NDOF)
+endif()
if(WITH_HEADLESS OR WITH_GHOST_SDL)
if(WITH_HEADLESS)
@@ -158,14 +161,21 @@
intern/GHOST_SystemCocoa.mm
intern/GHOST_SystemPathsCocoa.mm
intern/GHOST_WindowCocoa.mm
- intern/GHOST_NDOFManagerCocoa.mm
intern/GHOST_DisplayManagerCocoa.h
intern/GHOST_SystemCocoa.h
intern/GHOST_SystemPathsCocoa.h
intern/GHOST_WindowCocoa.h
- intern/GHOST_NDOFManagerCocoa.h
)
+
+ if(WITH_INPUT_NDOF)
+ list(APPEND SRC
+ intern/GHOST_NDOFManagerCocoa.mm
+
+ intern/GHOST_NDOFManagerCocoa.h
+ )
+ endif()
+
else()
list(APPEND SRC
intern/GHOST_DisplayManagerCarbon.cpp
@@ -199,13 +209,11 @@
intern/GHOST_SystemX11.cpp
intern/GHOST_SystemPathsX11.cpp
intern/GHOST_WindowX11.cpp
- intern/GHOST_NDOFManagerX11.cpp
intern/GHOST_DisplayManagerX11.h
intern/GHOST_SystemX11.h
intern/GHOST_SystemPathsX11.h
intern/GHOST_WindowX11.h
- intern/GHOST_NDOFManagerX11.h
)
if(NOT WITH_INSTALL_PORTABLE)
@@ -219,6 +227,14 @@
)
endif()
+ if(WITH_INPUT_NDOF)
+ list(APPEND SRC
+ intern/GHOST_NDOFManagerX11.cpp
+
+ intern/GHOST_NDOFManagerX11.h
+ )
+ endif()
+
elseif(WIN32)
if(MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX")
@@ -234,7 +250,6 @@
intern/GHOST_SystemPathsWin32.cpp
intern/GHOST_WindowWin32.cpp
intern/GHOST_DropTargetWin32.cpp
- intern/GHOST_NDOFManagerWin32.cpp
intern/GHOST_DisplayManagerWin32.h
intern/GHOST_DropTargetWin32.h
@@ -242,8 +257,16 @@
intern/GHOST_SystemPathsWin32.h
intern/GHOST_WindowWin32.h
intern/GHOST_TaskbarWin32.h
- intern/GHOST_NDOFManagerWin32.h
)
+
+ if(WITH_INPUT_NDOF)
+ list(APPEND SRC
+ intern/GHOST_NDOFManagerWin32.cpp
+
+ intern/GHOST_NDOFManagerWin32.h
+ )
+ endif()
+
endif()
blender_add_lib(bf_intern_ghost "${SRC}" "${INC}" "${INC_SYS}")
Modified: trunk/blender/intern/ghost/SConscript
===================================================================
--- trunk/blender/intern/ghost/SConscript 2011-08-02 05:49:11 UTC (rev
38911)
+++ trunk/blender/intern/ghost/SConscript 2011-08-02 05:52:27 UTC (rev
38912)
@@ -78,6 +78,9 @@
else:
sources.remove('intern' + os.sep + 'GHOST_EventPrinter.cpp')
+if env['WITH_BF_3DMOUSE']:
+ defs.append('WITH_INPUT_NDOF')
+
if window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross',
'win64-vc'):
incs = env['BF_WINTAB_INC'] + ' ' + incs
Modified: trunk/blender/intern/ghost/intern/GHOST_System.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_System.cpp 2011-08-02 05:49:11 UTC
(rev 38911)
+++ trunk/blender/intern/ghost/intern/GHOST_System.cpp 2011-08-02 05:52:27 UTC
(rev 38912)
@@ -46,7 +46,13 @@
GHOST_System::GHOST_System()
-: m_displayManager(0), m_timerManager(0), m_windowManager(0),
m_eventManager(0), m_ndofManager(0)
+ : m_displayManager(0),
+ m_timerManager(0),
+ m_windowManager(0),
+ m_eventManager(0)
+#ifdef WITH_INPUT_NDOF
+ , m_ndofManager(0)
+#endif
{
}
Modified: trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp 2011-08-02
05:49:11 UTC (rev 38911)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp 2011-08-02
05:52:27 UTC (rev 38912)
@@ -167,7 +167,9 @@
GHOST_TSuccess success = GHOST_System::init();
if (success) {
+#ifdef WITH_INPUT_NDOF
m_ndofManager = new GHOST_NDOFManagerX11(*this);
+#endif
m_displayManager = new GHOST_DisplayManagerX11(this);
if (m_displayManager) {
@@ -414,9 +416,11 @@
anyProcessed = true;
}
+#ifdef WITH_INPUT_NDOF
if
(dynamic_cast<GHOST_NDOFManagerX11*>(m_ndofManager)->processEvents()) {
anyProcessed = true;
}
+#endif
} while (waitForEvent && !anyProcessed);
Modified: trunk/blender/source/blender/editors/space_image/image_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/image_ops.c
2011-08-02 05:49:11 UTC (rev 38911)
+++ trunk/blender/source/blender/editors/space_image/image_ops.c
2011-08-02 05:52:27 UTC (rev 38912)
@@ -445,7 +445,7 @@
* that explains the negative signs in the code below
*/
-static int view_ndof_invoke(bContext *C, wmOperator *op, wmEvent *event)
+static int view_ndof_invoke(bContext *C, wmOperator *UNUSED(op), wmEvent
*event)
{
SpaceImage *sima= CTX_wm_space_image(C);
ARegion *ar= CTX_wm_region(C);
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
2011-08-02 05:49:11 UTC (rev 38911)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
2011-08-02 05:52:27 UTC (rev 38912)
@@ -968,7 +968,7 @@
q[3] = scale * z;
}
-static int ndof_orbit_invoke(bContext *C, wmOperator *op, wmEvent *event)
+static int ndof_orbit_invoke(bContext *C, wmOperator *UNUSED(op), wmEvent
*event)
// -- "orbit" navigation (trackball/turntable)
// -- zooming
// -- panning in rotationally-locked views
@@ -1118,7 +1118,7 @@
ot->flag = 0;
}
-static int ndof_pan_invoke(bContext *C, wmOperator *op, wmEvent *event)
+static int ndof_pan_invoke(bContext *C, wmOperator *UNUSED(op), wmEvent *event)
// -- "pan" navigation
// -- zoom or dolly?
{
Modified: trunk/blender/source/blender/windowmanager/intern/wm_operators.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_operators.c
2011-08-02 05:49:11 UTC (rev 38911)
+++ trunk/blender/source/blender/windowmanager/intern/wm_operators.c
2011-08-02 05:52:27 UTC (rev 38912)
@@ -1411,7 +1411,7 @@
ot->poll= wm_search_menu_poll;
}
-static int wm_ndof_menu_invoke(bContext *C, wmOperator *op, wmEvent
*UNUSED(event))
+static int wm_ndof_menu_invoke(bContext *C, wmOperator *UNUSED(op), wmEvent
*UNUSED(event))
{
uiPupMenuInvoke(C,"VIEW3D_MT_ndof_settings");
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
