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

update comment

This commit is contained in:
yangxiao 2015-12-01 10:47:25 +08:00
parent 11f1bd6e28
commit 23f03bc65f
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cocos/3d/CCMesh.cpp
View File

@ -46,10 +46,10 @@ NS_CC_BEGIN
// Helpers // Helpers
// //sampler uniform names, only diffuse and normal texture are supported for now
std::string s_uniformSamplerName[] = std::string s_uniformSamplerName[] =
{ {
"",//NTextureData::Usage::Unknown "",//NTextureData::Usage::Unknown,
"",//NTextureData::Usage::None "",//NTextureData::Usage::None
"",//NTextureData::Usage::Diffuse "",//NTextureData::Usage::Diffuse
"",//NTextureData::Usage::Emissive "",//NTextureData::Usage::Emissive

4
cocos/3d/CCMesh.h
View File

@ -96,12 +96,12 @@ public:
int getVertexSizeInBytes() const; int getVertexSizeInBytes() const;
/** /**
* set texture * set diffuse texture
* @param texPath texture path * @param texPath texture path
*/ */
void setTexture(const std::string& texPath); void setTexture(const std::string& texPath);
/** /**
* set texture * set diffuse texture
* @param tex texture to be set * @param tex texture to be set
*/ */
void setTexture(Texture2D* tex); void setTexture(Texture2D* tex);

2
cocos/3d/CCSprite3D.h
View File

@ -80,7 +80,7 @@ public:
static void createAsync(const std::string &modelPath, const std::string &texturePath, const std::function<void(Sprite3D*, void*)>& callback, void* callbackparam); static void createAsync(const std::string &modelPath, const std::string &texturePath, const std::function<void(Sprite3D*, void*)>& callback, void* callbackparam);
/**set texture, set the first if multiple textures exist*/ /**set diffuse texture, set the first if multiple textures exist*/
void setTexture(const std::string& texFile); void setTexture(const std::string& texFile);
void setTexture(Texture2D* texture); void setTexture(Texture2D* texture);