v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,917 Commits
74 Branches
37 Tags
234 MiB
Commit Graph

42 Commits (f90d874978f2fb0cafde4fff74225319a5dce823)

Author SHA1 Message Date
Turo Lamminen 5ecab20bd0 Fix delete / delete[] mismatch in glTFAsset 2017-10-02 10:55:26 +03:00
Kim Kulling afd6c4d57d Revert "Asan" 2017-09-13 21:40:44 +02:00
Kim Kulling d139b4d180 Merge pull request #1423 from Matter-and-Form/feature/gltf2 
glTF 2 Importer + glTF 2 Spec Conformity
 2017-09-13 20:01:38 +02:00
Turo Lamminen b6f122ff2c Fix delete / delete[] mismatch in glTFAsset 2017-09-13 11:31:05 +03:00
Daniel Hritzkiv 5cb13aa4b3
Load gltf .bin files from correct directory 2017-09-11 11:02:15 -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
Daniel Hritzkiv 5b3b80cbc2
Formatting 2017-08-09 11:41:12 -04:00
Daniel Hritzkiv 7a4a32625c
Ensure gltf asset version is printed as \d.0 2017-08-09 10:47:34 -04:00
Kim Kulling a2b8d66a86 Update license info. 2017-05-09 19:57:36 +02:00
Jared Mulconry f206249fbf Merge branch 'master' of https://github.com/assimp/assimp into implementation_warning_fix 
# Conflicts:
#	code/AMFImporter_Postprocess.cpp
#	code/FBXConverter.cpp
#	code/IFCLoader.cpp
#	code/NDOLoader.cpp
#	code/glTFAsset.inl
 2016-11-23 22:24:04 +11:00
Kim Kulling c5e3058ab3 Fix coverity findings. 2016-11-22 10:22:15 +01:00
Jared Mulconry d9b0449e83 Fixed build warnings on MSVC14 x64 in the glTF format sources. One warning 
yet to be resolved.
 2016-11-20 00:18:29 +11:00
Kim Kulling e0dde73018 C++11-combat: replace more std::to_string by assimp-specific to_string 2016-10-15 21:25:16 +02:00
Kim Kulling b90669c45e C++11: Replace std::to_string by assimp-specific implementation. 2016-10-15 20:36:51 +02:00
Angelo Scandaliato 99c93e861c Merge remote-tracking branch 'upstream/master' into feature/fix-glTF-validator-errors 2016-10-03 09:34:16 -07:00
Angelo Scandaliato 0619232aef included samplers dictionary for textures 2016-09-30 17:23:38 -07:00
John Senneker 83c0163ec6 glTF: Read and write transparency values 2016-09-29 17:44:04 -04: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
Alexandr Arutjunov d49ad6c93e [*] Stylistic changes. 
[F] Added all files from Open3DGC codec to CMakeLists.txt
 2016-09-09 16:38:43 +03:00
Daniel Knezevic c2c12c1db5 Use Assimp namespace to fix build for big-endian architectures 2016-08-18 10:51:20 +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 8ab50aa9a0 [*] Few C++11 constructions are removed. 2016-08-13 16:27:07 +03:00
Alexandr Arutjunov 1844665693 [*] Few C++11 constructions are removed. 2016-08-13 16:09:21 +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 9a4fa1321b [+] Save parameters of mesh extension: Open3DGC-compression. 2016-08-09 13:26:57 +03:00
Alexandr Arutjunov 507668229f [+] Support Open3DGC for glTF import/export. Intermediate commit. 2016-08-08 19:24:50 +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
Alexandr Arutjunov c024beadba [+] Put information to log about decompressing. 2016-08-03 11:16:30 +03:00
Alexandr Arutjunov 5e4fd5fa3c [+] glTF. Support for import meshes with Open3DGC compression. 2016-08-03 03:46:04 +03:00
Kim Kulling 38ce71d5a0 Update glTFAsset.inl 
closes https://github.com/assimp/assimp/issues/893: fix invalid memcpy usage.
 2016-05-19 09:10:56 +02:00
Otger 159af06524 Fixed GLTF bugs, and added a few test models 2016-05-10 16:25:15 +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
Kim Kulling bac6067869 gltf: make code more radable and check against one possible null ptr 
access.
 2016-01-27 20:26:38 +01:00
Kim Kulling d43a083dc1 snprintf replacement: fix usage of ai_snprintf when snprintf is available. 2016-01-06 19:25:35 +01:00
Kim Kulling 6bfdeb6a12 sprintf replacement: introduce au_snprintf to support snprintf for v2013 
and earier ( closes https://github.com/assimp/assimp/issues/743 )
 2016-01-06 15:35:25 +01:00
Kim Kulling c3d4be1dce sprintf: replace more sprintf by snprintf. 2016-01-04 22:24:25 +01:00
Kim Kulling 1191d03405 Update license info. 2016-01-01 21:07:24 +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