[Bf-blender-cvs] [699df00] HMD_viewport: Make branch compile with blenderplayer

Julian Eisel noreply at git.blender.org
Tue Jun 7 20:16:35 CEST 2016


Commit: 699df00847211f38b388a81c61b49057f0d05d95
Author: Julian Eisel
Date:   Tue Jun 7 20:15:01 2016 +0200
Branches: HMD_viewport
https://developer.blender.org/rB699df00847211f38b388a81c61b49057f0d05d95

Make branch compile with blenderplayer

===================================================================

M	source/blenderplayer/CMakeLists.txt
M	source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
M	source/blenderplayer/bad_level_call_stubs/stubs.c

===================================================================

diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt
index 6f32d50..9066f52 100644
--- a/source/blenderplayer/CMakeLists.txt
+++ b/source/blenderplayer/CMakeLists.txt
@@ -203,6 +203,10 @@ endif()
 		list(APPEND BLENDER_SORTED_LIBS extern_xdnd)
 	endif()
 
+	if(WITH_OPENHMD)
+		list(APPEND BLENDER_SORTED_LIBS extern_openhmd)
+	endif()
+
 	if(WITH_CODEC_QUICKTIME)
 		list(APPEND BLENDER_SORTED_LIBS bf_quicktime)
 	endif()
diff --git a/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt b/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
index 1d681d2..ec22b2b 100644
--- a/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
+++ b/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
@@ -70,4 +70,8 @@ if(WITH_FREESTYLE)
 	add_definitions(-DWITH_FREESTYLE)
 endif()
 
+if(WITH_INPUT_HMD)
+	add_definitions(-DWITH_INPUT_HMD)
+endif()
+
 blender_add_lib_nolist(blenkernel_blc "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c
index 95abfdc..6c68a52 100644
--- a/source/blenderplayer/bad_level_call_stubs/stubs.c
+++ b/source/blenderplayer/bad_level_call_stubs/stubs.c
@@ -320,6 +320,13 @@ void WM_cursor_warp(struct wmWindow *win, int x, int y) RET_NONE
 
 void WM_ndof_deadzone_set(float deadzone) RET_NONE
 
+int WM_device_HMD_num_devices_get(void) RET_ZERO
+int WM_device_HMD_current_get(void) RET_ZERO
+void WM_device_HMD_state_set(const int device, const bool enable) RET_NONE
+float WM_device_HMD_IPD_get(void) RET_ZERO
+const char *WM_device_HMD_name_get(int index) RET_NULL
+const char *WM_device_HMD_vendor_get(int index) RET_NULL
+
 void                WM_uilisttype_init(void) RET_NONE
 struct uiListType  *WM_uilisttype_find(const char *idname, bool quiet) RET_NULL
 bool                WM_uilisttype_add(struct uiListType *ult) RET_ZERO




More information about the Bf-blender-cvs mailing list