Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2010-10-15 13:02:33 +0000
committerStijn Buys <ingar@osirion.org>2010-10-15 13:02:33 +0000
commitc3097a768077fa9251a70de10bd29aff3c8553e1 (patch)
treedebfce077e8d16ee8772cf1bb8532975a5e2507a /src/model/asefile.h
parent862f1dc0ae63b476b620a817bb2ea73d9b35ef3f (diff)
added parsing of ASE submaterial definitions
Diffstat (limited to 'src/model/asefile.h')
-rw-r--r--src/model/asefile.h16
1 files changed, 13 insertions, 3 deletions
diff --git a/src/model/asefile.h b/src/model/asefile.h
index d8e3aea..9e3fea6 100644
--- a/src/model/asefile.h
+++ b/src/model/asefile.h
@@ -35,9 +35,14 @@ public:
private:
/**
+ * @brief type definition for a list of submaterials in the ASE file
+ */
+ typedef std::map<size_t, Material *> SubMaterialList;
+
+ /**
* @brief type definition for a list of materials in the ASE file
*/
- typedef std::map<size_t, Material *> MaterialList;
+ typedef std::map<size_t, SubMaterialList *> MaterialList;
/**
* @brief type definition for a list of vertices in a GEOMOBJECT
@@ -53,9 +58,14 @@ private:
~ASEFile();
/**
+ * @brief read *SUBMATERIAL
+ */
+ Material *read_submaterial(std::istream &is);
+
+ /**
* @brief read *MATERIAL
*/
- Material *read_material(std::istream &is);
+ SubMaterialList *read_material(std::istream &is);
/**
* @brief read *MATERIAL_LIST
@@ -142,7 +152,7 @@ private:
FaceList ase_facelist;
- MaterialList ase_materiallist;
+ MaterialList ase_materials;
math::Vector3f ase_maxbbox;