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

move zipfFileIO into own header

Browse Source 
route loadTextureFile from fileIO plugin
fix B3_ENABLE_FILEIO_PLUGIN logic
This commit is contained in:
erwincoumans
2018-10-11 10:58:14 -07:00
parent 3861266a6d
commit f792a5951a
8 changed files with 339 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/SharedMemory/plugins/tinyRendererPlugin/TinyRendererVisualShapeConverter.h
View File

@@ -47,7 +47,7 @@ struct TinyRendererVisualShapeConverter : public UrdfRenderingInterface
virtual void render();
virtual void render(const float viewMat[16], const float projMat[16]);
virtual int loadTextureFile(const char* filename);
virtual int loadTextureFile(const char* filename, struct CommonFileIOInterface* fileIO);
virtual int registerTexture(unsigned char* texels, int width, int height);
virtual void syncTransform(int shapeUid, const class btTransform& worldTransform, const class btVector3& localScaling);