diff options
author | Stijn Buys <ingar@osirion.org> | 2009-08-16 21:23:47 +0000 |
---|---|---|
committer | Stijn Buys <ingar@osirion.org> | 2009-08-16 21:23:47 +0000 |
commit | 80aaacbaef16b4eba33428aec268f80e7466cbb1 (patch) | |
tree | f157011d8e97d490ec3a9b0e8b28980f091de87b /src/model/mapfile.cc | |
parent | d763e294f44eb38b94bf7e2055b77a982b72b7c0 (diff) |
minor cleanups, corrected map widget
Diffstat (limited to 'src/model/mapfile.cc')
-rw-r--r-- | src/model/mapfile.cc | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/model/mapfile.cc b/src/model/mapfile.cc index cc96051..575232e 100644 --- a/src/model/mapfile.cc +++ b/src/model/mapfile.cc @@ -121,9 +121,9 @@ void face_texture_verts(Face &face, const math::Vector2f &tex_shift, const float for (i=0 ; i<2 ; i++) for (j=0 ; j<3 ; j++) - face.tex_vec(i)[j] = vecs[i][j] / scale[i]; + face.get_tex_vec(i)[j] = vecs[i][j] / scale[i]; - face.tex_shift().assign(tex_shift); + face.get_tex_shift().assign(tex_shift); } // from radiant tools/quake3/q3map2/map.c @@ -131,8 +131,8 @@ void face_texture_verts(Face &face, const math::Vector2f &tex_shift, const float const math::Vector2f map_texture_coords(Face *face, const math::Vector3f &v) { return math::Vector2f ( - (face->tex_shift().x() + math::dotproduct(face->tex_vec(0), v)) / face->material()->size().width(), - (face->tex_shift().y() + math::dotproduct(face->tex_vec(1), v)) / face->material()->size().height() + (face->get_tex_shift().x() + math::dotproduct(face->tex_vec(0), v)) / face->material()->size().width(), + (face->get_tex_shift().y() + math::dotproduct(face->tex_vec(1), v)) / face->material()->size().height() ); } @@ -395,14 +395,14 @@ bool MapFile::getline() if (!(linestream >> n)) n = 0; if (n > 0) - face->detail() = true; + face->set_detail(); // surface flags if (!(linestream >> n)) { n = 0; warning_q2brush = true; } - face->surface_flags() = n; + face->set_surface_flags(n); planes.push_back(face); @@ -1462,9 +1462,8 @@ Model * MapFile::load(std::string const &name) } con_debug << " " << mapfile.name() << " " << mapfile.map_brushes << " brushes " << - model->model_tris_count << "/" << model->model_tris_detail_count << " tris/detail " << - model->model_quad_count << "/" << model->model_quad_detail_count << " quads/detail" << - std::endl; + model->model_tris_detail_count << "/" << model->model_tris_count << " detail/tris " << + model->model_quad_detail_count << "/" << model->model_quad_count << " detail/quads" << std::endl; if (mapfile.warning_q2brush) con_warn << " quake2 style brushes detected" << std::endl; |