Commit Graph

11689 Commits (fa4273ee1f069058a9bc151465d10726fc128986)

Author SHA1 Message Date
ethaninfinity 4961241c09 Removed pragma warnings 2022-06-06 14:53:03 -04:00
Matthew Clendening aca02190a7
Merge branch 'master' into fix_FBXConverter_double_precision 2022-06-06 10:01:13 -04:00
Kim Kulling 49fdd12fdf
Merge pull request #4554 from Nor-s/fix_fbx
Fix Import a specific FBX model will freeze the app #4395
2022-06-03 13:48:35 +02:00
Kim Kulling 680ea6b0e0
Merge branch 'master' into fix_fbx 2022-06-03 11:21:41 +02:00
Kim Kulling 39a4627519
Merge branch 'master' into kimkulling/create_skeleton_data_issue_4015 2022-06-02 21:47:29 +02:00
Kim Kulling 530ae2b192
Merge pull request #4555 from Underdisc/issue4516
Remove dllexport tags from static library builds.
2022-06-02 20:01:51 +02:00
Kim Kulling 638fda66da
Merge branch 'master' into issue4516 2022-06-01 20:47:13 +02:00
nsg 96d2052ed0
Merge branch 'master' into fix_fbx 2022-06-02 02:31:32 +09:00
Kim Kulling 7fcd961a20
Merge pull request #4549 from Gargaj/msvcfix
fix msvc warnings-as-errors
2022-06-01 17:39:01 +02:00
Kim Kulling 03532eaec3
Merge branch 'master' into msvcfix 2022-06-01 17:11:06 +02:00
Underdisc 17289985a4 Update comment 2022-06-01 12:45:40 +02:00
Underdisc 02e0d1d05c Remove dllexport tags from static library builds. 2022-06-01 12:26:04 +02:00
nsg 681eb3e91e Fix Import a specific FBX model 2022-06-01 17:41:27 +09:00
Kim Kulling 2e944686f8
Merge pull request #4478 from assimp/kimkulling/link_stb_image_statically_issue_4467
Link static linkage for std_image.
2022-06-01 00:01:00 +02:00
Kim Kulling b7a70ac707 Add compiler switgxh for using static linkage for std_image 2022-05-31 23:24:31 +02:00
Kim Kulling 43c767dd62
Merge branch 'master' into msvcfix 2022-05-31 22:06:57 +02:00
Kim Kulling 05867f4752 Merge branch 'kimkulling/link_stb_image_statically_issue_4467' of https://github.com/assimp/assimp into kimkulling/link_stb_image_statically_issue_4467 2022-05-31 20:08:39 +02:00
Kim Kulling de4fe01c94 Fix clang build 2022-05-31 20:08:26 +02:00
Kim Kulling e28becbaf5
Update Assimp.cpp 2022-05-31 19:17:08 +02:00
Kim Kulling e5cd85ac0c
Update M3DWrapper.h 2022-05-31 19:16:46 +02:00
Kim Kulling 4b25eb6c4b
Update Assimp.cpp 2022-05-31 19:09:22 +02:00
Kim Kulling c0e141a6a9
Update StbCommon.h 2022-05-31 19:08:46 +02:00
Kim Kulling b00923ebcd
Update Assimp.cpp 2022-05-31 19:08:29 +02:00
Kim Kulling 4e22635406
Update PbrtExporter.cpp 2022-05-31 18:31:19 +02:00
Kim Kulling 472e15c405
Merge branch 'master' into kimkulling/link_stb_image_statically_issue_4467 2022-05-31 17:47:43 +02:00
Kim Kulling 4b923f0603
Merge pull request #4537 from assimp/kimkulling/fix_compiler_warning
Cleanups
2022-05-31 17:47:21 +02:00
Kim Kulling 234e55fbb1
Use size_t 2022-05-31 07:29:54 +02:00
Gargaj f612865f22 fix msvc warnings-as-errors 2022-05-29 01:35:48 +02:00
Matthew Clendening 26233f1b77 Fixed FBXConverter build error (warning as error) when ASSIMP_DOUBLE_PRECISION is defined 2022-05-26 15:06:23 -04:00
Piroska Gabor ddc63119b5 Using hex instead of decimal 2022-05-26 10:11:30 +02:00
hgdagon efbcdccac9
Fix GNUC check on Windows (2nd attempt) 2022-05-25 09:18:42 -07:00
hgdagon affa85a36b
Fix GNUC check on Windows 2022-05-25 07:59:01 -07:00
Piroska Gabor 7ce447294f I ran into an error while processing colored binary stl. Just a type but
better be fixed.
2022-05-24 19:47:24 +02:00
Luca Della Vedova 6b0a7a21a4
Store SID in SID field
Signed-off-by: Luca Della Vedova <luca@openrobotics.org>
2022-05-23 14:24:56 +08:00
Kim Kulling ed3e218550 Bugfix: fix not initialized member attributes 2022-05-21 19:08:43 +02:00
Kim Kulling e0696486b2 Update gtest 2022-05-21 11:09:46 +02:00
Kim Kulling e5a2b00719 Fix comparison signed unsigned warning. 2022-05-21 09:47:54 +02:00
tanolino 002d6dc016
Inifinite loop on bad import files
I had an import file that caused an infinite loop. I don't exactly know how this algorithm works here but maybe we should change it more.
Probably calculate the amount of steps and chop linear.
2022-05-18 15:22:11 +02:00
Kim Kulling 4d451fe437
Merge pull request #4532 from assimp/kimkulling/fix_undefined_behaviour_in_superfasthast_issue4531
Add unittest to reproduce undefined behaviour
2022-05-17 22:08:54 +02:00
Kim Kulling c623a363a6 Add unittest to reproduce undefined behaviour: left shift on negative value 2022-05-17 20:48:35 +02:00
Kim Kulling c8dafe0d28
Merge pull request #4527 from motazmuhammad/master
Accelerate the Merge vertex post processing step
2022-05-14 11:54:06 +02:00
Kim Kulling 58af6ba9db
Fix compier warning 2022-05-14 09:59:07 +02:00
Kim Kulling deb1698cbe
Fixed formattings. 2022-05-14 09:56:38 +02:00
motazmuhammad 78dbef8711
Merge branch 'master' into master 2022-05-13 20:15:55 +01:00
motazmuhammad 36d730fc4e add more comments 2022-05-13 20:10:19 +01:00
motazmuhammad 5d8b1649a4 Revert "use unordered_set to accelerate the vertix merging"
This reverts commit 0ffb91fbf1.
2022-05-13 19:59:16 +01:00
Kim Kulling 1b3e9e4e01 Add testmodel 2022-05-13 19:44:14 +02:00
Kim Kulling e284fe67b8 Adapt file for skeleton unittest 2022-05-13 19:43:46 +02:00
motazmuhammad 0ffb91fbf1 use unordered_set to accelerate the vertix merging 2022-05-13 18:14:49 +01:00
Kim Kulling f44a94e118
Merge pull request #4510 from hgdagon/assimp_resource
[Feedback needed]Resource script updates
2022-05-12 11:30:39 +02:00