Skip to content

refactor CCBundle3DData #19756

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 27, 2019
Merged

refactor CCBundle3DData #19756

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 3 additions & 14 deletions cocos/3d/CCBundle3DData.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,8 @@ struct ModelData
std::vector<std::string> bones;
std::vector<Mat4> invBindPose;

virtual ~ModelData()
{
resetData();
}
virtual ~ModelData() {}

virtual void resetData()
{
bones.clear();
Expand Down Expand Up @@ -188,10 +186,6 @@ struct MeshData
, attribCount(0)
{
}
~MeshData()
{
resetData();
}
};

/** mesh datas
Expand Down Expand Up @@ -326,7 +320,7 @@ struct NTextureData
Usage type;
GLenum wrapS;
GLenum wrapT;
} ;
};
struct NMaterialData
{
std::vector<NTextureData> textures;
Expand Down Expand Up @@ -440,14 +434,9 @@ struct Animation3DData
*/
struct Reference
{
public:
std::string id;
unsigned int type;
unsigned int offset;

Reference(){}

~Reference(){}
};

NS_CC_END
Expand Down