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

Fix merge conflicts.

pull/2966/head
Kim Kulling 2020-07-14 09:02:14 +02:00
parent 8cfd2a4cc1
commit b19ebf5d54
1 changed files with 0 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
code/AssetLib/XGL/XGLLoader.h
View File

@ -73,10 +73,6 @@ public:
XGLImporter(); XGLImporter();
~XGLImporter(); ~XGLImporter();
<<<<<<< HEAD
=======
public:
>>>>>>> master
// ------------------------------------------------------------------- // -------------------------------------------------------------------
/** Returns whether the class can handle the format of the given file. /** Returns whether the class can handle the format of the given file.
* See BaseImporter::CanRead() for details. */ * See BaseImporter::CanRead() for details. */
@ -96,24 +92,12 @@ protected:
IOSystem *pIOHandler); IOSystem *pIOHandler);
private: private:
<<<<<<< HEAD
struct TempScope
{
TempScope()
: light()
{}
~TempScope()
{
for(aiMesh* m : meshes_linear) {
=======
struct TempScope { struct TempScope {
TempScope() : TempScope() :
light() {} light() {}
~TempScope() { ~TempScope() {
for (aiMesh *m : meshes_linear) { for (aiMesh *m : meshes_linear) {
>>>>>>> master
delete m; delete m;
} }
@ -183,31 +167,6 @@ private:
private: private:
void Cleanup(); void Cleanup();
<<<<<<< HEAD
unsigned int ReadIDAttr(XmlNode &node);
void ReadWorld(TempScope& scope);
void ReadLighting(XmlNode &node, TempScope &scope);
aiLight *ReadDirectionalLight(XmlNode &node);
aiNode *ReadObject(XmlNode &node, TempScope &scope, bool skipFirst = false, const char *closetag = "object");
bool ReadMesh(XmlNode &node, TempScope &scope);
void ReadMaterial(XmlNode &node, TempScope &scope);
aiVector2D ReadVec2(XmlNode &node );
aiVector3D ReadVec3(XmlNode &node );
aiColor3D ReadCol3(XmlNode &node );
aiMatrix4x4 ReadTrafo(XmlNode &node );
unsigned int ReadIndexFromText(XmlNode &node);
float ReadFloat(XmlNode &node );
aiMesh* ToOutputMesh(const TempMaterialMesh& m);
void ReadFaceVertex(XmlNode &node, const TempMesh &t, TempFace &out);
unsigned int ResolveMaterialRef(XmlNode &node, TempScope &scope);
private:
//std::shared_ptr<irr::io::IrrXMLReader> m_reader;
XmlParser *m_xmlParser;
aiScene* m_scene;
=======
std::string GetElementName(); std::string GetElementName();
bool ReadElement(); bool ReadElement();
bool ReadElementUpToClosing(const char *closetag); bool ReadElementUpToClosing(const char *closetag);
@ -234,7 +193,6 @@ private:
private: private:
std::shared_ptr<irr::io::IrrXMLReader> m_reader; std::shared_ptr<irr::io::IrrXMLReader> m_reader;
aiScene *m_scene; aiScene *m_scene;
>>>>>>> master
}; };
} // end of namespace Assimp } // end of namespace Assimp