diff options
author | Stijn Buys <ingar@osirion.org> | 2011-08-25 22:04:42 +0000 |
---|---|---|
committer | Stijn Buys <ingar@osirion.org> | 2011-08-25 22:04:42 +0000 |
commit | 431421c7e626b50186fc54542db3967cde844a66 (patch) | |
tree | 31eddc445b1227e77e12f628305e9dacb3f81c39 /src/model/model.cc | |
parent | bdd1e564921d7001c218d1e7bcde925057f9b3dc (diff) |
OBJ model support, by Thorn
Diffstat (limited to 'src/model/model.cc')
-rw-r--r-- | src/model/model.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/model/model.cc b/src/model/model.cc index ab89dae..776eba7 100644 --- a/src/model/model.cc +++ b/src/model/model.cc @@ -8,6 +8,7 @@ #include "model/model.h" #include "model/asefile.h" #include "model/mapfile.h" +#include "model/objfile.h" #include "model/vertexarray.h" namespace model @@ -138,6 +139,11 @@ Model *Model::load(const std::string & name) // if it can't be found, try the ase model model = ASEFile::load(name); } + + if (!model) { + // if it can't be found, try the obj model + model = OBJFile::load(name); + } if (!model) { con_warn << "Could not open model " << name << std::endl; |