8956e567b2
Better comment.
2019-12-05 14:09:36 +00:00
81984002d3
Fix and test for GLTF.
2019-12-05 13:52:34 +00:00
fabfcf3cb0
More checking
2019-12-05 12:33:00 +00:00
894b8e3519
Initial version
2019-12-05 12:32:22 +00:00
505769935e
Merge branch 'master' into remove-cout-2797
2019-12-04 22:38:50 +00:00
a29e407853
Update B3DImporter.cpp
...
some minor format changes: add brackets for one-liner if statement.
2019-12-04 21:25:17 +01:00
fadf4a3ee2
Update M3DWrapper.h
...
Add missing include.
Odd that MSVC2013-2017, GCC and Clang were ok with this.
2019-12-04 14:05:46 +00:00
d8608156d3
Merge branch 'master' into partial-cleanup-m3d
2019-12-04 14:00:33 +00:00
bdb89413bc
Merge branch 'master' into fix_gltf_accessor_overflow
2019-12-03 22:20:19 +00:00
4a29cc7fcb
Merge branch 'master' into partial-cleanup-m3d
2019-12-03 14:16:11 +00:00
45a96af9ac
Fix typo in M3DWrapper.cpp
...
Don't use std::mutex if not supported.
Allow override to force it to be used if does in fact exist
Thank you CI
2019-12-03 14:15:50 +00:00
e5b065da3e
Formatter is a stringstream
...
Used wrong API. Sorry about that.
2019-12-03 13:35:53 +00:00
3a977d009d
Merge branch 'master' into remove-cout-2797
2019-12-03 13:24:03 +00:00
ee537b70ad
Correct M3DWrapper ifdef guards
...
M3DWrapper should also compile if M3D Importer is enabled
2019-12-03 13:18:59 +00:00
e668eead19
Some cleanup of M3D support
...
Wrap the m3d.h header
Note: C++11 support required to use in a threaded environment
Fix export memory leak (although exporter apopears to be unused)
Apply clangformat.
2019-12-03 12:56:21 +00:00
e5edd8a28a
Merge branch 'master' into preserve_error_string
2019-12-03 11:29:35 +01:00
903ce59ffe
Merge branch 'master' into fix_memory_leak_in_gltf2_on_exception
2019-12-02 19:07:44 +01:00
496382982a
Remove cout calls from FBX, LWO and B3D
...
Fixes #2797
2019-12-02 11:56:55 +00:00
631da3a3d1
Merge branch 'master' into preserve_error_string
2019-12-02 10:35:29 +00:00
7c0f84f484
Merge branch 'master' into fix_gltf_accessor_overflow
2019-12-01 19:31:44 -06:00
4071fcd398
Update Exporter.cpp
...
Fix format.
2019-12-01 22:46:48 +01:00
54720e36cb
Merge branch 'master' into fix_vertex_weighted_repeatedly
2019-12-01 22:46:18 +01:00
7967deb06a
Update glTF2Asset.inl
...
some minor review finding: use brackets and add a newline.
2019-12-01 12:34:45 +01:00
ef4bf35f69
Merge branch 'master' into fix_gltf_accessor_overflow
2019-11-30 17:11:07 +00:00
97b71dd03b
Add reading of extensionsRequired and explicit check to throw an error if Draco compression is required. Fixes issue #2791 .
2019-11-28 09:01:01 +10:00
30851b796f
Update glTF2Importer.cpp
...
Make them const
2019-11-27 17:18:12 +01:00
e4f1b8e609
Correctly change the coordinate system of the glTF UV transforms to match those used internally inside Assimp. This should now hopefully result in a complete implementation for issue #2119
2019-11-27 11:05:31 +11:00
f52df5d242
Merge branch 'master' into fix_gltf_accessor_overflow
2019-11-26 18:42:07 +00:00
fdd76a6d0b
Merge branch 'migenius-fix-doubleexport' of github.com:migenius/assimp into migenius-fix-doubleexport
2019-11-26 18:17:55 +11:00
b4f778f53b
Fix aiGetMaterialUVTransform which assumed the data was 4 floats when in fact it is 5 floats. Fixes and issue seen in #2119 .
2019-11-26 18:17:35 +11:00
184caea952
Merge branch 'master' into migenius-fix-doubleexport
2019-11-25 21:24:35 +01:00
7230f32c14
Fix issue with y UV translation. Fixes #2119 .
2019-11-25 20:58:21 +11:00
8f2123379d
Merge branch 'master' into master
2019-11-25 05:23:18 +01:00
9ddeb4edad
MinGW support, profiling and signed error code
2019-11-25 05:03:10 +01:00
929d83398d
Remove duplicate call to exporter. Fixes issue #2718 .
2019-11-25 13:51:33 +11:00
5cfb0fd633
Add function aiGetVersionPatch() to be able to display Assimp version as in Git tags
2019-11-22 18:27:34 +01:00
136996e1f6
Use std::numeric_limits for double max
2019-11-22 10:56:31 -06:00
868aea8d94
Merge branch 'master' into fix_vertex_weighted_repeatedly
2019-11-22 08:19:50 +01:00
36ca37f9ac
Merge branch 'master' into fix_gltf_accessor_overflow
2019-11-22 00:14:11 -06:00
91e6d3abeb
Fix glTF Accessor min and max values
2019-11-21 23:46:14 -06:00
3cc4ec4eec
Merge branch 'master' into master
2019-11-21 22:10:28 +01:00
375ee17339
Merge branch 'fix_memory_leak_in_gltf2_on_exception' of https://github.com/muxanickms/assimp into fix_memory_leak_in_gltf2_on_exception
2019-11-19 17:44:05 +00:00
91af4b7476
fix the crash
2019-11-19 17:43:31 +00:00
5985bdfebf
Merge branch 'master' into fix_memory_leak_in_gltf2_on_exception
2019-11-19 18:11:10 +01:00
12f184867e
Fix for memory leak in glTF2 Importer if an exception has been thrown
2019-11-19 17:05:24 +00:00
6f7cb6af06
revert memory leak fix
2019-11-19 16:58:48 +00:00
b93c360b87
memory leak fix
2019-11-19 16:10:34 +00:00
7c312f6f68
Merge branch 'master' into master
2019-11-19 01:28:11 +01:00
7e222f0730
fix invalid cast.
2019-11-18 18:43:28 +01:00
83e9c551f5
stbi functions prefixed for those who do not know how to use inlcude
2019-11-18 18:31:53 +01:00
80f5283b2f
Error string of Importer should contain a message in case of an exception
2019-11-18 16:57:01 +00:00
301748be6a
Make Clang happy
2019-11-18 15:22:15 +01:00
2b252bb9a5
My mistake, fixed
2019-11-18 06:23:41 +01:00
2bd92aeb88
Merge branch 'master' into master
2019-11-18 03:21:34 +01:00
41ae01a6b2
Upgraded to newest SDK and improved texture import
2019-11-18 03:04:52 +01:00
75204e20bd
fix invalid setup for texture enum.
2019-11-16 19:22:37 +01:00
17257cd2ae
just a try, i dunno have a clue ...
2019-11-16 15:51:26 +01:00
2eed8b1820
TextureTransform: set material transform only when the extension is provided.
2019-11-16 08:08:57 +01:00
a8182d86cb
fix initialization + some vs2019 compiler warnings.
2019-11-15 19:38:37 +01:00
17946e26ef
add missing setup of texture transform in aiMaterial.
2019-11-15 18:35:33 +01:00
04db5cd5ea
closes https://github.com/assimp/assimp/issues/2119 : initial version.
2019-11-14 21:11:53 +01:00
0c3c88270a
Merge branch 'master' into master
2019-11-11 10:19:22 +01:00
aa25c815bd
closes https://github.com/assimp/assimp/issues/1320 : make sure build works with all exporter disabled.
2019-11-10 09:47:50 +01:00
ddf7c0ad8f
avoid weighting vertex repeatedly when joining identical vertices
2019-11-05 17:34:32 -08:00
adec426b7c
Fix for exporting fbx bigger than 2GB
2019-11-05 17:11:56 +00:00
d29185ec7d
Merge branch 'master' into master
2019-11-03 21:22:01 +01:00
dda46f5f4d
Merge branch 'master' into master
2019-11-02 01:14:04 +01:00
7201ebdccc
Make Clang happy
2019-11-01 21:52:11 +01:00
7d9e9aadbb
Asked modifications and unit test
2019-11-01 17:21:24 +01:00
536fea1c8d
operator less for old compilers
2019-11-01 14:50:30 +00:00
55c2a3edb9
FBX orphant embedded textures
2019-11-01 12:29:54 +00:00
8ebd48442e
Made the M3D SDK C++ wrapper optional
2019-11-01 03:39:36 +01:00
805bc2e766
Update ColladaParser.cpp
...
Add missing brackets.
2019-10-31 20:18:39 +01:00
3bf81375da
Fixed clang's problem with register keyword
2019-10-30 03:06:24 +01:00
37cc29c020
Fixed clang's problem with register keyword
2019-10-30 03:04:33 +01:00
0ff3e40157
Fixed clang's casting issue and MSVC's buffer allocation problem
2019-10-30 02:35:51 +01:00
60e9157699
Fixed AI_MATKEY list string constant issue. My gcc didn't comply about this
2019-10-30 01:37:28 +01:00
5a79287041
More reduced scope fix, what's wrong with reusing i as a loop variable?
2019-10-30 01:21:15 +01:00
7ed621b53f
More reduced scope fix by wasting more memory...
2019-10-30 01:14:20 +01:00
1c23d2e8de
More reduced scope fix by wasting more memory...
2019-10-30 01:11:34 +01:00
5b18baf883
Fixed issues with MSVC
2019-10-30 00:55:54 +01:00
02a63f8b10
Fixed template being used in file
2019-10-29 20:21:16 +00:00
be09110aa8
Merge branch 'master' into feature/easy-armature-lookup
2019-10-29 21:09:50 +01:00
a622e109a0
Fixed PR Quality Review Issues
2019-10-29 18:42:10 +01:00
0baec5f0bd
Added M3D format support
2019-10-29 14:14:00 +01:00
459d8105a7
Merge branch 'master' into fix-3ds-material-names
2019-10-29 13:18:23 +01:00
18555abed0
Merge branch 'master' into migenius-fix-pbrsg
2019-10-28 20:08:47 +01:00
571d64e3c1
Merge branch 'master' into migenius-fix-doublefree
2019-10-28 07:51:19 +01:00
61ea5a4ac6
Merge branch 'master' into collada_zae_textures_2710
2019-10-27 18:24:16 +01:00
a9a0d4d29b
Tidying order of function calls and fixed debug statements
2019-10-27 14:16:39 +00:00
212bcfe75c
Test disable cache
2019-10-27 14:16:39 +00:00
9c8d835704
Explicitly use nullptr
2019-10-27 14:16:39 +00:00
5d0c63391b
Explicitly set the size of the parent node if we have no children
2019-10-27 14:16:39 +00:00
a30936954e
Best to check the number of children before checking the actual array
2019-10-27 14:16:39 +00:00
514257f587
Added unit tests for ArmaturePopulate when used (added huestos model to tests)
...
Added clear documentation for this too to explain, you need to enable it to make it available
Signed-off-by: RevoluPowered <gordon@gordonite.tech>
2019-10-27 14:16:39 +00:00
46cdd81d75
Added ArmaturePopulate scale process for all formats
2019-10-27 14:16:39 +00:00
93efe4197a
Removed redundant rest matrix and fixed assert compile error
2019-10-27 14:16:39 +00:00
168ae22ad4
Implemented easy armature lookup
...
This lets you directly retrieve the node a bone links to and informs you of the armature directly
This also fixes a bug with bone name being made unique which causes them to become not 1:1 what the modeller has imported.
2019-10-27 14:16:39 +00:00
120e97e55b
Merge branch 'master' into assimp_version_2693
2019-10-27 13:47:59 +01:00
93d87c775d
Merge branch 'master' into master
2019-10-27 09:00:47 +01:00
Malcolm Tyrrell
Gordon MacPherson
Kim Kulling
RichardTea
Mike Samsonov
Cory Fabre
Paul Arden
Zoltan Baldaszti
bzt
Loïc
Mike Samsonov
Kim Kulling
Yingying Wang