518d50d2e6
Fixes for Windows/MSYS2
2022-04-07 03:07:57 -07:00
e5747dad9b
First concepts
2022-04-05 20:07:22 +02:00
5c438963c0
Disable correct compiler-warning: unused-function.
2022-04-05 19:59:36 +02:00
97c7ab3c05
Move stb_image header into its own header file.
2022-04-05 19:53:41 +02:00
fa5a8476ee
Fix gcc warning: unused function
2022-04-05 19:04:29 +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
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
0904490150
Merge branch 'master' into issue_4349
2022-03-15 14:11:57 +01:00
b1dc8cfe56
Merge branch 'master' into master
2022-03-15 11:58:45 +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
4457d9300a
Merge branch 'master' into issue_4349
2022-03-14 15:41:20 +09:00
729ab8ae33
Trying to fix reorder error
2022-03-12 08:15:11 +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
e02d51ec24
add ifndef guard for resolve to fails to compile
2022-03-11 10:51:13 +09:00
47f004517f
Add missing cast.
2022-03-10 10:33:29 +01:00
c14eccefaf
Fix 'i >= 0' always true bug
...
If 'disk_filename' does not contain a dot (.) then 'i' would overflow.
Making 'i' an int makes sure the for loop works as intended.
2022-03-09 23:05:47 +01:00
efe92e9ec1
Merge branch 'assimp:master' into master
2022-03-09 10:15:41 -07: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
b35879989c
Added missing ObjMaterial.h to CMakeLists
2022-03-08 20:00:22 -07: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
52b106bf7e
Merge branch 'master' into master
2022-02-20 19:04:32 +01:00
ad766cb738
update the calculation and orthogonalization for bitangent
2022-02-20 17:15:11 +08:00
17123ed4a1
Add support for bump -bm (bump/normal multiplier)
2022-02-17 22:10:46 -07:00
33a48c6ca6
cmake: Fix assimp target install rule fully specifying component
...
This commit ensures generated install rules for the assimp target are
all consistently associated with components named after LIBASSIMP_COMPONENT
or LIBASSIMP-DEV_COMPONENT CMake variables.
It streamlines the packaging of specific components of assimp in client
projects leveraging the CPACK_INSTALL_CMAKE_PROJECTS variable.
Failing to do so leads to "/path/to/assimp-build/code/cmake_install.cmake"
file having install rules associated with a component called "Unspecified".
See https://cmake.org/cmake/help/v3.10/command/install.html#installing-targets
and https://cmake.org/cmake/help/v3.22/module/CPack.html#variable:CPACK_INSTALL_CMAKE_PROJECTS
2022-02-17 05:47:34 -05: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
acf73659d8
fix missing include for size_t
2022-02-08 00:08:46 +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
91737f1cc9
Fix copyright: last year
2022-01-23 21:18:31 +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
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
hgdagon
Kim Kulling
Kim Kulling
xiaohunqupo
Filip Lundgren
Jan Krassnigg
Promit Roy
jaefunk
Sergio Acereda
Jonas Karlsson
Terence Russell
youkeyao
Jaroslav Pribyl
sola
Terence Russell
Jean-Christophe Fillion-Robin
Tomas Maly
Ben Sewell
Jeremy Sigrist
Viktor Kovacs
Jeremy Sigrist
tanolino
Ben Wolsieffer
Alex Rebert
Colin Reeder
Peter Seiderer
Jérôme Leclercq
Vyacheslav Vanin
Garux
Rene Sepulveda
sssaoi