855b47452e
Export opacity is 3DS
...
closes https://github.com/assimp/assimp/issues/3291
2020-08-04 17:41:28 +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
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
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
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
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
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
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
d74c10dcb7
Merge branch 'master' into pugi_xml
2020-07-03 17:29:38 +02:00
b1369d0912
next steps.
2020-07-02 15:18:59 +02:00
97085c1c05
update sync
2020-06-30 11:48:37 -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
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
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
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
b3af5c5a14
closes https://github.com/assimp/assimp/issues/3253 : remove useless code
2020-06-17 20:37:39 +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
f938a6b744
fix leak: just ignore broken texture coordinates.
2020-06-12 14:52:02 +02:00
1e0c5f26b4
Merge branch 'migenius-migenius-fix-texcoord' of https://github.com/assimp/assimp into migenius-migenius-fix-texcoord
2020-06-12 12:30:11 +02:00
ad62e6e863
fix unittest check - cannot work, just crash shall not occurr any more.
2020-06-12 12:29:51 +02:00
f67c71d5c7
Merge branch 'master' into fbx_blendshape_channelName
2020-06-12 10:55:32 +02:00
e65434bf82
extra callback
2020-06-11 17:37:06 -07:00
f57e7221c0
temp
2020-06-10 13:23:29 -07:00
ffaa634c48
Merge branch 'master' into issue_3165
2020-06-09 10:48:27 +02:00
620bebb999
diable warning only for gcc 8.0 or greater
2020-06-09 10:14:57 +02:00
42afc40d16
Disable warning only for gcc 8.0 or greater
2020-06-09 10:13:43 +02:00
35fb4c9370
Remove dead code
2020-06-09 10:07:25 +02:00
5c7bed01f1
remove dead code.
2020-06-09 10:06:50 +02:00
9e46f9751f
Check for invalid texture coordinate accessor. Fixes #3269 .
2020-06-09 15:49:38 +10:00
8fed101432
avoid all zero
2020-06-08 16:18:11 -07:00
f18f1a35f6
accommodate linux build
2020-06-08 14:49:50 -07:00
2065512470
remove comments
2020-06-08 14:41:53 -07:00
12dc736d94
Merge branch 'master' of https://github.com/thomasbiang/assimp into gltf2_sparseAccessor_export
2020-06-08 14:32:23 -07:00
26421aebc9
support channel name in blendshape name
2020-06-08 13:33:16 -07:00
b37d42f6b5
Perform sanity check only in debug
...
closes https://github.com/assimp/assimp/issues/3255
2020-06-07 18:03:47 +02:00
e6446e1e68
Merge branch 'master' into issue_3258
2020-06-07 08:23:04 +02:00
2c0df39ef3
Added rapidjson define to avoid warnings in c++17
2020-06-06 14:33:41 +02:00
62273b63e5
closes https://github.com/assimp/assimp/issues/3256 : Remove redundand code
2020-06-06 12:22:01 +02:00
4e34853ac7
gltf2 export target names for blendshapes
2020-06-05 12:17:27 -07:00
6d04e16c7e
Merge branch 'master' into issue_3165
2020-05-28 21:51:58 +02:00
d40a3026db
closes https://github.com/assimp/assimp/issues/3165 : fix gcc build.
2020-05-28 21:02:13 +02:00
98767cbb08
pull master
2020-05-27 10:23:28 -07:00
78c9ac2889
Merge branch 'master' into gltf2_sparseAccessor_import
2020-05-25 16:11:01 +02:00
2be731d1bf
Merge branch 'master' into pugi_xml
2020-05-22 10:09:46 +02:00
a97e4c15b3
Merge branch 'master' into master
2020-05-21 21:15:50 +02:00
ecfca1d5c5
Merge branch 'master' into verboseLogging
2020-05-21 18:30:52 +02:00
50f0a86798
conditional export
2020-05-19 16:10:41 -07:00
c10e409a5d
merge
2020-05-18 12:16:45 -07:00
193deb3441
cleanup
2020-05-18 12:01:09 -07:00
e39c632809
cleanup
2020-05-18 11:50:51 -07:00
0897c4c7be
merge
2020-05-18 11:31:44 -07:00
02cbd36271
pull master
2020-05-18 11:15:18 -07:00
e9a3cc2c8a
Fixed rotation order bug in BVH Loader
...
This bug has been present since after the 4.10 release.
It fixes the issue "play the bvh error" #2187
Almost all bvh files are affected, such as any of the CMU library.
The bug is caused by the introduction of channelMap in the BVHLoader.cpp - function void BVHLoader::CreateAnimation(aiScene *pScene). The channelMap loses the rotation order present oin the BVH file, and always applies the rotations in X,Y,Z order.
2020-05-18 16:07:46 +01:00
14692368d5
Same for LogDebug -> LogVerboseDebug
2020-05-18 11:55:14 +01:00
87a7662bee
More thinks using VERBOSE_DEBUG
2020-05-18 11:45:00 +01:00
2438e1b52e
Merge branch 'master' into gltf2_fix_skin_recursion
2020-05-18 09:05:28 +02:00
4b0a3305b1
Merge branch 'master' into master
2020-05-17 13:54:10 +02:00
4f24b3dac2
Merge branch 'added_check_before_using' of https://github.com/qarmin/assimp into qarmin-added_check_before_using
2020-05-17 11:48:24 +02:00
cfbdacb02a
Merge branch 'master' into bug-3201-collada_root_meshes
2020-05-16 20:50:34 +02:00
b8e39b58d1
clean up
2020-05-15 12:32:58 -07:00
f6720271cb
sparce accessor exporter
2020-05-15 12:20:31 -07:00
d70685d37f
Fix typo
2020-05-15 17:50:48 +01:00
90cdbd9d9a
Fix ups
2020-05-15 17:46:50 +01:00
434c5e3d37
More verbose logging
2020-05-15 17:29:49 +01:00
2ffd1cb8db
nits
2020-05-15 17:22:15 +01:00
bcca3a0d79
No need for bespoke macros
2020-05-15 17:22:02 +01:00
6be0ce1ec9
Initial pass at adding logging
2020-05-15 17:21:45 +01:00
7a16a7a7e4
Fix infinite recursion in gltf2 skin parsing
...
Previously parsing a node caused the skin that was attached to it
to be parsed, which caused the skins node joints to be parsed,
which could cause the skin to be re-parsed leading to infinite or
at the very least exponential recursion.
The fix is to just get a reference to a temporarily uninitialized
skin as they were being parsed after the scene graph just to be safe
anyway. This way we avoid the recursion problem and all the references
will be valid in the end.
2020-05-15 16:48:41 +03:00
464d4cf99a
Merge branch 'master' of https://github.com/inhosens/assimp into inhosens-master
2020-05-15 15:08:30 +02:00
246ec2b0dc
Merge branch 'migenius-fix-ortho' of https://github.com/migenius/assimp into migenius-migenius-fix-ortho
2020-05-15 13:37:03 +02:00
a6b5abd698
Merge branch 'master' of https://github.com/zyndor/assimp into zyndor-master
2020-05-15 08:51:46 +02:00
2571b47a28
Merge branch 'master' into bug-3177-dae-geo-id
2020-05-13 20:24:53 +02:00
e9b67cdb89
gltf2 import sparse accessor
2020-05-11 14:34:35 -07:00
c3a21666da
Make gltf2 export normal normalization safe
...
This avoids introducing NaNs e.g. when the input mesh has 0-length normals
2020-05-11 12:02:38 -07:00
c5a9fbd47f
Gracefully handle NaNs and Infs in gltf2 accessor bound computation
2020-05-11 12:02:38 -07:00
aef4ecada5
Fail gltf/gltf2 export whenever invalid / incomplete JSON is generated
...
This can happen currently for example if NaNs are introduced in accessor bounds as rapidjson cannot write NaN/inf floats (see subsequent commit for fix there) and will halt writing to buffer at this point. Fix here ensures that whenever anything like this happens we throw an exception so this ends up as a registered export failure case, rather than silently exporting the incomplete JSON
2020-05-11 12:02:38 -07:00
3fdcd0861f
Fix fbx rotation ;
2020-05-11 10:28:05 +02:00
a1bcca2c99
remove step prototype: does not work this way.
2020-05-07 14:00:40 +02:00
60e8146b9f
fix wrong target idx when importing
2020-05-05 12:51:40 -07:00
56a4e61533
Collada: Don't copy the scene when exporting
...
This was purely to add a virtual top-level node
Use a flag instead.
Also add more const
2020-05-05 10:16:13 +01:00
6e447b2c44
Merge branch 'bug-3177-dae-geo-id' into bug-3201-collada_root_meshes
2020-05-05 09:52:08 +01:00
d1ae6ac77a
Fix typo in <visual_scene>
...
Swapped Id and Name
2020-05-05 09:51:41 +01:00
fa1d2f09db
Merge branch 'master' into bug-3177-dae-geo-id
2020-05-05 09:33:48 +01:00
ddee1b1ddb
Merge branch 'master' into aaronfranke-file-formatting
2020-05-05 10:21:46 +02:00
4e16716924
Merge branch 'file-formatting' of https://github.com/aaronfranke/assimp into aaronfranke-file-formatting
2020-05-05 10:17:52 +02:00
bf95d1da7c
fix conversion
2020-05-04 21:48:46 +02:00
8e73984a11
Collada Root Nodes aren't allowed to have meshes
...
Create a null parent node instead
2020-05-04 17:47:09 +01:00
6e200cb0d3
Merge branch 'master' into bug-3177-dae-geo-id
...
Impossible merge, have discarded upstream
2020-05-04 13:59:09 +01:00
ea917bd4ae
Move Collada into AssetLib folder
...
Should make the merge easier
2020-05-04 13:54:49 +01:00
91fa9a102b
closes https://github.com/assimp/assimp/issues/3181 : fix typo for light type.
2020-05-03 12:17:32 +02:00
3b06f57150
add missing inclde +
2020-05-02 21:11:47 +02:00
514593548d
add assert-test for nullptr.
2020-05-02 21:07:41 +02:00
3329e76263
closes https://github.com/assimp/assimp/issues/3178 : throw exception in case of invalid export stream.
2020-05-02 21:06:55 +02:00
f8e6512a63
Move format importer and exporter into its won folder.
2020-05-02 15:14:38 +02:00
Kim Kulling
Malcolm Tyrrell
Ryan Styrczula
Kim Kulling
Rahul Sheth
MeyerFabian
RichardTea
awr1
Ryan Styrczula
Robert Reif
Max Vollmer
Yingying Wang
Marc-Antoine Lortie
Evangel
Filip Lundgren
Paul Arden
Alec
Kevin Shepherd
Matias Kangasjärvelä
Jeremy Cytryn
hoshiryu
kkulling