From 25bcd92706ce2cd6aee24cfb81e9ff2fd7dd4820 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Tue, 11 Aug 2009 11:49:12 +0000 Subject: misc_model support --- src/model/asefile.cc | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'src/model/asefile.cc') diff --git a/src/model/asefile.cc b/src/model/asefile.cc index 22fcd78..28c84cf 100644 --- a/src/model/asefile.cc +++ b/src/model/asefile.cc @@ -18,7 +18,6 @@ const float MAX_BOUNDS = 16384.0f; ASEFile::ASEFile(std::string const &name) { - asefile_name.assign("models/"); asefile_name.append(name); asefile_name.append(".ase"); @@ -90,7 +89,7 @@ bool ASEFile::read_mesh_vertex_list(std::istream &is) line >> firstword; if (firstword.compare("}") == 0) { - con_debug << count << " mesh vertices" << std::endl; + con_debug << " " << count << " mesh vertices" << std::endl; return true; @@ -428,9 +427,9 @@ Model * ASEFile::load(const std::string &name) Model *model = new Model(name); // default material - Material *material = Material::find("models/" + name); + Material *material = Material::find(name); if (!material) { - material = new Material("models/" + name); + material = new Material(name); Material::add(material); material->set_flags(Material::Texture); material->set_texture(material->name()); @@ -440,13 +439,13 @@ Model * ASEFile::load(const std::string &name) Fragment *fragment = new Fragment(Fragment::Triangles, material); FragmentGroup *group = new FragmentGroup(); group->set_type(FragmentGroup::None); - group->push_back(fragment); + group->add_fragment(fragment); // calculate model center math::Vector3f center((asefile.ase_minbbox + asefile.ase_maxbbox) * 0.5f); - //const float scale = SCALE; - const float scale = 0.125f; + const float scale = SCALE; + //const float scale = 0.125f; // caculate bounding box model->model_minbbox = (asefile.ase_minbbox - center) * scale; -- cgit v1.2.3