v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

closes https://github.com/assimp/assimp/issues/934: introduce material keys for shader types.

pull/2370/head
Kim Kulling 2019-03-13 19:32:13 +01:00
parent 152cddedd3
commit 0a731a0bff
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/assimp/material.h
View File

@ -198,8 +198,6 @@ enum aiTextureType
*/ */
aiTextureType_NONE = 0x0, aiTextureType_NONE = 0x0,
/** The texture is combined with the result of the diffuse /** The texture is combined with the result of the diffuse
* lighting equation. * lighting equation.
*/ */
@ -278,7 +276,7 @@ enum aiTextureType
* *
* A texture reference that does not match any of the definitions * A texture reference that does not match any of the definitions
* above is considered to be 'unknown'. It is still imported, * above is considered to be 'unknown'. It is still imported,
* but is excluded from any further postprocessing. * but is excluded from any further post-processing.
*/ */
aiTextureType_UNKNOWN = 0xC, aiTextureType_UNKNOWN = 0xC,
@ -375,7 +373,7 @@ enum aiShadingMode
*/ */
enum aiTextureFlags enum aiTextureFlags
{ {
/** The texture's color values have to be inverted (componentwise 1-n) /** The texture's color values have to be inverted (component-wise 1-n)
*/ */
aiTextureFlags_Invert = 0x1, aiTextureFlags_Invert = 0x1,