Commit Graph

10389 Commits

Author SHA1 Message Date
Kim Kulling
00a2cd20f9 Merge branch 'master' into remove-dead-code 2021-07-31 17:00:58 +02:00
Kim Kulling
8f02c29023 Merge pull request #4011 from krishty/more-range-based-for
more range-based for
2021-07-31 16:59:49 +02:00
Krishty
bb53961fa9 more range-based for
f6b4370f6a and 7c822f23bd introduced raw loops on data types with heavy nesting; range-based for suits better here
2021-07-29 14:57:25 +02:00
Krishty
738c31c3ea removed useless code
Found while reviewing #3880
2021-07-28 16:48:53 +02:00
Kim Kulling
fc22d6cdae Merge pull request #4002 from assimp/kimkulling-issue_3760
Fix Issue3760
2021-07-28 10:58:52 +02:00
Kim Kulling
f87550fdbc Fix Issue3760
- Convert left-handed coordinate system to right-handed coordinate system
- Rescale model by 0.01
- closes https://github.com/assimp/assimp/issues/3760
2021-07-28 10:39:39 +02:00
Kim Kulling
8748f8591c Merge pull request #4000 from assimp/kimkulling-issue_3790
Fix euler angles
2021-07-26 15:59:32 +02:00
Kim Kulling
92af44f092 Fix euler angles 2021-07-26 15:47:19 +02:00
Kim Kulling
209c66dff1 Merge pull request #3999 from assimp/kimkulling-issue_3974
Fix fuzzer issue in m3d-importer
2021-07-26 15:17:46 +02:00
Kim Kulling
aeae2cf242 Update M3DWrapper.h 2021-07-26 14:44:26 +02:00
Kim Kulling
e8e720d584 Update M3DWrapper.h 2021-07-26 13:41:54 +02:00
Kim Kulling
291c0a4faa Fix build failure
- Fix the failure
- Put inlined stuff out of declaration
- Add some docu
2021-07-26 13:13:21 +02:00
Kim Kulling
df2e7208fb Fix fuzzer issue in m3d-importer
- closes https://github.com/assimp/assimp/issues/3974
- Check for nullptr before dereferencing name in m3d-data-instance.
2021-07-26 11:56:26 +02:00
Kim Kulling
c3a097abc9 Merge pull request #3998 from assimp/issue_3975
closes https://github.com/assimp/assimp/issues/3975:
2021-07-26 11:51:25 +02:00
Kim Kulling
16c3f82222 closes https://github.com/assimp/assimp/issues/3975: Use latest version of OpenDDL-Parser 2021-07-26 11:24:18 +02:00
Kim Kulling
26538a4f4a Merge pull request #3997 from assimp/issue_3957
closes https://github.com/assimp/assimp/issues/3957: checkj for empty…
2021-07-26 11:14:46 +02:00
Kim Kulling
b7f88f3063 closes https://github.com/assimp/assimp/issues/3957: checkj for empty positions. 2021-07-26 10:51:16 +02:00
Kim Kulling
a96e7e6e2b Merge pull request #3992 from AdrianAtGoogle/gltf_fixes
Fix issues encountered during integration attempt
2021-07-23 21:59:26 +02:00
Kim Kulling
4e28a3072f Merge branch 'master' into gltf_fixes 2021-07-23 20:37:25 +02:00
Kim Kulling
1757513890 Merge pull request #3995 from assimp/add_missing_includes_to_doc
Add hpp to dxygen filter
2021-07-22 21:23:37 +02:00
Kim Kulling
d554b4950d Add hpp to dxygen filter 2021-07-22 20:48:25 +02:00
Kim Kulling
0372c8c65d Merge pull request #3991 from mahiuchun/double
FBX: fix double precision build.
2021-07-22 10:49:37 +02:00
Kim Kulling
e07af07311 Merge branch 'master' into double 2021-07-22 10:07:40 +02:00
Kim Kulling
f3cb23c0c7 Merge pull request #3994 from assimp/doxygen_api_generation
Disable html and enable xml
2021-07-22 10:07:23 +02:00
Kim Kulling
33da6ab376 Merge branch 'master' into doxygen_api_generation 2021-07-21 21:00:46 +02:00
Kim Kulling
aa8628abef Disable html and enable xml 2021-07-21 20:38:58 +02:00
Kim Kulling
e9d7ec4ba5 Merge pull request #3990 from RichardTea/gltf_export_id_issue_3978
Ensure glTFv2 scene name is unique
2021-07-21 17:31:58 +02:00
Kim Kulling
d0885af634 Merge branch 'master' into gltf_export_id_issue_3978 2021-07-21 13:47:47 +02:00
Kim Kulling
9036d3bd12 Merge pull request #3993 from assimp/doxygen_api_generation
Fix version, remove deprecated doc files, fix some path errors
2021-07-21 13:47:34 +02:00
Kim Kulling
9f2540a2a8 Merge branch 'master' into doxygen_api_generation 2021-07-21 09:51:13 +02:00
Kim Kulling
e13ce4b624 Fix version, remove deprecated doc files, fix some path errors 2021-07-21 09:46:23 +02:00
Adrian Perez
a10f918071 Merge branch 'gltf_fixes' of https://github.com/AdrianAtGoogle/assimp into gltf_fixes 2021-07-16 14:30:14 -07:00
Adrian Perez
30d342534a Fix issues encountered during integration atempt 2021-07-16 14:29:28 -07:00
Adrian Perez
5285736ba0 Fix issues encountered during integration atempt 2021-07-16 14:21:32 -07:00
Kim Kulling
22099605e3 Merge pull request #3988 from RichardTea/collada_makehuman_issue_3984
Collada: Read <matrix> tags properly, assume <input set="0"/> when not present
2021-07-16 12:00:28 +02:00
Kim Kulling
5171aa52d1 Remove dead code 2021-07-16 11:47:38 +02:00
Kim Kulling
5693bc71f3 Merge branch 'master' into collada_makehuman_issue_3984 2021-07-16 11:44:32 +02:00
Hill Ma
aa883eda19 FBX: fix double precision build. 2021-07-15 11:54:55 -07:00
Kim Kulling
cb5686653f Merge pull request #3989 from rbsheth/rbsheth_fix_hunter
Find stb for Assimp
2021-07-15 19:51:46 +02:00
Kim Kulling
e791f09aeb Merge branch 'master' into rbsheth_fix_hunter 2021-07-15 19:05:20 +02:00
Kim Kulling
f3addb3ba4 Merge pull request #3986 from mlopezantequera/patch-1
PyAssimp fix: don't always search anaconda paths
2021-07-14 21:09:31 +02:00
RichardTea
632b2db97c Ensure glTFv2 scene name is unique
Use the provided scene name if extant
Fixes issue #3978
2021-07-14 13:39:41 +01:00
Rahul Sheth
6e863b2435 Find stb for Assimp 2021-07-14 08:27:04 -04:00
RichardTea
0c6c238956 Merge branch 'master' into collada_makehuman_issue_3984 2021-07-14 11:33:43 +01:00
Kim Kulling
23e416de3b Merge branch 'master' into patch-1 2021-07-14 11:34:58 +02:00
Kim Kulling
a08c1c1d67 Merge pull request #3985 from rbsheth/rbsheth_fix_hunter
Fix stb_image dependency
2021-07-14 11:32:03 +02:00
Kim Kulling
9c207cd865 Merge branch 'master' into rbsheth_fix_hunter 2021-07-13 20:45:22 +02:00
RichardTea
bff1d012bd Read matrix and input (shared) correctly
<matrix> may have leading and trailing whitespace
<input/> set attribute is unsigned. It is also optional, default 0
2021-07-13 16:50:09 +01:00
RichardTea
206b2436d4 Apply clangformat 2021-07-13 16:47:31 +01:00
Kim Kulling
d37ef516f8 Merge pull request #3981 from arkeon7/PLY_RN_LINE
Manage /R/N lines ends correctly on binary files, tested with solidworks PLY export
2021-07-12 12:47:05 +02:00