|
@@ -47,7 +47,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
#include <assimp/scene.h>
|
|
|
#include <assimp/ai_assert.h>
|
|
|
|
|
|
-#include <algorithm>
|
|
|
#include <vector>
|
|
|
|
|
|
static const aiImporterDesc desc = {
|
|
@@ -194,9 +193,9 @@ OpenGEXImporter::VertexContainer::VertexContainer()
|
|
|
: m_numVerts( 0 )
|
|
|
, m_vertices(NULL)
|
|
|
, m_numNormals( 0 )
|
|
|
-, m_normals(NULL) {
|
|
|
- std::fill(&m_numUVComps[0], &m_numUVComps[AI_MAX_NUMBER_OF_TEXTURECOORDS], 0U);
|
|
|
- std::fill(&m_textureCoords[0], &m_textureCoords[AI_MAX_NUMBER_OF_TEXTURECOORDS], static_cast<aiVector3D *>(NULL));
|
|
|
+, m_normals(NULL)
|
|
|
+, m_numUVComps()
|
|
|
+, m_textureCoords() {
|
|
|
}
|
|
|
|
|
|
//------------------------------------------------------------------------------------------------
|
|
@@ -228,13 +227,13 @@ OpenGEXImporter::OpenGEXImporter()
|
|
|
, m_meshCache()
|
|
|
, m_mesh2refMap()
|
|
|
, m_ctx( NULL )
|
|
|
+, m_metrics()
|
|
|
, m_currentNode( NULL )
|
|
|
, m_currentMesh( NULL )
|
|
|
, m_currentMaterial( NULL )
|
|
|
, m_tokenType( Grammar::NoneType )
|
|
|
, m_nodeStack()
|
|
|
, m_unresolvedRefStack() {
|
|
|
- std::fill(&m_metrics[0], &m_metrics[MetricInfo::Max], MetricInfo());
|
|
|
}
|
|
|
|
|
|
//------------------------------------------------------------------------------------------------
|