fe97ff6474
Draco platform libraries have different names
...
On Windows it's draco.dll/lib
On Linux/macOS draco_shared.dylib & draco_static.lib
2021-01-26 17:19:41 +00:00
c917e6513f
Merge branch 'master' into issue_2195_draco
2021-01-26 16:43:46 +00:00
f39ba8ddb2
Add compile error for bad error draco config
...
KHR_draco_mesh_compression requires
DRACO_MESH_COMPRESSION_SUPPORTED
2021-01-26 16:24:18 +00:00
dde7605158
Implement draco decoding
2021-01-26 16:08:12 +00:00
3a7d0f5656
Add Draco to cmakelists
...
Initial pass. Not yet used.
Add Draco library to assimp build and link
2021-01-26 15:58:14 +00:00
d7bf513250
renaming iterator to avoid any possibility of scop collisions
2021-01-26 01:36:12 -08:00
69fc809307
size_t is not the same as unsigned int on some systems
2021-01-26 01:01:59 -08:00
f92a34e0b7
Merge branch 'master' into ColladaSubmeshFix
2021-01-26 00:38:37 -08:00
243d017463
Add missing skip
...
- closes https://github.com/assimp/assimp/issues/3601
- Fix some format issues
2021-01-24 18:47:50 +01:00
a2b889ab09
Fix typo in collada parser
...
closes https://github.com/assimp/assimp/issues/3599
2021-01-24 18:21:46 +01:00
6ebae5e67c
GCC 11 build fixes
2021-01-24 11:04:46 +02:00
338abded12
ColladaLoader now assigns individual materials to submeshes as needed
...
Optional assignment of individual materials to submeshes, addresses #3606
2021-01-23 02:20:58 -08:00
5f50e42535
added missing return
2021-01-23 09:56:35 +09:00
f8c512acd7
changed morph anim error to warning when validating
2021-01-23 09:52:46 +09:00
91dc904ed1
Merge branch 'master' into master
2021-01-22 13:25:31 -08:00
e792455d66
Remove redundant statement in if
...
- closes https://github.com/assimp/assimp/issues/3180
2021-01-22 14:22:34 +01:00
dc4514de82
Update COBLoader.cpp
...
Fix cppcheck finding
2021-01-22 13:23:39 +01:00
0dcd72d420
Update IFCOpenings.cpp
2021-01-22 13:18:43 +01:00
f44572157a
Update 3DSLoader.cpp
2021-01-22 13:14:59 +01:00
f2d3f0dbe6
Merge branch 'master' into master
2021-01-22 12:35:44 +01:00
b3a35364ad
Merge branch 'master' into master
2021-01-21 13:38:21 -08:00
2bcf08370d
Merge branch 'master' into fix-gltf-vertex-colors
2021-01-21 11:54:02 +01:00
d7cf7847ba
Merge branch 'master' into master
2021-01-20 18:47:39 -08:00
01e61c8b9f
customized node transformation format
2021-01-20 18:42:56 -08:00
4e0c4d7bb7
Update PbrtExporter.h
2021-01-20 21:11:14 +01:00
11a17ebfe6
Merge branch 'master' into tdb/pbrt3_exporter
2021-01-20 20:03:30 +01:00
8ba1d38dea
Fix STL Expoter error.
2021-01-20 16:29:30 +08:00
f8dd3a9aa6
Update DefaultIOSystem.cpp
2021-01-20 08:05:43 +01:00
ed3e745752
Update DefaultIOSystem.cpp
2021-01-19 21:58:04 +01:00
f05a57560b
Remove buggy method.
2021-01-19 21:27:50 +01:00
22f632d8d0
Merge branch 'master' into kimkulling-oss_fuzz29168
2021-01-19 21:21:28 +01:00
5b325af79f
Fix typo.
2021-01-19 21:19:42 +01:00
5a6498af92
Fix nullptr access
2021-01-19 21:14:38 +01:00
4008862a35
Merge branch 'master' into ihsinme-patch-210
2021-01-19 21:05:43 +01:00
8f5148f108
Merge branch 'master' into tdb/pbrt3_exporter
2021-01-18 17:15:40 -08:00
0bc5cf9fd3
Fix build failure on Linux
2021-01-18 16:17:28 -06:00
5a7f212162
Merge branch 'master' into ihsinme-patch-210
2021-01-18 21:55:42 +01:00
f24c042925
Fix typo
2021-01-18 20:28:38 +01:00
0803e5e6f3
Fix nullptr dereference in scenepreprocessor
2021-01-18 20:25:33 +01:00
17c79bcb94
Merge branch 'master' into tdb/pbrt3_exporter
2021-01-15 13:47:21 -08:00
6d13fd6aa2
Fix glTF vertex colors with types other than float
2021-01-15 02:56:45 +00:00
a9705e346a
Merge branch 'master' into ihsinme-patch-210
2021-01-14 17:21:44 +01:00
87a6305cf0
Merge branch 'master' into gltf2_buffer_fixes
2021-01-12 18:32:17 +01:00
ff8d50c8d0
Fix MSVC compiler warnings
2021-01-12 08:23:53 -08:00
09c5564d5b
More compiler warnings
2021-01-12 08:16:08 -08:00
1fd8646b7a
Fix compiler warnings
2021-01-12 08:03:16 -08:00
070072370d
Update AMFImporter_Material.cpp
2021-01-12 15:43:40 +03:00
2e96366d04
Update AMFImporter_Geometry.cpp
2021-01-12 15:40:19 +03:00
9174bca3f7
closes https://github.com/assimp/assimp/issues/3517 : use const instead of constexpr
2021-01-12 10:01:53 +01:00
1042845414
Merge branch 'master' of https://github.com/assimp/assimp into tdb/pbrt3_exporter
2021-01-11 19:57:10 -08:00
71cfd8e0cf
Merge branch 'master' into tdb/pbrt3_exporter
2021-01-11 19:54:11 -08:00
2bc074e35a
Additional PBRT exporter cleanups
2021-01-11 19:42:23 -08:00
d49aed4585
* Check that buffer view has buffer
...
* Handle integer overflow when calculating byte length
* Minor code cleanup for exception messages
2021-01-11 08:45:47 +00:00
938537c884
Checkpoint improvements to pbrt exporter
2021-01-08 16:57:22 -08:00
cf78781fa8
Merge branch 'master' into 3mf-improvements
2021-01-02 13:14:13 +01:00
3298082a96
Merge branch 'master' into update-unzip
2021-01-02 12:06:53 +01:00
07aace0fdd
Merge branch 'master' into dev/gltf-KHR_materials
2020-12-31 07:08:31 +01:00
465220b26a
Merge branch 'master' into 3mf-improvements
2020-12-30 18:12:26 +01:00
e0803b3ec2
Merge branch 'master' into fix-gltf-bin-from-memory
2020-12-30 11:17:31 +01:00
b8d947299a
Merge branch 'master' into dev/gltf-KHR_materials
2020-12-29 17:09:15 +01:00
37df38f951
[3MF] Improves node naming
2020-12-29 15:46:28 +01:00
4025c57fd0
[3MF] Parse the transform of the components
2020-12-28 15:47:20 +01:00
eda967bd02
Parse the <build> node + refactoring
2020-12-28 12:31:54 +01:00
07b59f539d
Merge branch 'master' into dev/gltf-KHR_materials
2020-12-28 08:48:54 +01:00
ca653e0c6a
Fix glTF from memory loading .bin with a custom IOHandler
2020-12-28 07:18:50 +00:00
eed75aaf2c
Remove debug print
2020-12-26 14:57:52 +01:00
0ec8d6e285
[3MF] Missing file in previous commit + parse object material in the importer
2020-12-26 14:04:45 +01:00
0952038461
Small refactoring on 3MF export
2020-12-26 03:02:18 +01:00
c10d592b79
Fix material parsing in the 3MF importer
2020-12-26 02:36:24 +01:00
77f9c2854a
Merge branch 'master' into fbx_tokenizer_fix
2020-12-25 21:44:26 +01:00
3f5238d7c1
Merge branch 'master' into gltf2_fixes
2020-12-24 16:48:36 +01:00
effe52368c
No need to allocate a full size buffer for small files
2020-12-24 12:18:07 +01:00
895137c7d7
Fix unzip max buffer length error
2020-12-24 11:39:59 +01:00
54be7ac582
Update unzip contrib
2020-12-24 01:53:40 +01:00
dbffe25c9d
Merge branch 'master' into dev/gltf-KHR_materials
2020-12-23 11:33:04 +01:00
383c97e380
Add KHR_materials_transmission during export
2020-12-23 10:43:21 +01:00
2b097c1e73
Add KHR_materials_transmission during import
2020-12-23 10:43:01 +01:00
197bf1e617
Add KHR_materials_clearcoat during export
2020-12-23 09:56:15 +01:00
f8c63d874b
support KHR_materials_clearcoat during import
2020-12-23 08:12:09 +01:00
b4b011e764
Merge branch 'master' into master
2020-12-22 11:11:45 +01:00
50f9fb28b6
Merge branch 'master' into fix-casting-mingw
2020-12-21 18:29:18 +01:00
aa9d6ce7b7
add support for khr_materials_sheen during export
2020-12-21 14:34:16 +01:00
0fdda99ea1
add underscore (MATERIAL_SHEEN instead of MATERIALSHEEN)
2020-12-21 14:33:35 +01:00
63b0a97369
import KHR_materials_sheen
2020-12-20 07:59:12 +01:00
981923821a
Merge branch 'master' into gltf2-exporter-crash
2020-12-18 16:27:06 +01:00
4e5b25cd81
Keep AnimMesh data during the SortByPTypeProcess
...
A Postprocessing step, SortByPTypeProcess, can rebuild Mesh data,
but it does not handle AnimMesh.
This patch helps to rebuild appropriate AnimMeshes for the Mesh.
2020-12-16 19:19:30 +01:00
b8bf1eac04
FBXConverter : Fix timescales of FBX animations
...
FBX animations were recorded by framenumber, not by time.
This patch will change it as a base of milliseconds.
2020-12-16 15:02:46 +01:00
a15adc9fbc
Fixed copypaste error
2020-12-14 17:01:42 +00:00
9d3c0081eb
Throw if property length is out of bounds
2020-12-14 16:49:04 +00:00
1db51503d8
Throw instead of assert on invalid file input
2020-12-14 16:44:56 +00:00
5436e16802
* Fix memory leak in GLTF2 Importer that occurs when an exception gets thrown while constructing a scene
...
* Fix crash in GLTF2 Importer when a scene with dangling/uninitialized pointers gets deleted after an exception was thrown
* Fix crash in GLTF2 Importer when channel sampler is not set (negative index)
2020-12-14 16:37:02 +00:00
4e9176d2cd
_dest may be destructed twice if _dest is not null in MergeScenes()
2020-12-14 19:16:29 +08:00
922f874e78
Merge branch 'gltf2-exporter-crash' of https://github.com/JLouis-B/assimp into gltf2-exporter-crash
2020-12-13 17:03:09 +01:00
d18fce3f06
Fix https://github.com/assimp/assimp/issues/3054
...
Corrected the animation of each bone of an animation were exported in different animations (+tabs fixes)
2020-12-13 17:02:50 +01:00
33e7e2366c
Merge branch 'master' into gltf2-exporter-crash
2020-12-13 16:48:40 +01:00
c65f2cb3fb
Remove extra semicolon while GCC being pedantic.
2020-12-13 00:12:44 +05:30
e2af015a57
Common: Fix GCC error invalid conversion in MINGW.
2020-12-11 21:43:09 +05:30
7dd0596010
Merge branch 'master' into 3dsMax2021PbrMaterials
2020-12-11 14:31:00 +01:00
a2adef8726
Merge branch 'master' into add-msvc-check
2020-12-11 14:11:10 +01:00
8701a86c9d
Fixed a crash of the Gltf 2 exporter in the case of an animation without a translation, rotation or scale animation key.
2020-12-10 23:47:54 +01:00
e4a1fb171e
Merge branch 'master' into master
2020-12-09 17:58:18 +01:00
6db5b7046f
Provide option for rapidjson no-member-iterator define
...
Originally added to fix warning on MSVC but breaks android build
2020-12-09 20:21:43 +09:00
816bbc852c
Merge branch 'master' into master
2020-12-08 19:54:04 +01:00
c0d7ea981a
Merge branch 'master' into gltf_fixes
2020-12-04 16:02:16 +01:00
eccdc6dc96
Merge branch 'master' into master
2020-12-04 15:30:56 +01:00
5020a0aa33
Merge branch 'master' into fbxExceptionSafety
2020-12-04 11:01:56 +01:00
e737adde50
Merge branch 'master' into gltf_fixes
2020-12-04 08:58:52 +00:00
f67a9f253f
Merge branch 'master' into 3dsMax2021PbrMaterials
2020-12-03 22:20:01 +01:00
c7aeb882e6
Update ScenePreprocessor.cpp
2020-12-03 17:28:51 +01:00
471d2acc92
Improvements & style
2020-12-03 11:17:45 +00:00
c5f45e26bd
Merge branch 'master' into scenepreprocessor-memoryleak
2020-12-03 10:08:05 +01:00
19af3f0d31
Swap the meaning using the out_mat property.
2020-12-02 16:59:29 +00:00
8d8ba521e2
Check _MSC_VER for MSVC specific pragma directives.
...
This fixes build issues when compiled with compiles like Clang or GCC.
2020-12-02 02:05:14 +05:30
f7be3048de
New 3ds Max PBR Materials in FBX
2020-12-01 12:05:42 +00:00
b47c5c8c27
glTF2Exporter: fix crash when exporting a scene with several meshes per node (regression coming from commit e8d2b84 on 08/03/2020 "clean all warnings for vs-2019")
2020-11-30 20:11:41 +01:00
53ff0702ce
Fixed check for base64 char values
2020-11-30 16:21:29 +00:00
7d72c78c8e
Some improvements
2020-11-30 15:20:51 +00:00
6ed1488e6e
* Improved error messages
...
* Throw instead of asserts on invalid file input
2020-11-30 15:04:06 +00:00
4d4a3c42f6
Fix for 3489 | Preserve morph targets when splitting by bone count
2020-11-28 10:01:50 -08:00
88be8ec698
Merge branch 'master' into fbxExceptionSafety
2020-11-27 21:49:58 +01:00
149b8d1fd1
Don't need operator< either.
2020-11-27 14:26:51 +00:00
14f79caf41
textures_converted keys can just be pointers
2020-11-26 16:29:37 +00:00
ea60563822
Merge branch 'master' into scenepreprocessor-memoryleak
2020-11-26 08:57:57 +00:00
4590f06756
Merge branch 'master' into master
2020-11-25 16:57:49 +01:00
c059e58c5e
Merge branch 'master' into fbxparser-overead
2020-11-24 08:36:15 +01:00
fe78310486
Merge branch 'master' into fbxExceptionSafety
2020-11-23 10:08:23 +01:00
98e42e22b8
Added check around setting pScene->mName from asset.scene.
2020-11-22 15:49:41 +10:00
30584c1ec1
Replaced name with scene_name to avoid shadowing.
2020-11-22 15:36:08 +10:00
67abcb10ba
Added mName to aiScene. Primarily to provide access to the "name" member of glTF2 scenes.
2020-11-22 15:33:31 +10:00
885a196c74
Unsigned
2020-11-19 16:30:44 +00:00
8108338215
Merge branch 'master' into master
2020-11-19 16:34:15 +01:00
fc842a0f97
Sceneprecessor potential memory leak
2020-11-19 13:20:43 +00:00
7b59cc297e
FBXParser.cpp - handle buffer over-read cases correctly
2020-11-19 12:20:06 +00:00
d10bf9a0d3
Merge branch 'master' into master
2020-11-18 21:30:58 +01:00
e3083c21f0
glTF2: import correct animation values for CUBICSPLINE
...
CUBICSPLINE interpolation has tangent values with the animation data.
Current import don't care this interpolation type but it will help not
to fetch tangent values instead of animation data.
Note: Assimp cannot support interpolation types yet.
2020-11-17 17:21:07 +01:00
c00153089a
Neater construction
2020-11-17 10:45:10 +00:00
213a9f9d55
First pass at PotentialNode
2020-11-17 10:39:03 +00:00
c4573a6d5c
Merge branch 'master' into findDegeneratesOptimization
2020-11-17 09:44:13 +00:00
c4ba5eeeea
Merge branch 'master' into issue_3500
2020-11-16 21:52:14 +01:00
3221522f95
Prevent crash with malformed texture reference
2020-11-16 17:29:19 +00:00
d9b90f714a
Fix typo
2020-11-16 11:06:39 +00:00
3ce0958b98
Merge branch 'master' into findDegeneratesOptimization
2020-11-16 09:13:13 +00:00
09ca11d063
Fixing issue 3500, invalid outer cone angle readed from gltf2 file on machines which defines M_PI as a double value
2020-11-16 09:19:13 +01:00
647cef8a8b
Merge branch 'master' into nullBufferviewFix
2020-11-15 19:02:09 +01:00
0d5e5790cb
Fix findings.
2020-11-14 12:44:49 +01:00
db7e594221
Merge branch 'master' into findDegeneratesOptimization
2020-11-14 12:32:57 +01:00
8845d7eed3
Prevent to generate redundant morph targets for glTF2
2020-11-11 20:49:22 +01:00
fa0951012f
closes https://github.com/assimp/assimp/issues/1044 : fix envelope handling in lightintensity.
2020-11-11 20:32:55 +01:00
707ad68fba
Merge branch 'master' into findDegeneratesOptimization
2020-11-11 09:54:08 +01:00
ab34b25a03
Merge branch 'master' into kimkulling-patch-8
2020-11-10 15:32:04 +01:00
8c91d1a3cd
closes https://github.com/assimp/assimp/issues/3198 : make aiMaterial::GetName const.
2020-11-10 12:50:17 +01:00
a8381113eb
Update ObjFileMtlImporter.cpp
2020-11-10 10:23:28 +01:00
856d4c016e
closes https://github.com/assimp/assimp/issues/3448
...
Add transmission alpha value. if any.
2020-11-10 10:03:09 +01:00
0f246edb97
Prevent GetValue from corrupting memory
2020-11-06 13:43:16 +00:00
34e3e6293a
Style
2020-11-06 09:57:48 +00:00
0af05e7a60
Better message
2020-11-05 15:10:52 +00:00
01b2088dd3
A missing bufferview was causing a crash.
2020-11-05 15:02:41 +00:00
6873d79505
Delete AMFImporter_Postprocess.cpp
2020-11-03 13:00:28 +01:00
3deae8760c
Optimize FindDegenerates so it doesn't explode
2020-11-02 14:43:35 +00:00
206f28b8ad
Merge branch 'master' into fix/3365
2020-10-29 13:40:00 +01:00
72bc41b50f
Merge branch 'master' into fix/xcode-compile-20201018
2020-10-28 22:00:08 +01:00
8c135f779e
Merge branch 'master' into readFbxWeightsInConfig
2020-10-28 20:38:29 +01:00
3fd95aff4e
Merge branch 'master' into fix/3365
2020-10-27 17:43:28 +01:00
df768bdd99
Merge branch 'master' into patch-1
2020-10-27 16:20:33 +01:00
7e1a8f09c5
more openddl-fixes
2020-10-26 21:35:44 +01:00
aee2e9a87d
Merge branch 'master' into patch-1
2020-10-25 20:35:06 +01:00
57e691e28e
openddl: latest greatest.
2020-10-25 10:34:43 +01:00
55feb0cb78
Merge branch 'master' into fix/xcode-compile-20201018
2020-10-23 22:06:49 +02:00
4006bb71f4
Fixes for crashes in GLTF2 Importer
2020-10-23 12:01:43 +01:00
cea54d1ac5
Merge branch 'master' into fix/xcode-compile-20201018
2020-10-23 14:06:25 +08:00
6ee5e248ee
Fix typo
2020-10-22 22:26:29 +02:00
b168d8f441
replaced data with taking address of first element
...
oops, seems like `data()` returns `char*` only since C++17. Replaced with taking address of first string element
2020-10-21 23:41:33 +03:00
7781fe5781
MSVC crash workaround
...
I do not know why, but the following line causes crash if assimp was compiled using MSVC with RelWithDebInfo configuration:
`std::transform(shading.begin(), shading.end(), shading.begin(), Assimp::ToLower<char>);`
replacing `shading.begin()` with `shading.data()` fixes this issue.
2020-10-21 23:21:50 +03:00
b842b4a3c1
Merge branch 'master' into fbxReportAssetIssuesProperly
2020-10-21 20:02:48 +02:00
bbac168ced
Merge branch 'master' into collada_cleanup
2020-10-19 23:56:52 +02:00
69143ed149
fix unittests.
2020-10-19 23:53:27 +02:00
080322b9e2
cleanup collada xml migration.
2020-10-19 19:06:11 +02:00
a2cd5619b4
Merge branch 'master' into readFbxWeightsInConfig
2020-10-19 10:16:02 +01:00
d48ac9d0a4
fix xcode compile bug
2020-10-18 10:54:04 +08:00
ad7f8910e9
Rollback the method to handle empty bones for GLTF2
...
A patch made the assimp to ignore empty bones.
However, some assets can have bones which don't have weights
but are connected to other bones.
2020-10-16 17:09:17 +02:00
9f880e2214
Fix glTF1 orthographic camera
2020-10-16 08:56:55 +02:00
0363c18f1f
Read weights
2020-10-15 10:07:24 +01:00
3b5212067c
Fix CMake config generation
...
Use standard CMake function to generate the CMake config files.
2020-10-14 23:55:28 +02:00
7660070aa4
Merge branch 'master' into master
2020-10-14 21:01:35 +02:00
857f62cde0
closes pParam.mReference = source;
2020-10-14 20:34:46 +02:00
6848a18999
Fix for issue #3445
...
Add const to avoid creating a temporary copy.
This should fix the cmake compilation error on XGLLoader.cpp shown in bug #3445
The fix is similar to commit bbe6f7f213
2020-10-13 21:56:43 +03:00
84ef3dc0fc
Merge branch 'master' into fbxReportAssetIssuesProperly
2020-10-13 18:37:03 +02:00
f12e6eb6f4
Update Hunter for pugixml
2020-10-12 16:30:03 -04:00
636f28965f
Merge branch 'master' into fbxReportAssetIssuesProperly
2020-10-11 18:13:43 +02:00
eb9928e029
fix for fbx files using stringray materials;
2020-10-09 07:28:15 +01:00
20733537d7
Merge branch 'master' into fbxReportAssetIssuesProperly
2020-10-08 09:54:04 +01:00
152343b186
Merge branch 'master' into master
2020-10-06 08:35:26 +05:30
52826a03f8
remove all hunter-dependencies for pugixml.
2020-10-05 18:53:42 +02:00
23f144a7b7
pugixml: use pugixml in headeronly mode.
2020-10-05 18:44:59 +02:00
4bdaf20b70
Add comment.
2020-10-05 14:23:42 +01:00
f2b3ec2e0c
strict-aliasing level 3 warnings fix
2020-10-05 15:29:09 +05:30
585fb89154
Make an assert a DeadlyImportError.
2020-10-02 15:25:16 +01:00
6b9c477763
The floar parsing routines are now DeadlyErrors.
2020-10-02 13:58:55 +01:00
b6dde74155
adaptions to support hunter
2020-10-01 16:35:34 +02:00
d75fa2bb4b
fix invalid path.
2020-10-01 10:43:48 +02:00
c740f61f97
hunter integration: pugixml
2020-10-01 10:29:52 +02:00
c7f7ed8901
Update ColladaLoader.cpp
2020-09-30 20:51:54 +02:00
0191c661b5
fix division by zero.
2020-09-30 20:39:26 +02:00
177426185e
Fix invalid cast
2020-09-30 16:38:13 +02:00
50d21e08f3
fix memoy leak.
2020-09-30 12:05:32 +02:00
788099a223
Merge branch 'master' into pugi_xml
2020-09-29 21:29:37 +02:00
c591f7de2f
make xml parsing more verbose.
2020-09-29 21:01:10 +02:00
db49a541c3
remove unused attributes.
2020-09-28 20:35:30 +02:00
ef9a78b49d
remove unused attributes.
2020-09-28 20:34:44 +02:00
effccfe2e6
Remove dead code.
2020-09-28 15:23:26 +02:00
bf4ad2837f
Remove dead code.
2020-09-28 15:20:59 +02:00
69822fd5e6
remove pugixml from hunter
2020-09-28 10:23:25 +02:00
c598a12340
Remove unused variable.
2020-09-28 09:15:56 +02:00
89ac168014
ogre: fix warning: not inited variable.
2020-09-27 21:23:55 +02:00
1c85676a9c
collada: fix warning: not inited variable.
2020-09-27 21:19:23 +02:00
052cc2e070
collada: fix warning: not inited variable.
2020-09-27 21:16:51 +02:00
5038f21d06
collada: fix warning: not inited variable.
2020-09-27 21:14:21 +02:00
202907d471
collada: fix warning: unused variable.
2020-09-27 21:11:42 +02:00
3f97a1df2c
collada: fix warning: unused variable.
2020-09-27 21:09:06 +02:00
bdd3c96eee
amf: fix warning: unused variable.
2020-09-27 21:06:14 +02:00
5877f81419
amf: fix warning: unused variable.
2020-09-27 21:03:59 +02:00
5230b91611
amf: fix warning: unused variable.
2020-09-27 21:01:48 +02:00
8143ea5aec
amf: fix warning: unused variable.
2020-09-27 20:58:08 +02:00
9a19a4723b
amf: fix warning: unused variable.
2020-09-27 20:54:21 +02:00
5653a82a87
fix the unittests.
2020-09-27 20:20:44 +02:00
9234fee35e
Ogre: fix xml migration.
2020-09-27 09:36:38 +02:00
a3c8cfc0ff
Fix for build break due to warnings-as-errors when not building M3D exporter.
2020-09-26 23:21:23 -07:00
d6892b3f58
Merge branch 'master' into pugi_xml
2020-09-25 21:00:09 +02:00
557273818d
collada: next iteration.
2020-09-23 21:23:12 +02:00
34351b3cb9
fix collada material parsing.
2020-09-23 00:20:06 +02:00
c0e58c1895
Merge branch 'master' into gltfBufferViewSizeFix
2020-09-22 20:02:16 +02:00
71f20eaa8a
next fixes
2020-09-22 15:51:21 +02:00
dee8e5bee1
Merge branch 'pugi_xml' of https://github.com/assimp/assimp into pugi_xml
2020-09-22 15:20:35 +02:00
c4039d5cf0
fix collada data parsing.
2020-09-21 20:05:16 +02:00
8c88526da8
fix collada unittests.
2020-09-21 16:39:24 +02:00
c9fb21661f
Merge branch 'master' into gltfBufferViewSizeFix
2020-09-18 08:01:24 +01:00
354e09e785
Merge branch 'master' into rbsheth_hunter_rapidjson
2020-09-17 14:39:04 -04:00
338c0b753c
Merge branch 'master' into collada_animation_ticks_per_sec_issue_3162
2020-09-16 21:43:35 +02:00
9c1edaee96
Merge branch 'master' into gltfBufferViewSizeFix
2020-09-16 10:08:47 +01:00
14d6141f69
Collada: fix scenenode parsing.
2020-09-14 21:35:36 +02:00
9e2c4e0cf4
Merge branch 'master' into rbsheth_hunter_rapidjson
2020-09-14 09:00:11 +02:00
0e9621012c
Adapt code style - finally :-).
2020-09-14 08:43:31 +02:00
1ff9e2b522
Adapt code style.
2020-09-14 08:40:21 +02:00
23defc275a
Merge branch 'master' into makeInternalErrorsAccessible
2020-09-14 08:36:13 +02:00
d0932c405f
fix duplicated node parsing.
2020-09-11 15:46:46 +02:00
c1f50e116a
fix next unittests.
2020-09-11 00:46:29 +02:00
31f3812241
XGL: fix import of node values.
2020-09-10 21:03:02 +02:00
6ec07e4dc7
XGL: next steps.
2020-09-10 17:31:30 +02:00
cca9eddb1c
Fix material-base AMF-unittest.
2020-09-10 13:56:04 +02:00
615ffdf93f
What: Throw instead of assert when input file is invalid.
...
Why: Assimp shouldn't crash on invalid files. Asserts are disabled on Release builds.
2020-09-10 10:47:58 +01:00
d854f3b842
AMF: fix adding for child-nodes.
2020-09-10 00:05:53 +02:00
bd91033172
Merge branch 'master' into collada_animation_ticks_per_sec_issue_3162
2020-09-08 20:53:00 +02:00
0618db1f99
AMF: some smaller refactorings to improve readability.
2020-09-07 20:52:46 +02:00
f3b25b999b
Fix an unreferenced formal parameter warning on MSVC when no exporter is built
2020-09-05 23:20:31 +02:00
ef6b93a949
Merge branch 'master' into collada_animation_ticks_per_sec_issue_3162
2020-09-04 16:27:47 +02:00
689406fbda
Fix Colladat import.
2020-09-04 07:33:10 +02:00
78b30d1752
Merge branch 'master' into rbsheth_hunter_rapidjson
2020-09-03 09:51:32 -04:00
be5089ae40
Collada: correct parsing of float data in xml nodes.
2020-09-02 22:38:19 +02:00
075540e15a
AMF: fixes.
2020-09-02 22:37:57 +02:00
0b8ed5c03a
fix crash when x3d is empty
2020-09-02 21:49:40 +02:00
34f343233e
3ml: fix xml parsing.
2020-09-02 21:49:20 +02:00
87d2580aad
fix 3mf rel-parsing
2020-09-02 17:45:37 +02:00
9053dfea05
add missing define to glTF importer
2020-09-02 16:28:12 +02:00
73fa2cbe88
Fix memory handling of xml-nodes in the parser.
2020-09-01 21:48:50 +02:00
638499a278
Replace unique_ptr and add custom deleter
2020-09-01 10:30:31 -06:00
3c2133a3b9
fix node collection for collada xml parsing
2020-09-01 07:51:17 +02:00
e62b4e5cce
next iteration.
2020-08-31 16:10:38 +02:00
6d5c388780
Introduce node iterator.
2020-08-30 21:10:04 +02:00
dcf9a7b2d8
Conform variable names to code standards
2020-08-29 23:58:31 -06:00
953e976de6
Close stream when finished
2020-08-29 23:56:50 -06:00
cc2613f264
Replace unique_ptr with raw pointer
2020-08-29 23:06:33 -06:00
c769f8d4ad
Replace unique_ptr with raw pointer to avoid destructing stream
2020-08-29 22:21:34 -06:00
30a4eae17f
simplify some ttributes access in loaded xml.
2020-08-28 16:25:22 +02:00
0730eebe6f
fix collada handling of xml nodes.
2020-08-28 16:17:56 +02:00
3c98197be0
set aiAnimation->mTicksPerSecond to 1000.0. this is analog to the behaviour of gltf2-importer
2020-08-28 16:09:15 +02:00
b7e9595e54
fix loop of xml-files.
2020-08-28 00:09:51 +02:00
59c8b4ed84
Move RapidJSON definitions to CMake
2020-08-27 16:51:06 -04:00
582a8b1887
Fix xml-migration bild.
2020-08-27 17:05:09 +02:00
c359b973bb
finish migration of collada.
2020-08-26 22:31:46 +02:00
904f17f29f
next collada-iteration
2020-08-24 07:44:54 +02:00
7adfe1f2d8
Xml: introduce helper for attribute parsing.
2020-08-21 06:45:30 +02:00
8f893e3653
Actually, just keep the old behaviour for now.
2020-08-20 14:32:15 +01:00
cb631517a7
next iteration.
2020-08-19 22:44:13 +02:00
9b5e758bdd
Even simpler DeadlyErrorBase
2020-08-19 17:59:13 +01:00
6f9c61e157
Use case which matches surrounding code.
2020-08-19 17:57:25 +01:00
6c2ceb55f8
Simplify some FBX error code.
2020-08-19 17:20:57 +01:00
d393f677ce
Collada: next methods migrated.
2020-08-19 17:10:30 +02:00
56381241c5
move hasAttribute to XmlParser scope.
2020-08-19 00:19:56 +02:00
554ed1bf91
next step.s
2020-08-18 20:44:06 +02:00
0f6127e90e
No need to build strings.
2020-08-18 18:21:20 +01:00
e1a0163e7e
Make all exceptions available.
2020-08-18 18:14:51 +01:00
b7c789da67
Stop concatenating std::strings. Use formatter.
2020-08-18 17:35:08 +01:00
6a8edb21f8
fix merge issues
2020-08-18 17:41:37 +02:00
0ffcdf160e
Build formatting into DeadlyImportError
2020-08-18 16:32:34 +01:00
7e93ae4428
3MF: Migration.
2020-08-18 16:54:29 +02:00
829ff1adf0
Maybe this will help.
2020-08-18 10:33:47 +01:00
b1ed751b83
Provide an API for accessing internal errors.
2020-08-18 10:33:42 +01:00
0d00ff7043
use ai_real instead of float
2020-08-15 14:57:49 +02:00
729882debb
Fix incorrect index
...
closes https://github.com/assimp/assimp/issues/3364
2020-08-11 19:57:36 +02:00
394651e640
x3d: migration of goups.
2020-08-10 22:13:45 +02:00
11daed69d3
Fixed overwriting of CMake global output directory variables.
2020-08-07 16:04:39 -04:00
13d7fad7f7
closes https://github.com/assimp/assimp/issues/2992 : add single or double precision + missing compilers.
2020-08-07 14:23:07 +02:00
58bf23be55
Merge branch 'master' into issue_3353
2020-08-05 18:03:26 +02:00
b94183376c
Fix possible overflow in new.
2020-08-05 17:56:44 +02:00
1f348c5fc0
Remove redundant float f
2020-08-04 20:55:29 +02:00
aabf12827b
fix typo
2020-08-04 17:52:43 +02:00
855b47452e
Export opacity is 3DS
...
closes https://github.com/assimp/assimp/issues/3291
2020-08-04 17:41:28 +02:00
e7ae576614
undo change
2020-08-03 15:54:19 +02:00
435bba30dd
Move functions into the correct preprocessor branch
2020-08-03 09:30:02 +02:00
008e551f8e
Merge branch 'master' into fbxVersionCheck
2020-07-31 14:33:21 +02:00
0282f358a4
Remove unneeded check.
2020-07-31 12:40:17 +01:00
301bae3967
Improve message
2020-07-30 16:37:41 +01:00
eaf0587dd8
FBX Version/Size Check
2020-07-30 14:56:01 +01:00
3170c3d15c
FBXExport: Fix crash if scene->mMetaData is null
2020-07-30 09:21:43 -04:00
58b81a2590
start migrating X3D.
2020-07-26 10:17:21 +02:00
ad18e365e5
Fixing more warnings
2020-07-24 16:33:36 -04:00
c7a9ef30cc
Merge branch 'master' into fix-mingw-priumax
2020-07-24 11:14:15 +02:00
0f442b1ff2
Merge branch 'master' into gltfIndexOutOfRangeFix
2020-07-23 11:27:34 +02:00
a33557be71
Merge branch 'master' into acloader_enums
2020-07-22 23:50:51 +02:00
76a6bb36f6
Merge branch 'master' into issue-3332_msvc2017
2020-07-20 22:04:35 +02:00
51e592123a
Fix two deletions.
2020-07-20 18:42:57 +02:00
a19e4e4112
Make clang with msvc abi work.
2020-07-20 18:28:50 +02:00
13ee2306c3
build/clang-cl-windows
2020-07-20 17:04:11 +02:00
9cad10a995
Disable MSVC warnings on all MSVC
...
Fixes the build on MSVC 2017 (and probably MSVC 2015)
2020-07-17 14:58:51 +01:00
f2e3e43fbc
Merge branch 'master' into acloader_enums
2020-07-17 11:30:50 +01:00
17b9403b7a
ACLoader: Use enum for Surface flags
2020-07-17 11:23:50 +01:00
b2e53783de
Merge branch 'master' into fix-mingw-priumax
2020-07-17 12:07:46 +02:00
fa486240d5
Merge branch 'master' into rbsheth_update_hunter
2020-07-17 11:39:55 +02:00
719cc82a1f
Apply clangformat
2020-07-17 10:29:44 +01:00
516bdc2a4b
Merge branch 'master' into master
2020-07-16 22:48:02 +02:00
deddaf49df
finish migrate ogrexmlserializer.
2020-07-16 11:33:28 +02:00
df8792d24b
Merge branch 'master' into gltf1_gltf2_split
2020-07-16 10:45:55 +02:00
84e68eaf24
fix invalid pointer for bone animation
2020-07-16 15:26:02 +09:00
04df5f8b1e
Don't use make_unique
2020-07-15 15:47:25 +01:00
e1bab44e19
Exception safety
2020-07-15 15:02:27 +01:00
37e1fb9cd7
Fix message
2020-07-15 14:19:13 +01:00
f3170a96ba
Ensure data does not depend on faces we may not have created.
2020-07-15 12:36:48 +01:00
fff6396e3c
Rename to avoid overloading problems.
2020-07-15 12:22:28 +01:00
212903e935
Unit test for all indices out of range, and fix.
2020-07-15 12:19:00 +01:00
c0d978786e
Fix warning
2020-07-15 09:12:52 +01:00
a56134ba33
Drop faces when indices are out of range.
2020-07-15 09:05:09 +01:00
638369e995
Try to fix lexing issue with preproc w/r/t __has_warning
2020-07-14 21:58:36 -05:00
cc8cd88d7a
Preproc conditional should be &&, not ||
2020-07-14 21:50:22 -05:00
bad0df9a1a
Remove unnecessary inversion in preproc
2020-07-14 21:48:46 -05:00
b3f61f8759
Fix error where -Wunused-but-set-variable might not be available
2020-07-14 21:44:33 -05:00
3bf6963d20
Use a better divider for import error
2020-07-14 21:34:30 -05:00
93d567e3b1
Fix sprintf format string
2020-07-14 21:32:22 -05:00
700d8e6614
Fix MinGW builds (issues related to pragmas and format strings)
2020-07-14 21:19:07 -05:00
abc6b9ce4c
ifdef fixes to fix MSVC warnings
2020-07-14 19:00:38 -04:00
209a61d0e7
Update hunter and utf8cpp inclusion
2020-07-14 19:00:23 -04:00
84e342acd7
DefaultIOStream: Remove assert on empty count
...
fwrite() is valid to call with a 0 count, and will simply return 0.
See:
https://en.cppreference.com/w/cpp/io/c/fwrite
http://www.cplusplus.com/reference/cstdio/fwrite/
There are code paths where StreamWriter will call Tell(), which calls
Flush(), which calls Write(buffer.data(), 1, buffer.size()). This can
happen when nothing has yet been written to the buffer, so size is 0.
2020-07-14 10:39:18 -04:00
b19ebf5d54
Fix merge conflicts.
2020-07-14 09:02:14 +02:00
8cfd2a4cc1
Migrate OgreSerializer.
2020-07-14 09:00:06 +02:00
f5d5d7c5ed
Merge branch 'master' into master
2020-07-13 20:35:24 +02:00
0c2f7a119c
FBXExporter: Forgot WritePropColor defaultValue
2020-07-13 13:56:06 -04:00
6619ec8253
FBXExporter: Use scene metadata for global settings
...
Models with non-standard axes and scale are not imported and exported
correctly if the input metadata is ignored.
2020-07-13 13:56:06 -04:00
78d0b81b6c
Merge branch 'master' into patch-1
2020-07-12 18:54:34 +02:00
eaac92830a
Merge branch 'master' of https://github.com/LoicFr/assimp into LoicFr-master
2020-07-12 12:05:34 +02:00
b1dd77fbbc
Merge branch 'master' into gltf2_sparseAccessor_export
2020-07-11 22:57:31 +02:00
306e03d497
Merge branch 'master' into extras_property_callback
2020-07-11 22:46:19 +02:00
21678df589
ogre + collada migration.
2020-07-10 22:25:38 +02:00
628394baec
check for invalid vertex
2020-07-07 23:29:54 -04:00
9aa468262f
closes https://github.com/assimp/assimp/issues/3252 : fix build.
2020-07-07 17:35:03 +02:00
6c29247180
add triangle strip support to AC file loader
2020-07-06 17:41:14 -04:00
fb11705dd0
Merge branch 'master' into gltf1_gltf2_split
2020-07-06 09:11:06 +01:00
abf43eaf74
* Added ASSIMP_BUILD_NO_GLTF1_IMPORTER, ASSIMP_BUILD_NO_GLTF2_IMPORTER, ASSIMP_BUILD_NO_GLTF1_EXPORTER, and ASSIMP_BUILD_NO_GLTF2_EXPORTER to allow disabling GLTF1 and GLTF2 independently.
...
* ASSIMP_BUILD_NO_GLTF_IMPORTER and ASSIMP_BUILD_NO_GLTF_EXPORTER remain with same behavior as before
2020-07-05 19:22:31 +01:00
d04f8b3174
Merge branch 'master' into defsIncludeFix
2020-07-05 18:59:37 +02:00
77b705048b
fix merge issues.
2020-07-04 13:42:23 +02:00
839986ca14
next step of AMF-Migration.
2020-07-04 09:04:06 +02:00
3fb7747429
Improve ToBinary() for double precision.
...
The constant 0x80000000 is specific to 32 bit types. Make the bit mask
according to the size of types.
2020-07-03 18:14:45 -07:00
d74c10dcb7
Merge branch 'master' into pugi_xml
2020-07-03 17:29:38 +02:00
51150cb3df
Ensure asserts are defined where expected.
2020-07-02 14:53:29 +01:00
693da43095
closes https://github.com/assimp/assimp/issues/3305 : remove merge issue.
2020-07-02 15:22:06 +02:00
b1369d0912
next steps.
2020-07-02 15:18:59 +02:00
7fda533484
Merge branch 'master' into double
2020-06-30 21:12:02 +02:00
97085c1c05
update sync
2020-06-30 11:48:37 -07:00
36f899bf09
sync update
2020-06-30 11:45:11 -07:00
3f2e5518eb
update sync
2020-06-30 11:29:08 -07:00
03340787ec
Fixed variable in loop - HL1MDLLoader.cpp
...
Commit 7e5a0acc48
2020-06-29 07:50:51 -04:00
eeb4a981bd
Merge branch 'master' into patch-2
2020-06-29 09:55:55 +02:00
30f09e9fc0
Fix build when ASSIMP_DOUBLE_PRECISION is on.
...
Tested:
$ cmake -DASSIMP_DOUBLE_PRECISION=1 -DASSIMP_BUILD_MDL_IMPORTER=0 ..; make
The MDL importer is disabled due to the fact that there is some float-only code
in MDL. This also means bin/assimp and bin/unit would not link successfully with
the above build flags.
2020-06-28 17:36:21 -07:00
fb20e15163
start to migrate colladat and amf
2020-06-27 15:57:06 +02:00
6d85280c8d
Added bool, removed unused debug parameter
2020-06-27 12:53:26 +10:00
f6b4370f6a
Added arbitrary recursive metadata to allow for glTF2's extensions to be properly represented.
...
Primary changes are to include/assimp/metadata.h, adding in the aiMetadata GetAiType function,
adding the operator= to allow an aiMetadata type to be assigned, adding a check for the
AI_AIMETADATA type flag as it can't be trivially memcpy'd.
operator= is implemented with a by-value argument as then the copy is made by the copy
constructor and we can just swap everything out and let the destructor handle the mess.
Implemented parsing of the "extensions" flag on all glTF2 Nodes. Doesn't use the ReadValue
helper function on numbers as it did not seem to fill out the Nullable structure properly.
2020-06-26 14:28:41 +10:00
b7b38c2282
Merge branch 'master' into patch-2
2020-06-25 16:52:40 +02:00
ba6af9ff98
Merge branch 'master' into FindInvalidData
2020-06-25 16:41:24 +02:00
95e822a6ec
Merge branch 'master' into aiAssertHandler
2020-06-24 20:47:10 +02:00
1466bbacf8
fix unittests.
2020-06-24 20:30:02 +02:00
ae05dbb252
define CheckValidFacesIndices also in release builds.
2020-06-23 21:11:18 +02:00
6205af4efb
replace NULL and avoid ai_assert with more than 2 tests.
2020-06-23 21:05:42 +02:00
9188f56839
Allow assert handling to be replaced.
2020-06-23 11:55:51 +01:00
5717ea466f
FindInvalidDataProcess: Mark removed meshes as "out"
...
There's a code path where an input scene only has a single mesh.
In this case, if ProcessMesh returns 2, we delete the mesh and move on
with the postprocessing. UpdateMeshReferences is not called and so the
deleted mesh is left dangling in nodes.
In a later step (SplitMesh in my testing), it then tries to deference a
null pointer and we explode.
With `out = true`, we can now hit the DeadlyImportError instead of a
segfault.
2020-06-22 17:24:16 -04:00
2006286528
Fix Maya PBR & stingray texture detection
2020-06-22 23:14:16 +02:00
ba09e1ef94
Fix Blender .fbx metalness detection
2020-06-21 23:56:11 +02:00
6397bfbf90
replace NULL by nullptr on loadFile.
2020-06-21 12:03:38 +02:00
6acaaee80f
Check invalid vertex id for bone weight
2020-06-20 15:27:28 +09:00
b3af5c5a14
closes https://github.com/assimp/assimp/issues/3253 : remove useless code
2020-06-17 20:37:39 +02:00
524e2e4728
fix warning, hopefully ...
2020-06-15 21:34:49 +02:00
31b8d4710f
Merge branch 'master' into issue_3165
2020-06-15 20:32:00 +02:00
15f11aec93
Merge branch 'master' into gltf2_targetNames_export
2020-06-14 09:43:09 +02:00
RichardTea
contriteobserver
Kim Kulling
Ville Voutilainen
Bart Sekura
thomasbiang
ywang
xiaohunqupo
Matt Pharr
Dan Church
Maki
ihsinme
kkulling
Max Vollmer
Danny-Kint
Jean-Louis
Danny-Kint
Danny Kabrane
Inho Lee
wasd845
Biswapriyo Nath
tellypresence
Max Vollmer (Microsoft Havok)
Malcolm Tyrrell
FRICOTEAUX
Oleg Bogdanov
Neil Clifford
Evangel
Neil Clifford
Malcolm Tyrrell
Jean-François Verdon
Kim Kulling
John Mai
#Momo
john
Silvio Traversaro
Jukka Maatta
Rahul Sheth
Sahin Serdar Kocdemir
Optimizer0
Isuru2000psn
Sherief Farouk
rahulshethsc
Fabian Schmidt
Denis Blank
Gargaj
Joshua Hyatt
lsliegeo
Marc-Antoine Lortie
Ryan Styrczula
MeyerFabian
Kota Iguchi
awr1
Ryan Styrczula
Robert Reif
Hill Ma
Evangel
Filip Lundgren