Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,208 Commits 19 Branches 43 Tags
03c01004c5cf531292fdc18451cf2a6e4f338bfa
Commit Graph

48 Commits

Author SHA1 Message Date
petrmohelnik
83247e3fbd Merge branch 'master' into glTF-importer---clean-all-member-arrays 2019-06-09 15:52:32 +02:00
petrmohelnik
1855bf44f9 glTF importer - clean all member arrays 
When importing more than one scene using the same gtlf importer loading fails with error 'bad array new length'. This happens because 'meshOffsets' are not cleared and the importer continues to push_back values at the end. Adjacent values are then used to calculate the length of 'mMeshes' array. This calculation expects that each value is higher than the previous otherwise we get negative length. But when pushin at the end of uncleared array we get contents like this: 0,1,2,3,0,1,2. Then when calculating 0-3 we try to allocate array of length -3 and get this exception.
 2019-06-05 18:51:49 +02:00
Rémi Verschelde
fc7575f5c5 Remove Unix executable bit on code files 2019-05-22 10:23:13 +02:00
kimkulling
a06133ab52 Update copyrights. 2019-01-30 09:41:39 +01:00
Alexandre Avenel
ae0f82d5b7 Fix #2077 : GLTF segfault using triangle strip 2018-08-04 12:47:37 +02:00
Paul Arden
e43e30b726 Slight rework for fix to issue #2046 to remove some duplicated code. 2018-07-05 09:49:08 +10:00
Paul Arden
e7699ca585 Added support for non-indexed meshes in glTF importer. Addresses issue #2046. 2018-07-05 09:37:57 +10:00
Marco Di Benedetto
affedc139e Merge https://github.com/assimp/assimp 2018-02-09 15:54:34 +01:00
Kim Kulling
b049933d2f update license dates. 2018-01-28 19:42:05 +01:00
Marco Di Benedetto
5f38bd01ec restored gltf checks. 2018-01-18 22:28:44 +01:00
Marco Di Benedetto
c749594e9d gltf instant ok on valid extension. 2018-01-18 19:12:51 +01:00
Marco Di Benedetto
55ca48e838 Merge branch 'master' of https://github.com/assimp/assimp 2018-01-18 19:08:54 +01:00
Christian Meurin
925be5e983 Merge branch 'master' into master 2018-01-11 13:13:46 -08:00
Marco Di Benedetto
978c156c2a added import of material properties (double sided and transparency) in glTF 1.0 importer. 2018-01-10 20:02:41 +01:00
Axel Wefers
901b981260 glTF: Always check signature 
Always check signature for glTF 1.0 and glTF 2.0 files to select the correct importer. Fixes #1605
 2018-01-09 09:37:57 -08:00
BuildTools
66171de915 Successful lib build, unit testing still WIP 2018-01-05 16:18:33 -08:00
Turo Lamminen
7ebd8e7543 glTFAsset: Use std:unique_ptr for Image data 2018-01-02 20:09:22 +02:00
Thomas Lemaire
5b76a31485 fix trivial warnings 
mainly unused parameter and unused function
some parameters are indeed used in a debug built, I used the
(void)(param) trick
warnings reported by clang 4
 2017-11-02 11:13:52 +01:00
Daniel Hritzkiv
3e8955faf5 Don’t ignore rgba(1,1,1,1) color properties 
Do not ignore rgba(1,1,1,1) material properties when importing glTF1. While a white diffuse color may be the default value for a default assimp material, `1,1,1,1` is a very explicit color value for ambient/specular/emissive color properties.

Closes #1434
 2017-09-18 18:16:48 -04:00
John Senneker
140b903d7a Fix parsing of glTF version 
Handle version as int in gltf
Fix format specifiers in glTF version parser
 2017-09-11 11:02:15 -04:00
John Senneker
19876e9822 Add support for importing both glTF and glTF2 files 2017-09-11 11:02:15 -04:00
Kim Kulling
a2b8d66a86 Update license info. 2017-05-09 19:57:36 +02:00
Kim Kulling
ef540f46a3 Remove unused headers. 2017-02-22 17:20:26 +01:00
Andy Maloney
0c7aac02eb Fixes spelling in comments 2016-12-07 21:31:51 -05:00
Kim Kulling
b90669c45e C++11: Replace std::to_string by assimp-specific implementation. 2016-10-15 20:36:51 +02:00
Alexandr Arutjunov
d97f00571e [*] Not needed namespace. 2016-09-10 09:07:50 +03:00
Alexandr Arutjunov
ac1bcaa4cc Merge branch 'master' of https://github.com/assimp/assimp into gltf_o3dgc 2016-09-10 09:05:36 +03:00
Kim Kulling
c6f670ff50 glTFImporter: avoid out-of-bounds-access. 2016-08-29 20:05:29 +02:00
Alexandr Arutjunov
48f8c117e2 [F] Conditional compilation for Open3DGC-extension. 
[F] Flag comp_allow did not reset when mesh can not be encoded.
 2016-08-14 16:27:16 +03:00
Alexandr Arutjunov
0ad2f2247a [+] glTF import/export. Support for Open3DGC-compression of mesh primitives. 2016-08-11 01:04:30 +03:00
Alexandr Arutjunov
a6ec0e4c7a [*] Style. Intermediate commit. 2016-08-08 19:06:17 +03:00
Alexandr Arutjunov
29e982e185 [F] Fixed problem with more then one mesh in scene. More detaily read at line 529 in glTFAsset.inl. 2016-08-03 18:06:38 +03:00
Otger
159af06524 Fixed GLTF bugs, and added a few test models 2016-05-10 16:25:15 +02:00
Alexander Gessler
0b79d1ebda Revert previous glTF fix (e5233283ef) because it breaks ODR as pointed out by @turol, instead just make importer depend on the necessary definitions. 2016-05-05 19:11:33 +02:00
Otger
64f78e003f Fixed crashes when files were not found, and fixed some warnings 2016-04-28 20:50:01 +02:00
Otger
d9b365eb90 Fixed a few GLTF importer/exporter bugs 2016-04-28 18:44:47 +02:00
mensinda
5dacda0a08 replaced boost smart pointers with c++11 smart pointers 2016-04-05 23:23:53 +02:00
Kim Kulling
1191d03405 Update license info. 2016-01-01 21:07:24 +01:00
Kim Kulling
4e9ee4e406 coverity findings: add missing initialization. 2015-12-31 16:00:19 +01:00
Otger
d72443d6b0 Fixed gcc warnings and errors 2015-11-29 20:17:06 +01:00
Otger
4f757cdf5a Implemented basic glTF exporter and improved the importer (plus some code refactor) 2015-11-29 19:13:51 +01:00
Otger
5942d60aea Fixed gcc errors 2015-11-27 02:31:18 +01:00
Otger
526027999b Merge 2015-11-27 01:44:06 +01:00
Otger
b307ec643d Created exporter class and fixed a few bugs 2015-11-27 01:16:48 +01:00
Kim Kulling
502d9f17b6 glTF: add importer to registry and try to parse json. 2015-11-26 20:49:00 +01:00
Otger
148a20a703 Experimental support for glTF 2015-11-26 02:36:22 +01:00
Kim Kulling
db8845d2b2 glTF: add jsn reader + example model to work on. 2015-11-25 22:03:39 +01:00
Kim Kulling
e6ac1ed66a glTF-Importer: add files. 2015-11-08 20:29:05 +01:00