From 30cd60ff828e4600e3b91e071486a5b96e27b362 Mon Sep 17 00:00:00 2001 From: Albin Bernhardsson Date: Thu, 24 Nov 2016 13:26:18 +0100 Subject: [PATCH 1/5] Remove unnecessary semicolons --- code/Exporter.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/Exporter.cpp b/code/Exporter.cpp index 26cb5e998..ce134f0a3 100644 --- a/code/Exporter.cpp +++ b/code/Exporter.cpp @@ -602,28 +602,28 @@ bool ExportProperties :: HasPropertyInteger(const char* szName) const bool ExportProperties :: HasPropertyBool(const char* szName) const { return HasGenericProperty(mIntProperties, szName); -}; +} // ------------------------------------------------------------------------------------------------ // Has a configuration property bool ExportProperties :: HasPropertyFloat(const char* szName) const { return HasGenericProperty(mFloatProperties, szName); -}; +} // ------------------------------------------------------------------------------------------------ // Has a configuration property bool ExportProperties :: HasPropertyString(const char* szName) const { return HasGenericProperty(mStringProperties, szName); -}; +} // ------------------------------------------------------------------------------------------------ // Has a configuration property bool ExportProperties :: HasPropertyMatrix(const char* szName) const { return HasGenericProperty(mMatrixProperties, szName); -}; +} #endif // !ASSIMP_BUILD_NO_EXPORT From 3b49dfe93e8b4642d12e07b281ec25c74c24c678 Mon Sep 17 00:00:00 2001 From: Albin Bernhardsson Date: Thu, 24 Nov 2016 14:10:24 +0100 Subject: [PATCH 2/5] Comment out unused variables --- code/ObjFileImporter.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/ObjFileImporter.cpp b/code/ObjFileImporter.cpp index 97ae29996..f0746085b 100644 --- a/code/ObjFileImporter.cpp +++ b/code/ObjFileImporter.cpp @@ -149,10 +149,10 @@ void ObjFileImporter::InternReadFile( const std::string &file, aiScene* pScene, // This next stage takes ~ 1/3th of the total readFile task // so should amount for 1/3th of the progress // only update every 100KB or it'll be too slow - unsigned int progress = 0; + /*unsigned int progress = 0; unsigned int progressCounter = 0; const unsigned int updateProgressEveryBytes = 100 * 1024; - const unsigned int progressTotal = (3*m_Buffer.size()/updateProgressEveryBytes); + const unsigned int progressTotal = (3*m_Buffer.size()/updateProgressEveryBytes);*/ // process all '\' /*std::vector ::iterator iter = m_Buffer.begin(); while (iter != m_Buffer.end()) From bd6f94b9267ba2dcdadb0484d353c3b891667f44 Mon Sep 17 00:00:00 2001 From: Albin Bernhardsson Date: Thu, 24 Nov 2016 14:15:13 +0100 Subject: [PATCH 3/5] Remove unused variable --- code/ObjFileParser.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/ObjFileParser.cpp b/code/ObjFileParser.cpp index 7371b2d81..ddab8f786 100644 --- a/code/ObjFileParser.cpp +++ b/code/ObjFileParser.cpp @@ -101,8 +101,6 @@ ObjFile::Model *ObjFileParser::GetModel() const { // ------------------------------------------------------------------- // File parsing method. void ObjFileParser::parseFile( IOStreamBuffer &streamBuffer ) { - // only update every 100KB or it'll be too slow - const unsigned int updateProgressEveryBytes = 100 * 1024; unsigned int progressCounter = 0; const unsigned int bytesToProcess = streamBuffer.size(); const unsigned int progressTotal = 3 * bytesToProcess; From bde2b466be10b0aadd9ef7548d70202c33b3191b Mon Sep 17 00:00:00 2001 From: Albin Bernhardsson Date: Thu, 24 Nov 2016 14:53:33 +0100 Subject: [PATCH 4/5] Remove unnecessary semicolon --- code/X3DExporter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/X3DExporter.cpp b/code/X3DExporter.cpp index cb6a6740f..9e89b5b9e 100644 --- a/code/X3DExporter.cpp +++ b/code/X3DExporter.cpp @@ -158,7 +158,7 @@ string tstr; AttrHelper_FloatToString(pValue, tstr); pList.push_back({pName, tstr}); -}; +} void X3DExporter::NodeHelper_OpenNode(const string& pNodeName, const size_t pTabLevel, const bool pEmptyElement, const list& pAttrList) { From 347c09c539f23686abf500b900f58237a29a0564 Mon Sep 17 00:00:00 2001 From: Albin Bernhardsson Date: Thu, 24 Nov 2016 15:15:17 +0100 Subject: [PATCH 5/5] Put back unused line (in comments) --- code/ObjFileParser.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/ObjFileParser.cpp b/code/ObjFileParser.cpp index ddab8f786..eba43c3b5 100644 --- a/code/ObjFileParser.cpp +++ b/code/ObjFileParser.cpp @@ -101,6 +101,8 @@ ObjFile::Model *ObjFileParser::GetModel() const { // ------------------------------------------------------------------- // File parsing method. void ObjFileParser::parseFile( IOStreamBuffer &streamBuffer ) { + // only update every 100KB or it'll be too slow + //const unsigned int updateProgressEveryBytes = 100 * 1024; unsigned int progressCounter = 0; const unsigned int bytesToProcess = streamBuffer.size(); const unsigned int progressTotal = 3 * bytesToProcess;