Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
path: root/src/model
diff options
context:
space:
mode:
Diffstat (limited to 'src/model')
-rw-r--r--src/model/asefile.cc28
1 files changed, 13 insertions, 15 deletions
diff --git a/src/model/asefile.cc b/src/model/asefile.cc
index 06e10dc..b0072d0 100644
--- a/src/model/asefile.cc
+++ b/src/model/asefile.cc
@@ -149,7 +149,7 @@ bool ASEFile::read_material_list(std::istream &is)
if ((line >> index) && (line >> word) && (word.compare("{") == 0)) {
// add material to the ase material list
ase_materiallist[index] = read_material(is);
- con_debug << " " << name() << " " << "*MATERIAL " << index << " " << ase_materiallist[index]->name() << std::endl;
+ //con_debug << " " << name() << " " << "*MATERIAL " << index << " " << ase_materiallist[index]->name() << std::endl;
}
} else {
@@ -314,7 +314,7 @@ bool ASEFile::read_mesh_tvertex_list(std::istream &is)
line >> firstword;
if (firstword.compare("}") == 0) {
- con_debug << " " << count << " texture vertices" << std::endl;
+ //con_debug << " " << count << " texture vertices" << std::endl;
return true;
} else if (firstword.compare("*MESH_TVERT") == 0) {
@@ -345,7 +345,7 @@ bool ASEFile::read_mesh_tface_list(std::istream &is)
line >> firstword;
if (firstword.compare("}") == 0) {
- con_debug << " " << count << " face texture coordinates" << std::endl;
+ //con_debug << " " << count << " face texture coordinates" << std::endl;
return true;
} else if (firstword.compare("*MESH_TFACE") == 0) {
@@ -388,31 +388,31 @@ bool ASEFile::read_mesh(std::istream &is)
if ((level == 1) && (word.compare("*MESH_VERTEX_LIST") == 0)) {
if ((line >> word) && (word.compare("{") == 0)) {
- con_debug << " " << name() << " *MESH_VERTEX_LIST" << std::endl;
+ //con_debug << " " << name() << " *MESH_VERTEX_LIST" << std::endl;
read_mesh_vertex_list(is);
}
} else if ((level == 1) && (word.compare("*MESH_FACE_LIST") == 0)) {
if ((line >> word) && (word.compare("{") == 0)) {
- con_debug << " " << name() << " *MESH_FACE_LIST" << std::endl;
+ //con_debug << " " << name() << " *MESH_FACE_LIST" << std::endl;
read_mesh_face_list(is);
}
} else if ((level == 1) && (word.compare("*MESH_NORMALS") == 0)) {
if ((line >> word) && (word.compare("{") == 0)) {
- con_debug << " " << name() << " *MESH_NORMALS" << std::endl;
+ //con_debug << " " << name() << " *MESH_NORMALS" << std::endl;
read_mesh_normals(is);
}
} else if ((level == 1) && (word.compare("*MESH_TVERTLIST") == 0)) {
if ((line >> word) && (word.compare("{") == 0)) {
- con_debug << " " << name() << " *MESH_TVERTLIST" << std::endl;
+ //con_debug << " " << name() << " *MESH_TVERTLIST" << std::endl;
read_mesh_tvertex_list(is);
}
} else if ((level == 1) && (word.compare("*MESH_TFACELIST") == 0)) {
if ((line >> word) && (word.compare("{") == 0)) {
- con_debug << " " << name() << " *MESH_TFACELIST" << std::endl;
+ //con_debug << " " << name() << " *MESH_TFACELIST" << std::endl;
read_mesh_tface_list(is);
}
@@ -473,13 +473,13 @@ bool ASEFile::read_geom(std::istream &is)
if ((level == 1) && (word.compare("*MESH") == 0)) {
if ((line >> word) && (word.compare("{") == 0)) {
- con_debug << " " << name() << " " << "*MESH" << std::endl;
+ //con_debug << " " << name() << " " << "*MESH" << std::endl;
read_mesh(is);
}
} else if ((level == 1) && (word.compare("*MATERIAL_REF") == 0)) {
// the material to use for this GEOMOBJECT
if (line >> index) {
- con_debug << " " << name() << " " << "*MATERIAL_REF " << index << std::endl;
+ //con_debug << " " << name() << " " << "*MATERIAL_REF " << index << std::endl;
// find the Material for index
MaterialList::iterator it = ase_materiallist.find(index);
@@ -542,13 +542,13 @@ bool ASEFile::read()
if (word.compare("*GEOMOBJECT") == 0) {
if ((line >> word) && (word.compare("{") == 0)) {
- con_debug << " " << name() << " " << "*GEOMOBJECT" << std::endl;
+ //con_debug << " " << name() << " " << "*GEOMOBJECT" << std::endl;
read_geom(asefile_ifs);
}
} else if (word.compare("*MATERIAL_LIST") == 0) {
if ((line >> word) && (word.compare("{") == 0)) {
- con_debug << " " << name() << " " << "*MATERIAL_LIST" << std::endl;
+ //con_debug << " " << name() << " " << "*MATERIAL_LIST" << std::endl;
read_material_list(asefile_ifs);
}
}
@@ -569,10 +569,8 @@ Model *ASEFile::load(const std::string &name)
return 0;
}
- /* this is cleared by clear_geom()
- if (!asefile.ase_facelist.size())
+ if (!asefile.fragmentgroup()->size())
return 0;
- */
// create a new model
Model *model = new Model(name);