From c3097a768077fa9251a70de10bd29aff3c8553e1 Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Fri, 15 Oct 2010 13:02:33 +0000
Subject: added parsing of ASE submaterial definitions

---
 src/model/asefile.h | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'src/model/asefile.h')

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
@@ -34,10 +34,15 @@ public:
 	static Model *load(std::string const &name);
 
 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
@@ -52,10 +57,15 @@ private:
 	ASEFile(std::string const &name);
 	~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;
 
-- 
cgit v1.2.3