Commit Graph

9560 Commits (deac3a9f6c6a4417144586ed28a1f474fea97984)

Author SHA1 Message Date
RichardTea deac3a9f6c Add Draco 1.4.1 sources
Upstream: https://github.com/google/draco
2021-01-20 10:14:20 +00:00
RichardTea 7c9cddf786 Draco test file
2CylinderEngine from https://github.com/KhronosGroup/glTF-Sample-Models
2021-01-15 17:25:36 +00:00
Kim Kulling e3d39b9f66
Merge pull request #3583 from assimp/kimkulling-replace_sstrcasecmp
Remove dependency to posix-extension function
2021-01-14 12:06:24 +01:00
Kim Kulling 484ac21ef5
Remove dependency to posix-extension function 2021-01-14 11:53:25 +01:00
Kim Kulling 6d6a6ac11e
Merge pull request #3575 from ms-maxvollmer/gltf2_buffer_fixes
Fixes for GLTF2 buffers
2021-01-14 09:57:39 +01:00
Kim Kulling 87a6305cf0
Merge branch 'master' into gltf2_buffer_fixes 2021-01-12 18:32:17 +01:00
Kim Kulling 20873cb142
Merge pull request #3581 from assimp/build_fixes
Use const instead of constexpr
2021-01-12 18:31:53 +01:00
kkulling 9174bca3f7 closes https://github.com/assimp/assimp/issues/3517: use const instead of constexpr 2021-01-12 10:01:53 +01:00
Max Vollmer d49aed4585 * Check that buffer view has buffer
* Handle integer overflow when calculating byte length
* Minor code cleanup for exception messages
2021-01-11 08:45:47 +00:00
Kim Kulling ec08092dbf
Merge pull request #3571 from JacksonM8/issue_3570
Issue 3570 (CMake Policy violations on MSVC)
2021-01-09 08:41:28 +01:00
Kim Kulling 68be7c77c0
Merge branch 'master' into issue_3570 2021-01-08 15:22:14 +01:00
Kim Kulling 1e81bed4d0
Merge pull request #3561 from ffontaine/master
contrib/zlib/CMakeLists.txt: don't install zlib
2021-01-07 11:05:37 +01:00
Kim Kulling d898ecc80c
Fix another typo. 2021-01-06 18:59:13 +01:00
Kim Kulling 2ad4218d25
Merge branch 'master' into master 2021-01-06 18:54:57 +01:00
Kim Kulling 5222ab989f
Fix a typo 2021-01-06 18:51:59 +01:00
Kim Kulling b23ecb4864
Update CMakeLists.txt
- Update minimum cmake version
- install for win32-platforms to avoid conflicts with targets for win32
2021-01-06 18:51:30 +01:00
JacksonM8 a01ef5374c
Merge branch 'master' into issue_3570 2021-01-07 01:47:06 +10:30
Kim Kulling 53c03fa364
Merge pull request #3569 from ihsinme/master
fix of an unattainable condition.
2021-01-06 16:00:46 +01:00
JacksonM8 3eed6fa006 Remove relative pathing in target_sources() as per CMP0076 2021-01-07 01:23:41 +10:30
JacksonM8 d0e57e2554 Remove quoted variable de-referencing as per CMP0054 2021-01-07 00:40:50 +10:30
ihsinme e1052f421b
Update OpenDDLParser.cpp 2021-01-06 16:52:28 +03:00
ihsinme 177304bb7c
Update o3dgcArithmeticCodec.cpp 2021-01-06 16:50:07 +03:00
Kim Kulling ccc0a50d96
Merge pull request #3558 from JLouis-B/3mf-improvements
3mf improvements
2021-01-02 13:29:58 +01:00
Kim Kulling cf78781fa8
Merge branch 'master' into 3mf-improvements 2021-01-02 13:14:13 +01:00
Kim Kulling 43ea4d679b
Merge pull request #3556 from JLouis-B/update-unzip
Update unzip contrib
2021-01-02 13:13:20 +01:00
Kim Kulling 3298082a96
Merge branch 'master' into update-unzip 2021-01-02 12:06:53 +01:00
Kim Kulling 05da2123e1
Merge pull request #3552 from Danny-Kint/dev/gltf-KHR_materials
[gltf2] Add support for extensions KHR_materials
2021-01-02 12:06:12 +01:00
Kim Kulling 48b138ce13
Merge branch 'master' into dev/gltf-KHR_materials 2021-01-02 10:02:07 +01:00
Kim Kulling 89d4d6b68f
Merge pull request #3546 from wasd845/develop3
add operator* in aiQuaterniont
2021-01-02 00:50:53 +01:00
Kim Kulling fa24e4199c
Merge branch 'master' into develop3 2021-01-02 00:13:47 +01:00
Kim Kulling 18ad1510f7
Merge pull request #3543 from gris-martin/patch-1
Only consider continuation tokens at end of line
2021-01-02 00:12:57 +01:00
Kim Kulling 0a1535647a
Merge branch 'master' into patch-1 2021-01-02 00:01:25 +01:00
Danny-Kint 07aace0fdd
Merge branch 'master' into dev/gltf-KHR_materials 2020-12-31 07:08:31 +01:00
Kim Kulling 465220b26a
Merge branch 'master' into 3mf-improvements 2020-12-30 18:12:26 +01:00
Kim Kulling 88e5f3416e
Merge pull request #3562 from makitsune/fix-gltf-bin-from-memory
Fix glTF from memory loading .bin with a custom IOHandler
2020-12-30 11:50:35 +01:00
Kim Kulling e0803b3ec2
Merge branch 'master' into fix-gltf-bin-from-memory 2020-12-30 11:17:31 +01:00
Danny-Kint b8d947299a
Merge branch 'master' into dev/gltf-KHR_materials 2020-12-29 17:09:15 +01:00
Jean-Louis 37df38f951 [3MF] Improves node naming 2020-12-29 15:46:28 +01:00
Kim Kulling 3ccfc03c48
Merge pull request #3542 from ms-maxvollmer/fbx_tokenizer_fix
FBXBinaryTokenizer: Check length of property
2020-12-28 20:19:35 +01:00
Jean-Louis 4025c57fd0 [3MF] Parse the transform of the components 2020-12-28 15:47:20 +01:00
Jean-Louis eda967bd02 Parse the <build> node + refactoring 2020-12-28 12:31:54 +01:00
Danny-Kint 3e320100e5
Merge branch 'master' into dev/gltf-KHR_materials 2020-12-28 10:29:17 +01:00
Danny-Kint 07b59f539d
Merge branch 'master' into dev/gltf-KHR_materials 2020-12-28 08:48:54 +01:00
Maki ca653e0c6a Fix glTF from memory loading .bin with a custom IOHandler 2020-12-28 07:18:50 +00:00
Jean-Louis 629147043e XmlParser: Fixed an error message when the file was correctly parsed 2020-12-27 18:13:49 +01:00
Fabrice Fontaine bfe35fc06b contrib/zlib/CMakeLists.txt: don't install zlib
Don't install zlib static library to avoid potential conflicts with a
system-wide zlib package

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
2020-12-27 15:27:41 +01:00
Jean-Louis eed75aaf2c Remove debug print 2020-12-26 14:57:52 +01:00
Jean-Louis 0ec8d6e285 [3MF] Missing file in previous commit + parse object material in the importer 2020-12-26 14:04:45 +01:00
Jean-Louis 0952038461 Small refactoring on 3MF export 2020-12-26 03:02:18 +01:00
Jean-Louis c10d592b79 Fix material parsing in the 3MF importer 2020-12-26 02:36:24 +01:00