Promit Roy
68d33a6e13
Added support for more bone weights in GLTF2
...
The GLTF2 importer doesn't actually read beyond the first four bone weights (first attribute). This patch expands the parser to store as many bone weights as are available in the file.
2022-03-17 14:55:26 -04:00
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
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
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
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
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
RichardTea
4a66ec25d0
Standardise Clearcoat, Sheen and Transmission
...
Also cleanup glTFv2 defaults, don't import/export if disabled
2021-06-14 15:11:41 +01:00
RichardTea
4476352882
First pass at simplifying glTFv2 PBR
...
Removed 'core' set of GLTF-specific properties
2021-06-14 15:11:41 +01:00
Kim Kulling
a9b29abee6
Merge pull request #3938 from BaldricS/Fix_SceneCombiner_Texture_Reindexing
...
SceneCombiner memory issues when re-indexing textures.
2021-06-14 15:40:25 +02:00
Kim Kulling
9a851cac7b
Merge branch 'master' into Fix_SceneCombiner_Texture_Reindexing
2021-06-14 14:47:15 +02:00
Kim Kulling
a0388b1727
Merge pull request #3918 from Nodrev/fbx-lights-export
...
Adding basic support for lights in FBX exporter
2021-06-14 14:46:36 +02:00
Evangel
064ffc625b
Const qualify aiMetadata::HasKey
2021-06-14 12:21:29 +10:00
Evangel
3de20af3cc
Renamed glTF2::Object::extensions to customExtensions to avoid shadowing in other subclasses.
2021-06-12 13:16:53 +10:00
Evangel
a7a30baf27
Renamed local variable to avoid shadowing member variable.
2021-06-12 13:08:14 +10:00
Evangel
7f0efa0866
Added ReadExtensions to glTF2::Object, so all objects now have their extensions read.
...
Importer is the only place that needs to be modified to make them available on the Assimp side now.
2021-06-12 12:50:44 +10:00
Evangel
5be2330fbb
Added CustomExtension to glTF2::Object so that all subclasses have it instead of doing it piecemeal.
2021-06-12 12:20:40 +10:00
Evangel
6d413444b5
Merge branch 'master' of https://github.com/Evangel63/assimp
2021-06-12 11:46:20 +10:00
Evangel
36c8cdf3de
Add scene metadata for glTF2 files as allowed by the glTF2 specification.
2021-06-12 11:44:28 +10:00
RichardTea
fbf75963dc
Fix typo
...
Thank you clang!
2021-06-11 15:25:02 +01:00
RichardTea
230f367ef9
Fix glTFv2 texcoord/uv mapping
...
Use the standard property to indicate the UV map index
2021-06-11 15:17:25 +01:00