Commit Graph

58 Commits

Author SHA1 Message Date
Kim Kulling
293654fe7c Fix unittest. 2016-10-30 08:55:11 +01:00
Angelo Scandaliato
6ce2a37b82 merge upstream/master and fix conflicts 2016-10-15 18:12:02 -07:00
Angelo Scandaliato
fcf2d6357e check if bones exist before creating skin 2016-10-15 17:21:55 -07: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
Angelo Scandaliato
9c4bb1c9bc find the correct index in jointNames 2016-10-14 15:47:21 -07:00
Angelo Scandaliato
1c03aebfb8 test combining skins 2016-10-13 19:49:59 -07:00
Angelo Scandaliato
dc1e11c8be added some comments 2016-10-11 15:33:52 -07:00
Angelo Scandaliato
57a00d5faa find skeleton root joint and only allow four joint weights per vertex 2016-10-11 15:28:04 -07:00
Angelo Scandaliato
1f377bc99d try to find root joint node for skeleton 2016-10-08 19:18:13 -07:00
Angelo Scandaliato
c49971e120 fix bug when exporting mRotationKeys data 2016-10-08 15:36:01 -07:00
Angelo Scandaliato
71de606770 add skeleton and mesh to node containing the mesh 2016-10-08 15:34:00 -07:00
Angelo Scandaliato
84803bd51a removed cout debugging statements and older ExportSkins function 2016-10-06 23:57:16 -07:00
Angelo Scandaliato
d128837a3a export vertex joint and weight information 2016-10-06 18:59:53 -07:00
Angelo Scandaliato
ae36ca0e44 moved ExportSkins function into ExportMeshes function 2016-10-06 15:18:33 -07:00
Angelo Scandaliato
83c9addbc9 removed duplicate function for ExportData 2016-10-06 13:01:03 -07:00
Angelo Scandaliato
f59b8b3a59 export inverseBindMatrix Data for skins 2016-10-06 12:56:34 -07:00
Angelo Scandaliato
42a8d58f45 Export Nodes before meshes to avoid issue if node id's are changed 2016-10-06 11:29:09 -07:00
Angelo Scandaliato
4ac57f1fab fixed issues to get node animations working 2016-10-06 02:34:11 -07:00
Angelo Scandaliato
0313328a92 set bindShapeMatrix to identity 2016-10-05 18:16:32 -07:00
Angelo Scandaliato
79852de5ae added skins and jointNames 2016-10-05 17:30:02 -07:00
Angelo Scandaliato
cfa0ea3189 finished first version of extport animation data 2016-10-05 13:32:06 -07:00
Angelo Scandaliato
d249cca011 created the asset writer function for animations export gltf 2016-10-04 07:09:01 -07:00
Angelo Scandaliato
37d32e79c9 created exportAnimation function 2016-10-03 19:29:37 -07: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
Angelo Scandaliato
7dd2e7011d fixed issue with texcoordinate bufferview target 2016-09-28 18:50:08 -07:00
Angelo Scandaliato
f2e6f2f67f work around for indices array in ExportData 2016-09-28 15:56:06 -07:00
Angelo Scandaliato
e89e98291a calculate and write min and max attributes for accessors 2016-09-28 14:47:15 -07:00
johnmaf
3052f35824 glTF: move mesh splitting to constructor to cover GLB 2016-09-20 14:15:42 -04:00
johnmaf
c9f28192d9 Merge upstream master 2016-09-20 11:53:12 -04:00
Alexandr Arutjunov
f11545d2c0 [*] Merge with fresh master. 2016-09-20 16:02:41 +03:00
Kim Kulling
b8950f6d90 Merge pull request #998 from johnmaf/bugfix/gltfUVs
Flip UVs in glTFExporter
2016-09-20 09:53:57 +02:00
johnmaf
3c827f29f6 Export glTF buffers as separate .bin files 2016-09-19 17:44:38 -04:00
johnmaf
cd038209dd Add all glTF data to single buffer 2016-09-15 10:38:02 -04:00
johnmaf
8b3f348d63 Flip UVs in glTFExporter 2016-09-14 18:03:52 -04:00
Alexandr Arutjunov
ac1bcaa4cc Merge branch 'master' of https://github.com/assimp/assimp into gltf_o3dgc 2016-09-10 09:05:36 +03:00
johnmaf
702d57fbae Split mesh before exporting gltf. Fixes #995 2016-09-07 17:03:19 -04:00
Kim Kulling
238f14f30f Fix coverity findings: fix possible usage after calling free. 2016-08-29 15:28:37 +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
0ad2f2247a [+] glTF import/export. Support for Open3DGC-compression of mesh primitives. 2016-08-11 01:04:30 +03:00
Alexandr Arutjunov
778ad7f06f [+] Use "buffer" ID against "bufferView" ID for Open3DGC-compression. 2016-08-09 13:37:32 +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
Kangning Li
f15b6177f7 glTFExporter fixes: spaces to tabs 2016-06-10 13:41:59 -04:00
Kangning Li
c98e77907c fixed some small bugs in the gltf exporter: byteOffsets in accessors/bufferViews, logic problem with bufferView targets 2016-06-10 09:49:04 -04: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
mensinda
5dacda0a08 replaced boost smart pointers with c++11 smart pointers 2016-04-05 23:23:53 +02:00