Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,311 Commits 19 Branches 43 Tags
1ea3cb545dc5dfcff4fa1fb40cf4edd6f07bb648
Commit Graph

10311 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Kim Kulling
951d5158c5 Merge branch 'master' into patch-1 2021-06-22 09:42:30 +02:00
ihsinme
d699e7b56e Merge branch 'master' into patch-1 2021-06-22 09:48:25 +03:00
Kim Kulling
43a5c6c8e3 Merge pull request #3946 from mahiuchun/safe 
glTF2: Make handling of embedded textures safer.
 2021-06-21 19:02:43 +02:00
Kim Kulling
9512e9ac1e Merge branch 'master' into safe 2021-06-21 17:53:17 +02:00
Kim Kulling
376b3b2eff Merge pull request #3945 from mahiuchun/embed 
Add GetEmbeddedTextureAndIndex() to aiScene.
 2021-06-17 22:21:03 +02:00
Kim Kulling
a8c75c34a1 Update scene.h 
Add some more checks against nullptr dereferecnes.
 2021-06-17 21:31:28 +02:00
Kim Kulling
089375bd63 Merge branch 'master' into embed 2021-06-17 21:22:36 +02:00
Hill Ma
fe8c4ebd8c Merge branch 'master' into zero 2021-06-16 10:18:41 -07:00
Andreas Buhr
e27074594f Replace swear words in IFCBoolean.cpp 
Add a more gentle comment.
 2021-06-16 18:58:41 +02:00
Kim Kulling
fdb9ce6445 Merge pull request #3958 from mahiuchun/iosys 
Fix issue #2873
 2021-06-16 14:22:02 +02:00
Kim Kulling
a34b9d1c95 Fix review findings 2021-06-16 11:21:31 +02:00
Hill Ma
148b8c66a8 glTF2: zero out extra space created by padding. 
This makes resulting GLB deterministic.
 2021-06-15 15:18:20 -07:00
Hill Ma
af748755e1 Fix issue #2873 2021-06-15 13:20:12 -07:00
Kim Kulling
a6558ca249 Merge branch 'master' into embed 2021-06-15 13:32:09 +02:00
ihsinme
6a78ef5652 Merge branch 'master' into patch-1 2021-06-15 09:42:05 +03:00
RichardTea
a909341767 Merge remote-tracking branch 'origin/clean_gltf_pbr_brdf' into clean_gltf_pbr_brdf 2021-06-14 15:11:51 +01:00
RichardTea
f412595887 Fix typo 
Thank you clang!
 2021-06-14 15:11:41 +01:00
RichardTea
985f3ee665 Fix glTFv2 texcoord/uv mapping 
Use the standard property to indicate the UV map index
 2021-06-14 15:11:41 +01:00
RichardTea
fb039bb9eb Add glTFv2 Clearcoat import/export tests 
Uses Clearcoat model from Khronos
 2021-06-14 15:11:41 +01:00