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:
@@ -1,11 +1,14 @@
|
||||
#ifdef BT_ENABLE_VR
|
||||
//#define BT_USE_CUSTOM_PROFILER
|
||||
#ifdef BT_USE_CUSTOM_PROFILER
|
||||
#endif
|
||||
|
||||
//========= Copyright Valve Corporation ============//
|
||||
|
||||
#include "../OpenGLWindow/SimpleOpenGL3App.h"
|
||||
#include "../OpenGLWindow/OpenGLInclude.h"
|
||||
#include "Bullet3Common/b3Quaternion.h"
|
||||
#include "Bullet3Common/b3Transform.h"
|
||||
#include "Bullet3Common/b3CommandLineArgs.h"
|
||||
|
||||
|
||||
#include "../ExampleBrowser/OpenGLGuiHelper.h"
|
||||
@@ -776,12 +779,14 @@ void CMainApplication::RunMainLoop()
|
||||
|
||||
while ( !bQuit && !m_app->m_window->requestedExit())
|
||||
{
|
||||
{
|
||||
B3_PROFILE("main");
|
||||
|
||||
bQuit = HandleInput();
|
||||
|
||||
RenderFrame();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -1282,6 +1287,8 @@ void CMainApplication::AddCubeToScene( Matrix4 mat, std::vector<float> &vertdata
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose: Draw all of the controllers as X/Y/Z lines
|
||||
//-----------------------------------------------------------------------------
|
||||
extern int gGraspingController;
|
||||
|
||||
void CMainApplication::DrawControllers()
|
||||
{
|
||||
// don't draw controllers if somebody else has input focus
|
||||
@@ -1295,6 +1302,8 @@ void CMainApplication::DrawControllers()
|
||||
|
||||
for ( vr::TrackedDeviceIndex_t unTrackedDevice = vr::k_unTrackedDeviceIndex_Hmd + 1; unTrackedDevice < vr::k_unMaxTrackedDeviceCount; ++unTrackedDevice )
|
||||
{
|
||||
|
||||
|
||||
if ( !m_pHMD->IsTrackedDeviceConnected( unTrackedDevice ) )
|
||||
continue;
|
||||
|
||||
@@ -2183,9 +2192,11 @@ void CGLRenderModel::Draw()
|
||||
//-----------------------------------------------------------------------------
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
|
||||
|
||||
#ifdef BT_USE_CUSTOM_PROFILER
|
||||
//b3SetCustomEnterProfileZoneFunc(...);
|
||||
//b3SetCustomLeaveProfileZoneFunc(...);
|
||||
b3SetCustomEnterProfileZoneFunc(dcEnter);
|
||||
b3SetCustomLeaveProfileZoneFunc(dcLeave);
|
||||
#endif
|
||||
|
||||
|
||||
@@ -2223,7 +2234,6 @@ int main(int argc, char *argv[])
|
||||
pMainApplication->Shutdown();
|
||||
|
||||
#ifdef BT_USE_CUSTOM_PROFILER
|
||||
//...
|
||||
#endif
|
||||
|
||||
return 0;
|
||||
|
||||
@@ -83,8 +83,11 @@ int main(int argc, char* argv[])
|
||||
//DummyGUIHelper gui;
|
||||
|
||||
CommonExampleOptions options(&gui);
|
||||
|
||||
|
||||
example = StandaloneExampleCreateFunc(options);
|
||||
example->processCommandLineArgs(argc, argv);
|
||||
|
||||
example->initPhysics();
|
||||
example->resetCamera();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user