Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,964 Commits 19 Branches 43 Tags
3b7e2bc3fae142a845f1c42e694167402add4bdc
Commit Graph

4392 Commits

Author SHA1 Message Date
Malcolm Tyrrell
3b7e2bc3fa Fix typos 2019-12-18 16:13:23 +00:00
Kim Kulling
7244f53f5f Merge branch 'master' into partial-cleanup-m3d 2019-12-14 19:22:19 +01:00
Malcolm Tyrrell
b6553b8a78 Merge branch 'master' into fixTexcoord 2019-12-12 12:19:02 +00:00
Malcolm Tyrrell
b70c05b4e0 Fix texcoords. 2019-12-12 09:38:50 +00:00
Mike Samsonov
08c5fa37bf Add a support for 3DSMax Physically Based Materials for FBX format 2019-12-10 12:04:35 +00:00
RichardTea
4a8b7800ff Update M3D ASCII exporter ident and extension 
Changed to match existing Assimp style.
Set extension as per:
https://gitlab.com/bztsrc/model3d/blob/master/docs/a3d_format.md
 2019-12-09 11:23:57 +00:00
RichardTea
9cabeddf4f Odd Negative Scale: PretransformVertices 
PretransformVertices postprocessing now reverses face order when transform is mirroring.
Fixes flip to backfacing in models that mirrored some nodes.

(Odd count of negative scale components, negative determinant)
 2019-12-09 11:07:13 +00:00
RichardTea
193b02cdac Odd negative scale: OptimizeGraph 
OptimizeGraph postprocessing now reverses face order when
node scale is mirroring.
Fixes flip to backfacing in models that mirrored some nodes.

(Odd count of negative scale components, negative determinant)
 2019-12-09 10:42:50 +00:00
RichardTea
463573c771 Apply clangformat 2019-12-09 09:56:01 +00:00
Kim Kulling
e3da92f7d3 closes https://github.com/assimp/assimp/issues/2809: fix crash for special ifc file. 2019-12-08 10:12:14 +01:00
Kim Kulling
747e12465b Merge branch 'master' into partial-cleanup-m3d 2019-12-07 19:43:05 +01:00
Kim Kulling
9f3c26dbd8 Update Importer.cpp 
fix typo
 2019-12-07 09:18:45 +01:00
Kim Kulling
7648c438ca Update Importer.cpp 
fix more typos.
 2019-12-07 09:08:15 +01:00
Kim Kulling
26f6e5ad30 Update Importer.cpp 
fix typo
 2019-12-07 08:58:47 +01:00
Kim Kulling
ef13fb2ddd Update Importer.cpp 
Fix minor review findings.
 2019-12-06 21:38:07 +01:00
Kim Kulling
b2ab3fa35e Merge branch 'master' into ModellerMetaData 2019-12-06 21:19:29 +01:00
Malcolm Tyrrell
8956e567b2 Better comment. 2019-12-05 14:09:36 +00:00
Malcolm Tyrrell
81984002d3 Fix and test for GLTF. 2019-12-05 13:52:34 +00:00
Malcolm Tyrrell
fabfcf3cb0 More checking 2019-12-05 12:33:00 +00:00
Malcolm Tyrrell
894b8e3519 Initial version 2019-12-05 12:32:22 +00:00
Gordon MacPherson
505769935e Merge branch 'master' into remove-cout-2797 2019-12-04 22:38:50 +00:00
Kim Kulling
a29e407853 Update B3DImporter.cpp 
some minor format changes: add brackets for one-liner if statement.
 2019-12-04 21:25:17 +01:00
RichardTea
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
RichardTea
d8608156d3 Merge branch 'master' into partial-cleanup-m3d 2019-12-04 14:00:33 +00:00
Gordon MacPherson
bdb89413bc Merge branch 'master' into fix_gltf_accessor_overflow 2019-12-03 22:20:19 +00:00
RichardTea
4a29cc7fcb Merge branch 'master' into partial-cleanup-m3d 2019-12-03 14:16:11 +00:00
RichardTea
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
RichardTea
e5b065da3e Formatter is a stringstream 
Used wrong API. Sorry about that.
 2019-12-03 13:35:53 +00:00
RichardTea
3a977d009d Merge branch 'master' into remove-cout-2797 2019-12-03 13:24:03 +00:00
RichardTea
ee537b70ad Correct M3DWrapper ifdef guards 
M3DWrapper should also compile if M3D Importer is enabled
 2019-12-03 13:18:59 +00:00
RichardTea
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
Kim Kulling
e5edd8a28a Merge branch 'master' into preserve_error_string 2019-12-03 11:29:35 +01:00
Kim Kulling
903ce59ffe Merge branch 'master' into fix_memory_leak_in_gltf2_on_exception 2019-12-02 19:07:44 +01:00
RichardTea
496382982a Remove cout calls from FBX, LWO and B3D 
Fixes #2797
 2019-12-02 11:56:55 +00:00
Mike Samsonov
631da3a3d1 Merge branch 'master' into preserve_error_string 2019-12-02 10:35:29 +00:00
Cory Fabre
7c0f84f484 Merge branch 'master' into fix_gltf_accessor_overflow 2019-12-01 19:31:44 -06:00
Kim Kulling
4071fcd398 Update Exporter.cpp 
Fix format.
 2019-12-01 22:46:48 +01:00
Kim Kulling
54720e36cb Merge branch 'master' into fix_vertex_weighted_repeatedly 2019-12-01 22:46:18 +01:00
Kim Kulling
7967deb06a Update glTF2Asset.inl 
some minor review finding: use brackets and add a newline.
 2019-12-01 12:34:45 +01:00
Gordon MacPherson
ef4bf35f69 Merge branch 'master' into fix_gltf_accessor_overflow 2019-11-30 17:11:07 +00:00
Paul Arden
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
Kim Kulling
30851b796f Update glTF2Importer.cpp 
Make them const
 2019-11-27 17:18:12 +01:00
Paul Arden
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
Gordon MacPherson
f52df5d242 Merge branch 'master' into fix_gltf_accessor_overflow 2019-11-26 18:42:07 +00:00
Paul Arden
fdd76a6d0b Merge branch 'migenius-fix-doubleexport' of github.com:migenius/assimp into migenius-fix-doubleexport 2019-11-26 18:17:55 +11:00
Paul Arden
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
Kim Kulling
184caea952 Merge branch 'master' into migenius-fix-doubleexport 2019-11-25 21:24:35 +01:00
Paul Arden
7230f32c14 Fix issue with y UV translation. Fixes #2119. 2019-11-25 20:58:21 +11:00
Zoltan Baldaszti
8f2123379d Merge branch 'master' into master 2019-11-25 05:23:18 +01:00
bzt
9ddeb4edad MinGW support, profiling and signed error code 2019-11-25 05:03:10 +01:00