Commit Graph

11373 Commits (0d8723a3eba772a8f5b3f673b9a4d3f298c6a806)

Author SHA1 Message Date
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
Kim Kulling 15bbab2d9e
Merge branch 'master' into PLY_RN_LINE 2021-07-12 10:53:00 +02:00
Kim Kulling bd28c285fc
Merge pull request #3980 from irajsb/master
Update Gitignore exclude x64 folder generated by build
2021-07-11 19:05:52 +02:00
Kim Kulling d678fb7406
Merge branch 'master' into master 2021-07-11 18:52:46 +02:00
Manuel López Antequera e49ee6cfb2
PyAssimp fix: don't always search anaconda paths
The helper was erroneously adding the Anaconda paths to the search.
2021-07-08 09:51:05 +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
Kim Kulling 1d33131e90
Merge pull request #3969 from Promit/promit/gltf-extras
Added support for custom properties ("extras") in glTF2 importer
2021-07-04 19:28:19 +02:00
Promit Roy 90c115cb3f
Merge branch 'master' into promit/gltf-extras 2021-07-02 00:38:00 -04:00
Kim Kulling 939dacdbee
Merge pull request #3967 from jerstlouis/master
glTF2: Improved support for AI_MATKEY_OPACITY
2021-07-01 20:01:31 +02: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
DESKTOP-HEFITKI\Iraj 391080d2e6 Update Gitignore exclude x64 folder generate by build 2021-07-01 15:01:39 +04:30
Kim Kulling 1ea3cb545d
Merge pull request #3973 from assimp/issue_3971_kkulling
closes https://github.com/assimp/assimp/issues/3971: fix wrong depend…
2021-06-30 00:23:35 +02:00
Kim Kulling 0a48a35382 closes https://github.com/assimp/assimp/issues/3971: fix wrong dependency 2021-06-29 21:22:22 +02:00
Kim Kulling 3ea4baad81
Merge pull request #3965 from Pankaj003/master
FBX module unable to read uv rotation angle and write all the uv transformation data.
2021-06-29 21:05:15 +02:00
Kim Kulling 01930101c7
Merge branch 'master' into master 2021-06-29 20:45:09 +02:00
Kim Kulling 67c45e2d87
Merge pull request #3964 from Skylion007/clang-tidy-perf-fixes
Performance: Apply various performance fixes from clang-tidy
2021-06-29 20:41:52 +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
Kim Kulling d855ec2472
Merge pull request #3959 from mahiuchun/zero
glTF2: zero out extra space created by padding.
2021-06-25 00:03:37 +02:00
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 bd9b28bc45
Merge pull request #3955 from Evangel63/master
Add scene metadata for glTF2 files as allowed by the glTF2 specification
2021-06-24 17:00:16 +02:00
Kim Kulling d18d838812
Fix formatting 2021-06-24 16:18:11 +02:00
Kim Kulling b5350899b2
Merge branch 'master' into master 2021-06-24 16:15:51 +02:00
Kim Kulling 28ca0d13d3
Merge pull request #3966 from jerstlouis/master
include/material.h: Fixed broken C support
2021-06-24 16:15:21 +02:00
Kim Kulling 00bf757688
Update material.h 2021-06-24 13:28:49 +02:00
Jerome St-Louis 170063643c include/material.h: Fixed broken C support
- The aiGetMaterialFloat() and aiGetMaterialInteger() C preprocessor definitions were broken because:
   - They had a space before the opening parenthesis
   - Using material key definitions expanding 1 to argument into 3 breaks the invocation of macros expecting 5 parameters
2021-06-23 18:15:01 -04: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
Kim Kulling bf82caba18
Merge pull request #3954 from ihsinme/patch-1
the expression does not throw an exception.
2021-06-23 01:20:00 +02:00
Kim Kulling c447fc6892
Merge branch 'master' into patch-1 2021-06-23 01:08:40 +02:00
Kim Kulling 1faedc136a
Merge pull request #3952 from RichardTea/clean_gltf_pbr_brdf
First pass at simplifying PBR
2021-06-23 01:07:53 +02: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
Kim Kulling 53d2cf975a
Merge pull request #3961 from andreasbuhr/patch-1
Replace swear words in IFCBoolean.cpp
2021-06-22 20:03:47 +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
Aaron Gokaslan 94c3abd841 Apply various performance fixes from clang-tidy 2021-06-22 12:27:15 -04:00