Merge pull request #970 from nyorain/patch-1

Added documentation for embedded textures
pull/974/head
Alexander Gessler 2016-08-09 01:43:19 +02:00 committed by GitHub
commit fefa4ee9c1
1 changed files with 31 additions and 25 deletions

View File

@ -724,6 +724,9 @@ public:
* #GetTextureCount() can be used to determine the number of textures
* per texture type.
* @param path Receives the path to the texture.
* If the texture is embedded, receives a '*' followed by the id of
* the texture (for the textures stored in the corresponding scene) which
* can be converted to an int using a function like atoi.
* NULL is a valid value.
* @param mapping The texture mapping.
* NULL is allowed as value.
@ -1506,6 +1509,9 @@ ASSIMP_API unsigned int aiGetMaterialTextureCount(const C_STRUCT aiMaterial* pMa
* #aiGetMaterialTextureCount() can be used to determine the number of
* textures in a particular texture stack.
* @param[out] path Receives the output path
* If the texture is embedded, receives a '*' followed by the id of
* the texture (for the textures stored in the corresponding scene) which
* can be converted to an int using a function like atoi.
* This parameter must be non-null.
* @param mapping The texture mapping mode to be used.
* Pass NULL if you're not interested in this information.