efd1d36aa9
Merge branch 'master' into krishty-new-file-detection
2022-01-18 22:17:50 +01:00
959af1ac4d
Revert change
2022-01-18 21:37:49 +01:00
7350baea93
Revert change
2022-01-18 21:36:55 +01:00
cf47411742
Revert change
2022-01-18 21:36:02 +01:00
1e80630d5d
Revert change.
2022-01-18 21:35:09 +01:00
037732c429
Revert change
2022-01-18 21:34:18 +01:00
cff213d4dd
Revert change
2022-01-18 21:33:05 +01:00
9d0006fecb
Revert change
2022-01-18 21:32:06 +01:00
5af79cac1d
Fix unittests + small refactorings
2022-01-18 21:23:43 +01:00
59f28e168e
Merge branch 'master' into jere9309/read_collada_materials
2022-01-18 09:55:33 -08:00
6e50b04ae0
Merge branch 'master' into IQM
2022-01-17 18:33:37 +01:00
f16e4fadc7
Merge branch 'master' into patch-1
2022-01-17 18:18:16 +01:00
415b0e19d9
Changes for gcc compatibility
2022-01-17 16:39:50 +00:00
65f2353105
IFC Reading: Fix opening reading.
2022-01-17 15:49:11 +00:00
cbde086bfb
Merge branch 'krishty-new-file-detection' of https://github.com/assimp/assimp into krishty-new-file-detection
2022-01-16 20:58:07 +01:00
acd70b35a0
Fix merge issues
2022-01-16 20:57:56 +01:00
6ad7505376
Merge branch 'master' into krishty-new-file-detection
2022-01-16 20:43:57 +01:00
05746acb07
Merge branch 'new-file-detection' of https://github.com/krishty/assimp into krishty-new-file-detection
2022-01-16 20:41:24 +01:00
c8ab39dd04
Merge branch 'master' into common_base64
2022-01-15 23:42:56 +01:00
d3e24196c0
Merge branch 'master' into so-unloading
2022-01-13 20:19:23 +01:00
5aac72791d
Merge branch 'master' into jere9309/read_collada_materials
2022-01-12 10:12:58 -08:00
e671d087e1
Collada: Read all instance_material child nodes
2022-01-12 09:52:12 -08:00
c71f4bc95a
Merge branch 'master' into common_base64
2022-01-11 18:46:08 +01:00
f8abb015de
Merge branch 'master' into patch-1
2022-01-11 09:55:19 +01:00
d68224f2ed
Merge branch 'master' into patch-1
2022-01-10 23:45:03 +01:00
f63b10bf45
OpenGEX: Fix usage of texture specular token
2022-01-10 21:22:44 +01:00
6b9732721a
Merge branch 'assimp:master' into common_base64
2022-01-10 21:15:31 +01:00
50c7301a38
Update copyrights
2022-01-10 21:13:43 +01:00
629c8850ec
Fix imported target include directory
...
Fix the imported target include directory when the headers are not installed in '${CMAKE_INSTALL_PREFIX}/include'.
2022-01-09 20:59:14 -05:00
8cb5ab69b0
Merge branch 'master' into fix-bone-fit-check
2022-01-08 11:35:59 +01:00
776130534b
Fix nullptr-dereferencing
...
- Fix a possible nullptr-exception.
2022-01-06 22:35:32 +01:00
b14b34d2b8
LWSLoader: Fix out of bounds iterator access
...
Fix https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=38947
Fix #4222
2022-01-05 15:43:16 -05:00
310c81aaa2
Add support for spanned archives
...
Without it, assimp would crash on some inputs by jumping to a NULL
opendisk function. This commit adds an opendisk implementation, which
required adding a filename member to ZipFile.
Fix https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=38873
Fix #4229
2022-01-05 15:43:10 -05:00
34d8fba100
Fix stack overflow in ZipArchiveIOSystem::MapArchive
...
The function allocates a filename buffer of 256, and copies the filename
extracted from the zip file into it. However, a filename might be larger
than 256 characters, in which case the function would write out of bounds.
This commit skips any file whose name is larger than 256 to avoid the
overflow.
Fix https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=38870
Fix #4228
2022-01-05 10:01:46 -05:00
089fc7311a
GCC might have an issue with value type Errors
2022-01-05 10:34:27 +01:00
04d2d13172
Locale independent meter scale
...
`XmlParser::getRealAttribute(...)` will call `strtod` (or `wcstod`) which are both locale dependent. So on a German locale system a scale of 0.01 meter will be parsed to 0. In order to avoid that I use the `fast_atoreal_move<ai_real>()` method.
2022-01-05 10:10:38 +01:00
87e9dbac40
Fix bone fitted check in gltf2 exporter
2022-01-03 16:32:34 -07:00
125acf9ec8
Merge remote-tracking branch 'origin/master' into common_base64
2022-01-02 19:47:57 +01:00
bbe12240ca
Move Base64 encode/decode functionality to the common folder.
2022-01-02 19:47:43 +01:00
ab19cff328
Merge branch 'master' into pbr-obj
2021-12-31 08:33:30 +01:00
a86ab45161
Merge branch 'master' into ps-devel-fix-namespace-001
2021-12-31 08:20:24 +01:00
a099fe7cd3
BlenderScene: use explicit namespace instead of using namespace
...
Fixes (using g++ Sourcery CodeBench Lite 2014.05-29 - 4.8.3 20140320):
.../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:101:33: error: specialization of 'template<class T> void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' in different namespace [-fpermissive]
const FileDatabase &db) const {
^
In file included from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.h:49:0,
from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:47:
.../build/assimp-5.1.4/code/AssetLib/Blender/BlenderDNA.h:266:10: error: from definition of 'template<class T> void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' [-fpermissive]
void Convert(T &dest, const FileDatabase &db) const;
^
.../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:121:33: error: specialization of 'template<class T> void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' in different namespace [-fpermissive]
const FileDatabase &db) const {
^
In file included from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.h:49:0,
from .../build/assimp-5.1.4/code/AssetLib/Blender/BlenderScene.cpp:47:
.../build/assimp-5.1.4/code/AssetLib/Blender/BlenderDNA.h:266:10: error: from definition of 'template<class T> void Assimp::Blender::Structure::Convert(T&, const Assimp::Blender::FileDatabase&) const' [-fpermissive]
void Convert(T &dest, const FileDatabase &db) const;
^
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
2021-12-30 18:01:54 +01:00
0a5bd792de
Merge branch 'master' into fix-fbx-metalness-import
2021-12-29 19:08:16 +01:00
81fc50f612
CMake: Replace CMAKE_COMPILER_IS_MINGW by MINGW
...
See https://discourse.cmake.org/t/cmake-compiler-is-mingw-removed/4539 and https://cmake.org/cmake/help/latest/variable/MINGW.html
2021-12-28 15:58:37 +01:00
2da06dd41a
Merge branch 'master' into fix-fbx-metalness-import
2021-12-26 17:31:33 +03:00
d44641398f
Add console progresshandler
2021-12-26 11:16:02 +01:00
d11d2fc60d
fix Inter-Quake Model (IQM) Importer MSVC warnings
2021-12-24 18:36:25 +03:00
db2500c393
MDL: Do not try to copy empty embedded texture
...
- When an embedded texture is empty, skip it instead of trying to copy it. This must fail.
- closes https://github.com/assimp/assimp/issues/4238
- Found from the Google fuzzer.
2021-12-23 12:28:43 +01:00
635153b3a4
LWS-Import: Avoid access to empty string token
...
- Fix invalid access to string pointer when string token is empty
- closes https://github.com/assimp/assimp/issues/4222
2021-12-22 21:08:28 +01:00
2c66d4d3a2
Optimize the check
2021-12-22 20:43:44 +01:00
215f4e1f4d
Fix typo
2021-12-22 20:02:29 +01:00
2eb86d75b8
Make sure no overflow can happen
...
- During UTF32 LE with BOM make sure that the byteswap operation will have enough space when iterating through the text buffer, which shall get encoded.
- closes https://github.com/assimp/assimp/issues/4230
2021-12-22 19:45:19 +01:00
19371af6e6
Support PBR properties/maps in Obj importer
2021-12-20 13:43:46 -05:00
cab7b330ee
Merge branch 'master' into so-unloading
2021-12-20 17:58:18 +01:00
46f618a6ef
add Inter-Quake Model (IQM) Importer
2021-12-18 15:34:58 +03:00
d7bf8d6e07
Fix compile error when ASSIMP_BUILD_NO_X3D_IMPORTER is define.
2021-12-18 14:50:22 +09:00
53968550e4
Merge branch 'master' into fix-fbx-metalness-import
2021-12-17 12:08:55 +03:00
3e97329fa1
Merge branch 'master' into cmake_no_known_features_error_fix
2021-12-16 20:27:58 +01:00
efdaf603b0
Merge branch 'master' into so-unloading
2021-12-16 14:52:58 +01:00
1afe7e6255
fix fbx import metalness
...
Can't import metalness textures in fbx importer
2021-12-16 12:09:06 +03:00
26dc168449
Merge branch 'master' into bugfix/import-crashes
2021-12-15 07:54:48 +01:00
92aef9236f
Fixed cmake error: No known features for C compiler when using the assimp library from another project.
2021-12-14 23:54:36 +03:00
003942aafe
Merge branch 'master' into copyscene_fix
2021-12-13 21:19:08 +01:00
d619f7015a
Merge branch 'master' into copyscene_fix
2021-12-13 20:08:45 +01:00
cb657e4c13
Use correct XmlParser-methods and add some missing casts
2021-12-13 18:06:23 +01:00
54e60b031e
Merge branch 'master' into master
2021-12-12 21:12:37 +01:00
4959924dab
Merge branch 'master' into copyscene_fix
2021-12-10 20:10:25 +01:00
33c6762272
Update HMPLoader.cpp
...
- Fix possible division by zero
- closes https://github.com/assimp/assimp/issues/4235
2021-12-10 14:32:45 +01:00
68682d75b5
Fix nullptr dereferencing from std::shared_ptr
...
- Finding from fuzzer
- closes https://github.com/assimp/assimp/issues/4237
2021-12-10 08:39:21 +01:00
c2297e9199
Revert "FBXConverter : Fix timescales of FBX animations"
...
The previous patch was made by misunderstanding about mTime.
It is not real time value, but time ticks.
This reverts commit b8bf1eac04
2021-12-09 10:57:39 +01:00
d2c8cb755e
Merge branch 'master' into copyscene_fix
2021-12-08 14:29:31 +01:00
e51feac2c5
Update PolyTools.h
2021-12-07 21:19:01 +01:00
1e4861f86e
Fix division by zero in PointInTriangle2D
...
- closes https://github.com/assimp/assimp/issues/4240
2021-12-07 20:45:21 +01:00
2be6bac4b0
Bug: Export crashes when any of the meshes contains texture coordinate names #4243
2021-12-07 20:42:43 +01:00
9a7ee0ac14
Throw a DeadlyImportError rather than an assertion if all materials are redundant and thus removed
...
Closes: https://github.com/assimp/assimp/issues/4224
Closes: https://github.com/assimp/assimp/issues/4225
2021-12-07 12:35:15 +01:00
6e090c88b8
fix index variable for surfaces
...
Closes: https://github.com/assimp/assimp/issues/4209
2021-12-07 12:13:31 +01:00
5b4829155c
Merge branch 'master' into so-unloading
2021-12-04 20:28:12 +01:00
0e2ac2a91c
X3D: simplistic attempt to avoid crashes due to nullptr access
...
Related: https://github.com/assimp/assimp/issues/4201
while the crashes go away, i'm not sure whether this is the correct fix.
also, afaict the X3D importer produces wrong results anyhow
2021-12-01 12:21:29 +01:00
c8cdf3009e
X3D: replace 'here' debugging printout by an assertion.
...
if mNodeElementCur is NULL, we get a crash anyhow...
2021-12-01 12:19:19 +01:00
23d7811276
X3D: consistent initialization with nullptr
2021-12-01 11:35:06 +01:00
836963428e
Fix file-extension check for X3D-files
...
using the pre-existing and well-tested GetExtension() (which happens
to also normalize the extension), rather than attempting our own
buggy one...
Closes: https://github.com/assimp/assimp/issues/4177
2021-12-01 11:17:42 +01:00
834ec20008
Merge branch 'master' into master
2021-11-30 23:44:42 +01:00
d6f3f292f2
Merge branch 'master' into ms-maxvollmer/crashfixes2
2021-11-30 23:17:59 +01:00
4a37aa2ef8
Interpolate euler rotations for quaternion animations
...
FBX uses euler rotation but assimp library's base type is
quaternion. When assimp convert FBX some animation information
can be lost.
This patch interpolates euler-angle rotations and insert
additional keyframes for the FBX format.
2021-11-30 12:49:59 +01:00
095bd67e10
Fix memory leaks in CollectionObject by making ob a weak pointer and removing prev pointer.
...
Something was cyclic in CollectionObject and we don't traverse backwards anyways
2021-11-26 22:09:06 -04:00
e831ecf3c2
Add a separate test case for Blender 276 and update Box.blend to be 293
2021-11-26 22:09:06 -04:00
44fa1ec6a7
Make Blender importer aware of collections, and use them when available. Also add the default startup file for Blender 2.93
2021-11-26 22:09:06 -04:00
0015823bef
Reject files with an invalid byteLength value
2021-11-26 13:01:15 +00:00
38382715f7
Ensure we don't access the vector with an out of bounds index
2021-11-26 13:01:00 +00:00
1a5d66714f
Prevent out-of-range memory writes by sparse accessors
...
This turned up during fuzz testing. Corrupted data would make assimp write to random memory locations, leading to subsequent crashes.
2021-11-25 11:20:26 +01:00
690e558b88
Update IOSystem.cpp
2021-11-25 09:32:52 +01:00
8b78a63b50
Allow dlclose of so library by avoiding unique symbols.
2021-11-23 20:39:48 +01:00
60bfde78eb
Fixed an incorrect indeiciesType in the glTF2 sparse accessor.
2021-11-21 23:23:22 +09:00
9ebd74bd26
Merge branch 'master' into win_dll_so_version
2021-11-20 14:16:32 +01:00
0d857bcf9f
Merge branch 'master' into deprecated_gltfpbr_macros
2021-11-20 12:35:56 +01:00
2ceb18746b
Append '-SOVERSION' to DLL base file name for mingw builds to match common style
2021-11-18 08:17:31 +01:00
74b3be194d
Read the Value, not the Attribute
...
Correct some mistakes made when moving to pugixml from IrrXML
Fixes #4179
2021-11-17 17:10:10 +00:00
bab8b8dbab
apply clangformat
2021-11-17 17:08:19 +00:00
c24f99cd0e
Redefine deprecated glTF-specific PBR material macros
...
Intended to support Qt5 QtQuick3D until it is ported to generic PBR
macros.
2021-11-16 11:42:59 +00:00
b0d564467e
Merge branch 'master' into jdumas/ziplib
2021-11-14 08:25:59 -08:00
78d72bff59
Fix 3MF presence test.
2021-11-14 08:24:27 -08:00
b1c336799c
Merge branch 'master' into master
2021-11-13 09:16:27 +01:00
c3ac5569c5
Merge branch 'master' into jdumas/ziplib
2021-11-13 08:46:46 +01:00
b9937994ca
Fix glTF2 skinning bone weight exporting issue
2021-11-13 12:07:29 +08:00
6e6807ee6c
Verbose processor bone weight count fix
2021-11-13 11:56:15 +08:00
1407491a67
glTF2 exporter buffer overrun issue fix.
2021-11-13 11:52:49 +08:00
57d22e4dbf
Merge branch 'master' into jdumas/ziplib
2021-11-12 10:13:21 -08:00
159fadebbf
Update M3DExporter.cpp
2021-11-12 17:53:46 +01:00
0beacc3854
Merge branch 'master' into kimkulling-diable_m3m_issue-4126
2021-11-12 16:02:51 +01:00
f03dcc27c0
Update M3DExporter.h
2021-11-12 15:39:21 +01:00
e2ccd17494
Fix typo
2021-11-12 11:20:22 +01:00
157e032bde
Fix small findings
...
- Merge anonymous functions into one block.
- Some reformattings
2021-11-12 11:08:19 +01:00
37c81e7a28
Merge branch 'master' into MalcolmTyrrell/jsonSchemaSupport
2021-11-12 10:37:19 +01:00
c22524351a
Merge branch 'master' into master
2021-11-12 09:56:56 +01:00
97b8e41997
Fix formatting
2021-11-12 09:56:45 +01:00
ece61c6c68
Update M3DWrapper.cpp
2021-11-12 09:17:32 +01:00
608bccd9cf
Update M3DWrapper.h
2021-11-12 09:13:48 +01:00
13731b37c4
Merge branch 'master' into 3ds_export_4157
2021-11-12 07:06:52 +01:00
43b0ef181a
Merge branch 'master' into fix_gltf_warning_4126
2021-11-11 20:30:07 +01:00
7120504c46
Merge branch 'master' into fix_aiMesh_abi_4162
2021-11-11 20:02:46 +01:00
eafb79e7dc
Merge branch 'Artenuvielle-x3d_pugi_migration_artenuvielle' of https://github.com/assimp/assimp into Artenuvielle-x3d_pugi_migration_artenuvielle
2021-11-11 19:06:33 +01:00
952f0a53c9
Try to fix a leak
2021-11-11 19:06:25 +01:00
9f28ef4c25
Merge branch 'master' into Artenuvielle-x3d_pugi_migration_artenuvielle
2021-11-10 20:43:39 +01:00
a31c979abc
Use helloworld as X3D-Testcase
2021-11-10 20:40:05 +01:00
8ed18621db
Fixes
2021-11-10 20:37:27 +01:00
39664d608d
Merge branch 'master' into master
2021-11-10 10:51:18 +01:00
b8a10e62f9
Remove optimization fence
2021-11-09 13:08:13 -05:00
86a25b62e4
Better aiMesh ABI compatibility with 5.0.1, make smaller
...
Move new mTextureCoordsNames member to end of struct
Convert to pointer-to-array, saving ~8KB per aiMesh in almost all cases
Add C++ accessor functions for simpler usage
2021-11-09 13:03:06 +00:00
30143e9626
Merge branch 'master' into MalcolmTyrrell/jsonSchemaSupport
2021-11-09 10:53:58 +01:00
aaae3e3a10
size_t is 32bit on some platforms
...
Also assert if size_t is smaller than uint32_t (probably not necessary)
Note: 32bit builds will crash OOM if a really large model is loaded, as cannot allocate that much in total, let alone contiguously.
2021-11-08 15:05:20 +00:00
9433fc526a
Apply clangformat
2021-11-08 14:42:21 +00:00
69cafe64b4
Cap glTFv1 & 2 json size to ~4GB
...
Ensures size_t cannot overflow
Limits the maximum contiguous memory allocation to something plausible.
2021-11-08 14:41:13 +00:00
ee19ce6021
3DS Export: Add support for aiShadingMode_PBR_BRDF
...
Export as Phong.
If no Diffuse texture, export the PBR base color instead,
2021-11-08 11:06:15 +00:00
cedf1819c3
Do not build ziplib when 3MF exporter is disabled.
2021-11-04 01:14:24 -07:00
5a3401b69f
Update D3MFOpcPackage.cpp
...
- Log an error in case of a nullptr-exception in reading out the 3MF-Archive
- closes https://github.com/assimp/assimp/issues/4153
2021-11-02 10:38:38 +01:00
145f972d76
Fix out-of-bounds read in RemoveLineComments
...
Follow up to 6f07e89fdfhttps://bugs.chromium.org/p/oss-fuzz/issues/detail?id=24553
2021-10-30 13:43:41 -04:00
e900617796
Fix out-of-bounds read in FileSystemFilter::Cleanup
...
Fix https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=33238
2021-10-29 09:17:40 -04:00
6f07e89fdf
Fix out-of-bounds read in RemoveLineComments
...
Fix https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=24553
2021-10-28 23:50:16 -04:00
107371657b
Fix out-of-bounds read in ReadFirstSkin
...
Fix https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=25401
2021-10-28 23:12:54 -04:00
1fe9d405f5
Fix out-of-bounds read in MDLImporter
...
Fix https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=24502
2021-10-28 22:38:40 -04:00
932dfe0562
Fix overflowing allocations in MDLMaterialLoader
...
Some allocations might underallocate due to integer overflows. This
commit ensures that we are throwing an exception if the allocation size
does not fit in an unsigned int.
Fix https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=25341
2021-10-28 22:27:19 -04:00
30f17aa206
Fix heap out-of-bounds write in _m3d_safestr
...
While there is a 256 character limit when computing the length of the
newly allocated strength, that limit was missing when copying the
string. This commit adds a new length check in the copy loop, preventing
it from writhing out of bounds.
Fix https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=34416
2021-10-28 21:32:38 -04:00
8c0b869998
Merge branch 'master' into MalcolmTyrrell/jsonSchemaSupport
2021-10-28 13:38:41 +02:00
5af71feef2
Merge branch 'master' into MalcolmTyrrell/spatialSortImprovements
2021-10-27 17:20:47 +02:00
e01b488075
Remove dead code.
2021-10-26 22:06:10 +02:00
2239442c64
Merge branch 'master' into MalcolmTyrrell/spatialSortImprovements
2021-10-21 08:55:11 +01:00
db0127859a
CalculateDistance method
2021-10-21 08:39:44 +01:00
791cb195be
Merge branch 'master' into x3d_pugi_migration_artenuvielle
2021-10-20 21:14:43 +02:00
f3baab1153
Merge branch 'master' into master
2021-10-20 20:51:43 +02:00
c644f9d719
Subtract the centroid
2021-10-20 15:08:08 +01:00
4d10f5d133
Move distance initialization to Finalize.
2021-10-20 12:47:44 +01:00
5b13b97f27
Ensure the usage pattern of SpatialSort.
2021-10-19 14:22:28 +01:00
cff5035b5f
Merge branch 'master' into master
2021-10-19 09:31:19 +02:00
36c937cc19
Merge branch 'master' into debian-fixes
2021-10-18 09:07:47 +02:00
0e3d058504
Add some exporter macros.
2021-10-17 15:10:25 +02:00
a82dc887fc
Merge branch 'master' into x3d_pugi_migration_artenuvielle
2021-10-14 09:27:07 +02:00
a01a5b4e3a
Added missing include
2021-10-09 20:12:29 +03:00
1a9403e787
Fix spelling error in comment in exported Pbrt file
...
See https://github.com/assimp/assimp/pull/4109#issuecomment-934747675
for a discussion that this is really a comment in the exported file,
and thus the fix should be harmless.
2021-10-08 08:55:02 +02:00
3b8126d26a
Fix spelling mistake
2021-10-08 08:48:01 +02:00
ceddfe19d8
Add comment with link to schema repo.
2021-10-07 10:01:32 +01:00
a283a255a5
Allow schema checking of glTF2 file.
2021-10-07 10:01:32 +01:00
0fb66f8437
Replaced AI_MATKEY_IOR with AI_MATKEY_REFRACTI.
2021-10-07 09:39:08 +01:00
b01d008bc0
Revert "Removed KHR_materials_ior support."
...
This reverts commit 0738742611
2021-10-07 09:36:53 +01:00
0738742611
Removed KHR_materials_ior support.
2021-10-07 09:30:22 +01:00
656b0b25d8
Fix warning for array comparison
...
The code previously compared two float arrays with the != operator. This is deprecated in Visual Studio 2019 and results in a warning that leads to an error when compiling with warnings as errors. Small fix to make the build work.
2021-10-05 19:24:42 +02:00
ae951fbef9
Fix aiString length in aiProcess_EmbedTextures
2021-10-03 00:41:09 +02:00
ac6b8988df
Add support for normal maps, the classic way
...
- get compiant to tinyobjloader and other importers
- closes https://github.com/assimp/assimp/issues/3726
2021-10-01 14:24:40 +02:00
1f76b2e6b9
Merge branch 'master' into Q1MDLgroup
2021-10-01 13:36:55 +02:00
addd541251
Added gltf2 KHR_materials_ior support.
2021-09-30 08:47:53 +01:00
d3276de47d
Added gltf2 KHR_materials_volume write support.
2021-09-30 08:10:02 +01:00
200bf8df7a
Added gltf2 KHR_materials_volume import support.
2021-09-29 17:05:17 +01:00
6cb6a6acdd
Merge branch 'master' into const-tokens
2021-09-24 13:37:57 +02:00
95263b2e54
Update ObjTools.h
2021-09-21 11:34:58 +02:00
fb5b5e9d40
Fix possible nullptr dereferencing in material parsing
...
* Return 0.0f for empty buffer
* closes https://github.com/assimp/assimp/issues/3442
2021-09-21 11:06:18 +02:00
79f3368c85
Merge branch 'master' into static
2021-09-17 09:06:16 -07:00
e92177cb99
changed use and def attribute check for x3d importer to upper case
...
This is how it is specified in the standard.
2021-09-17 14:24:57 +02:00
d0f7200196
Update X3DImporter_Geometry3D.cpp
2021-09-16 21:01:44 +02:00
8c84afaff0
Merge branch 'master' into const-tokens
2021-09-15 23:31:00 +02:00
70dfdb8f9d
Merge branch 'master' into x3d_pugi_migration_artenuvielle
2021-09-15 14:51:38 +02:00
a8a6aa2bd8
fixed some compiling issues
2021-09-15 14:49:46 +02:00
880a2f25bb
Merge branch 'master' into remove-useless-code
2021-09-14 23:33:34 +02:00
8a975549a9
Add missing override
2021-09-14 20:49:20 +02:00
0fef0e1101
Move duplicate code to glFT common header.
2021-09-14 20:45:36 +02:00
18531e3677
Next iteration for c++11 features.
2021-09-13 22:38:20 +02:00
c7e9c6580a
Merge branch 'master' into x3d_pugi_migration_artenuvielle
2021-09-12 11:45:00 +02:00
3f6a371b64
migrated x3d importer to pugixml reader
2021-09-12 11:37:33 +02:00
5895c0c22c
more const in format detection
...
BaseImporter::SearchFileHeaderForToken() expected a pointer to a non-const token list. This was probably an oversight, as nobody would realistically expect the function to change the list. Furthermore, it prevented token lists from being compiled to read-only memory, in some cases even causing the compiler to generate thread-safe initialization.
The list is now const and all callers declare their token lists static const, thus compiling them to read-only memory.
2021-09-11 23:23:05 +02:00
4cf4e7454f
removed useless code
...
In destructors, zeroing attributes or clearing containers is utterly useless.
2021-09-11 21:51:20 +02:00
93edbe883f
Use Safe Constants Idioms for ObjFileParser::DEFAULT_MATERIAL.
...
Reference: "A static Class Member" in https://abseil.io/tips/140
2021-09-10 11:56:37 -07:00
0dabce2754
Merge branch 'master' into cleanup_public_header
2021-09-09 20:18:01 +02:00
bc0a2762df
Merge branch 'master' into master
2021-09-09 09:16:50 +02:00
f47479aba4
Rework format + introdule missing C++11 features
2021-09-08 23:19:10 +02:00
3001d88172
Merge branch 'master' into x3d_pugi_migration
2021-09-07 15:04:08 +02:00
768024d5a0
Merge branch 'master' into master
2021-09-07 11:39:34 +02:00
74e8a6a366
Merge branch 'master' into xgl-fix
2021-09-07 09:03:40 +02:00
bf8e36ae28
Fixed typo
2021-09-02 10:07:28 +01:00
72ea80b41f
Revert last change (gltf2::Ref type is not a pointer and has a bool() operator)
2021-09-02 10:00:56 +01:00
d710d0700f
Make nullptr test more explicit.
2021-09-02 10:10:42 +02:00
4c86772091
Added another nullptr safety check
2021-09-02 08:27:03 +01:00
9b535d1c15
Fix Double Precision errors/warnings
2021-08-31 12:59:31 +02:00
155db25883
Merge branch 'master' into ms-maxvollmer/code_improvements
2021-08-31 08:55:47 +02:00
96f0787f51
Fix the -Werror=unused-but-set-parameter warning by removing the skipFirst variable.
2021-08-30 18:15:37 -04:00
51f294c587
Fixes issues our internal compliance and code quality tool found:
...
* Adds nullptr checks and asserts to protect certain code paths
* Fixes wrong integer type in a printf call
* Adds const to const values
* Prevents integer overflow with explicit casts
2021-08-30 14:59:17 +01:00
82d8c4e849
Merge branch 'master' into compressed_json
2021-08-30 10:11:03 +02:00
38c611a02c
Update ColladaLoader.cpp
2021-08-30 08:33:35 +02:00
e2c2a60c45
Remove not used attribute
2021-08-29 18:41:07 +02:00
c9d35b6edc
Remove C++14 feature.
2021-08-29 18:35:44 +02:00
ceafa95610
Remove unused header
2021-08-29 10:36:02 +02:00
5ca2cbb7ae
Fix MinGW build
2021-08-28 20:04:37 +03:00
c9b76f5255
Decrease xml-serializer complexity
2021-08-28 14:20:12 +02:00
df739f00dd
Merge branch 'master' into issue_3398
2021-08-28 13:56:50 +02:00
69051bbc2c
Add missing docu
2021-08-28 13:46:41 +02:00
a7bc858698
Fix review finding.
2021-08-28 13:36:57 +02:00
3e090b21f5
Fix setup of embedded texture loading
2021-08-28 13:33:25 +02:00
b9b62d106c
Merge branch 'master' into compressed_json
2021-08-27 18:18:28 +02:00
b39f38b73c
Add export property for assimp json exporter to write compressed json (without whitespaces).
2021-08-27 18:17:27 +02:00
a45878c41a
Fix possible overrun
...
- closes https://github.com/assimp/assimp/issues/3425
2021-08-27 14:04:00 +02:00
eabfc05bbb
Handle empty keys
2021-08-27 10:41:25 +02:00
6439305379
Remove dead code
2021-08-24 20:53:55 +02:00
61ba320a04
Merge branch 'master' into master
2021-08-24 20:53:04 +02:00
0590a39159
Fix M3D import crash and memory leak.
...
The same default material pointer was assigned to all the materials in the scene, so poor destructor tried to free the same pointer multiple times.
2021-08-24 07:26:20 +02:00
468aa50aed
mingw build fix
2021-08-19 13:50:26 +02:00
f3903e34a4
Merge branch 'master' into master
2021-08-18 07:32:16 +02:00
a486a698e8
Merge branch 'master' into clang13
2021-08-16 21:35:59 +02:00
a850f312ac
Merge branch 'master' into ms-maxvollmer/crash_fixes_08_2021
2021-08-16 21:00:07 +02:00
27231c3f52
Merge branch 'master' into bound
2021-08-16 20:48:17 +02:00
c1e830cf3b
The GLTF2 specs aren't very specific about the restrictions of the number of keyframes in sampler input and output. It seems logical that they should be the same, but there is an official sample model from Khronos where output has more keyframes. I thus assume that the GLTF2 standard allows more keyframes in output, but not in input. Fixed the check accordingly.
2021-08-13 17:46:10 +01:00
de2f5cf021
Crash fixes
2021-08-13 16:26:42 +01:00
4b1ff645e3
closes https://github.com/assimp/assimp/issues/3398 : Add support for embedded textures
2021-08-12 21:13:07 +02:00
26defda671
Merge branch 'master' into master
2021-08-12 08:20:59 +03:00
58cae73401
Disable diagnostic for LogStream comparator
2021-08-11 19:32:26 -04:00
69c152d7c1
Add missing diagnostic push
2021-08-11 18:57:21 -04:00
c3fcbfd2c1
Fix issue of incorrect reading of PBR properties such as base and emissive color in FBX
2021-08-11 08:54:34 +03:00
a16cd95b16
Merge branch 'master' into fix-indent
2021-08-10 21:39:13 +02:00
a55518f6fc
Merge branch 'master' into no-empty-string-literals
2021-08-10 20:41:40 +02:00
89eadb934f
Merge branch 'master' into trim-trailing-whitespace
2021-08-09 21:24:22 +02:00
0aa36ee550
Merge branch 'master' into master
2021-08-07 12:06:23 +02:00
f8fe3d1341
Merge branch 'master' into fix-indent
2021-08-06 09:40:34 +02:00
00b22d1397
Merge branch 'master' into no-empty-string-literals
2021-08-06 09:40:31 +02:00
6cb54d1c95
Merge branch 'master' into trim-trailing-whitespace
2021-08-06 09:40:03 +02:00
408b5053a4
update LWO importer(available lwo3)
2021-08-03 20:18:14 +03:00
8d6d6b48c3
Obj: make a predicate more robust.
...
Since we might encounter invalid input it is a good idea to check the actual
size of the array.
2021-08-02 12:04:15 -07:00
1ee2be8c5c
Merge branch 'master' into trim-trailing-whitespace
2021-07-31 18:01:48 +02:00
00a2cd20f9
Merge branch 'master' into remove-dead-code
2021-07-31 17:00:58 +02:00
bb53961fa9
more range-based for
...
f6b4370f6a7c822f23bd
2021-07-29 14:57:25 +02:00
42a7611f85
style fix: indentation
2021-07-29 14:39:22 +02:00
4991f728c8
style fix – initializing and assigning empty std::string properly
...
for details, see #3764
2021-07-29 14:23:52 +02:00
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
738c31c3ea
removed useless code
...
Found while reviewing #3880
2021-07-28 16:48:53 +02:00
d065513e27
Merge branch 'master' into master
2021-07-28 17:02:28 +08:00
Kim Kulling
Kim Kulling
Jeremy Sigrist
Ben Sewell
Viktor Kovacs
Jeremy Sigrist
tanolino
Ben Wolsieffer
Alex Rebert
Colin Reeder
Peter Seiderer
Jérôme Leclercq
Vyacheslav Vanin
Garux
Rene Sepulveda
sssaoi
rumgot
Inho Lee
IOhannes m zmölnig
Pencil Amazing
Max Vollmer (Microsoft Havok)
Jan Krassnigg
Thomas Nicky Thulesen
ruyo
Ralf Habacker
RichardTea
Jérémie Dumas
Jérémie Dumas
freizhang
Aaron Gokaslan
Malcolm Tyrrell
Malcolm Tyrrell
Lassi Helynranta
diharaw
Marc
Davide Pizzolotto
Hill Ma
René Martin
krishty
Krishty
Hill Ma
Madrich
Doug Roeper
kirillsurkov
Mykhailo Smoliakov
Robert Ubiñas
bearbit
xiaohunqupo