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

fix VR controllers only visible in one eye (remove stray glClear for testing planar reflection)

Browse Source 
PyBullet: force both contactStiffness and contactDamping (report error otherwise)
This commit is contained in:
erwincoumans
2018-05-16 14:24:12 -07:00
parent b432daed65
commit 034dfba3ae
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/OpenGLWindow/GLInstancingRenderer.cpp
View File

@@ -1618,7 +1618,7 @@ void GLInstancingRenderer::renderScene()
{ {
renderSceneInternal(B3_CREATE_SHADOWMAP_RENDERMODE); renderSceneInternal(B3_CREATE_SHADOWMAP_RENDERMODE);
glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT|GL_STENCIL_BUFFER_BIT);
if (m_planeReflectionShapeIndex>=0) if (m_planeReflectionShapeIndex>=0)
{ {

6
examples/OpenGLWindow/Win32OpenGLWindow.cpp
View File

@@ -119,9 +119,9 @@ void Win32OpenGLWindow::closeWindow()
void Win32OpenGLWindow::startRendering() void Win32OpenGLWindow::startRendering()
{ {
pumpMessage(); pumpMessage();
//don't clear all 3 buffers because some AMD drivers are buggy
//glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT|GL_STENCIL_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT|GL_STENCIL_BUFFER_BIT);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
//glCullFace(GL_BACK); //glCullFace(GL_BACK);

6
examples/pybullet/pybullet.c
View File

@@ -937,6 +937,12 @@ static PyObject* pybullet_changeDynamicsInfo(PyObject* self, PyObject* args, PyO
return NULL; return NULL;
} }
if ((contactStiffness>=0 && contactDamping <0)||(contactStiffness<0 && contactDamping >=0))
{
PyErr_SetString(SpamError, "Both contactStiffness and contactDamping needs to be set together.");
return NULL;
}
{ {
b3SharedMemoryCommandHandle command = b3InitChangeDynamicsInfo(sm); b3SharedMemoryCommandHandle command = b3InitChangeDynamicsInfo(sm);
b3SharedMemoryStatusHandle statusHandle; b3SharedMemoryStatusHandle statusHandle;