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

fixed some loading problems.

This commit is contained in:
lvlong 2014-08-16 15:40:00 +08:00
parent 84dcff2f7a
commit 5b59b8a987
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cocos/3d/CCBundle3D.cpp
View File

@ -1467,6 +1467,14 @@ GLenum Bundle3D::parseGLType(const std::string& str)
{ {
return GL_FLOAT; return GL_FLOAT;
} }
else if (str == "REPEAT")
{
return GL_REPEAT;
}
else if (str == "CLAMP")
{
return GL_CLAMP_TO_EDGE;
}
else else
{ {
CCASSERT(false, "Wrong GL type"); CCASSERT(false, "Wrong GL type");

2
cocos/3d/CCSprite3D.cpp
View File

@ -179,7 +179,7 @@ bool Sprite3D::loadFromC3x_0_3(const std::string& path)
MaterialDatas materialdatas; MaterialDatas materialdatas;
ret = bundle->loadMaterials(materialdatas); ret = bundle->loadMaterials(materialdatas);
if (ret) if (!ret)
{ {
return false; return false;
} }