From c014bb977c290a578131b39d31de8bbdab68424f Mon Sep 17 00:00:00 2001 From: Andy Maloney Date: Sat, 16 May 2015 15:13:22 -0400 Subject: [PATCH] - add missing initialization of several class members - prefer check for empty() over check for size() in OptimizeGraph (empty() is guaranteed to be constant time, size() is not) - fix a couple of incorrect indentations --- code/BaseImporter.cpp | 4 +++- code/ColladaExporter.h | 7 +++++-- code/ColladaHelper.h | 26 ++++++++++++++++++-------- code/ColladaLoader.cpp | 5 ++++- code/FindInvalidDataProcess.cpp | 1 + code/OptimizeGraph.cpp | 8 ++++++-- code/OptimizeMeshes.cpp | 8 +++++--- 7 files changed, 42 insertions(+), 17 deletions(-) diff --git a/code/BaseImporter.cpp b/code/BaseImporter.cpp index 1bb0a1cee..38de47432 100644 --- a/code/BaseImporter.cpp +++ b/code/BaseImporter.cpp @@ -480,7 +480,9 @@ namespace Assimp struct Assimp::BatchData { BatchData() - : next_id(0xffff) + : pIOSystem() + , pImporter() + , next_id(0xffff) {} // IO system to be used for all imports diff --git a/code/ColladaExporter.h b/code/ColladaExporter.h index 9456508ce..7ba32f9ea 100644 --- a/code/ColladaExporter.h +++ b/code/ColladaExporter.h @@ -144,8 +144,11 @@ protected: struct Property { bool exist; - float value; - Property() { exist = false; } + float value; + Property() + : exist(false) + , value(0.0f) + {} }; // summarize a material in an convinient way. diff --git a/code/ColladaHelper.h b/code/ColladaHelper.h index 71ccd2dfc..8a4e38d53 100644 --- a/code/ColladaHelper.h +++ b/code/ColladaHelper.h @@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include #include -#include "../include/assimp/types.h" +#include "../include/assimp/light.h" #include "../include/assimp/mesh.h" #include "../include/assimp/material.h" @@ -134,7 +134,8 @@ struct Camera struct Light { Light() - : mAttConstant (1.f) + : mType (aiLightSource_UNDEFINED) + , mAttConstant (1.f) , mAttLinear (0.f) , mAttQuadratic (0.f) , mFalloffAngle (180.f) @@ -172,13 +173,14 @@ struct Light struct InputSemanticMapEntry { InputSemanticMapEntry() - : mSet (0) + : mSet(0) + , mType(IT_Invalid) {} //! Index of set, optional unsigned int mSet; - //! Name of referenced vertex input + //! Type of referenced vertex input InputType mType; }; @@ -235,7 +237,7 @@ struct Node { std::string mName; std::string mID; - std::string mSID; + std::string mSID; Node* mParent; std::vector mChildren; @@ -384,8 +386,8 @@ struct Controller // accessor URL of the joint names std::string mJointNameSource; - ///< The bind shape matrix, as array of floats. I'm not sure what this matrix actually describes, but it can't be ignored in all cases - float mBindShapeMatrix[16]; + ///< The bind shape matrix, as array of floats. I'm not sure what this matrix actually describes, but it can't be ignored in all cases + float mBindShapeMatrix[16]; // accessor URL of the joint inverse bind matrices std::string mJointOffsetMatrixSource; @@ -609,7 +611,15 @@ struct ChannelEntry const Collada::Accessor* mValueAccessor; ///> Collada accessor to the key value values const Collada::Data* mValueData; ///> Source datat array for the key value values - ChannelEntry() { mChannel = NULL; mSubElement = 0; } + ChannelEntry() + : mChannel() + , mTransformIndex() + , mSubElement() + , mTimeAccessor() + , mTimeData() + , mValueAccessor() + , mValueData() + {} }; } // end of namespace Collada diff --git a/code/ColladaLoader.cpp b/code/ColladaLoader.cpp index 735eede18..b2d4d4869 100644 --- a/code/ColladaLoader.cpp +++ b/code/ColladaLoader.cpp @@ -81,7 +81,10 @@ static const aiImporterDesc desc = { // ------------------------------------------------------------------------------------------------ // Constructor to be privately used by Importer ColladaLoader::ColladaLoader() -: noSkeletonMesh(), ignoreUpDirection(false), mNodeNameCounter() + : noSkeletonMesh() + , ignoreUpDirection(false) + , invertTransparency(false) + , mNodeNameCounter() {} // ------------------------------------------------------------------------------------------------ diff --git a/code/FindInvalidDataProcess.cpp b/code/FindInvalidDataProcess.cpp index 450c5f873..e82aedc36 100644 --- a/code/FindInvalidDataProcess.cpp +++ b/code/FindInvalidDataProcess.cpp @@ -58,6 +58,7 @@ using namespace Assimp; // ------------------------------------------------------------------------------------------------ // Constructor to be privately used by Importer FindInvalidDataProcess::FindInvalidDataProcess() + : configEpsilon(0.0f) { // nothing to do here } diff --git a/code/OptimizeGraph.cpp b/code/OptimizeGraph.cpp index d418655bf..25dca7923 100644 --- a/code/OptimizeGraph.cpp +++ b/code/OptimizeGraph.cpp @@ -71,6 +71,10 @@ using namespace Assimp; // ------------------------------------------------------------------------------------------------ // Constructor to be privately used by Importer OptimizeGraphProcess::OptimizeGraphProcess() + : mScene() + , nodes_in() + , nodes_out() + , count_merged() {} // ------------------------------------------------------------------------------------------------ @@ -122,7 +126,7 @@ void OptimizeGraphProcess::CollectNewChildren(aiNode* nd, std::list& no ++it; } - if (nd->mNumMeshes || child_nodes.size()) { + if (nd->mNumMeshes || !child_nodes.empty()) { nodes.push_back(nd); } else { @@ -172,7 +176,7 @@ void OptimizeGraphProcess::CollectNewChildren(aiNode* nd, std::list& no } ++it; } - if (join_master && join.size()) { + if (join_master && !join.empty()) { join_master->mName.length = sprintf(join_master->mName.data,"$MergedNode_%i",count_merged++); unsigned int out_meshes = 0; diff --git a/code/OptimizeMeshes.cpp b/code/OptimizeMeshes.cpp index cbd5ea693..1e33f7356 100644 --- a/code/OptimizeMeshes.cpp +++ b/code/OptimizeMeshes.cpp @@ -60,9 +60,11 @@ static const unsigned int DeadBeef = 0xdeadbeef; // ------------------------------------------------------------------------------------------------ // Constructor to be privately used by Importer OptimizeMeshesProcess::OptimizeMeshesProcess() -: pts (false) -, max_verts( NotSet ) -, max_faces( NotSet ) { + : mScene() + , mesh() + , pts(false) + , max_verts( NotSet ) + , max_faces( NotSet ) { // empty }