Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #140 from tangziwen/v3 

fix mesh AABB incorrect calculation through using static variable
This commit is contained in:
XiaoYang 2014-10-14 09:23:13 +08:00
parent 72e6204426 7566880d46
commit c171a8772d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cocos/3d/CCMeshVertexIndexData.cpp
View File

@ -121,9 +121,9 @@ MeshVertexData* MeshVertexData::create(const MeshData& meshdata)
return vertexdata; return vertexdata;
} }
const AABB& MeshVertexData::calculateAABB(const std::vector<float>& vertex, int stride, const std::vector<unsigned short>& index) AABB MeshVertexData::calculateAABB(const std::vector<float>& vertex, int stride, const std::vector<unsigned short>& index)
{ {
static AABB aabb; AABB aabb;
stride /= 4; stride /= 4;
for(const auto& it : index) for(const auto& it : index)
{ {

2
cocos/3d/CCMeshVertexIndexData.h
View File

@ -115,7 +115,7 @@ CC_CONSTRUCTOR_ACCESS:
MeshVertexData(); MeshVertexData();
virtual ~MeshVertexData(); virtual ~MeshVertexData();
static const AABB& calculateAABB(const std::vector<float>& vertex, int stride, const std::vector<unsigned short>& index); static AABB calculateAABB(const std::vector<float>& vertex, int stride, const std::vector<unsigned short>& index);
protected: protected:
VertexData* _vertexData; //mesh vertex data VertexData* _vertexData; //mesh vertex data
VertexBuffer* _vertexBuffer; // vertex buffer VertexBuffer* _vertexBuffer; // vertex buffer