v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use const char* const

pull/3869/head
kimkulling 2021-05-04 12:09:38 +02:00
parent 33a85e280f
commit 0e17939e8d
2 changed files with 51 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
code/AssetLib/3MF/3MFXmlTags.h
View File

@ -45,65 +45,65 @@ namespace D3MF {
namespace XmlTag {
// Root tag
static const char *RootTag = "3MF";
const char* const RootTag = "3MF";
// Meta-data
static const char *meta = "metadata";
static const char *meta_name = "name";
const char* const meta = "metadata";
const char* const meta_name = "name";
// Model-data specific tags
static const char *model = "model";
static const char *model_unit = "unit";
static const char *metadata = "metadata";
static const char *resources = "resources";
static const char *object = "object";
static const char *mesh = "mesh";
static const char *components = "components";
static const char *component = "component";
static const char *vertices = "vertices";
static const char *vertex = "vertex";
static const char *triangles = "triangles";
static const char *triangle = "triangle";
static const char *x = "x";
static const char *y = "y";
static const char *z = "z";
static const char *v1 = "v1";
static const char *v2 = "v2";
static const char *v3 = "v3";
static const char *id = "id";
static const char *pid = "pid";
static const char *pindex = "pindex";
static const char *p1 = "p1";
static const char *name = "name";
static const char *type = "type";
static const char *build = "build";
static const char *item = "item";
static const char *objectid = "objectid";
static const char *transform = "transform";
const char* const model = "model";
const char* const model_unit = "unit";
const char* const metadata = "metadata";
const char* const resources = "resources";
const char* const object = "object";
const char* const mesh = "mesh";
const char* const components = "components";
const char* const component = "component";
const char* const vertices = "vertices";
const char* const vertex = "vertex";
const char* const triangles = "triangles";
const char* const triangle = "triangle";
const char* const x = "x";
const char* const y = "y";
const char* const z = "z";
const char* const v1 = "v1";
const char* const v2 = "v2";
const char* const v3 = "v3";
const char* const id = "id";
const char* const pid = "pid";
const char* const pindex = "pindex";
const char* const p1 = "p1";
const char* const name = "name";
const char* const type = "type";
const char* const build = "build";
const char* const item = "item";
const char* const objectid = "objectid";
const char* const transform = "transform";
// Material definitions
static const char *basematerials = "basematerials";
static const char *basematerials_id = "id";
static const char *basematerials_base = "base";
static const char *basematerials_name = "name";
static const char *basematerials_displaycolor = "displaycolor";
const char* const basematerials = "basematerials";
const char* const basematerials_id = "id";
const char* const basematerials_base = "base";
const char* const basematerials_name = "name";
const char* const basematerials_displaycolor = "displaycolor";
// Meta info tags
static const char *CONTENT_TYPES_ARCHIVE = "[Content_Types].xml";
static const char *ROOT_RELATIONSHIPS_ARCHIVE = "_rels/.rels";
static const char *SCHEMA_CONTENTTYPES = "http://schemas.openxmlformats.org/package/2006/content-types";
static const char *SCHEMA_RELATIONSHIPS = "http://schemas.openxmlformats.org/package/2006/relationships";
static const char *RELS_RELATIONSHIP_CONTAINER = "Relationships";
static const char *RELS_RELATIONSHIP_NODE = "Relationship";
static const char *RELS_ATTRIB_TARGET = "Target";
static const char *RELS_ATTRIB_TYPE = "Type";
static const char *RELS_ATTRIB_ID = "Id";
static const char *PACKAGE_START_PART_RELATIONSHIP_TYPE = "http://schemas.microsoft.com/3dmanufacturing/2013/01/3dmodel";
static const char *PACKAGE_PRINT_TICKET_RELATIONSHIP_TYPE = "http://schemas.microsoft.com/3dmanufacturing/2013/01/printticket";
static const char *PACKAGE_TEXTURE_RELATIONSHIP_TYPE = "http://schemas.microsoft.com/3dmanufacturing/2013/01/3dtexture";
static const char *PACKAGE_CORE_PROPERTIES_RELATIONSHIP_TYPE = "http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties";
static const char *PACKAGE_THUMBNAIL_RELATIONSHIP_TYPE = "http://schemas.openxmlformats.org/package/2006/relationships/metadata/thumbnail";
}
const char* const CONTENT_TYPES_ARCHIVE = "[Content_Types].xml";
const char* const ROOT_RELATIONSHIPS_ARCHIVE = "_rels/.rels";
const char* const SCHEMA_CONTENTTYPES = "http://schemas.openxmlformats.org/package/2006/content-types";
const char* const SCHEMA_RELATIONSHIPS = "http://schemas.openxmlformats.org/package/2006/relationships";
const char* const RELS_RELATIONSHIP_CONTAINER = "Relationships";
const char* const RELS_RELATIONSHIP_NODE = "Relationship";
const char* const RELS_ATTRIB_TARGET = "Target";
const char* const RELS_ATTRIB_TYPE = "Type";
const char* const RELS_ATTRIB_ID = "Id";
const char* const PACKAGE_START_PART_RELATIONSHIP_TYPE = "http://schemas.microsoft.com/3dmanufacturing/2013/01/3dmodel";
const char* const PACKAGE_PRINT_TICKET_RELATIONSHIP_TYPE = "http://schemas.microsoft.com/3dmanufacturing/2013/01/printticket";
const char* const PACKAGE_TEXTURE_RELATIONSHIP_TYPE = "http://schemas.microsoft.com/3dmanufacturing/2013/01/3dtexture";
const char* const PACKAGE_CORE_PROPERTIES_RELATIONSHIP_TYPE = "http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties";
const char* const PACKAGE_THUMBNAIL_RELATIONSHIP_TYPE = "http://schemas.openxmlformats.org/package/2006/relationships/metadata/thumbnail";
}
} // Namespace D3MF
} // Namespace Assimp

1
code/AssetLib/3MF/D3MFImporter.cpp
View File

@ -173,7 +173,6 @@ public:
}
}
XmlNode buildNode = node.child(XmlTag::build);
for (auto &currentNode : resNode.children()) {
const std::string &currentNodeName = currentNode.name();
if (currentNodeName == XmlTag::item) {