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 |
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 |
RichardTea
|
c86522e552
|
Add glTFv2 Clearcoat import/export tests
Uses Clearcoat model from Khronos
|
2021-06-11 14:34:42 +01:00 |
RichardTea
|
4b4d6b1326
|
Standardise Clearcoat, Sheen and Transmission
Also cleanup glTFv2 defaults, don't import/export if disabled
|
2021-06-11 13:44:52 +01:00 |
ihsinme
|
6dd9ab062c
|
the expression does not throw an exception.
maybe you just forgot this word.
|
2021-06-11 10:56:45 +03:00 |
RichardTea
|
9f9d77f882
|
First pass at simplifying glTFv2 PBR
Removed 'core' set of GLTF-specific properties
|
2021-06-10 18:13:46 +01:00 |
Kim Kulling
|
391d3195df
|
Merge branch 'master' into fbx-lights-export
|
2021-06-10 12:27:14 +02:00 |
Scott Baldric
|
1deacf32be
|
Merge branch 'master' into Fix_SceneCombiner_Texture_Reindexing
|
2021-06-09 15:27:20 -05:00 |
Kim Kulling
|
199aa5dd66
|
Merge pull request #3911 from RichardTea/update_draco
Update Draco to upstream e4103dc
|
2021-06-09 16:34:53 +02:00 |
Kim Kulling
|
fc4ebefaa4
|
Merge branch 'master' into update_draco
|
2021-06-08 23:30:01 +02:00 |
Hill Ma
|
ef739c1703
|
glTF2: Make handling of embedded textures safer.
Previous code does not check whether the embedded texture exists.
|
2021-06-08 12:53:18 -07:00 |
Scott Baldric
|
ca1ab8b11b
|
Merge branch 'master' into Fix_SceneCombiner_Texture_Reindexing
|
2021-06-08 08:18:15 -05:00 |
Kim Kulling
|
c58fe0c98f
|
Merge pull request #3873 from krishty/improve-msvc-switches
enable debug information in MSVC release build
|
2021-06-08 15:09:28 +02:00 |
Hill Ma
|
121c0e7d0c
|
Add GetEmbeddedTextureAndIndex() to aiScene.
It allows the caller to get the index of the embedded texture that is always computed anyway.
|
2021-06-07 21:53:28 -07:00 |