Commit Graph

75 Commits

Author SHA1 Message Date
Turo Lamminen
0b140db0a4 glTFExporter: Silence uninitialized variable warning
This is a false positive, idx_srcdata_begin is only used if comp_allow
is true and in that case it's also initialized.
2017-09-15 12:39:58 +03:00
Jared Mulconry
698cd5826d Fixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3. 2017-09-11 00:16:26 +10: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
jamesgk
7e45c63901 GLTF exporter: ensure buffer view byte offsets are correctly aligned 2017-06-21 09:58:24 -07:00
Kim Kulling
439409bef2 SceneCombiner: fix the build. 2017-06-21 15:24:06 +02:00
jamesgk
c33039d682 GLTF exporter: convert animation time from ticks to seconds 2017-05-11 11:04:23 -07:00
Kim Kulling
ab19c5e3f7 Merge pull request #1258 from jamesgk/gltf-export
GLTF exporter: ensure animation accessors have same count
2017-05-11 10:46:06 +02:00
Kim Kulling
a2b8d66a86 Update license info. 2017-05-09 19:57:36 +02:00
jamesgk
36f4fb8826 GLTF exporter: ensure animation accessors have same count 2017-05-08 14:45:26 -07:00
Kim Kulling
7f014ea889 Merge pull request #1256 from johnmaf/bugfix/gltf-bin-uri
Fix incorrect truncation of binary URI in glTF exporter
2017-05-04 19:52:18 +02:00
John Senneker
d6e8fd34f0 Search for .gltf extension at end of file name for buffer prefix.
Previously the code assumed that there would be only one '.' in the file
name, which is not a valid assumption. This patch fixes this issue, but
still assumes that the only occurrence of the string ".gltf" is at the
end of the file name. In particular, it will fail on a file name like
"/path/to/a.gltf/my_gltf.wrong_extension".
2017-05-03 15:11:31 -04:00
Maarten Heremans
8f3aaa88f9 Fixed compiler error on clang 4.0 running on OSX
glTFExporter.cpp:585:35: error: ordered comparison between pointer and zero ('aiVector3D *'
      (aka 'aiVector3t<float> *') and 'int')
                if(comp_allow && (aim->mNormals > 0)) idx_srcdata_normal = b->byteLength;// Store index of normals array.
2017-04-03 11:07:43 +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
ba2f377b52 Fix coverity findings. 2016-11-22 22:03:31 +01: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
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