fdfb6e0660
Merge branch 'master' into jakras-progress
2023-10-10 06:20:01 +00:00
666ecd3f1f
Bug Fix:
...
Failed to get floating values (e.g. opacity) from scene material when ASSIMP_DOUBLE_PRECISION is defined, so they are not reflected to output fbx file.
2023-10-08 15:21:26 +00:00
8fcc65a8af
Extension of data export to GLB/GLTF format
...
Allows to export unlimited (more than 4) bones per vertex
Use JOINTS_1,2,.. and WEIGHTS_1,2,...
Added AI_CONFIG_EXPORT_GLTF_UNLIMITED_SKINNING_BONES_PER_VERTEX flag
2023-10-08 14:43:53 +00:00
d7cde43367
Fix: Add check for invalid input argument
2023-10-02 10:41:50 +02:00
aa1996e143
Mosfet80 clipper update ( #5220 )
...
* remove deprecated sprinf
* Update clipper
Updated Clipper to V6.4.2
* Fix the build
* Fix the build
* Disable hunter build
* Fix: Fix hided var.
* Fix invalid use of hunter enabled macro.
* Fix misconfig for hunter
* Disable removing contrib folder
* Update BlenderTessellator.h
* Remove Hunter-based includes
* Refactorings
* Remove final
* Update IFCCurve.cpp
* Update IFCCurve.cpp
---------
Co-authored-by: andrea <realeandrea@yahoo.it>
Co-authored-by: Kim Kulling <kim.kullingk@draeger.com>
2023-09-09 19:29:15 +02:00
8d8a0a5af7
DXF: Support negative index in VERTEX
2023-09-01 18:26:53 +09:00
bfc1207e78
Merge branch 'master' into jakras-progress
2023-08-30 20:51:23 +02:00
e79d105957
Merge branch 'master' into vulcano/export_gltf2_with_roughness_texture
2023-08-29 15:13:43 +02:00
cc2c5d3ae3
Merge branch 'master' into collada-ignore-unit-size-property
2023-08-29 14:01:40 +02:00
4389c3d80c
The texture strength attribute in aiMaterial set when importing and exporting gltf files is inconsistent
2023-08-23 14:54:40 +08:00
d07934bf25
adjust comment
2023-08-18 01:03:49 +08:00
554fa8f5e2
code format
2023-08-18 01:03:49 +08:00
2b4606c082
add fallback strategy for metallicRoughnessTexture
2023-08-18 01:03:49 +08:00
3a03fe31b1
gltf2 export diffuse roughness
2023-08-18 01:03:49 +08:00
32716002ac
Add DIFFUSE_ROUGHNESS_TEXTURE for gltf2 exporter
2023-08-18 01:03:49 +08:00
5c45cdc0ad
Fix Invalid-free in Assimp::FBX::Scope::Scope
2023-08-16 07:45:23 +00:00
d77903423f
Merge branch 'master' into floatwarn
2023-08-15 12:55:37 +02:00
e5d9339c21
Merge branch 'master' into 5513536726761472
2023-08-12 08:05:27 +02:00
d8a7399a04
Merge branch 'assimp:master' into collada-ignore-unit-size-property
2023-08-10 08:10:18 +02:00
b9460dd959
Fix UNKNOWN READ in std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<ch
2023-08-08 16:01:00 +00:00
49ed0711d1
Fix another warning
2023-08-05 15:43:31 +02:00
8312b31d27
fix warning-as-error
2023-08-05 15:39:47 +02:00
bb1873dd22
Collada: added import property to disable unit size scaling
2023-08-04 09:54:55 +02:00
f7e7f82b9d
Add const
2023-08-03 17:10:17 +00:00
d7dc88e0d0
Fix UNKNOWN READ in Assimp::MDLImporter::InternReadFile_Quake1
2023-08-01 13:04:16 +00:00
1e93280f47
Infrastructure for reporting progress
...
This commit adds two classes:
* ProgressTracker
* ProgressScope
The first is for users to implement, and to instantiate when they desire
to get informed about the overall progress.
The second is to be added to all functions that may take a considerable
amount of time, such that they can report back how far along they are.
These are much more convenient to use than the existing ProgressHandler.
ProgressScope is designed such that it only requires "local knowledge"
about upcoming and finished work. Scopes are nested and combined to
form the final global progress.
The active ProgressTracker is stored in a thread_local pointer.
This is a consicius decision since in assimp there is often no 'context'
passed through. The ProgressTracker may be needed anywhere, and it would
be tedious and a huge change to pass it through to every function.
Therefore, using a thread_local variable makes it accessible everywhere,
without a major interface change. Since assimmp is single-threaded,
but may be run in parallel on multiple threads, a thread_local is a
good trade-off, in my opinion.
This change only adds few uses of ProgressScope, to generally show how
it would be used. Also for our use cases these where the most pressing
places to add progress reporting, so this already covers loading from FBX
files pretty well.
2023-08-01 14:06:12 +02:00
dd40b0ccee
Changed #define FBX_FOV_UNKNOWN to const float kFovUnknown
2023-07-23 12:05:01 -07:00
3ec8a36764
Merge branch 'assimp:master' into sfjohnston_mods
2023-07-23 08:37:47 -07:00
37a1366fb7
Add missing rapidjson headers.
2023-07-21 11:33:06 +02:00
64e0ba2625
Merge branch 'master' into sfjohnston_mods
2023-07-20 09:21:13 +00:00
bf38d67935
Fix detection of KHR_materials_specular.
2023-07-13 11:51:56 +02:00
c7afea3cd7
Merge branch 'assimp:master' into sfjohnston_mods
2023-07-10 07:58:21 -07:00
90ff723b6c
Merge branch 'master' into gltf_binary
2023-07-03 21:31:28 +02:00
ed903543a7
Merge branch 'master' into 4879958521806848
2023-07-03 19:50:38 +02:00
093e35dd54
Fix eternal loop
2023-07-03 09:12:00 +00:00
edb8375702
Fix integer overflow
2023-07-03 09:11:38 +00:00
f1561f03ce
Merge branch 'master' into irrfix
2023-07-02 15:10:04 -04:00
0bacc7134d
Remove debugging code, clean up some notes
2023-07-02 14:32:17 -04:00
19da9cc84d
Port mesh loading to pugixml. Untested.
2023-07-02 14:32:12 -04:00
3e1fd74940
Fix up scene loading. pugixml is a breadth-first parser while irrxml is
...
a depth first. This only parses scene structure, no mesh loading yet.
2023-07-02 14:30:54 -04:00
537b445a59
Apply clang-format to files
2023-07-02 14:17:52 -04:00
6f3bfb5b60
Fix memory leak
2023-07-02 14:12:49 -04:00
3838a8aaf8
Fix unknown write in Assimp::ObjFileMtlImporter::getFloatValue
2023-07-02 14:12:49 -04:00
82d3f47432
Unify way to check readable blender files.
2023-06-29 15:10:28 +02:00
2875de132f
Fix compilation on windows.
2023-06-29 08:20:51 +02:00
17fac97b04
Fix magic token usage.
2023-06-29 08:20:51 +02:00
1c0f3c5f87
Fix string length calculation.
2023-06-29 08:20:50 +02:00
a2bdfdd05a
Improve binary check for gltf and gltf2.
...
By checking the magic token we don't depend on the extension any more
and follow the official way to detect a gltf file as binary, see also
https://github.com/KhronosGroup/glTF/blob/main/extensions/1.0/Khronos/KHR_binary_glTF/README.md#header
and https://registry.khronos.org/glTF/specs/2.0/glTF-2.0.html#binary-header .
2023-06-29 08:20:50 +02:00
1ec3dbd11a
Merge branch 'master' into 5093294573486080
2023-06-27 17:04:58 +02:00
f24224fdc5
Merge branch 'master' into SupportOBJSpecifiedOnlyAPartOfVertexColors
2023-06-27 13:44:31 +02:00
Kim Kulling
Kawashima Satoshi
fvbj
Kim Kulling
OGAWA KenIchi
tangxin
zhucan
朱灿
Alex
Martin Weber
Gargaj
Jan Krassnigg
sfjohnston
Marco Feuerstein
PencilAmazing
dog