Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'bp/master'

Browse Source
This commit is contained in:
Erwin Coumans
2017-05-04 10:51:42 -07:00
parent 4602fbba34 87a24dba84
commit a7d08ca9d7
27 changed files with 707 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
examples/SharedMemory/PhysicsServerExample.cpp
View File

@@ -1203,39 +1203,45 @@ public:
printf("key[%d]=%d state = %d\n",i,m_args[0].m_keyboardEvents[i].m_keyCode,m_args[0].m_keyboardEvents[i].m_keyState);
}
*/
double shift=0.1;
CommonWindowInterface* window = m_guiHelper->getAppInterface()->m_window;
if (window->isModifierKeyPressed(B3G_SHIFT))
shift=0.01;
if (key=='w' && state)
{
gVRTeleportPos1[0]+=0.1;
gVRTeleportPos1[0]+=shift;
saveCurrentSettingsVR();
}
if (key=='s' && state)
{
gVRTeleportPos1[0]-=0.1;
gVRTeleportPos1[0]-=shift;
saveCurrentSettingsVR();
}
if (key=='a' && state)
{
gVRTeleportPos1[1]-=0.1;
gVRTeleportPos1[1]-=shift;
saveCurrentSettingsVR();
}
if (key=='d' && state)
{
gVRTeleportPos1[1]+=0.1;
gVRTeleportPos1[1]+=shift;
saveCurrentSettingsVR();
}
if (key=='q' && state)
{
gVRTeleportPos1[2]+=0.1;
gVRTeleportPos1[2]+=shift;
saveCurrentSettingsVR();
}
if (key=='e' && state)
{
gVRTeleportPos1[2]-=0.1;
gVRTeleportPos1[2]-=shift;
saveCurrentSettingsVR();
}
if (key=='z' && state)
{
gVRTeleportRotZ+=0.1;
gVRTeleportRotZ+=shift;
gVRTeleportOrn = btQuaternion(btVector3(0, 0, 1), gVRTeleportRotZ);
saveCurrentSettingsVR();
}