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

First pass of load files through an interface (to allow loading from memory, zip file etc). So instead of posix fopen/fread, using CommonFileIOInterface.

Browse Source 
A fileIO plugin can override custom file IO operations. As a small test, load files from a zipfile in memory.
Default fileIO implementation is in examples/Utils/b3BulletDefaultFileIO.h
Affects URDF, SDF, MJCF, Wavefront OBJ, STL, DAE, images.
This commit is contained in:
erwincoumans
2018-10-08 21:27:08 -07:00
parent a1543714f1
commit dba239fe8d
49 changed files with 1211 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
examples/Importers/ImportObjDemo/ImportObjExample.cpp
View File

@@ -7,6 +7,7 @@
#include "../OpenGLWindow/SimpleOpenGL3App.h"
#include "Wavefront2GLInstanceGraphicsShape.h"
#include "../../Utils/b3ResourcePath.h"
#include "../../Utils/b3BulletDefaultFileIO.h"
#include "Bullet3Common/b3FileUtils.h"
#include "stb_image/stb_image.h"
@@ -56,7 +57,8 @@ int loadAndRegisterMeshFromFile2(const std::string& fileName, CommonRenderInterf
int shapeId = -1;
b3ImportMeshData meshData;
if (b3ImportMeshUtility::loadAndRegisterMeshFromFileInternal(fileName, meshData))
b3BulletDefaultFileIO fileIO;
if (b3ImportMeshUtility::loadAndRegisterMeshFromFileInternal(fileName, meshData,&fileIO))
{
int textureIndex = -1;
@@ -94,7 +96,7 @@ void ImportObjSetup::initPhysics()
btQuaternion orn = trans.getRotation();
btVector3 scaling(1, 1, 1);
btVector3 color(1, 1, 1);
btVector4 color(1, 1, 1,1);
int shapeId = loadAndRegisterMeshFromFile2(m_fileName, m_guiHelper->getRenderInterface());
if (shapeId >= 0)

10
examples/Importers/ImportObjDemo/LoadMeshFromObj.cpp
View File

@@ -33,7 +33,9 @@ void b3EnableFileCaching(int enable)
std::string LoadFromCachedOrFromObj(
std::vector<tinyobj::shape_t>& shapes, // [output]
const char* filename,
const char* mtl_basepath)
const char* mtl_basepath,
struct CommonFileIOInterface* fileIO
)
{
CachedObjResult* resultPtr = gCachedObjResults[filename];
if (resultPtr)
@@ -43,7 +45,7 @@ std::string LoadFromCachedOrFromObj(
return result.m_msg;
}
std::string err = tinyobj::LoadObj(shapes, filename, mtl_basepath);
std::string err = tinyobj::LoadObj(shapes, filename, mtl_basepath,fileIO);
CachedObjResult result;
result.m_msg = err;
result.m_shapes = shapes;
@@ -54,13 +56,13 @@ std::string LoadFromCachedOrFromObj(
return err;
}
GLInstanceGraphicsShape* LoadMeshFromObj(const char* relativeFileName, const char* materialPrefixPath)
GLInstanceGraphicsShape* LoadMeshFromObj(const char* relativeFileName, const char* materialPrefixPath, struct CommonFileIOInterface* fileIO)
{
B3_PROFILE("LoadMeshFromObj");
std::vector<tinyobj::shape_t> shapes;
{
B3_PROFILE("tinyobj::LoadObj2");
std::string err = LoadFromCachedOrFromObj(shapes, relativeFileName, materialPrefixPath);
std::string err = LoadFromCachedOrFromObj(shapes, relativeFileName, materialPrefixPath,fileIO);
}
{

6
examples/Importers/ImportObjDemo/LoadMeshFromObj.h
View File

@@ -8,11 +8,13 @@ struct GLInstanceGraphicsShape;
int b3IsFileCachingEnabled();
void b3EnableFileCaching(int enable);
std::string LoadFromCachedOrFromObj(
std::vector<tinyobj::shape_t>& shapes, // [output]
const char* filename,
const char* mtl_basepath);
const char* mtl_basepath,
struct CommonFileIOInterface* fileIO);
GLInstanceGraphicsShape* LoadMeshFromObj(const char* relativeFileName, const char* materialPrefixPath);
GLInstanceGraphicsShape* LoadMeshFromObj(const char* relativeFileName, const char* materialPrefixPath,struct CommonFileIOInterface* fileIO);
#endif //LOAD_MESH_FROM_OBJ_H