TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-13 07:34:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix mesh load issue & merge issue

Browse source
This commit is contained in:
James Urquhart 2016-08-21 02:15:26 +01:00
parent 41dfb64210
commit e7db0d7956
4 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/ts/tsMesh.cpp
View file

@ -3119,9 +3119,9 @@ void TSMesh::copySourceVertexDataFrom(const TSMesh* srcMesh)
tverts.setSize(srcMesh->mNumVerts); tverts.setSize(srcMesh->mNumVerts);
norms.setSize(srcMesh->mNumVerts); norms.setSize(srcMesh->mNumVerts);
if (hasTVert2)
colors.setSize(mNumVerts);
if (hasColor) if (hasColor)
colors.setSize(mNumVerts);
if (hasTVert2)
tverts2.setSize(mNumVerts); tverts2.setSize(mNumVerts);
// Fill arrays // Fill arrays

1
Engine/source/ts/tsRenderState.cpp
View file

@ -51,7 +51,6 @@ TSRenderState::TSRenderState( const TSRenderState &state )
mUseOriginSort( state.mUseOriginSort ), mUseOriginSort( state.mUseOriginSort ),
mLightQuery( state.mLightQuery ), mLightQuery( state.mLightQuery ),
mAccuTex( state.mAccuTex ), mAccuTex( state.mAccuTex ),
mUseOriginSort( state.mUseOriginSort ),
mNodeTransforms( state.mNodeTransforms ), mNodeTransforms( state.mNodeTransforms ),
mNodeTransformCount( state.mNodeTransformCount ) mNodeTransformCount( state.mNodeTransformCount )
{ {

2
Engine/source/ts/tsShape.cpp
View file

@ -732,7 +732,7 @@ void TSShape::initVertexBufferPointers()
mesh->getMeshType() == TSMesh::SkinMeshType)) mesh->getMeshType() == TSMesh::SkinMeshType))
{ {
// Set buffer // Set buffer
AssertFatal(mesh->mNumVerts >= mesh->vertsPerFrame, "invalid verts per frame"); AssertFatal(mesh->mNumVerts == 0 || mesh->mNumVerts >= mesh->vertsPerFrame, "invalid verts per frame");
if (mesh->mVertSize > 0 && !mesh->mVertexData.isReady()) if (mesh->mVertSize > 0 && !mesh->mVertexData.isReady())
{ {
U32 boneOffset = 0; U32 boneOffset = 0;

3
Engine/source/ts/tsShapeEdit.cpp
View file

@ -917,6 +917,9 @@ TSMesh* TSShape::copyMesh( const TSMesh* srcMesh ) const
bool TSShape::addMesh(TSMesh* mesh, const String& meshName) bool TSShape::addMesh(TSMesh* mesh, const String& meshName)
{ {
// Ensure mesh is in editable state
mesh->makeEditable();
// Determine the object name and detail size from the mesh name // Determine the object name and detail size from the mesh name
S32 detailSize = 999; S32 detailSize = 999;
String objName(String::GetTrailingNumber(meshName, detailSize)); String objName(String::GetTrailingNumber(meshName, detailSize));