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

fix conflict

This commit is contained in:
tangziwen 2015-03-27 15:08:20 +08:00
parent 68563494ae
commit 12bcdc8868
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
cocos/3d/CCBundle3DData.h
View File

@ -53,8 +53,25 @@ struct MeshVertexAttrib
int attribSizeBytes;
};
/** @brief model node data, since 3.3 */
struct ModelData
{
std::string subMeshId;
std::string matrialId;
std::vector<std::string> bones;
std::vector<Mat4> invBindPose;
virtual ~ModelData()
{
resetData();
}
virtual void resetData()
{
bones.clear();
invBindPose.clear();
}
};
struct ModelData;
/** @brief Node data, since 3.3 */
struct NodeData
{
@ -80,24 +97,6 @@ struct NodeData
};
/** @brief model node data, since 3.3 */
struct ModelData
{
std::string subMeshId;
std::string matrialId;
std::vector<std::string> bones;
std::vector<Mat4> invBindPose;
virtual ~ModelData()
{
resetData();
}
virtual void resetData()
{
bones.clear();
invBindPose.clear();
}
};
/** @brief node datas, since 3.3 */
struct NodeDatas