Merge branch 'master' of https://github.com/assimp/assimp
commit
55595a7d18
|
@ -134,8 +134,8 @@ Contributions to assimp are highly appreciated. The easiest way to get involved
|
|||
a pull request with your changes against the main repository's `master` branch.
|
||||
|
||||
### Donate ###
|
||||
If you like assimp, consider buying us a beer (or two):
|
||||
[Donate](http://sourceforge.net/donate/index.php?group_id=226462)
|
||||
You can get a patron of Asset-Importer-Lib:
|
||||
<a href="https://www.patreon.com/bePatron?u=2790590" data-patreon-widget-type="become-patron-button">Become a Patron!</a><script async src="https://cdn6.patreon.com/becomePatronButton.bundle.js"></script>
|
||||
|
||||
### License ###
|
||||
Our license is based on the modified, __3-clause BSD__-License.
|
||||
|
|
|
@ -210,6 +210,7 @@ namespace glTF
|
|||
ComponentType_UNSIGNED_BYTE = 5121,
|
||||
ComponentType_SHORT = 5122,
|
||||
ComponentType_UNSIGNED_SHORT = 5123,
|
||||
ComponentType_UNSIGNED_INT = 5125,
|
||||
ComponentType_FLOAT = 5126
|
||||
};
|
||||
|
||||
|
@ -220,13 +221,15 @@ namespace glTF
|
|||
case ComponentType_UNSIGNED_SHORT:
|
||||
return 2;
|
||||
|
||||
case ComponentType_UNSIGNED_INT:
|
||||
case ComponentType_FLOAT:
|
||||
return 4;
|
||||
|
||||
//case Accessor::ComponentType_BYTE:
|
||||
//case Accessor::ComponentType_UNSIGNED_BYTE:
|
||||
default:
|
||||
case ComponentType_BYTE:
|
||||
case ComponentType_UNSIGNED_BYTE:
|
||||
return 1;
|
||||
default:
|
||||
throw DeadlyImportError("GLTF: Unsupported Component Type "+t);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue