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

Modify the binary parsing

This commit is contained in:
liuliang 2014-08-15 17:45:37 +08:00
parent e2312bd353
commit ab80c5026d
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/3d/CCBundle3D.cpp
View File

@ -349,7 +349,7 @@ bool Bundle3D::loadNodes(NodeDatas& nodedatas)
bool Bundle3D::loadMaterials(MaterialDatas& materialdatas)
{
materialdatas.resetData();
if (_isBinary)
{
return loadMaterialsBinary(materialdatas);

6
cocos/3d/CCSprite3D.h
View File

@ -43,13 +43,14 @@ class MeshSkin;
class AttachNode;
class SubMeshState;
class Skeleton3D;
struct NodeData;
/** Sprite3D: A sprite can be loaded from 3D model files, .obj, .c3t, .c3b, then can be drawed as sprite */
class CC_DLL Sprite3D : public Node, public BlendProtocol
{
public:
/** creates a Sprite3D*/
static Sprite3D* create(const std::string &modelPath);
static Sprite3D* create();
// creates a Sprite3D. It only supports one texture, and overrides the internal texture with 'texturePath'
static Sprite3D* create(const std::string &modelPath, const std::string &texturePath);
@ -99,6 +100,7 @@ CC_CONSTRUCTOR_ACCESS:
/**load from .c3b or .c3t*/
bool loadFromC3x(const std::string& path);
bool loadFromC3x_0_3(const std::string& path);
/**draw*/
virtual void draw(Renderer *renderer, const Mat4 &transform, uint32_t flags) override;
@ -111,7 +113,7 @@ CC_CONSTRUCTOR_ACCESS:
/**generate materials, and add them to cache, keyprefix is used as key prefix when added to cache*/
void genMaterials(const std::string& keyprefix, const std::vector<std::string>& texpaths);
Node* createNode(NodeData* nodedata);
protected:
Mesh* _mesh;//mesh
MeshSkin* _skin;//skin