AuroraMiddleware/bullet3
1
0
Fork 0
mirror of https://github.com/bulletphysics/bullet3 synced 2024-12-14 05:40:05 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1147 from erwincoumans/master

Browse Source 
minor fixes, increase max visual shape path length from 128 to 1024 (bump up version of C-API/pybullet, since it breaks binary compatibiltiy)
This commit is contained in:
erwincoumans 2017-05-25 11:24:50 -07:00 committed by GitHub
commit 4388a6ea02
3 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/CommonInterfaces/CommonGUIHelperInterface.h
View File

@ -84,8 +84,8 @@ struct GUIHelperInterface
virtual void autogenerateGraphicsObjects(btDiscreteDynamicsWorld* rbWorld) =0; virtual void autogenerateGraphicsObjects(btDiscreteDynamicsWorld* rbWorld) =0;
virtual void drawText3D( const char* txt, float posX, float posY, float posZ, float size)=0; virtual void drawText3D( const char* txt, float posX, float posY, float posZ, float size){}
virtual void drawText3D( const char* txt, float position[3], float orientation[4], float color[4], float size, int optionFlag)=0; virtual void drawText3D( const char* txt, float position[3], float orientation[4], float color[4], float size, int optionFlag){}
virtual int addUserDebugText3D( const char* txt, const double positionXYZ[3], const double orientation[4], const double textColorRGB[3], double size, double lifeTime, int trackingVisualShapeIndex, int optionFlags){return -1;} virtual int addUserDebugText3D( const char* txt, const double positionXYZ[3], const double orientation[4], const double textColorRGB[3], double size, double lifeTime, int trackingVisualShapeIndex, int optionFlags){return -1;}
virtual int addUserDebugLine(const double debugLineFromXYZ[3], const double debugLineToXYZ[3], const double debugLineColorRGB[3], double lineWidth, double lifeTime , int trackingVisualShapeIndex){return -1;}; virtual int addUserDebugLine(const double debugLineFromXYZ[3], const double debugLineToXYZ[3], const double debugLineColorRGB[3], double lineWidth, double lifeTime , int trackingVisualShapeIndex){return -1;};

4
examples/SharedMemory/SharedMemoryPublic.h
View File

@ -4,7 +4,7 @@
#define SHARED_MEMORY_KEY 12347 #define SHARED_MEMORY_KEY 12347
///increase the SHARED_MEMORY_MAGIC_NUMBER whenever incompatible changes are made in the structures ///increase the SHARED_MEMORY_MAGIC_NUMBER whenever incompatible changes are made in the structures
///my convention is year/month/day/rev ///my convention is year/month/day/rev
#define SHARED_MEMORY_MAGIC_NUMBER 201705023 #define SHARED_MEMORY_MAGIC_NUMBER 201705025
//#define SHARED_MEMORY_MAGIC_NUMBER 201703024 //#define SHARED_MEMORY_MAGIC_NUMBER 201703024
enum EnumSharedMemoryClientCommand enum EnumSharedMemoryClientCommand
@ -425,7 +425,7 @@ struct b3RaycastInformation
}; };
#define VISUAL_SHAPE_MAX_PATH_LEN 128 #define VISUAL_SHAPE_MAX_PATH_LEN 1024
struct b3VisualShapeData struct b3VisualShapeData
{ {

10
examples/SimpleOpenGL3/main.cpp
View File

@ -97,14 +97,7 @@ int main(int argc, char* argv[])
int textureHandle = app->m_renderer->registerTexture(image, textureWidth, textureHeight); int textureHandle = app->m_renderer->registerTexture(image, textureWidth, textureHeight);
int cubeIndex = app->registerCubeShape(1, 1, 1);
b3Vector3 pos = b3MakeVector3(0, 0, 0);
b3Quaternion orn(0, 0, 0, 1);
b3Vector4 color = b3MakeVector4(1, 0, 0,1);
b3Vector3 scaling = b3MakeVector3 (1, 1, 1);
//app->m_renderer->registerGraphicsInstance(cubeIndex, pos, orn, color, scaling);
app->m_renderer->writeTransforms();
do do
{ {
@ -151,7 +144,6 @@ int main(int argc, char* argv[])
float yellow[4] = {1,1,0,1}; float yellow[4] = {1,1,0,1};
app->drawText(bla, 10, 10, 1, yellow); app->drawText(bla, 10, 10, 1, yellow);
int optionFlag = 0;
float position[3] = {1,1,1}; float position[3] = {1,1,1};
float position2[3] = {0,0,5}; float position2[3] = {0,0,5};
@ -188,4 +180,4 @@ int main(int argc, char* argv[])
delete[] image; delete[] image;
} }
return 0; return 0;
} }