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

Merge pull request #1917 from erwincoumans/master

Browse Source 
reverse ER_SEGMENTATION_MASK to ER_NO_SEGMENTATION_MASK so segmentation
This commit is contained in:
erwincoumans
2018-10-04 18:41:16 -07:00
committed by GitHub
parent 62016a785b 24ca5afe95
commit 67954a873e
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/SharedMemory/PhysicsServerCommandProcessor.cpp
View File

@@ -3517,7 +3517,7 @@ bool PhysicsServerCommandProcessor::processRequestCameraImageCommand(const struc
this->m_data->m_guiHelper->setProjectiveTexture(false); this->m_data->m_guiHelper->setProjectiveTexture(false);
} }
if ((flags & (ER_SEGMENTATION_MASK_OBJECT_AND_LINKINDEX + ER_SEGMENTATION_MASK)) == 0) if ((flags & ER_NO_SEGMENTATION_MASK) != 0)
{ {
segmentationMaskBuffer = 0; segmentationMaskBuffer = 0;
} }

2
examples/SharedMemory/SharedMemoryPublic.h
View File

@@ -746,7 +746,7 @@ enum EnumRendererAuxFlags
{ {
ER_SEGMENTATION_MASK_OBJECT_AND_LINKINDEX = 1, ER_SEGMENTATION_MASK_OBJECT_AND_LINKINDEX = 1,
ER_USE_PROJECTIVE_TEXTURE = 2, ER_USE_PROJECTIVE_TEXTURE = 2,
ER_SEGMENTATION_MASK = 4, ER_NO_SEGMENTATION_MASK = 4,
}; };
///flags to pick the IK solver and other options ///flags to pick the IK solver and other options

2
examples/pybullet/pybullet.c
View File

@@ -9800,7 +9800,7 @@ initpybullet(void)
PyModule_AddIntConstant(m, "ER_TINY_RENDERER", ER_TINY_RENDERER); PyModule_AddIntConstant(m, "ER_TINY_RENDERER", ER_TINY_RENDERER);
PyModule_AddIntConstant(m, "ER_BULLET_HARDWARE_OPENGL", ER_BULLET_HARDWARE_OPENGL); PyModule_AddIntConstant(m, "ER_BULLET_HARDWARE_OPENGL", ER_BULLET_HARDWARE_OPENGL);
PyModule_AddIntConstant(m, "ER_SEGMENTATION_MASK_OBJECT_AND_LINKINDEX", ER_SEGMENTATION_MASK_OBJECT_AND_LINKINDEX); PyModule_AddIntConstant(m, "ER_SEGMENTATION_MASK_OBJECT_AND_LINKINDEX", ER_SEGMENTATION_MASK_OBJECT_AND_LINKINDEX);
PyModule_AddIntConstant(m, "ER_SEGMENTATION_MASK", ER_SEGMENTATION_MASK); PyModule_AddIntConstant(m, "ER_NO_SEGMENTATION_MASK", ER_NO_SEGMENTATION_MASK);
PyModule_AddIntConstant(m, "ER_USE_PROJECTIVE_TEXTURE", ER_USE_PROJECTIVE_TEXTURE); PyModule_AddIntConstant(m, "ER_USE_PROJECTIVE_TEXTURE", ER_USE_PROJECTIVE_TEXTURE);
PyModule_AddIntConstant(m, "IK_DLS", IK_DLS); PyModule_AddIntConstant(m, "IK_DLS", IK_DLS);