Commit Graph

6695 Commits (4407071aa0fea6e53f63d4a3f785abf8f43d8f21)

Author SHA1 Message Date
Kim Kulling 9cc277607d
Merge pull request #2249 from wxyu247/dev
Update SMDImporter
2018-12-01 09:42:41 +01:00
Kim Kulling 576673536b
Update SMDLoader.cpp
Fix compiler warning and do some reformattings.
2018-11-30 22:17:42 +01:00
Kim Kulling b16f7c98c0
Merge branch 'master' into dev 2018-11-30 09:25:30 +01:00
Kim Kulling d94c2a4b10
Merge pull request #2242 from mjerabek/a-bunch-of-fixes
Fix compressed assbin load/export, 3DS loader hardening, ...
2018-11-30 09:24:52 +01:00
wxyu 2761681022 Issue 1639: Smd mesh vertex bone assignment
bone.mOffsetMatrix not set when bone.iParent == -1
2018-11-30 14:42:05 +08:00
wxyu 9100ca8664 Fix: Smd Cannot read bone names containing spaces 2018-11-30 14:42:05 +08:00
wxyu 19521d222b Issue 1117: Smd load multiple animations
Read an animation list from a file
2018-11-30 14:42:05 +08:00
wxyu 8c2e975508 Fix smd animation mess
aiMatrix4x4t<TReal>::FromEulerAnglesXYZ modified to row order
2018-11-30 14:42:05 +08:00
wxyu ef151b4610 Smd loads a single animation file
Can't load without mesh before
2018-11-30 14:42:05 +08:00
Kim Kulling ebcea3cb02
Merge branch 'master' into a-bunch-of-fixes 2018-11-29 20:34:13 +01:00
Martin Jeřábek 4f767ecd13
Apply suggestions from code review
* make the copy constructors explicitly defaulted
* split compound assert
2018-11-28 14:19:46 +01:00
Kim Kulling ef8b61237d
Merge pull request #2243 from bubba/gltf2-anim-fix
Fix skins not always being loaded in GlTF2
2018-11-28 02:52:56 +01:00
Kim Kulling 47e3301c47
Update glTF2Asset.inl
Remove my nonsense, sorry!
2018-11-27 23:22:09 +01:00
Kim Kulling 657014dff6
Update glTF2Asset.inl
Fix possible nullptr-dereferencing.
2018-11-27 20:18:00 +01:00
Luke Lau c803e2d7e6
Merge branch 'master' into gltf2-anim-duration 2018-11-27 11:50:54 +00:00
Luke Lau d44e25350f
Merge branch 'master' into gltf2-anim-fix 2018-11-27 11:49:40 +00:00
Luke Lau ccea70c61f Calculate the mMaxDuration property based off of keyframes 2018-11-27 11:49:00 +00:00
Luke Lau 0bb672c6fa Fix scenes not always being loaded 2018-11-27 11:45:53 +00:00
Kim Kulling 0a57ab22fb
Merge branch 'master' into a-bunch-of-fixes 2018-11-26 22:13:35 +01:00
Kim Kulling 5fceb89300
Merge pull request #2241 from assimp/kimkulling-patch-3
Update Build.md
2018-11-26 22:13:22 +01:00
Martin Jeřábek 770356a55b AssbinLoader: fix setting mNumChildren and releasing the smart pointer 2018-11-26 15:10:48 +01:00
Martin Jeřábek a916c7b1e3 ensure that GitVersion fits into 32 bits 2018-11-26 12:06:38 +01:00
Martin Jeřábek 65a79029ec eliminate some compiler warnings by making copy constructors implicitly defaulted
Addresses #2222
2018-11-26 12:06:38 +01:00
Martin Jerabek a7cbb4386c 3DSLoader: exception-safety
Fixes memory leaks and/or crashes on malformed input.
2018-11-26 12:06:08 +01:00
Martin Jerabek 6e95601875 OpenDDLParserUtils: replace chartype_table with simple comparison 2018-11-26 12:06:08 +01:00
Martin Jeřábek 430fe98c53 AssbinLoader: hardening, exception safety
Fixes potential memory leaks and crashes on malformed input.
2018-11-26 12:06:08 +01:00
Martin Jerabek 66599b6392 Assbin: fix loading/exporting compressed format 2018-11-26 12:06:08 +01:00
Martin Jerabek e8e8578d7f assimp_cmd: fix writing compressed binary assimp format
Also print someting to console when compression fails.
2018-11-26 12:06:08 +01:00
Kim Kulling 4231844647
Update Build.md
Fix typos and try to make build doc more explicit.
2018-11-25 20:56:28 +01:00
Kim Kulling 396b518ecb
Update Build.md
Some doc improvements.
2018-11-25 20:16:49 +01:00
Kim Kulling 7df35ebc36
Merge pull request #2240 from assimp/issue_2202
closes https://github.com/assimp/assimp/issues/2202: put STEPParser o…
2018-11-25 12:45:59 +01:00
Kim Kulling 02359ea369 closes https://github.com/assimp/assimp/issues/2202: put STEPParser out of IFC importer. 2018-11-25 12:00:51 +01:00
Kim Kulling de52431126
Merge pull request #2239 from assimp/issue_2210
closes https://github.com/assimp/assimp/issues/2210: use different en…
2018-11-25 11:42:41 +01:00
Kim Kulling d03e978c1b closes https://github.com/assimp/assimp/issues/2210: use different enum value. 2018-11-25 10:45:45 +01:00
Kim Kulling 837a0742c4
Merge pull request #2236 from rdb/patch-1
Fix static init ordering issue in 3mf importer
2018-11-24 13:29:34 +01:00
Kim Kulling 23af5336d5
Update D3MFImporter.cpp
Avoid using extension twice.
2018-11-23 20:21:58 +01:00
rdb e595410de1
Fix static init ordering issue in 3mf importer 2018-11-23 20:04:16 +01:00
Kim Kulling d98f8bbf7b
Merge pull request #2235 from assimp/issue_2229
closes https://github.com/assimp/assimp/issues/2229: fix count of pol…
2018-11-22 10:13:57 +01:00
Kim Kulling a24502577f DXF-Importer: some small review findings. 2018-11-21 22:00:11 +01:00
Kim Kulling f00154802c Issue 2229: add a unittest. 2018-11-21 21:39:16 +01:00
Kim Kulling 9ae8efcf09 closes https://github.com/assimp/assimp/issues/2229: fix count of polylines when only one vertex was indexed. 2018-11-21 21:29:09 +01:00
Kim Kulling eba1887d34
Merge branch 'master' into kimkulling-patch-2-1 2018-11-20 20:15:44 +01:00
Kim Kulling 793694a4b1
Merge pull request #2232 from assimp/doc_fix_deprecated_stuff
Dox: remove parts about boost support - already replaced by c++11.
2018-11-19 23:59:20 +01:00
Kim Kulling 4b4f18fb31 Dox: remove parts about boost support - already replaced by c++11. 2018-11-19 21:46:02 +01:00
Kim Kulling fa686e4bd3
Merge pull request #2223 from matt77hias/C4703
C4703 workaround for msvc++
2018-11-16 19:29:13 +01:00
Matthias Moulin 0535b28908
nullptr instead of NULL 2018-11-16 12:17:12 +01:00
Matthias Moulin 48ee14c64e
C4703 workaround for msvc++
`error C4703: potentially uninitialized local pointer variable 'pcFirstFrame'` in debug mode
2018-11-14 21:20:27 +01:00
Kim Kulling 3f85a2ca07
Update vector2.h
Remove unused include to fix xcode build.
2018-11-13 16:11:13 +01:00
Kim Kulling 04ee420f63
Merge branch 'master' into kimkulling-patch-2-1 2018-11-13 16:08:18 +01:00
Kim Kulling e6905b6a5b
Merge pull request #2215 from ruyo/gltf_skinmesh
glTF2 importer multiple primitives and 16-bit index buffer skinmesh support.
2018-11-13 16:07:10 +01:00