Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ColladaExport: move root library nodes outside the loope

Browse Source
This commit is contained in:
Latif Khalifa
2013-07-16 16:12:35 +02:00
parent 01a675de0f
commit 5dc0ba1712
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/daeexport.cpp
View File

@@ -307,6 +307,12 @@ bool DAESaver::saveDAE(std::string filename)
contributor->add("authoring_tool")->setCharData("Singularity Viewer Collada Export"); contributor->add("authoring_tool")->setCharData("Singularity Viewer Collada Export");
daeElement* geomLib = root->add("library_geometries"); daeElement* geomLib = root->add("library_geometries");
daeElement* effects = root->add("library_effects");
daeElement* materials = root->add("library_materials");
daeElement* scene = root->add("library_visual_scenes visual_scene");
scene->setAttribute("id", "Scene");
scene->setAttribute("name", "Scene");
S32 prim_nr = 0; S32 prim_nr = 0;
for (obj_info_t::iterator obj_iter = mObjects.begin(); obj_iter != mObjects.end(); ++obj_iter) for (obj_info_t::iterator obj_iter = mObjects.begin(); obj_iter != mObjects.end(); ++obj_iter)
@@ -375,7 +381,6 @@ bool DAESaver::saveDAE(std::string filename)
} }
// Effects (face color, alpha) // Effects (face color, alpha)
daeElement* effects = root->add("library_effects");
for (S32 face_num = 0; face_num < num_faces; face_num++) for (S32 face_num = 0; face_num < num_faces; face_num++)
{ {
LLTextureEntry* te = obj->getTE(face_num); LLTextureEntry* te = obj->getTE(face_num);
@@ -390,7 +395,6 @@ bool DAESaver::saveDAE(std::string filename)
} }
// Materials // Materials
daeElement* materials = root->add("library_materials");
for (S32 face_num = 0; face_num < num_faces; face_num++) for (S32 face_num = 0; face_num < num_faces; face_num++)
{ {
domMaterial* mat = (domMaterial*)materials->add("material"); domMaterial* mat = (domMaterial*)materials->add("material");
@@ -399,11 +403,6 @@ bool DAESaver::saveDAE(std::string filename)
matEffect->setAttribute("url", llformat("#%s-f%d-%s", geomID, face_num, "fx").c_str()); matEffect->setAttribute("url", llformat("#%s-f%d-%s", geomID, face_num, "fx").c_str());
} }
// Add scene
daeElement* scene = root->add("library_visual_scenes visual_scene");
scene->setAttribute("id", "Scene");
scene->setAttribute("name", "Scene");
daeElement* node = scene->add("node"); daeElement* node = scene->add("node");
node->setAttribute("type", "NODE"); node->setAttribute("type", "NODE");
node->setAttribute("id", geomID); node->setAttribute("id", geomID);