manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

import, export and util semantically-correct for visual studio 2005

This commit is contained in:
granzuglia 2006-11-08 19:49:57 +00:00
parent 654ababe38
commit fa68f489cc
3 changed files with 70 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
wrap/io_trimesh/export_dae.h
View File

@ -14,28 +14,26 @@ class ExporterDAE : public UtilDAE
{ {
private: private:
static void SaveTexture(QDomDocument& doc,QDomNode& n,const std::vector<QString>& stv) //static void SaveTexture(QDomDocument& doc,QDomNode& n,const std::vector<QString>& stv)
{ //{
removeChildNode(doc,"library_images"); // removeChildNode(doc,"library_images");
QDomElement el = doc.createElement("library_images"); // QDomElement el = doc.createElement("library_images");
for(int img = 0;img < stv.size();++img) // for(int img = 0;img < stv.size();++img)
{ // {
QDomElement imgnode = doc.createElement("image"); // QDomElement imgnode = doc.createElement("image");
imgnode.setAttribute("id","file"+QString::number(img)); // imgnode.setAttribute("id","file"+QString::number(img));
imgnode.setAttribute("name","file"+QString::number(img)); // imgnode.setAttribute("name","file"+QString::number(img));
QDomElement tex = doc.createElement("init_from"); // QDomElement tex = doc.createElement("init_from");
QDomText txname = doc.createTextNode(stv[img]); // QDomText txname = doc.createTextNode(stv[img]);
tex.appendChild(txname); // tex.appendChild(txname);
imgnode.appendChild(tex); // imgnode.appendChild(tex);
el.appendChild(imgnode); // el.appendChild(imgnode);
} // }
n.appendChild(el); // n.appendChild(el);
} //}
static void SaveTexture(QDomDocument& doc,QDomNode& n,const std::vector<std::string>& stv) static void SaveTextureName(QDomDocument& doc,QDomNode& lbim,const std::vector<std::string>& stv)
{ {
removeChildNode(doc,"library_images");
QDomElement el = doc.createElement("library_images");
for(int img = 0;img < stv.size();++img) for(int img = 0;img < stv.size();++img)
{ {
QDomElement imgnode = doc.createElement("image"); QDomElement imgnode = doc.createElement("image");
@ -45,11 +43,26 @@ private:
QDomText txname = doc.createTextNode(QString(stv[img].c_str())); QDomText txname = doc.createTextNode(QString(stv[img].c_str()));
tex.appendChild(txname); tex.appendChild(txname);
imgnode.appendChild(tex); imgnode.appendChild(tex);
el.appendChild(imgnode); lbim.appendChild(imgnode);
} }
}
static void SaveTexture(QDomDocument& doc,QDomNode& n,const std::vector<std::string>& stv)
{
QDomElement el = doc.createElement("library_images");
SaveTextureName(doc,el,stv);
n.appendChild(el); n.appendChild(el);
} }
static void SaveTexture(QDomDocument& doc,const std::vector<std::string>& stv)
{
QDomNodeList lbim = doc.elementsByTagName("library_images");
assert(lbim.size() == 1);
removeChildNode(lbim.at(0));
SaveTextureName(doc,lbim.at(0),stv);
}
static void CreateVertInput(QDomDocument& doc,QDomNode& vert,const QString& attr,const QString& ref) static void CreateVertInput(QDomDocument& doc,QDomNode& vert,const QString& attr,const QString& ref)
{ {
QDomElement vinp_pos = doc.createElement("input"); QDomElement vinp_pos = doc.createElement("input");
@ -271,7 +284,11 @@ public:
coll.appendChild(ass); coll.appendChild(ass);
if (m.textures.size() != 0) if (m.textures.size() != 0)
SaveTexture(doc,doc.firstChild(),m.textures); {
QDomNodeList cl = doc.elementsByTagName("COLLADA");
assert(cl.size() == 1);
SaveTexture(doc,cl.at(0),m.textures);
}
QDomElement geolib = doc.createElement("library_geometries"); QDomElement geolib = doc.createElement("library_geometries");
QDomElement geonode = doc.createElement("geometry"); QDomElement geonode = doc.createElement("geometry");
@ -337,9 +354,13 @@ public:
assert(scenelst.size() == 1); assert(scenelst.size() == 1);
if (m.textures.size() != 0) if (m.textures.size() != 0)
SaveTexture(*(info->doc),info->doc->firstChild(),m.textures); SaveTexture(*(info->doc),m.textures);
QDomNodeList vsscene = info->doc->elementsByTagName("library_visual_scenes"); QDomNodeList vsscene = info->doc->elementsByTagName("library_visual_scenes");
QDomNodeList geolib = info->doc->elementsByTagName("library_geometries");
assert(geolib.size() == 1);
if (info->doc->elementsByTagName("instance_geometry").size() != 0) if (info->doc->elementsByTagName("instance_geometry").size() != 0)
{ {
QDomNodeList invisscnlst = info->doc->elementsByTagName("instance_visual_scene"); QDomNodeList invisscnlst = info->doc->elementsByTagName("instance_visual_scene");
@ -352,8 +373,17 @@ public:
for(int no = 0;no < sc.childNodes().size();++no) for(int no = 0;no < sc.childNodes().size();++no)
{ {
QDomNode oldnode = sc.childNodes().at(no); QDomNode oldnode = sc.childNodes().at(no);
if (sc.childNodes().at(no).toElement().elementsByTagName("instance_geometry").size() != 0) QDomNodeList lst = sc.childNodes().at(no).toElement().elementsByTagName("instance_geometry");
int lst_size = lst.size();
if (lst_size != 0)
{ {
for(int ingeo = 0;ingeo < lst_size;++ingeo)
{
QString url;
referenceToANodeAttribute(lst.at(ingeo),"url",url);
QDomNode oldgeo = findNodeBySpecificAttributeValue(geolib.at(0),"geometry","id",url);
geolib.at(0).removeChild(oldgeo);
}
sc.removeChild(oldnode); sc.removeChild(oldnode);
} }
} }
@ -373,6 +403,8 @@ public:
assert(geolib.size() == 1); assert(geolib.size() == 1);
//removeChildNode(geolib.at(0)); //removeChildNode(geolib.at(0));
/*QDomElement mshnode; /*QDomElement mshnode;
mshnode.setTagName("mesh");*/ mshnode.setTagName("mesh");*/

4
wrap/io_trimesh/import_dae.h
View File

@ -388,11 +388,11 @@ namespace io {
QDomDocument* doc = new QDomDocument(filename); QDomDocument* doc = new QDomDocument(filename);
QFile file(filename); QFile file(filename);
if (!file.open(QIODevice::ReadOnly)) if (!file.open(QIODevice::ReadOnly))
return E_CANTOPEN; return false;
if (!doc->setContent(&file)) if (!doc->setContent(&file))
{ {
file.close(); file.close();
return E_CANTOPEN; return false;
} }
file.close(); file.close();

16
wrap/io_trimesh/util_dae.h
View File

@ -171,13 +171,13 @@ namespace io {
return true; return true;
} }
/* inline static bool removeChildNode(QDomNode& node,const QString& tag = "", const QString& attribname = "", const QString& attribvalue = "") inline static bool removeChildNode(QDomNode& node,const QString& tag = "", const QString& attribname = "", const QString& attribvalue = "")
{ {
return removeChildNode((QDomDocument&) node.toElement(),tag,attribname,attribvalue); return removeChildNode((QDomDocument&) node.toElement(),tag,attribname,attribvalue);
}*/ }
//inline static bool removeChildNode(QDomDocument& node,const QString& tag = "", const QString& attribname = "", const QString& attribvalue = "") inline static bool removeChildNode(QDomDocument& node,const QString& tag = "", const QString& attribname = "", const QString& attribvalue = "")
inline static bool removeChildNode(QDomNode& node,const QString& tag = "", const QString& attribname = "", const QString& attribvalue = "") //inline static bool removeChildNode(QDomNode node,const QString& tag = "", const QString& attribname = "", const QString& attribvalue = "")
{ {
QDomNodeList clst = node.childNodes(); QDomNodeList clst = node.childNodes();
for(int ii = 0;ii < clst.size();++ii) for(int ii = 0;ii < clst.size();++ii)
@ -190,9 +190,15 @@ namespace io {
if (clst.at(ii).toElement().attribute(attribname) == attribvalue) if (clst.at(ii).toElement().attribute(attribname) == attribvalue)
node.removeChild(oldchild); node.removeChild(oldchild);
} }
else if (clst.at(ii).nodeName() == tag) else
{
QString nm = clst.at(ii).nodeName();
if (clst.at(ii).nodeName() == tag)
{
node.removeChild(oldchild); node.removeChild(oldchild);
} }
}
}
else node.removeChild(oldchild); else node.removeChild(oldchild);
} }
return true; return true;