diff --git a/Engine/source/ts/assimp/assimpAppMaterial.cpp b/Engine/source/ts/assimp/assimpAppMaterial.cpp index 138085036..979cf8318 100644 --- a/Engine/source/ts/assimp/assimpAppMaterial.cpp +++ b/Engine/source/ts/assimp/assimpAppMaterial.cpp @@ -57,7 +57,7 @@ AssimpAppMaterial::AssimpAppMaterial(const char* matName) { name = ColladaUtils::getOptions().matNamePrefix; name += matName; - + mAIMat = NULL; // Set some defaults flags |= TSMaterialList::S_Wrap; flags |= TSMaterialList::T_Wrap; diff --git a/Engine/source/ts/collada/colladaUtils.h b/Engine/source/ts/collada/colladaUtils.h index 9dad22056..781c41eee 100644 --- a/Engine/source/ts/collada/colladaUtils.h +++ b/Engine/source/ts/collada/colladaUtils.h @@ -886,7 +886,7 @@ struct AnimData return element ? (AnimChannels*)const_cast(element)->getUserData() : 0; } - AnimData() : enabled(false) { } + AnimData() : enabled(false), targetValueOffset(0), targetValueCount(0){ } void parseTargetString(const char* target, S32 fullCount, const char* elements[]); diff --git a/Engine/source/ts/loader/appMesh.cpp b/Engine/source/ts/loader/appMesh.cpp index bd5c291e0..a51b91002 100644 --- a/Engine/source/ts/loader/appMesh.cpp +++ b/Engine/source/ts/loader/appMesh.cpp @@ -26,7 +26,7 @@ Vector AppMesh::appMaterials; AppMesh::AppMesh() - : flags(0), vertsPerFrame(0),numFrames(0), numMatFrames(0) + : flags(0), vertsPerFrame(0),numFrames(0), numMatFrames(0), detailSize(1) { } diff --git a/Engine/source/ts/loader/appNode.cpp b/Engine/source/ts/loader/appNode.cpp index 6616d8120..e869cf02b 100644 --- a/Engine/source/ts/loader/appNode.cpp +++ b/Engine/source/ts/loader/appNode.cpp @@ -26,6 +26,7 @@ AppNode::AppNode() { mName = NULL; mParentName = NULL; + mParentIndex = 0; } AppNode::~AppNode() diff --git a/Engine/source/ts/loader/appSequence.h b/Engine/source/ts/loader/appSequence.h index c31683321..f5fdfae12 100644 --- a/Engine/source/ts/loader/appSequence.h +++ b/Engine/source/ts/loader/appSequence.h @@ -39,7 +39,7 @@ public: F32 fps; public: - AppSequence() { } + AppSequence():fps(30.0f) { } //default based on TSShapeLoader::XXXFrameRate(s) and AssimpAppSequence fallback virtual ~AppSequence() { } virtual void setActive(bool active) { } diff --git a/Engine/source/ts/loader/tsShapeLoader.h b/Engine/source/ts/loader/tsShapeLoader.h index 5ff189245..bfd0f687c 100644 --- a/Engine/source/ts/loader/tsShapeLoader.h +++ b/Engine/source/ts/loader/tsShapeLoader.h @@ -182,7 +182,7 @@ protected: void install(); public: - TSShapeLoader() : boundsNode(0) { } + TSShapeLoader() : boundsNode(0), shape(NULL) { } virtual ~TSShapeLoader(); static const Torque::Path& getShapePath() { return shapePath; } diff --git a/Engine/source/ts/tsMesh.cpp b/Engine/source/ts/tsMesh.cpp index 5800e7e7c..4f9dd434a 100644 --- a/Engine/source/ts/tsMesh.cpp +++ b/Engine/source/ts/tsMesh.cpp @@ -1182,7 +1182,14 @@ TSMesh::TSMesh() : mMeshType( StandardMeshType ) mNumVerts = 0; mVertSize = 0; mVertOffset = 0; - + mRadius = 0.0f; + mVertexFormat = NULL; + mPrimBufferOffset = 0; + numFrames = 0; + numMatFrames = 0; + vertsPerFrame = 0; + mPlanesPerFrame = 0; + mMergeBufferStart = 0; mParentMeshObject = NULL; } diff --git a/Engine/source/ts/tsMesh.h b/Engine/source/ts/tsMesh.h index cd53a04fc..b20a9a2fb 100644 --- a/Engine/source/ts/tsMesh.h +++ b/Engine/source/ts/tsMesh.h @@ -198,7 +198,7 @@ public: bool ownsData; public: - TSMeshVertexArray() : base(NULL), numElements(0), colorOffset(0), boneOffset(0), vertexDataReady(false), ownsData(false) {} + TSMeshVertexArray() : base(NULL), vertSz(0), numElements(0), colorOffset(0), boneOffset(0), vertexDataReady(false), ownsData(false) {} virtual ~TSMeshVertexArray() { set(NULL, 0, 0, 0, 0); } virtual void set(void *b, dsize_t s, U32 n, S32 inColorOffset, S32 inBoneOffset, bool nowOwnsData = true) @@ -339,7 +339,7 @@ protected: Point3F mBillboardAxis; /// @name Convex Hull Data - /// Convex hulls are convex (no angles >= 180º) meshes used for collision + /// Convex hulls are convex (no angles >= 180º) meshes used for collision /// @{ Vector mPlaneNormals; diff --git a/Engine/source/ts/tsPartInstance.cpp b/Engine/source/ts/tsPartInstance.cpp index 4c0875c3f..0c1a1b35c 100644 --- a/Engine/source/ts/tsPartInstance.cpp +++ b/Engine/source/ts/tsPartInstance.cpp @@ -51,6 +51,7 @@ void TSPartInstance::init(TSShapeInstance * sourceShape) mCurrentObjectDetail = 0; mCurrentIntraDL = 1.0f; mData = 0; + mRadius = 0.125; } TSPartInstance::~TSPartInstance() diff --git a/Engine/source/ts/tsShape.cpp b/Engine/source/ts/tsShape.cpp index 9ffef7b56..ef87b1cf2 100644 --- a/Engine/source/ts/tsShape.cpp +++ b/Engine/source/ts/tsShape.cpp @@ -68,12 +68,19 @@ U32 TSShape::smMaxSkinBones = 70; TSShape::TSShape() { + mExporterVersion = 124; + mSmallestVisibleSize = 2; + mSmallestVisibleDL = 0; + mRadius = 0; + mFlags = 0; + tubeRadius = 0; + data = NULL; materialList = NULL; mReadVersion = -1; // -1 means constructed from scratch (e.g., in exporter or no read yet) mSequencesConstructed = false; mShapeData = NULL; mShapeDataSize = 0; - + mVertexSize = 0; mUseDetailFromScreenError = false; mNeedReinit = false; diff --git a/Engine/source/ts/tsShapeConstruct.h b/Engine/source/ts/tsShapeConstruct.h index dba25d0ac..49b157f17 100644 --- a/Engine/source/ts/tsShapeConstruct.h +++ b/Engine/source/ts/tsShapeConstruct.h @@ -196,7 +196,7 @@ public: public: TSShapeConstructor(); - TSShapeConstructor(const String& path) : mShapePath(path) { } + TSShapeConstructor(const String& path) : mShapePath(path), mShape(NULL), mLoadingShape(false){ } ~TSShapeConstructor(); DECLARE_CONOBJECT(TSShapeConstructor); diff --git a/Engine/source/ts/tsShapeInstance.cpp b/Engine/source/ts/tsShapeInstance.cpp index d6889c2fe..4665efde3 100644 --- a/Engine/source/ts/tsShapeInstance.cpp +++ b/Engine/source/ts/tsShapeInstance.cpp @@ -118,6 +118,7 @@ TSShapeInstance::TSShapeInstance( const Resource &shape, bool loadMater mShapeResource = shape; mShape = mShapeResource; + mUseOverrideTexture = false; buildInstanceData( mShape, loadMaterials ); } @@ -135,6 +136,7 @@ TSShapeInstance::TSShapeInstance( TSShape *shape, bool loadMaterials ) mShapeResource = NULL; mShape = shape; + mUseOverrideTexture = false; buildInstanceData( mShape, loadMaterials ); } diff --git a/Engine/source/ts/tsSortedMesh.h b/Engine/source/ts/tsSortedMesh.h index 671fb7823..df0e58ddd 100644 --- a/Engine/source/ts/tsSortedMesh.h +++ b/Engine/source/ts/tsSortedMesh.h @@ -71,6 +71,7 @@ public: void disassemble(); TSSortedMesh() { + alwaysWriteDepth = false; mMeshType = SortedMeshType; } };