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

fix win32 UNICODE build

Browse Source 
re-enable VR teleport
This commit is contained in:
erwin coumans
2016-12-31 11:35:56 -08:00
parent fdd517e00f
commit c6650f9329
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/SharedMemory/PhysicsServerExample.cpp
View File

@@ -1908,7 +1908,7 @@ void PhysicsServerExample::vrControllerButtonCallback(int controllerId, int butt
if (button == 1 && state == 0) if (button == 1 && state == 0)
{ {
//gResetSimulation = true; //gResetSimulation = true;
//gVRTeleportPos1 = gLastPickPos; gVRTeleportPos1 = gLastPickPos;
} }
} else } else
{ {

2
examples/SharedMemory/Win32SharedMemory.cpp
View File

@@ -36,7 +36,7 @@ void* Win32SharedMemory::allocateSharedMemory(int key, int size, bool allowCre
b3Assert(m_internalData->m_buf==0); b3Assert(m_internalData->m_buf==0);
#ifdef UNICODE #ifdef UNICODE
swprintf_s (m_internalData->m_szName,"MyFileMappingObject%d",key); swprintf_s (m_internalData->m_szName,TEXT("MyFileMappingObject%d"),key);
#else #else
sprintf(m_internalData->m_szName,"MyFileMappingObject%d",key); sprintf(m_internalData->m_szName,"MyFileMappingObject%d",key);