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

Merge pull request #1927 from erwincoumans/master

Browse Source 
backward compatibility fix
This commit is contained in:
erwincoumans
2018-10-09 21:45:48 -07:00
committed by GitHub
parent 03461a0d1f 32b5c88d4b
commit d6b50d3bcc
4 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/Importers/ImportURDFDemo/BulletUrdfImporter.cpp
View File

@@ -173,7 +173,7 @@ bool BulletURDFImporter::loadURDF(const char* fileName, bool forceFixedBase)
}
}
while (line);
m_data->m_fileIO->fileClose(fileId);
#if 0
std::fstream xml_file(relativeFileName, std::fstream::in);
while (xml_file.good())

2
examples/Importers/ImportURDFDemo/BulletUrdfImporter.h
View File

@@ -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();

8
examples/TinyRenderer/TinyRenderer.cpp
View File

@@ -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<btVector3>& 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];

2
examples/TinyRenderer/TinyRenderer.h
View File

@@ -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);