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

Update material.h 

- Fix tests: use the correct max material parameter
pull/5101/head
Kim Kulling 2024-08-24 10:56:37 +02:00 committed by GitHub
parent 033016f180
commit 412416ad47
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
include/assimp/material.h
View File

@ -292,10 +292,13 @@ enum aiTextureType {
aiTextureType_DIFFUSE_ROUGHNESS = 16, aiTextureType_DIFFUSE_ROUGHNESS = 16,
aiTextureType_AMBIENT_OCCLUSION = 17, aiTextureType_AMBIENT_OCCLUSION = 17,
aiTextureType_MAYA_BASE = 22, /** Unknown texture
aiTextureType_MAYA_SPECULAR = 23, *
aiTextureType_MAYA_SPECULAR_COLOR = 24, * A texture reference that does not match any of the definitions
aiTextureType_MAYA_SPECULAR_ROUGHNESS = 25, * above is considered to be 'unknown'. It is still imported,
* but is excluded from any further post-processing.
*/
aiTextureType_UNKNOWN = 18,
/** PBR Material Modifiers /** PBR Material Modifiers
* Some modern renderers have further PBR modifiers that may be overlaid * Some modern renderers have further PBR modifiers that may be overlaid
@ -323,20 +326,20 @@ enum aiTextureType {
*/ */
aiTextureType_TRANSMISSION = 21, aiTextureType_TRANSMISSION = 21,
/** Unknown texture /**
* * Maya material declarations
* A texture reference that does not match any of the definitions */
* above is considered to be 'unknown'. It is still imported, aiTextureType_MAYA_BASE = 22,
* but is excluded from any further post-processing. aiTextureType_MAYA_SPECULAR = 23,
*/ aiTextureType_MAYA_SPECULAR_COLOR = 24,
aiTextureType_UNKNOWN = 18, aiTextureType_MAYA_SPECULAR_ROUGHNESS = 25,
#ifndef SWIG #ifndef SWIG
_aiTextureType_Force32Bit = INT_MAX _aiTextureType_Force32Bit = INT_MAX
#endif #endif
}; };
#define AI_TEXTURE_TYPE_MAX aiTextureType_TRANSMISSION #define AI_TEXTURE_TYPE_MAX aiTextureType_MAYA_SPECULAR_ROUGHNESS
// ------------------------------------------------------------------------------- // -------------------------------------------------------------------------------
/** /**