mirror of
https://github.com/IfcOpenShell/IfcOpenShell.git
synced 2026-09-27 02:31:09 +00:00
Change some auto keywords into fully qualified type names to make it easier on some of the older compilers
This commit is contained in:
@@ -199,7 +199,7 @@ bool ColladaSerializer::ColladaExporter::ColladaMaterials::contains(const IfcGeo
|
|||||||
|
|
||||||
void ColladaSerializer::ColladaExporter::ColladaMaterials::write() {
|
void ColladaSerializer::ColladaExporter::ColladaMaterials::write() {
|
||||||
effects.close();
|
effects.close();
|
||||||
for (auto it = materials.begin(); it != materials.end(); ++it) {
|
for (std::vector<IfcGeomObjects::Material>::const_iterator it = materials.begin(); it != materials.end(); ++it) {
|
||||||
const std::string& material_name = collada_id((*it).name());
|
const std::string& material_name = collada_id((*it).name());
|
||||||
openMaterial(material_name);
|
openMaterial(material_name);
|
||||||
addInstanceEffect("#" + material_name + "-fx");
|
addInstanceEffect("#" + material_name + "-fx");
|
||||||
@@ -252,12 +252,12 @@ void ColladaSerializer::ColladaExporter::endDocument() {
|
|||||||
// In fact due the XML based nature of Collada and its dependency on library nodes,
|
// In fact due the XML based nature of Collada and its dependency on library nodes,
|
||||||
// only at this point all objects are written to the stream.
|
// only at this point all objects are written to the stream.
|
||||||
materials.write();
|
materials.write();
|
||||||
for (auto it = deferreds.begin(); it != deferreds.end(); ++it) {
|
for (std::vector<DeferredObject>::const_iterator it = deferreds.begin(); it != deferreds.end(); ++it) {
|
||||||
const std::string object_name = it->Name();
|
const std::string object_name = it->Name();
|
||||||
geometries.write(object_name, it->type, it->vertices, it->normals, it->indices, it->material_ids, it->materials);
|
geometries.write(object_name, it->type, it->vertices, it->normals, it->indices, it->material_ids, it->materials);
|
||||||
}
|
}
|
||||||
geometries.close();
|
geometries.close();
|
||||||
for (auto it = deferreds.begin(); it != deferreds.end(); ++it) {
|
for (std::vector<DeferredObject>::const_iterator it = deferreds.begin(); it != deferreds.end(); ++it) {
|
||||||
const std::string object_name = it->Name();
|
const std::string object_name = it->Name();
|
||||||
scene.add(object_name, object_name, object_name, it->material_references, it->matrix);
|
scene.add(object_name, object_name, object_name, it->material_references, it->matrix);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user