diff options
| author | Alexander M Pickering <alex@cogarr.net> | 2022-08-07 23:23:14 -0500 |
|---|---|---|
| committer | Alexander M Pickering <alex@cogarr.net> | 2022-08-07 23:23:14 -0500 |
| commit | e9ed8fc5f9219b0b8be09dbceddbe9ca3de78017 (patch) | |
| tree | 6503569e90db59f7704bddd9d1cb7aff96464902 /src/shared | |
| parent | 9f6b7ecb31179ee980f729578d84d7889f5065b8 (diff) | |
| download | brokengine-e9ed8fc5f9219b0b8be09dbceddbe9ca3de78017.tar.gz brokengine-e9ed8fc5f9219b0b8be09dbceddbe9ca3de78017.tar.bz2 brokengine-e9ed8fc5f9219b0b8be09dbceddbe9ca3de78017.zip | |
API update to tinyobj
Update to tinyobj makes minor changes to the API
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/lua_api/phys/bphysmodel.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/shared/lua_api/phys/bphysmodel.cpp b/src/shared/lua_api/phys/bphysmodel.cpp index d4a689a..e5a9949 100644 --- a/src/shared/lua_api/phys/bphysmodel.cpp +++ b/src/shared/lua_api/phys/bphysmodel.cpp @@ -28,7 +28,7 @@ extern std::list<btRigidBody*> Objects; //btTriangleMesh *trimesh = new btTriangleMesh(); //} -static void get_file_data(const char* filename, int is_mtl, const char *obj_filename, char **data, size_t *len){ +static void get_file_data(void* ctx, const char* filename, int is_mtl, const char *obj_filename, char **data, size_t *len){ FILE *objfile = fopen(filename,"rb"); fseek(objfile,0,SEEK_END); *len = (size_t)ftell(objfile); @@ -77,7 +77,13 @@ void makebphysmodel(lua_State *L){ fread(objdata, sizeof(char), data_len, objfile); fclose(objfile); //printf("About to tinyobj_parse_obj\n"); - int err = tinyobj_parse_obj(&attrib, &shapes, &meshcount, &materials, &num_materials, ppath, get_file_data, TINYOBJ_FLAG_TRIANGULATE); + int err = tinyobj_parse_obj( + &attrib, &shapes, + &meshcount, &materials, + &num_materials, ppath, + get_file_data, (void*)NULL, + TINYOBJ_FLAG_TRIANGULATE + ); //printf("Finished parsing tinyobj\n"); if(err != TINYOBJ_SUCCESS){ printf("Tinyobj failed to load model:%s\n",ppath); |