diff options
| author | Stijn Buys <ingar@osirion.org> | 2009-02-08 16:50:54 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2009-02-08 16:50:54 +0000 |
| commit | ba9d61266c5f5d3d618e55bf6b85a2569c04c29f (patch) | |
| tree | 6e630ba2c6500701b08df04f44f921421b82782f /src/model/map.h | |
| parent | 2386bda56b33de68370fa8acc76e39ddddd836c6 (diff) | |
materials system
Diffstat (limited to 'src/model/map.h')
| -rw-r--r-- | src/model/map.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/model/map.h b/src/model/map.h index e38b9ec..d7b01d7 100644 --- a/src/model/map.h +++ b/src/model/map.h @@ -10,6 +10,7 @@ #include <string> #include <vector> +#include "model/material.h" #include "model/model.h" #include "model/plane.h" #include "model/primitives.h" @@ -33,7 +34,7 @@ private: ~Map(); /// tpye definition for a per-material list of Primitives - typedef std::map<unsigned int, Primitives *> Materials; + typedef std::map<Material *, Primitives *> Materials; /// open the file for reading /** the filename will get the "maps/" prefix and ".map" suffix |