diff --git a/examples/Importers/ImportURDFDemo/BulletUrdfImporter.h b/examples/Importers/ImportURDFDemo/BulletUrdfImporter.h index 34a28f15d..8acf2cefd 100644 --- a/examples/Importers/ImportURDFDemo/BulletUrdfImporter.h +++ b/examples/Importers/ImportURDFDemo/BulletUrdfImporter.h @@ -19,7 +19,7 @@ class BulletURDFImporter : public URDFImporterInterface struct BulletURDFInternalData* m_data; public: - BulletURDFImporter(struct GUIHelperInterface* helper, UrdfRenderingInterface* customConverter, struct CommonFileIOInterface* fileIO,double globalScaling, int flags); + BulletURDFImporter(struct GUIHelperInterface* helper, UrdfRenderingInterface* customConverter, struct CommonFileIOInterface* fileIO=0,double globalScaling=1, int flags=0); virtual ~BulletURDFImporter(); diff --git a/examples/TinyRenderer/TinyRenderer.cpp b/examples/TinyRenderer/TinyRenderer.cpp index 0e3a5f4e6..06984b6e8 100644 --- a/examples/TinyRenderer/TinyRenderer.cpp +++ b/examples/TinyRenderer/TinyRenderer.cpp @@ -14,6 +14,8 @@ #include "LinearMath/btVector3.h" #include "Bullet3Common/b3Logging.h" #include "../CommonInterfaces/CommonFileIOInterface.h" +#include "../Utils/b3BulletDefaultFileIO.h" + struct DepthShader : public IShader { Model* m_model; @@ -370,6 +372,12 @@ void TinyRenderObjectData::registerMesh2(btAlignedObjectArray& vertic void TinyRenderObjectData::createCube(float halfExtentsX, float halfExtentsY, float halfExtentsZ, CommonFileIOInterface* fileIO) { + b3BulletDefaultFileIO defaultFileIO; + + if (fileIO==0) + { + fileIO = &defaultFileIO; + } m_model = new Model(); char relativeFileName[1024]; diff --git a/examples/TinyRenderer/TinyRenderer.h b/examples/TinyRenderer/TinyRenderer.h index 414a7814d..e5b7ae289 100644 --- a/examples/TinyRenderer/TinyRenderer.h +++ b/examples/TinyRenderer/TinyRenderer.h @@ -42,7 +42,7 @@ struct TinyRenderObjectData virtual ~TinyRenderObjectData(); void loadModel(const char* fileName, struct CommonFileIOInterface* fileIO); - void createCube(float HalfExtentsX, float HalfExtentsY, float HalfExtentsZ, struct CommonFileIOInterface* fileIO); + void createCube(float HalfExtentsX, float HalfExtentsY, float HalfExtentsZ, struct CommonFileIOInterface* fileIO=0); void registerMeshShape(const float* vertices, int numVertices, const int* indices, int numIndices, const float rgbaColor[4], unsigned char* textureImage = 0, int textureWidth = 0, int textureHeight = 0);