Kim Kulling
9be69a90b1
Merge branch 'master' into fix/multibody-binary-stls
2017-11-30 00:28:59 +01:00
Kim Kulling
9d224f6ac5
Merge pull request #1603 from Matter-and-Form/fix/gltf-node-name-conflict
...
[gltf2] node name conflict fix
2017-11-30 00:28:28 +01:00
Daniel Hritzkiv
98e98dc40c
Fix node names sharing same name
...
Uses node name if it is set, and globally unique id otherwise.
This may still break in some models (glTF2 spec doesn’t guaruntee name values to be unique). However, I couldn’t cause it to break any further using gltf2 models on hand.
Closes #1600
2017-11-29 12:20:44 -05:00
Daniel Hritzkiv
5c9ed540b2
Add test for GLB import
...
Currently fails (testing the issue in #1600 )
2017-11-29 12:20:44 -05:00
Daniel Hritzkiv
67c236647d
Restore import of multi mesh binary STLs
...
Regression introduced in: 9a9f18bbed
2017-11-29 11:20:09 -05:00
Kim Kulling
e17f7010d1
Merge pull request #1599 from assimp/kimkulling-verbose-analyze
...
Update .travis.sh
2017-11-28 15:41:22 +01:00
Kim Kulling
ef4842e128
Update .travis.sh
...
Make check more verbose.
2017-11-28 15:15:43 +01:00
Kim Kulling
e6381b7616
Merge pull request #1594 from Matter-and-Form/fix/gltf2-transforms
...
[glTF2] Fix transform matrices multiplication order
2017-11-28 09:22:01 +01:00
Kim Kulling
7a395e274f
Merge branch 'master' into fix/gltf2-transforms
2017-11-28 08:48:19 +01:00
Kim Kulling
3e9bb23688
Merge pull request #1595 from Matter-and-Form/fix/gltf2-preserve-node-names
...
[glTF2] Preserve node names when importing
2017-11-28 08:47:49 +01:00
Kim Kulling
8ce5985aa0
Merge branch 'master' into fix/gltf2-preserve-node-names
2017-11-28 00:50:07 +01:00
Kim Kulling
890920110c
Merge pull request #1596 from Matter-and-Form/feature/gltf2-tangents
...
[glTF2] Add support for tangents in import
2017-11-28 00:49:42 +01:00
awefers
0031165789
Add support for tangents in glTF2.0 import
...
Closes #1562
2017-11-27 13:45:40 -05:00
awefers
0b04ae1d91
Preserve node names when importing glTF2.0
...
Closes #1522
2017-11-27 11:58:19 -05:00
awefers
e53d4735b0
Fix transform matrices multiplication order per glTF2.0 spec
...
Closes #1568
2017-11-27 11:32:05 -05:00
Kim Kulling
0ce3641deb
Merge pull request #1589 from aavenel/fix-typo-gltf
...
Fix typo on gltf2 camera parameters
2017-11-26 20:52:49 +01:00
Kim Kulling
623b5a515a
Merge branch 'master' into fix-typo-gltf
2017-11-25 20:11:49 +01:00
Kim Kulling
44b38263a5
Merge pull request #1590 from aavenel/fix-cmake-unit-win
...
Copy assimp dll to unit folder on windows
2017-11-25 20:11:22 +01:00
Kim Kulling
b9845285ca
Merge branch 'master' into fix-cmake-unit-win
2017-11-25 16:51:37 +01:00
Kim Kulling
a41bef0d54
Merge pull request #1591 from aavenel/fix-warnings-win
...
Fix all warnings on MSVC14
2017-11-25 12:28:51 +01:00
Alexandre Avenel
eb452b28a2
Fix warning on MSVC14
2017-11-25 11:38:12 +01:00
Alexandre Avenel
d529dd17f9
Fix warning cast double to float
2017-11-24 22:29:58 +01:00
Alexandre Avenel
273f6b0267
Fix MSVC14 warning cast double to real
2017-11-24 22:13:38 +01:00
Alexandre Avenel
f80e8b39a1
Fix warning C4138: '*/' found outside of comment on MSVC14
2017-11-24 22:08:50 +01:00
Alexandre Avenel
c63263b025
Fix typo on gltf2 camera parameters
2017-11-24 22:02:47 +01:00
Alexandre Avenel
d8d5cf1a2d
Copy assimp dll to unit folder on windows
2017-11-24 19:50:25 +01:00
Kim Kulling
35819340aa
Merge pull request #1588 from elect86/patch-15
...
Update jvm port supported formats
2017-11-23 14:20:48 +01:00
Kim Kulling
ad2223f1c5
Merge branch 'master' into patch-15
2017-11-23 13:31:39 +01:00
Kim Kulling
a1c1ad74bd
Merge pull request #1582 from mrautio/master
...
Add support for building Mac OS X Framework bundles
2017-11-23 13:31:00 +01:00
Giuseppe Barbieri
fdb52723c4
Update Readme.md
2017-11-22 16:11:46 +01:00
Kim Kulling
d180cfcba5
Merge branch 'master' into master
2017-11-22 16:01:16 +01:00
Kim Kulling
ed4e6b0db0
Merge pull request #1580 from assimp/scene_combiner_crash
...
check for nullptr dereferencing before copying scene data
2017-11-22 16:00:46 +01:00
Kim Kulling
e35f789ace
Merge branch 'master' into scene_combiner_crash
2017-11-22 13:46:14 +01:00
Kim Kulling
ac37977230
Merge pull request #1575 from elect86/patch-12
...
Update ValidateDataStructure.h, typo
2017-11-22 13:30:07 +01:00
Kim Kulling
6da4258206
Merge branch 'master' into patch-12
2017-11-21 20:03:09 +01:00
Kim Kulling
a2ba3d630d
Merge pull request #1586 from turol/validate
...
Enable data structure validation in cases where it doesn't cause failures
2017-11-21 20:02:28 +01:00
Turo Lamminen
127705d347
Unit tests: Enable data structure validation in cases where it doesn't cause failures
2017-11-21 18:04:22 +02:00
Kim Kulling
70d9df868d
Merge branch 'master' into patch-12
2017-11-20 22:23:47 +01:00
Kim Kulling
4cf8e10235
Merge pull request #1585 from pdaehne/master
...
[glTF2] Moved byteStride from accessor to bufferView
2017-11-20 22:19:22 +01:00
Kim Kulling
ba3acd7459
Merge branch 'master' into patch-12
2017-11-20 19:56:14 +01:00
Patrick Dähne
a05d74a281
[glTF2] Moved byteStride from accessor to bufferView
2017-11-20 19:01:28 +01:00
Kim Kulling
beff88228d
Merge branch 'master' into master
2017-11-20 18:56:10 +01:00
Kim Kulling
4502d72ee6
Merge pull request #1584 from pdaehne/master
...
[glTF2] Implemented reading binary glTF2 (glb) files
2017-11-20 18:55:30 +01:00
Patrick Dähne
6cbfd5b977
[glTF2] Implemented reading binary glTF2 (glb) files
2017-11-20 14:59:05 +01:00
Mika Rautio
9f1dce8e57
Merge branch 'master' into master
2017-11-20 10:27:11 +02:00
Mika Rautio
4fb5038fb1
Add support for building Mac OS X Framework bundles
2017-11-20 00:10:05 +02:00
Kim Kulling
2a9f79f958
check for 0 properties before copy them
2017-11-19 19:05:51 +01:00
Kim Kulling
55c9761228
Merge branch 'master' into patch-12
2017-11-19 18:25:22 +01:00
Kim Kulling
9707fde709
check for nullptr dereferencing before copying scene data
2017-11-19 17:41:31 +01:00
Kim Kulling
e1837b6cc8
Merge pull request #1576 from elect86/patch-13
...
Update ValidateDataStructure.h, typo
2017-11-19 17:38:02 +01:00
