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

Merge pull request #1217 from Kai-W/master 

Added ComponentType Unsigned int and Error handling
pull/1220/head
Kim Kulling 2017-03-28 17:06:06 +02:00 committed by GitHub
parent 23c70c901e 6c73cc8aff
commit 1ab85f16ff
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
code/glTFAsset.h
View File

@ -210,6 +210,7 @@ namespace glTF
ComponentType_UNSIGNED_BYTE = 5121, ComponentType_UNSIGNED_BYTE = 5121,
ComponentType_SHORT = 5122, ComponentType_SHORT = 5122,
ComponentType_UNSIGNED_SHORT = 5123, ComponentType_UNSIGNED_SHORT = 5123,
ComponentType_UNSIGNED_INT = 5125,
ComponentType_FLOAT = 5126 ComponentType_FLOAT = 5126
}; };
@ -220,13 +221,15 @@ namespace glTF
case ComponentType_UNSIGNED_SHORT: case ComponentType_UNSIGNED_SHORT:
return 2; return 2;
case ComponentType_UNSIGNED_INT:
case ComponentType_FLOAT: case ComponentType_FLOAT:
return 4; return 4;
//case Accessor::ComponentType_BYTE: case ComponentType_BYTE:
//case Accessor::ComponentType_UNSIGNED_BYTE: case ComponentType_UNSIGNED_BYTE:
default:
return 1; return 1;
default:
throw DeadlyImportError("GLTF: Unsupported Component Type "+t);
} }
} }