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

Remove not used attribute

pull/4029/head
Kim Kulling 2021-08-29 18:41:07 +02:00
parent c9d35b6edc
commit e2c2a60c45
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -123,7 +123,7 @@ void D3MFImporter::InternReadFile(const std::string &filename, aiScene *pScene,
XmlParser xmlParser; XmlParser xmlParser;
if (xmlParser.parse(opcPackage.RootStream())) { if (xmlParser.parse(opcPackage.RootStream())) {
XmlSerializer xmlSerializer(&xmlParser, &opcPackage); XmlSerializer xmlSerializer(&xmlParser);
xmlSerializer.ImportXml(pScene); xmlSerializer.ImportXml(pScene);
const std::vector<aiTexture*> &tex = opcPackage.GetEmbeddedTextures(); const std::vector<aiTexture*> &tex = opcPackage.GetEmbeddedTextures();

6
code/AssetLib/3MF/XmlSerializer.cpp
View File

@ -193,13 +193,11 @@ void assignDiffuseColor(XmlNode &node, aiMaterial *mat) {
} // namespace } // namespace
XmlSerializer::XmlSerializer(XmlParser *xmlParser, D3MFOpcPackage *archive) : XmlSerializer::XmlSerializer(XmlParser *xmlParser) :
mResourcesDictionnary(), mResourcesDictionnary(),
mMeshCount(0), mMeshCount(0),
mXmlParser(xmlParser), mXmlParser(xmlParser) {
mD3MFOpcPackage(archive) {
ai_assert(nullptr != xmlParser); ai_assert(nullptr != xmlParser);
ai_assert(nullptr != archive);
} }
XmlSerializer::~XmlSerializer() { XmlSerializer::~XmlSerializer() {

3
code/AssetLib/3MF/XmlSerializer.h
View File

@ -60,7 +60,7 @@ class EmbeddedTexture;
class XmlSerializer { class XmlSerializer {
public: public:
XmlSerializer(XmlParser *xmlParser, D3MFOpcPackage *archive); XmlSerializer(XmlParser *xmlParser);
~XmlSerializer(); ~XmlSerializer();
void ImportXml(aiScene *scene); void ImportXml(aiScene *scene);
@ -90,7 +90,6 @@ private:
std::map<unsigned int, Resource *> mResourcesDictionnary; std::map<unsigned int, Resource *> mResourcesDictionnary;
unsigned int mMeshCount; unsigned int mMeshCount;
XmlParser *mXmlParser; XmlParser *mXmlParser;
D3MFOpcPackage *mD3MFOpcPackage;
}; };
} // namespace D3MF } // namespace D3MF