RichardTea
|
5e84889724
|
Merge branch 'master' into collada_zae_textures_2710
|
2019-10-14 10:56:53 +01:00 |
|
RichardTea
|
ce5c71d2e7
|
Collada ZAE import must convert manifest and image paths
Moved ConvertPath into ColladaParser and use it when reading all filenames from the XML
Added more EXPECTS to the Collada tests
|
2019-10-11 18:57:38 +01:00 |
kimkulling
|
3f38011e86
|
Fix filter for vs for public headers.
|
2019-10-11 13:41:13 +02:00 |
|
kimkulling
|
33af183bb8
|
Cleanup the public headers.
|
2019-10-11 13:27:36 +02:00 |
Kim Kulling
|
78cfec41ec
|
Merge branch 'master' into issue_2693
|
2019-10-06 11:11:22 +02:00 |
Engin Manap
|
afec2e2c49
|
Fix #2693 aiGetVersionMajor return wrong version
The 2 constants MinorVersion and MajorVersion are updated for 5.0
|
2019-10-05 19:23:02 +02:00 |
vcebollada
|
6550b1df61
|
Merge branch 'master' into gltf_mesh_morph_animations
|
2019-10-01 08:04:46 +01:00 |
Theak
|
7a8b7ba88d
|
aiAnimation::mTicksPerSecond for gltf2 imports - should always be 1000.0
|
2019-09-29 10:09:53 +01:00 |
|
vcebollada
|
5018af995b
|
Merge branch 'master' into gltf_mesh_morph_animations
|
2019-09-26 11:33:33 +01:00 |
|
Kim Kulling
|
2757297b4f
|
Merge branch 'master' into issue_2662
|
2019-09-26 09:55:16 +02:00 |
|
vcebollada
|
8ca39ade6a
|
Merge branch 'master' into gltf_mesh_morph_animations
|
2019-09-25 16:16:32 +01:00 |
|
Kim Kulling
|
6e75d7a839
|
Merge branch 'master' into fix-multi-uvset-coord
|
2019-09-25 16:57:24 +02:00 |
|
Victor Cebollada
|
e0fee3d87b
|
gltf2.0 importer - Support for mesh morph animations added.
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
|
2019-09-25 09:58:23 +01:00 |
|
Kim Kulling
|
12a101124a
|
Merge branch 'master' into issue_2668
|
2019-09-24 19:29:40 +02:00 |
Alan
|
b8e53c967f
|
Merge branch 'master' into issue_2668
|
2019-09-24 02:21:59 +01:00 |
|
Alan
|
d3a79d0cc2
|
Merge branch 'master' into issue_2661
|
2019-09-24 02:21:19 +01:00 |
|
Alan
|
17f55aa67e
|
Merge branch 'master' into issue_2662
|
2019-09-24 02:20:47 +01:00 |
|
Kim Kulling
|
3b2e0ebfc7
|
Merge branch 'master' into issue_2661
|
2019-09-23 16:59:28 +02:00 |
Jennifer Buehler
|
aa47a028c8
|
Fix UV texture coords generation along Z Axis
|
2019-09-23 11:22:20 +02:00 |
|
Theak
|
61fa619f92
|
Fix: Mismatched new/free in gltf2 importer (fixes #2668)
|
2019-09-22 10:24:30 +01:00 |
|
Theak
|
720ac4846b
|
Fix: memory leak in gltf2 importer (fixes #2661)
|
2019-09-22 10:12:19 +01:00 |
|
Theak
|
0e6478c0d4
|
Fix: Wrong aiAnimation::mTicksPerSecond for gltf2 imports (fixes #2662)
|
2019-09-22 09:59:58 +01:00 |
|
Kim Kulling
|
94c488d7ea
|
fix compiler warnings.
|
2019-09-22 10:15:44 +02:00 |
|
Kim Kulling
|
ef54a00fc4
|
Use correct escape sequence for unsigned.
|
2019-09-22 09:12:37 +02:00 |
|
Kim Kulling
|
69087abc56
|
Ensure that the aiString lenght is 4 bytes independent which platform and add mingw back to appveyor.
|
2019-09-21 16:36:22 +02:00 |
ywang
|
a4092a3234
|
correct uvset index
|
2019-09-20 17:53:15 -07:00 |
escherstair
|
d4101bbf06
|
fix regression
|
2019-09-19 08:07:55 +02:00 |
|
escherstair
|
18bbfdac1a
|
init variable 'base' in initializer list
|
2019-09-19 08:01:47 +02:00 |
|
Kim Kulling
|
4b9cc1a484
|
Merge branch 'master' into fix-codacy-issues
|
2019-09-18 20:32:49 +02:00 |
Bruno
|
dbf47f7769
|
fix issue #2551
|
2019-09-18 17:54:30 +02:00 |
|
escherstair
|
1abf6d50fe
|
fixed regression #2
|
2019-09-18 08:31:33 +02:00 |
|
escherstair
|
2194577429
|
fix regression
|
2019-09-18 08:25:24 +02:00 |
|
escherstair
|
a5859dd3f4
|
Merge branch 'master' into fix-codacy-issues
|
2019-09-18 08:19:44 +02:00 |
|
escherstair
|
c0ec5140ee
|
init variable in initializer list
|
2019-09-18 08:18:52 +02:00 |
|
escherstair
|
6d4854f12c
|
init variable in initializer list
|
2019-09-18 08:15:50 +02:00 |
|
escherstair
|
116dcce0ba
|
init member in itilializer list
|
2019-09-18 08:04:46 +02:00 |
|
Kim Kulling
|
f7da7d8f67
|
Merge branch 'master' into kimkullig_dev
|
2019-09-17 22:01:29 +02:00 |
|
Kim Kulling
|
2edcf82f5a
|
add missing include.
|
2019-09-17 21:58:46 +02:00 |
|
Kim Kulling
|
8b95479bb0
|
closes https://github.com/assimp/assimp/issues/2598: introduce getEpsilon
|
2019-09-15 19:25:37 +02:00 |
PascalGilbraith
|
7f7918957a
|
Issue 2603
Normal face indices added to end of already resized vector, so normal faces did not match position faces.
Use vector index rather than push.
|
2019-09-15 13:05:04 +01:00 |
|
Kim Kulling
|
2be0eba1ab
|
put one in comments because the file seems to be corrupt.
|
2019-09-14 19:32:47 +02:00 |
|
Kim Kulling
|
79056da4be
|
closes https://github.com/assimp/assimp/issues/2613 : merge glTF2 patch.
|
2019-09-14 09:12:08 +02:00 |
|
Kim Kulling
|
a1254f067e
|
closes https://github.com/assimp/assimp/issues/2627 - fix typo
Remove code from ai_assert test, will be removed in release versions.
|
2019-09-13 12:05:29 +02:00 |
|
Kim Kulling
|
3bd63c006f
|
Merge branch 'gltf_add_ortho_cam' of https://github.com/assimp/assimp into gltf_add_ortho_cam
|
2019-09-12 20:27:53 +02:00 |
|
Kim Kulling
|
a25a1f0772
|
fix the build.
|
2019-09-12 20:27:35 +02:00 |
|
Kim Kulling
|
f10bd72100
|
Merge branch 'master' into gltf_add_ortho_cam
|
2019-09-12 00:30:06 +02:00 |
|
Kim Kulling
|
f9c6fed190
|
Add a camera unittest.
|
2019-09-11 22:34:53 +02:00 |
|
Kim Kulling
|
f67c18d41a
|
introduce inline helper.
|
2019-09-11 22:21:20 +02:00 |
|
kimkulling
|
7ff7a5d64e
|
glTF: Try to remove duplicate code.
|
2019-09-11 17:00:39 +02:00 |
|
escherstair
|
0307327999
|
Merge branch 'master' into fix-codacy-issues
|
2019-09-11 10:06:16 +02:00 |