Commit Graph

6878 Commits

Author SHA1 Message Date
Kim Kulling
00a2cd20f9 Merge branch 'master' into remove-dead-code 2021-07-31 17:00:58 +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
42a7611f85 style fix: indentation 2021-07-29 14:39:22 +02:00
Krishty
4991f728c8 style fix – initializing and assigning empty std::string properly
for details, see #3764
2021-07-29 14:23:52 +02:00
Krishty
758116b083 removed trailing spaces and tabs from source and text
This commit ignores the “contrib” folder in order to prevent merge conflicts in dependencies, should these be updated via git.
2021-07-29 13:28:51 +02:00
Krishty
738c31c3ea removed useless code
Found while reviewing #3880
2021-07-28 16:48:53 +02:00
xiaohunqupo
d065513e27 Merge branch 'master' into master 2021-07-28 17:02:28 +08: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
xiaohunqupo
8ee2c721d9 StepExporter support polygon mesh
StepExporter support polygon mesh
2021-07-28 16:32:27 +08: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
b7f88f3063 closes https://github.com/assimp/assimp/issues/3957: checkj for empty positions. 2021-07-26 10:51:16 +02:00
Kim Kulling
4e28a3072f Merge branch 'master' into gltf_fixes 2021-07-23 20:37:25 +02:00
Kim Kulling
e07af07311 Merge branch 'master' into double 2021-07-22 10:07:40 +02:00
Kim Kulling
d0885af634 Merge branch 'master' into gltf_export_id_issue_3978 2021-07-21 13:47:47 +02:00
Adrian Perez
30d342534a Fix issues encountered during integration atempt 2021-07-16 14:29:28 -07:00
Kim Kulling
5171aa52d1 Remove dead code 2021-07-16 11:47:38 +02:00
Hill Ma
aa883eda19 FBX: fix double precision build. 2021-07-15 11:54:55 -07: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
RichardTea
0c6c238956 Merge branch 'master' into collada_makehuman_issue_3984 2021-07-14 11:33:43 +01: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
15bbab2d9e Merge branch 'master' into PLY_RN_LINE 2021-07-12 10:53:00 +02:00
Rahul Sheth
1b37b74f9e Hunter fixes for stb_image 2021-07-07 17:01:19 -04:00
Rahul Sheth
0a5e49252d Merge remote-tracking branch 'origin/master' into HEAD 2021-07-07 16:35:29 -04:00
Promit Roy
90c115cb3f Merge branch 'master' into promit/gltf-extras 2021-07-02 00:38:00 -04:00
Kim Kulling
240eb36980 Merge branch 'master' into master 2021-07-01 19:23:52 +02:00
arkeon
3cbd31900c Manage /R/N lines ends correctly on binary files, tested with solidworks PLY export 2021-07-01 17:23:21 +02:00
Kim Kulling
01930101c7 Merge branch 'master' into master 2021-06-29 20:45:09 +02:00
Kim Kulling
59ab791a47 Merge branch 'master' into clang-tidy-perf-fixes 2021-06-29 20:24:23 +02:00
Promit Roy
7c822f23bd Added support for custom properties ("extras") in glTF2 2021-06-27 00:53:40 -04:00
Jerome St-Louis
e3d54860ec Merge branch 'master' into master 2021-06-25 18:50:33 -04:00
Pankaj003
72075f984e Merge branch 'master' into master 2021-06-25 19:48:12 +05:30
Jerome St-Louis
0e41efb050 glTF2: Improved support for AI_MATKEY_OPACITY
- Exporter: Writing opacity to pbrMetallicRoughness.baseColorFactor[3] even when alphaMode is set
- Importer: Setting AI_MATKEY_OPACITY from pbrMetallicRoughness.baseColorFactor[3]
2021-06-24 13:27:29 -04:00
Aaron Gokaslan
f435ce8c2c Merge branch 'master' into clang-tidy-perf-fixes 2021-06-24 11:54:56 -04:00
Kim Kulling
b38b65ff49 Add const 2021-06-24 17:03:00 +02:00
Kim Kulling
012ce30577 Merge branch 'master' into zero 2021-06-24 17:00:43 +02:00
Kim Kulling
d18d838812 Fix formatting 2021-06-24 16:18:11 +02:00
Aaron Gokaslan
8e3a159141 Merge branch 'master' into clang-tidy-perf-fixes 2021-06-23 10:10:28 -04:00
Pankaj Tyagi
6170c49155 Fixed:
1. FBX import is unable to read the texture UV rotation angle.
2. FBX export is unable to write the texture UV rotation angle.
2021-06-23 16:49:09 +05:30
Evangel63
e736538df3 Merge branch 'master' into master 2021-06-23 13:45:23 +10:00
Aaron Gokaslan
24d4be958d Merge branch 'master' into clang-tidy-perf-fixes 2021-06-22 14:42:51 -04:00
Aaron Gokaslan
544148a626 Fix code insertion duplication 2021-06-22 14:28:46 -04:00
Kim Kulling
760953c834 Merge branch 'master' into clean_gltf_pbr_brdf 2021-06-22 20:10:03 +02:00
Kim Kulling
36815b014b Update FBXExporter.h 2021-06-22 20:05:16 +02:00
Aaron Gokaslan
b17c2f29e9 Replace noexcept with proper macro 2021-06-22 12:44:36 -04:00
Aaron Gokaslan
1650868701 Remove redundant include 2021-06-22 12:32:58 -04:00