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

modify Bundle3D::parseGLType add other type

This commit is contained in:
lvlong 2014-07-07 09:16:08 +08:00
parent ff908d771a
commit 0a9e96bfdf
1 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
cocos/3d/CCBundle3D.cpp
View File

@ -768,17 +768,45 @@ bool Bundle3D::loadAnimationDataBinary(Animation3DData* animationdata)
GLenum Bundle3D::parseGLType(const std::string& str) GLenum Bundle3D::parseGLType(const std::string& str)
{ {
if (str == "GL_FLOAT") if ("GL_BYTE")
{ {
return GL_FLOAT; return GL_BYTE;
}
else if("GL_UNSIGNED_BYTE")
{
return GL_UNSIGNED_BYTE;
}
else if("GL_SHORT")
{
return GL_SHORT;
}
else if("GL_UNSIGNED_SHORT")
{
return GL_UNSIGNED_SHORT;
}
else if("GL_INT")
{
return GL_INT;
}
else if ("GL_UNSIGNED_INT")
{
return GL_UNSIGNED_INT;
} }
else if (str == "GL_UNSIGNED_INT") else if (str == "GL_UNSIGNED_INT")
{ {
return GL_UNSIGNED_INT; return GL_UNSIGNED_INT;
} }
else if (str == "GL_FLOAT")
{
return GL_FLOAT;
}
else if (str == "GL_FIXED")
{
return GL_FIXED;
}
else else
{ {
assert(0); CCASSERT(false, "Wrong GL type");
return 0; return 0;
} }
} }