benkyd/tinyobjloader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added multiple materials per shape/object

Browse Source
This commit is contained in:
Mykhailo Parfeniuk
2014-09-07 14:19:22 +03:00
parent 8f7712c382
commit 33cd9a4768
2 changed files with 63 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tiny_obj_loader.h
View File

@@ -45,8 +45,9 @@ typedef struct
typedef struct
{
std::string name;
material_t material;
mesh_t mesh;
std::vector< std::pair<int, int> > submeshes;
std::vector< int > materials;
} shape_t;
class MaterialReader
@@ -57,7 +58,8 @@ public:
virtual std::string operator() (
const std::string& matId,
std::map<std::string, material_t>& matMap) = 0;
std::vector<material_t>& materials,
std::map<std::string, int>& matMap) = 0;
};
class MaterialFileReader:
@@ -68,7 +70,8 @@ class MaterialFileReader:
virtual ~MaterialFileReader() {}
virtual std::string operator() (
const std::string& matId,
std::map<std::string, material_t>& matMap);
std::vector<material_t>& materials,
std::map<std::string, int>& matMap);
private:
std::string m_mtlBasePath;
@@ -81,6 +84,7 @@ class MaterialFileReader:
/// 'mtl_basepath' is optional, and used for base path for .mtl file.
std::string LoadObj(
std::vector<shape_t>& shapes, // [output]
std::vector<material_t>& materials, // [output]
const char* filename,
const char* mtl_basepath = NULL);
@@ -89,13 +93,15 @@ std::string LoadObj(
/// Returns empty string when loading .obj success.
std::string LoadObj(
std::vector<shape_t>& shapes, // [output]
std::vector<material_t>& materials, // [output]
std::istream& inStream,
MaterialReader& readMatFn);
/// Loads materials into std::map
/// Returns an empty string if successful
std::string LoadMtl (
std::map<std::string, material_t>& material_map,
std::map<std::string, int>& material_map,
std::vector<material_t>& materials,
std::istream& inStream);
}