Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/model/map.cc10
-rw-r--r--src/model/model.cc5
2 files changed, 4 insertions, 11 deletions
diff --git a/src/model/map.cc b/src/model/map.cc
index 7495edb..377ed0d 100644
--- a/src/model/map.cc
+++ b/src/model/map.cc
@@ -523,9 +523,6 @@ void Map::make_brushface(Plane *face)
}
}
- // split off quads
- con_debug << " * face with " << vl.size() << " vertices" << std::endl;
-
while (vl.size() > 3) {
std::vector<Vector3f *>::iterator v0 = vl.begin();
std::vector<Vector3f *>::reverse_iterator vn = vl.rbegin();
@@ -543,7 +540,6 @@ void Map::make_brushface(Plane *face)
delete(*vn1);
vl.pop_back();
vl.pop_back();
- con_debug << " culled quad, " << vl.size() << " vertices left" << std::endl;
}
// the remainder could be a triangle
@@ -559,7 +555,6 @@ void Map::make_brushface(Plane *face)
primitives->add_triangle(*(*vn1), *(*vn), *(*v0), n, color, face->detail());
delete(*vn);
vl.pop_back();
- con_debug << " culled tris, " << vl.size() << " vertices left" << std::endl;
}
} else {
con_debug << "Unresolved face!\n";
@@ -926,10 +921,9 @@ Model * Map::load(std::string const &name)
mapfile.load_fragments(model);
- con_debug << " " << mapfile.name() << " " <<
+ con_debug << " " << mapfile.name() << " " << model->fragments().size() << " frags " <<
model->model_tris_count << "/" << model->model_tris_detail_count << " tris/detail " <<
- model->model_quad_count << "/" << model->model_quad_detail_count << " quads/detail " <<
- model->fragments().size() << " frags " <<std::endl;
+ model->model_quad_count << "/" << model->model_quad_detail_count << " quads/detail" << std::endl;
mapfile.clear_materials();
diff --git a/src/model/model.cc b/src/model/model.cc
index 979b79a..101895b 100644
--- a/src/model/model.cc
+++ b/src/model/model.cc
@@ -106,10 +106,9 @@ void Model::clear()
void Model::list_model(Model *model)
{
- con_print << " " << model->name() << " " <<
+ con_print << " " << model->name() << " " << model->fragments().size() << " frags " <<
model->model_tris_count << "/" << model->model_tris_detail_count << " tris/detail " <<
- model->model_quad_count << "/" << model->model_quad_detail_count << " quads/detail "
- << model->fragments().size() << " frags "<< std::endl;
+ model->model_quad_count << "/" << model->model_quad_detail_count << " quads/detail" << std::endl;
}
void Model::list()