Add RtMidi for midi control, use the --midi option in premake, and see

update to OpenVR sdk 1.03 from https://github.com/ValveSoftware/openvr
add camPosX/Y/Z and camRotZ to adjust relative camera/world transform for VR (so you can align virtual table with real table etc)
tweak quadruped.py to move a bit
add mouse picking to physics server
This commit is contained in:
erwincoumans
2016-11-16 16:12:59 -08:00
parent b4b93573fc
commit 2329c00faa
32 changed files with 6434 additions and 398 deletions

View File

@@ -154,6 +154,37 @@ links {
language "C++"
if _OPTIONS["midi"] then
defines {"B3_USE_MIDI"}
includedirs{"../ThirdPartyLibs/midi"}
files {
"../ThirdPartyLibs/midi/RtMidi.cpp",
"../ThirdPartyLibs/midi/RtMidi.h",
"../ThirdPartyLibs/midi/RtError.h",
}
if os.is("Windows") then
links {"winmm"}
defines {"__WINDOWS_MM__", "WIN32"}
end
if os.is("Linux") then
defines {"__LINUX_ALSA__"}
links {"asound","pthread"}
end
if os.is("MacOSX") then
links{"CoreAudio.framework", "coreMIDI.framework", "Cocoa.framework"}
defines {"__MACOSX_CORE__"}
end
end
files {
myfiles,
"../StandaloneMain/main_opengl_single_example.cpp",
@@ -213,7 +244,37 @@ if os.is("Windows") then
else
kind "ConsoleApp"
end
if _OPTIONS["midi"] then
defines {"B3_USE_MIDI"}
includedirs{"../ThirdPartyLibs/midi"}
files {
"../ThirdPartyLibs/midi/RtMidi.cpp",
"../ThirdPartyLibs/midi/RtMidi.h",
"../ThirdPartyLibs/midi/RtError.h",
}
if os.is("Windows") then
links {"winmm"}
defines {"__WINDOWS_MM__", "WIN32"}
end
if os.is("Linux") then
defines {"__LINUX_ALSA__"}
links {"asound","pthread"}
end
if os.is("MacOSX") then
links{"CoreAudio.framework", "coreMIDI.framework", "Cocoa.framework"}
defines {"__MACOSX_CORE__"}
end
end
includedirs {
".","../../src", "../ThirdPartyLibs",
"../ThirdPartyLibs/openvr/headers",