diff --git a/cocos/3d/CCMesh.cpp b/cocos/3d/CCMesh.cpp index 4092600f70..2691c267b7 100644 --- a/cocos/3d/CCMesh.cpp +++ b/cocos/3d/CCMesh.cpp @@ -46,10 +46,10 @@ NS_CC_BEGIN // Helpers -// +//sampler uniform names, only diffuse and normal texture are supported for now std::string s_uniformSamplerName[] = { - "",//NTextureData::Usage::Unknown + "",//NTextureData::Usage::Unknown, "",//NTextureData::Usage::None "",//NTextureData::Usage::Diffuse "",//NTextureData::Usage::Emissive diff --git a/cocos/3d/CCMesh.h b/cocos/3d/CCMesh.h index 301908313b..b479fc4bf0 100644 --- a/cocos/3d/CCMesh.h +++ b/cocos/3d/CCMesh.h @@ -96,12 +96,12 @@ public: int getVertexSizeInBytes() const; /** - * set texture + * set diffuse texture * @param texPath texture path */ void setTexture(const std::string& texPath); /** - * set texture + * set diffuse texture * @param tex texture to be set */ void setTexture(Texture2D* tex); diff --git a/cocos/3d/CCSprite3D.h b/cocos/3d/CCSprite3D.h index 77809a4438..87ef5ff41f 100644 --- a/cocos/3d/CCSprite3D.h +++ b/cocos/3d/CCSprite3D.h @@ -80,7 +80,7 @@ public: static void createAsync(const std::string &modelPath, const std::string &texturePath, const std::function& 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(Texture2D* texture);