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

Merge branch 'master' of https://github.com/assimp/assimp

pull/1220/head
Kim Kulling 2017-03-29 20:56:55 +02:00
parent 29b5d075e2 1ab85f16ff
commit 55595a7d18
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Readme.md
View File

@ -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. a pull request with your changes against the main repository's `master` branch.
### Donate ### ### Donate ###
If you like assimp, consider buying us a beer (or two): You can get a patron of Asset-Importer-Lib:
[Donate](http://sourceforge.net/donate/index.php?group_id=226462) <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 ### ### License ###
Our license is based on the modified, __3-clause BSD__-License. Our license is based on the modified, __3-clause BSD__-License.

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);
} }
} }