7ce447294f
I ran into an error while processing colored binary stl. Just a type but
...
better be fixed.
2022-05-24 19:47:24 +02:00
6b0a7a21a4
Store SID in SID field
...
Signed-off-by: Luca Della Vedova <luca@openrobotics.org>
2022-05-23 14:24:56 +08:00
ed3e218550
Bugfix: fix not initialized member attributes
2022-05-21 19:08:43 +02:00
002d6dc016
Inifinite loop on bad import files
...
I had an import file that caused an infinite loop. I don't exactly know how this algorithm works here but maybe we should change it more.
Probably calculate the amount of steps and chop linear.
2022-05-18 15:22:11 +02:00
0f780fe141
Merge branch 'master' into MMD_Fixes
2022-05-12 10:00:00 +02:00
787fcc160a
Clang-Tidy performance fixes
2022-05-11 14:03:45 -04:00
1d3d5c4bb6
Rename TextureTypeToString() to aiTextureTypeToString()
...
Closes: https://github.com/assimp/assimp/issues/4493
2022-05-01 13:27:42 +02:00
64a6968254
Add skeleton generation to aiScene
2022-04-28 21:43:02 +02:00
0afb594f40
Generate container for skeleton during FBX-Import
2022-04-28 21:19:10 +02:00
6cdd1d3cc6
Generate container for skeleton during FBX-Import
2022-04-28 21:12:26 +02:00
1ac9173e8c
Disable assertion tests floating point against inf for Intel oneAPI
...
- closes https://github.com/assimp/assimp/issues/4450
2022-04-28 10:08:01 +02:00
174b2fcf59
Fix invalid use of material reference.
2022-04-27 20:21:30 +02:00
37ec378b60
Fixx out-of-range access in ASE-Parser
...
- closes https://github.com/assimp/assimp/issues/4495
2022-04-27 19:52:23 +02:00
d14bff5a9f
Merge branch 'master' into master
2022-04-24 18:17:33 +02:00
f3c9c7b413
Merge branch 'master' into SmallAllocationFixInFBXLoader
2022-04-22 08:37:58 +02:00
a415f33fb5
merge failure, parts in this file were missing
2022-04-21 16:09:28 +02:00
d3646c3118
Proper destruction of individual objects
2022-04-20 16:11:09 +02:00
2b3c49cb93
All allocation changes
2022-04-20 12:33:39 +02:00
37be87b0bd
Some minor findings
2022-04-19 23:37:16 +02:00
8a1dc87b4c
remove absolute_transform in FBXConverter
2022-04-18 18:10:59 +03:00
e3def37f42
assing absolute_transform to matrix
2022-04-18 17:26:37 +03:00
863e3e0ccb
FbxConverter, bone mOffsetMatrix update
2022-04-18 16:02:17 +03:00
9ab6ebd363
Fix foreach
2022-04-18 04:11:06 +09:00
128242e371
Fix ogre xml serializer
2022-04-18 01:28:03 +09:00
feec92022f
Merge branch 'master' into MMD_Fixes
2022-04-13 21:07:58 +02:00
5ab1be8d04
Fixed deprecated class usage; removed unsupported C++17 feature
2022-04-13 11:38:57 +02:00
f26dc74f21
Fixed MMD Importer not loading files from buffer and enabled unit test
2022-04-13 02:51:12 +02:00
aa814a522d
Merge branch 'master' into obj-pbr-explicit
2022-04-12 11:12:58 +02:00
ae9f5b6fc5
Merge branch 'master' into user/jakras/bitangent-fuzzer-fix
2022-04-12 10:41:43 +02:00
6943e59886
Merge branch 'master' into obj-pbr-explicit
2022-04-08 14:36:57 +02:00
e5747dad9b
First concepts
2022-04-05 20:07:22 +02:00
97c7ab3c05
Move stb_image header into its own header file.
2022-04-05 19:53:41 +02:00
b8658cefe0
Link std_image statically.
2022-04-05 18:48:45 +02:00
88dadd6c40
Merge branch 'master' into patch-3
2022-04-02 11:22:33 +02:00
a050dee096
Fix compile error:When enable macro ASSIMP_DOUBLE_PRECISION
2022-03-31 16:08:39 +08:00
de6e90a657
Fix commit error
2022-03-31 15:36:57 +08:00
2152aae2a3
Fix compile error due to namespace conflicts in VC140.
2022-03-31 15:34:49 +08:00
cc515746f7
Fix v140 compile errror
2022-03-31 14:58:31 +08:00
8e075ce713
Update ObjFileParser.cpp
2022-03-31 14:53:33 +08:00
18c4ebaa13
Fix compile in VC140
2022-03-31 14:28:35 +08:00
4175198d04
Detect Roughness factor exported by Blender
...
Matches the logic used by Blender's own FBX exporter / importer.
2022-03-26 22:33:10 +01:00
537c46a42a
Prevent nullptr access to normals-array in bitangent computation
2022-03-23 15:45:09 +01:00
5ec7e57b99
Merge branch 'assimp:master' into master
2022-03-17 15:00:09 -04:00
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
765b38cf04
Update glTF2Asset.inl
...
Fixing mistakes in attribute names for GLTF. This causes attribute index to not be parsed out correctly (e.g. JOINTS_1) and fails the scene load.
2022-03-16 16:49:45 -04:00
c2b05acaa6
Fix stack-overflow in MDLLoader
...
- Use correct len to copy filename.
- Closes https://github.com/assimp/assimp/issues/4447
2022-03-16 13:59:21 +01:00
552f3a308d
Fix nullptr dereferencing
...
- Check if we have any texture coordinates before calculating them
- closes https://github.com/assimp/assimp/issues/4445
2022-03-16 10:08:20 +01:00
d594e6eea4
Merge branch 'master' into obj-pbr-explicit
2022-03-15 14:30:24 +01:00
68f3386c7b
Merge branch 'master' into metallic-roughness-split
2022-03-15 08:38:38 +01:00
72888c49f6
Merge branch 'master' into parse_obj_anisotropy
2022-03-15 08:13:35 +01:00
26bb601d8f
Fix includes
2022-03-12 08:03:27 +01:00
51e248909f
Avoid setting metallic/roughness/sheen/clearcoat properties when they are not found on mtl file.
2022-03-11 22:29:59 +01:00
26598dc6bd
Forget to save file.
2022-03-09 11:00:05 +01:00
76e10b96fc
Fix missing members and do some small refactorings.
2022-03-09 10:51:37 +01:00
ba379c20e1
Merge branch 'master' into fix/obj_with_bspline_crash
2022-03-06 17:39:57 +01:00
80a8807c47
Fix compiler warnings
2022-03-05 20:37:34 +01:00
d4527d4e87
Merge branch 'master' into master
2022-03-05 14:00:32 +01:00
cfe84b9260
Use generic METALNESS and DIFFUSE_ROUGHNESS texture types
2022-03-03 16:18:25 +01:00
52008ec989
Apply clang-format
2022-03-03 15:42:23 +01:00
9b227fc262
Fix getting anisotropy in obj
2022-03-03 01:01:34 +08:00
62930076af
Merge branch 'master' into fix/obj_with_bspline_crash
2022-02-26 04:03:59 +01:00
c73ff82fc4
FBXConvert::ConvertMeshMultiMaterial: allocate memory using variable count_vertices
2022-02-25 19:58:44 +08:00
72da1e6d7b
Merge branch 'master' into master
2022-02-23 21:20:39 +01:00
6f31254ae1
Ensure dictionary for LazyDics is created before adding content to it
2022-02-23 20:57:15 +01:00
4ddacdb5df
Expose the original OBJ illum model as a material property.
2022-02-22 17:55:41 -07:00
466b34cf53
Merge branch 'master' into kimkulling/fix_ordering_of_gltf2_issue4407
2022-02-22 21:09:11 +01:00
aa04ee89f1
Fix init order to fix build
2022-02-22 21:07:42 +01:00
a6808b868c
Small code cleanup
2022-02-22 21:07:23 +01:00
480d6fee2a
cleanup
2022-02-22 01:46:47 +01:00
62c9347985
fixed obj parsing with cstype
2022-02-22 01:32:41 +01:00
17123ed4a1
Add support for bump -bm (bump/normal multiplier)
2022-02-17 22:10:46 -07:00
9bf5d01469
Fix invalid initialization of constexpr.
2022-02-16 21:22:35 +01:00
9e23d771bc
Fix invalid initialization of constexpr.
2022-02-16 21:19:17 +01:00
76a7614c4b
Adapt ai_epsilon to code
2022-02-16 20:07:27 +01:00
067c5d9ec4
Refactoring: add usage of ai_epsilon to fbx.
2022-02-16 00:17:26 +01:00
5d8e5fd130
Update XFileParser.cpp
...
Fix typo
2022-02-15 16:10:33 +01:00
7c13b16d30
Add missing flush modes supported by zlib
2022-02-14 20:51:06 +01:00
416f823866
Merge branch 'kimkulling/introduce_compression' of https://github.com/assimp/assimp into kimkulling/introduce_compression
2022-02-14 20:25:27 +01:00
c718500c55
Fix last review findings and finish windows bits
2022-02-14 20:25:18 +01:00
9a585d7b3c
Merge branch 'master' into kimkulling/introduce_compression
2022-02-13 19:58:22 +01:00
52b6c4f7c0
Fix broken importer and add some review findings2
2022-02-13 18:44:22 +01:00
3e09d462fa
Fix compression for fbx
2022-02-12 09:25:45 +01:00
23b43d1825
Fix X-Importer decompress algorithm
2022-02-08 21:43:14 +01:00
27bcddfb1a
Migrate more importers to compression class
2022-02-08 20:43:47 +01:00
ce61ea56a5
Merge branch 'master' into kimkulling/introduce_compression
2022-02-07 10:02:51 +01:00
9a15ca1007
LWO: validate enum value before parsing it
...
- Check for valid enum values
- closes https://github.com/assimp/assimp/issues/4236
2022-02-07 09:08:23 +01:00
eb5a7938e0
Remove dead code
2022-02-06 21:16:04 +01:00
9335cc30ab
INtroduce compression class to encapsulate compression via zlib
2022-02-06 20:42:58 +01:00
f217bd4b5f
Update HMPLoader.cpp
2022-01-26 19:42:09 +01:00
305d1f45aa
Add some constants and fix compile
2022-01-26 19:36:38 +01:00
50b00d33b5
HMP: Fix override during copying position data
...
- Fix override
- closes https://github.com/assimp/assimp/issues/4235
2022-01-26 19:22:52 +01:00
06fffb4f83
ASE: Fix warning unreachable code
2022-01-24 20:05:25 +01:00
3e6fc3a64b
Merge remote-tracking branch 'origin/master' into bensewell-fixifcopening4343
2022-01-20 09:43:45 +00:00
c1968823ad
ASE: Fix material parsing
...
- Fuzzer error found when material access get's an out-of-bound access.
- Break parsing when material index gets out of range.
- closes https://github.com/assimp/assimp/issues/4232
2022-01-20 10:25:52 +01:00
cbc4459dda
Fix compile error: missing var
2022-01-19 22:03:11 +01:00
43763f53d6
Fix compile error: missing var
2022-01-19 22:00:53 +01:00
15b08f643a
Fix warning: unused variable
2022-01-19 21:55:24 +01:00
17d5633a5b
Add missing SImpleExtensionCheck
2022-01-19 21:42:14 +01:00
4cb76e6a18
Update UnrealLoader.cpp
2022-01-18 22:29:55 +01:00
12b01dd575
Update SMDLoader.cpp
2022-01-18 22:28:54 +01:00
7b24437f06
Update SIBImporter.cpp
2022-01-18 22:27:19 +01:00
ec63fe74ee
Update RawLoader.cpp
2022-01-18 22:26:16 +01:00
088658b359
Update Q3BSPFileImporter.cpp
2022-01-18 22:25:43 +01:00
b4dee9220d
Update Q3BSPFileImporter.cpp
2022-01-18 22:25:22 +01:00
ffc13f18ba
NFF: reenable canRead
2022-01-18 22:24:11 +01:00
331cb5ac72
Update M3DImporter.cpp
2022-01-18 22:23:01 +01:00
c3b91dd766
C4D. Fix merge conflicts
2022-01-18 22:21:58 +01:00
ea5996307a
Update B3DImporter.cpp
2022-01-18 22:20:37 +01:00
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
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
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
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
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
2da06dd41a
Merge branch 'master' into fix-fbx-metalness-import
2021-12-26 17:31:33 +03: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
19371af6e6
Support PBR properties/maps in Obj importer
2021-12-20 13:43:46 -05: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
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
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
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
6e090c88b8
fix index variable for surfaces
...
Closes: https://github.com/assimp/assimp/issues/4209
2021-12-07 12:13:31 +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
60bfde78eb
Fixed an incorrect indeiciesType in the glTF2 sparse accessor.
2021-11-21 23:23:22 +09:00
0d857bcf9f
Merge branch 'master' into deprecated_gltfpbr_macros
2021-11-20 12:35:56 +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
b1c336799c
Merge branch 'master' into master
2021-11-13 09:16:27 +01:00
b9937994ca
Fix glTF2 skinning bone weight exporting issue
2021-11-13 12:07:29 +08:00
1407491a67
glTF2 exporter buffer overrun issue fix.
2021-11-13 11:52:49 +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
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
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
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
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
e01b488075
Remove dead code.
2021-10-26 22:06:10 +02: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
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
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
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
bc0a2762df
Merge branch 'master' into master
2021-09-09 09:16:50 +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
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
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
f87550fdbc
Fix Issue3760
...
- Convert left-handed coordinate system to right-handed coordinate system
- Rescale model by 0.01
- closes https://github.com/assimp/assimp/issues/3760
2021-07-28 10:39:39 +02:00
8ee2c721d9
StepExporter support polygon mesh
...
StepExporter support polygon mesh
2021-07-28 16:32:27 +08:00
aeae2cf242
Update M3DWrapper.h
2021-07-26 14:44:26 +02:00
e8e720d584
Update M3DWrapper.h
2021-07-26 13:41:54 +02:00
291c0a4faa
Fix build failure
...
- Fix the failure
- Put inlined stuff out of declaration
- Add some docu
2021-07-26 13:13:21 +02:00
df2e7208fb
Fix fuzzer issue in m3d-importer
...
- closes https://github.com/assimp/assimp/issues/3974
- Check for nullptr before dereferencing name in m3d-data-instance.
2021-07-26 11:56:26 +02:00
b7f88f3063
closes https://github.com/assimp/assimp/issues/3957 : checkj for empty positions.
2021-07-26 10:51:16 +02:00
4e28a3072f
Merge branch 'master' into gltf_fixes
2021-07-23 20:37:25 +02:00
e07af07311
Merge branch 'master' into double
2021-07-22 10:07:40 +02:00
d0885af634
Merge branch 'master' into gltf_export_id_issue_3978
2021-07-21 13:47:47 +02:00
30d342534a
Fix issues encountered during integration atempt
2021-07-16 14:29:28 -07:00
5171aa52d1
Remove dead code
2021-07-16 11:47:38 +02:00
aa883eda19
FBX: fix double precision build.
2021-07-15 11:54:55 -07:00
632b2db97c
Ensure glTFv2 scene name is unique
...
Use the provided scene name if extant
Fixes issue #3978
2021-07-14 13:39:41 +01:00
0c6c238956
Merge branch 'master' into collada_makehuman_issue_3984
2021-07-14 11:33:43 +01:00
9c207cd865
Merge branch 'master' into rbsheth_fix_hunter
2021-07-13 20:45:22 +02:00
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
206b2436d4
Apply clangformat
2021-07-13 16:47:31 +01:00
15bbab2d9e
Merge branch 'master' into PLY_RN_LINE
2021-07-12 10:53:00 +02:00
1b37b74f9e
Hunter fixes for stb_image
2021-07-07 17:01:19 -04:00
0a5e49252d
Merge remote-tracking branch 'origin/master' into HEAD
2021-07-07 16:35:29 -04:00
90c115cb3f
Merge branch 'master' into promit/gltf-extras
2021-07-02 00:38:00 -04:00
240eb36980
Merge branch 'master' into master
2021-07-01 19:23:52 +02:00
3cbd31900c
Manage /R/N lines ends correctly on binary files, tested with solidworks PLY export
2021-07-01 17:23:21 +02:00
01930101c7
Merge branch 'master' into master
2021-06-29 20:45:09 +02:00
59ab791a47
Merge branch 'master' into clang-tidy-perf-fixes
2021-06-29 20:24:23 +02:00
7c822f23bd
Added support for custom properties ("extras") in glTF2
2021-06-27 00:53:40 -04:00
e3d54860ec
Merge branch 'master' into master
2021-06-25 18:50:33 -04:00
72075f984e
Merge branch 'master' into master
2021-06-25 19:48:12 +05:30
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
f435ce8c2c
Merge branch 'master' into clang-tidy-perf-fixes
2021-06-24 11:54:56 -04:00
b38b65ff49
Add const
2021-06-24 17:03:00 +02:00
012ce30577
Merge branch 'master' into zero
2021-06-24 17:00:43 +02:00
d18d838812
Fix formatting
2021-06-24 16:18:11 +02:00
8e3a159141
Merge branch 'master' into clang-tidy-perf-fixes
2021-06-23 10:10:28 -04:00
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
e736538df3
Merge branch 'master' into master
2021-06-23 13:45:23 +10:00
24d4be958d
Merge branch 'master' into clang-tidy-perf-fixes
2021-06-22 14:42:51 -04:00
544148a626
Fix code insertion duplication
2021-06-22 14:28:46 -04:00
760953c834
Merge branch 'master' into clean_gltf_pbr_brdf
2021-06-22 20:10:03 +02:00
36815b014b
Update FBXExporter.h
2021-06-22 20:05:16 +02:00
b17c2f29e9
Replace noexcept with proper macro
2021-06-22 12:44:36 -04:00
1650868701
Remove redundant include
2021-06-22 12:32:58 -04:00
94c3abd841
Apply various performance fixes from clang-tidy
2021-06-22 12:27:15 -04:00
951d5158c5
Merge branch 'master' into patch-1
2021-06-22 09:42:30 +02:00
9512e9ac1e
Merge branch 'master' into safe
2021-06-21 17:53:17 +02:00
e27074594f
Replace swear words in IFCBoolean.cpp
...
Add a more gentle comment.
2021-06-16 18:58:41 +02:00
148b8c66a8
glTF2: zero out extra space created by padding.
...
This makes resulting GLB deterministic.
2021-06-15 15:18:20 -07:00
f412595887
Fix typo
...
Thank you clang!
2021-06-14 15:11:41 +01:00
985f3ee665
Fix glTFv2 texcoord/uv mapping
...
Use the standard property to indicate the UV map index
2021-06-14 15:11:41 +01:00
fb039bb9eb
Add glTFv2 Clearcoat import/export tests
...
Uses Clearcoat model from Khronos
2021-06-14 15:11:41 +01:00
4a66ec25d0
Standardise Clearcoat, Sheen and Transmission
...
Also cleanup glTFv2 defaults, don't import/export if disabled
2021-06-14 15:11:41 +01:00
4476352882
First pass at simplifying glTFv2 PBR
...
Removed 'core' set of GLTF-specific properties
2021-06-14 15:11:41 +01:00
3de20af3cc
Renamed glTF2::Object::extensions to customExtensions to avoid shadowing in other subclasses.
2021-06-12 13:16:53 +10:00
a7a30baf27
Renamed local variable to avoid shadowing member variable.
2021-06-12 13:08:14 +10:00
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
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
6d413444b5
Merge branch 'master' of https://github.com/Evangel63/assimp
2021-06-12 11:46:20 +10:00
36c8cdf3de
Add scene metadata for glTF2 files as allowed by the glTF2 specification.
2021-06-12 11:44:28 +10:00
6db142ee51
Merge branch 'x3d_pugi_migration' of https://github.com/assimp/assimp into x3d_pugi_migration
2021-06-10 23:36:47 +02:00
ebb9b1b2af
Next iteration
2021-06-10 23:36:07 +02:00
391d3195df
Merge branch 'master' into fbx-lights-export
2021-06-10 12:27:14 +02:00
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
a8ddc74426
Merge branch 'master' into fix-fbx-exporter2
2021-06-07 18:26:59 +02:00
d33cf1dc0c
Merge branch 'master' into x3d_pugi_migration
2021-06-06 16:06:08 +02:00
e0d1a36523
Merge branch 'master' into stb-image-updated
2021-06-03 23:07:38 +02:00
d600b45cd2
Merge branch 'x3d_pugi_migration' of https://github.com/assimp/assimp into x3d_pugi_migration
2021-06-03 22:21:10 +02:00
3a32612b71
Add skipping of unused nodes.
2021-06-03 20:55:31 +02:00
c8510a1a82
Merge branch 'master' into fix-fbx-exporter2
2021-06-03 11:05:07 +02:00
77ce4080b6
fix viewer in case of unknown primitives.
2021-05-30 21:54:04 +02:00
3b565444c3
Merge branch 'Q1MDLgroup' of https://github.com/Garux/assimp into Q1MDLgroup
2021-05-30 11:55:45 +03:00
c776924adf
fix -Waddress-of-packed-member
2021-05-30 11:45:50 +03:00
09bb79c68a
Merge branch 'master' into issue_3711
2021-05-29 08:39:18 +02:00
7534b149cf
fix non skipped CR in header parsing
2021-05-28 15:28:35 +02:00
70cc1630fa
Merge branch 'master' into fix-gcc4.9-compilation
2021-05-27 15:25:01 +02:00
b59db55b8c
Merge branch 'master' into less-string-bloat
2021-05-26 12:14:08 +02:00
6b8a00dfa1
Merge branch 'master' into wangyi_basisu
2021-05-25 17:17:07 +02:00
b5e54e4d3b
Merge branch 'master' into wangyi_basisu
2021-05-25 16:17:29 +02:00
faeae27923
Merge branch 'master' into importer_fixes_followup
2021-05-25 16:15:09 +02:00
f13515a391
Adding basic support for lights in FBX exporter
2021-05-23 19:12:21 +02:00
6c104e096e
Merge branch 'master' into fix-gcc4.9-compilation
2021-05-23 19:06:28 +02:00
aeaa22cbbd
Merge branch 'master' into UVStreamNames
2021-05-23 14:37:28 +02:00
ac54fe41e2
Merge branch 'master' into PBRsupport
2021-05-23 13:23:06 +02:00
f96e3cde2d
Fix transform chain is applied twice
2021-05-23 00:06:05 +09:00
b7b3c6db7e
Fixing GCC 4.9 compilation issues
2021-05-22 16:57:07 +02:00
28e34878cb
Fix fbx exporter bug if root node contains meshes.
2021-05-22 23:20:34 +09:00
ee85ebbd00
Merge branch 'master' into md3Tuning
2021-05-20 20:25:30 +02:00
4f801a104e
Merge branch 'master' into fix-sib-string-waste
2021-05-20 19:58:11 +02:00
3fa45e6a8c
Merge branch 'master' into sml_doc
2021-05-18 21:18:02 +02:00
e01a6b4276
Add xml doc.
2021-05-18 21:15:48 +02:00
54a27f4514
Merge branch 'master' into MalcolmTyrrell/loggingImprovements
2021-05-17 13:32:02 +01:00
6e4b9d267b
Remove TODO. Typo fix.
2021-05-17 10:29:06 +01:00
4ec01cfdcd
Improve use of logging
2021-05-13 12:05:31 +01:00
22340469f4
Merge branch 'master' into jc3-dnase
2021-05-13 11:51:42 +02:00
ad6f300b1d
Other LogAux functions
2021-05-13 10:43:28 +01:00
7abfd134b6
LogAux warn
2021-05-13 10:33:16 +01:00
5cd3bdd5c2
No need to distinguish formatting log functions.
2021-05-13 10:25:27 +01:00
78145f1425
log verboseDebug
2021-05-13 10:08:59 +01:00
89584c167a
Log debug
2021-05-13 09:56:42 +01:00
b70f195805
Merge branch 'master' into M3DasciiByDefault
2021-05-12 15:31:01 +02:00
58bc4bcb63
log info
2021-05-12 12:55:21 +01:00
813d0aecdd
Adjust warn
2021-05-12 12:43:24 +01:00
7a3c8e5504
Merge branch 'master' into md2orient
2021-05-12 13:07:27 +02:00
f127144f71
Merge branch 'master' into c4d-cineware
2021-05-12 10:57:17 +02:00
8013c5011c
Merge branch 'master' into hl1mdlOrient
2021-05-12 08:21:40 +02:00
ad4ca71e4c
Merge branch 'master' into jc3-dnase
2021-05-12 00:56:46 +02:00
75af93aaa4
Merge branch 'master' into patch-2
2021-05-11 12:12:07 -04:00
4ee2f5f69d
Merge branch 'master' into aseHack
2021-05-11 11:40:24 +02:00
00b625a2ae
[amf] Fix crash when file could not be parsed.
...
Fix double free of mXmlParser (deleted but not reset in ParseFile, then deleted again in ~AMFImporter).
Should probably use a smart pointer instead, though.
---
This change was previously made in 785cca1bb4#3890 , but was lost in a merge.
2021-05-10 19:06:39 -04:00
cb7d3ac598
Merge branch 'master' into jc3-spam-killa
2021-05-10 22:21:13 +02:00
e1a0e16a4e
Merge branch 'master' into jc3-importer-open-error-handling
2021-05-10 22:07:25 +02:00
4807853f09
Merge branch 'master' into mdcOrient
2021-05-10 21:06:15 +02:00
433620350e
Merge branch 'master' into stb-image-updated
2021-05-10 11:30:45 +02:00
f87b180147
Merge branch 'master' into jc3-importer-open-error-handling
2021-05-09 17:02:04 -04:00
b30cbcf117
Merge branch 'master' into jc3-spam-killa
2021-05-09 21:47:17 +02:00
0f85990fe3
Merge branch 'master' into jc3-importer-open-error-handling
2021-05-09 14:42:17 -04:00
5cc05c26a7
Merge branch 'master' into jc3-spam-killa
2021-05-09 14:41:39 -04:00
319770db9d
Merge branch 'master' into jc3-cctype-fixes
2021-05-09 20:37:21 +02:00
a19b708144
support both ktx and ktx2
2021-05-07 16:27:23 -07:00
9a2a0384f4
Merge branch 'master' into patch-3
2021-05-07 17:53:18 -04:00
279e9a186f
Merge branch 'master' into jc3-dnase
2021-05-07 14:49:22 -04:00
6eb15080ec
Merge branch 'master' into jc3-importer-open-error-handling
2021-05-07 14:49:00 -04:00
2fd6102573
Merge branch 'master' into jc3-spam-killa
2021-05-07 14:48:24 -04:00
7b404788a6
Merge branch 'master' into jc3-cctype-fixes
2021-05-07 14:48:01 -04:00
25a0eb0d67
Merge branch 'master' into mdcOrient
2021-05-07 13:03:08 +02:00
8cae8c5461
Fix static code analysis findings
2021-05-07 11:52:16 +02:00
56bfa1ce5c
Make constructros with one arg explicit
2021-05-07 11:36:21 +02:00
2b9d88c943
support basis universal
2021-05-06 15:10:06 -07:00
350f2ea1d3
Fix build and merged master.
2021-05-06 21:36:25 +02:00
52228a93f8
Fix X3DGeohelper.
2021-05-06 21:07:38 +02:00
bc7551b778
Merge branch 'master' into add-step-extension
2021-05-06 14:19:53 +02:00
7da9c42c81
[blender] Disable creation of "dna.txt"
...
Developers who want to enable it can either:
- *Temporarily* set ASSIMP_BUILD_BLENDER_DEBUG_DNA=1 in BlenderDNA.h, or
- *Temporarily* define ASSIMP_BUILD_BLENDER_DEBUG_DNA=1 on the build command line.
Addresses #3886 .
2021-05-05 19:30:29 -04:00
c08ad2e5c2
Merge branch 'master' into jc3-cctype-fixes
2021-05-05 19:04:47 -04:00
de5c8ece6f
[xgl] Fail if file could not be parsed.
...
Fail instead of returning empty scene.
Partially addresses #3888 .
TODO: Propagate XML error detail through exception (depends on #3881 ).
2021-05-05 17:49:10 -04:00
98f586c8d4
[irr] Fail if file could not be parsed.
...
Fail instead of returning empty scene.
Partially addresses #3888 .
TODO: Propagate XML error detail through exception (depends on #3881 ).
2021-05-05 17:48:44 -04:00
470913bf27
[assbin] Fail if file could not be opened
...
Fail instead of returning empty scene.
Partially addresses #3888 .
2021-05-05 17:46:24 -04:00
0d3e8b52be
[sib] Fix assertion failure when file could not be opened.
...
Check result of IOSystem::Open before constructing stream.
Partially addresses #3888 .
2021-05-05 17:32:10 -04:00
a80b3b25eb
[quick3d] Fix assertion failure when file could not be opened.
...
Check result of IOSystem::Open before constructing stream.
Partially addresses #3888 .
2021-05-05 17:31:50 -04:00
e52c297284
[nendo] Fix assertion failure when file could not be opened.
...
Check result of IOSystem::Open before constructing stream.
Partially addresses #3888 .
2021-05-05 17:31:24 -04:00
1cd3752ec6
[ms3d] Fix assertion failure when file could not be opened.
...
Check result of IOSystem::Open before constructing stream.
Partially addresses #3888 .
2021-05-05 17:31:06 -04:00
7f13387487
[cob] Fix assertion failure when file could not be opened.
...
Check result of IOSystem::Open before constructing stream.
Partially addresses #3888 .
2021-05-05 17:30:29 -04:00
116ebf6e10
[3ds] Fix assertion failure when file could not be opened
...
Check result of IOSystem::Open before constructing stream.
Partially addresses #3888 .
2021-05-05 17:30:05 -04:00
816da9b677
merge and update all copies of stb_image.h
2021-05-05 23:15:41 +02:00
785cca1bb4
[amf] Fix crash when file could not be parsed.
...
Fix double free of mXmlParser (deleted but not reset in ParseFile, then deleted again in ~AMFImporter).
Should probably use a smart pointer instead, though.
Partially addresses https://github.com/assimp/assimp/issues/3888 .
2021-05-05 17:13:10 -04:00
f5a31b70f5
Merge branch 'master' into patch-3
2021-05-05 16:24:46 -04:00
992f10e7bf
Merge branch 'master' into remove-useless-scaling-prototype
2021-05-05 21:54:31 +02:00
7ae8a52d9f
Merge branch 'master' into jc3-spam-killa
2021-05-05 10:33:29 -04:00
b82d9f4bc7
Merge branch 'master' into new-file-detection
2021-05-05 15:59:25 +02:00
5325b327c3
Merge branch 'master' into optimize_3mf_strings
2021-05-05 15:12:06 +02:00
153b890b02
Prevent accessing nullpointers
2021-05-05 14:09:43 +01:00
b546dfccc7
fix for 0f3e6e2941
...
Visual Studio’s Search All Files ignores ObjFileImporter.cpp and now I’m sure that’s a bug
2021-05-05 13:14:25 +02:00
f15dcfa981
- Fix model parsing
2021-05-05 13:10:52 +02:00
cbce6d3dad
Merge branch 'optimize_3mf_strings' of https://github.com/assimp/assimp into optimize_3mf_strings
2021-05-05 10:46:54 +02:00
ccd1a4455e
[ply] Fix minor typo in error message.
2021-05-04 21:57:00 -04:00
a03dc4edaa
[amf] Fix minor typo in error message.
...
Added missing space to detail string on parse failure.
2021-05-04 21:56:49 -04:00
f8609c2c2d
[opengex] Direct OpenDDLParser log messages to assimp logger
...
Also filter unprintable characters. Addresses second part of #3862 .
2021-05-04 21:54:14 -04:00
9a04f5d4b0
Fix garbage messages in SIB, MD2, and MDC loaders.
2021-05-04 21:53:16 -04:00
a9fb1e56ae
Add ai_str_toprintable; fixed garbage messages in HMP, MDL, Q3D loaders.
...
- ai_str_toprintable: See docs in StringUtils.h.
- HMP, MDL, Q3D: In particular, newlines in binary data were complicating logging.
2021-05-04 20:33:16 -04:00
c8ad8c6017
[mmd] Remove stderr spam.
...
Removed stderr spam and cleaned up exception text.
Addresses #3865 .
2021-05-04 20:33:16 -04:00
b79b84d34e
Merge branch 'master' into new-file-detection
2021-05-05 00:09:42 +02:00
0f3e6e2941
replaced std::size() with AI_COUNT_OF for pre-C++20 compilers
2021-05-05 00:08:54 +02:00
2925592c64
[assimp] Make sure ctype calls use unsigned char.
...
Cast to unsigned char as required by C++ (see C++ **[cctype.cyn]** -> ISO C99 section 7.4, [see also](https://en.cppreference.com/w/cpp/string/byte/isspace )).
Addresses https://github.com/assimp/assimp/issues/3867 and then some.
2021-05-04 17:31:13 -04:00
072aee7cbe
Merge branch 'master' into add-step-extension
2021-05-04 22:35:21 +02:00
b57ce004f8
reduced FBX string bloat
...
The FBX importer used two std::strings where string literals would have been sufficient.
2021-05-04 22:01:01 +02:00
f3c18556d1
reduced OpenGEX string bloat
...
The OpenGEX importer defined a few global std::string constants, only to convert them back to C strings on use. This commit defines them as C strings from the beginning.
strncmp() was used to compare these strings to other strings, but the length limit was set to string length, which made it equivalent to strcmp(), just slower. Fixed that as well.
2021-05-04 22:01:01 +02:00
7b6dab5e20
reduced DXF string bloat
...
The DXF importer defined a global std::string constant, only to convert it back to a C string on use.
This commit defines the constant as a C string right away, thus saving 340 B of code and data.
2021-05-04 22:01:00 +02:00
2a126f9f62
reduced Ogre string bloat
...
The Ogre importer used std::string where a string literal would have been sufficient. Saves another 600 B of code and data.
2021-05-04 22:01:00 +02:00
e85a69a960
Update D3MFImporter.cpp
2021-05-04 15:31:07 +02:00
4231a86ad8
Merge branch 'master' into fbxBlendshapes
2021-05-04 06:22:22 -07:00
7690f92c81
Fix version of strnlen
2021-05-04 14:48:39 +02:00
ee5170c18a
- fix security issue
2021-05-04 14:40:25 +02:00
9c44c0ab2b
Merge branch 'master' into remove-useless-scaling-prototype
2021-05-04 13:02:00 +02:00
0e17939e8d
Use const char* const
2021-05-04 12:09:38 +02:00
55fd820ed7
use const chars
2021-05-04 10:57:30 +02:00
f91b439f79
preserve UV Stream names in FBX files
2021-05-03 13:40:31 -04:00
e7211790fb
PBR material support
2021-05-03 13:27:52 -04:00
fe5a23e110
fixed bloat in SIB importer
...
The SIB importer, upon needing an empty aiString, did not create a new one but rather copied a predefined global empty string.
Since aiStrings contain large buffers, Assimp copied 1028 B of zeros instead of setting five bytes (at least when compiled with Visual C++). Since aiString is a user-defined type without a constexpr constructor, Visual C++ had to generate a thread-safe run-time initializer as well.
Now it’s just two instructions.
2021-05-03 17:01:59 +02:00
9ae3e88f6c
Merge branch 'master' into fbxBlendshapes
2021-05-03 07:40:25 -07:00
f29828f657
Merge branch 'master' into fix-file-detection
2021-05-02 19:41:33 +02:00
e278673fe7
Merge branch 'master' into 3ds-namespace
2021-05-02 15:08:11 +02:00
e73a2ed5e0
style fix: namespace instead of class with public static members
2021-05-01 23:20:37 +02:00
65a2b98b86
updated C4D importer to use the Cineware SDK
...
Maxon’s Melange SDK has been renamed Cineware SDK as of 21.004, and with it all namespaces and types. This commit
- makes CMake use contrib/Cineware instead of contrib/Melange;
- renames Assimp’s namespace melange to namespace cineware;
- removes useless functions and formatter references from class C4DImporter;
- removes duplicate conversion of cineware::String to aiString in the importer;
- updates comments accordingly;
- updates copyright info.
2021-05-01 18:46:23 +02:00
c2d3d22271
Fix crash in CanRead when file can not be opened.
...
Addresses #3849
2021-05-01 10:58:29 -04:00
78132d666f
Merge branch 'master' into fix-3ds-matrix
2021-05-01 11:34:33 +02:00
eab1c9c3c0
add `AI_CONFIG_IMPORT_MD3_LOAD_SHADERS` bool option
...
the purpose is use of this loader with idtech3 FS
this requires full original material name, which euqals to Q3 shader path
result of deduction is not usable inside Q3 FS at all
option in general is "do not tinker with the path"
2021-05-01 08:14:44 +03:00
813b64ef52
corrected M3D_EXP_NOFACE test
2021-04-30 21:51:02 -07:00
e51bb1e77e
fixed signed/unsigned mismatch warning
2021-04-30 21:26:57 -07:00
694f4c2e34
Merge branch 'master' into M3DasciiByDefault
2021-04-30 21:12:48 -07:00
af0aca796e
now compiling M3D ASCII support by default
...
addresses issue #3777
2021-04-30 21:07:01 -07:00
55abc49d6d
improve md3::Q3 shader::cull keyword support
...
only use nonstandard winding order with `cull back`; might be excess too, since engine doesn't support this
2021-04-30 22:59:05 +03:00
0b7ebef497
fix path separator in md3 shader loading
2021-04-30 22:51:21 +03:00
2feda5b4b2
Merge branch 'master' into md2-mdc-const
2021-04-30 20:10:45 +02:00
149224091f
support missing closing brace in material list after Ascii Scene Exporter v2.51
2021-04-30 10:37:06 +03:00
57091d761e
Merge branch 'master' into md2-mdc-const
2021-04-30 00:56:50 +02:00
0b92abe9b4
Merge branch 'master' into empty-string-style
2021-04-30 00:54:57 +02:00
5298ed8f9e
Merge branch 'master' into fbxBlendshapes
2021-04-29 15:21:16 -07:00
Piroska Gabor
Luca Della Vedova
Kim Kulling
tanolino
Kim Kulling
Aaron Gokaslan
IOhannes m zmölnig
Florian Born
Mykhailo418
Ichiro
RedSkittleFox
xiaohunqupo
Filip Lundgren
Jan Krassnigg
Promit Roy
Promit Roy
Sergio Acereda
youkeyao
Jaroslav Pribyl
sola
Terence Russell
Ben Sewell
Jeremy Sigrist
Jeremy Sigrist
Viktor Kovacs
Alex Rebert
Colin Reeder
Peter Seiderer
Vyacheslav Vanin
Garux
Rene Sepulveda
sssaoi
Inho Lee
IOhannes m zmölnig
Pencil Amazing
Max Vollmer (Microsoft Havok)
ruyo
RichardTea
freizhang
Malcolm Tyrrell
diharaw
Marc
Hill Ma
René Martin
krishty
Krishty
Hill Ma
Madrich
Doug Roeper
kirillsurkov
Robert Ubiñas
bearbit
Adrian Perez
Rahul Sheth
arkeon
Jerome St-Louis
Pankaj003
Pankaj Tyagi
Evangel63
Andreas Buhr
Matthias Möller
Jean-François Verdon
Jean-François Verdon
Jagoon
Malcolm Tyrrell
Jason C
ywang
Jason C
Krishty
kkulling
vfxgordon
Tom spot Callaway
contriteobserver