Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,597 Commits 19 Branches 43 Tags
fe511fddc46dfd5440ab73ba1f25bfcfb36455ce
Commit Graph

10597 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Martin
6003be382c Merge branch 'master' into patch-1 2020-12-17 14:29:51 +01:00
cywang
b75ea77365 Merge branch 'develop3' of https://github.com/wasd845/assimp into develop3 2020-12-17 17:09:20 +08:00
cywang
15cff94926 add operator* in aiQuaterniont 2020-12-17 17:08:06 +08:00
wasd845
2250462853 Merge branch 'master' into develop3 2020-12-17 16:18:35 +08:00
cywang
b6f8448b78 add operator* in aiQuaterniont 2020-12-17 16:13:35 +08:00
cywang
f6dd11ca1a add operator* in aiQuaterniont 2020-12-17 15:07:03 +08:00
Kim Kulling
b3e1ee3ca0 Merge pull request #3524 from inhosens/master 
FBXConverter : Fix timescales of FBX animations
 2020-12-16 22:33:16 +01:00
Inho Lee
4e5b25cd81 Keep AnimMesh data during the SortByPTypeProcess 
A Postprocessing step, SortByPTypeProcess, can rebuild Mesh data,
but it does not handle AnimMesh.
This patch helps to rebuild appropriate AnimMeshes for the Mesh.
 2020-12-16 19:19:30 +01:00
Inho Lee
b8bf1eac04 FBXConverter : Fix timescales of FBX animations 
FBX animations were recorded by framenumber, not by time.
This patch will change it as a base of milliseconds.
 2020-12-16 15:02:46 +01:00
Martin
8003a016c2 Add some spaces to format code consistently 2020-12-15 12:36:00 +01:00
Martin
3718980c09 Only consider continuation tokens at end of line 2020-12-15 12:16:22 +01:00
Max Vollmer
a15adc9fbc Fixed copypaste error 2020-12-14 17:01:42 +00:00
Max Vollmer
9d3c0081eb Throw if property length is out of bounds 2020-12-14 16:49:04 +00:00
Max Vollmer
1db51503d8 Throw instead of assert on invalid file input 2020-12-14 16:44:56 +00:00
Max Vollmer
5436e16802 * Fix memory leak in GLTF2 Importer that occurs when an exception gets thrown while constructing a scene 
* Fix crash in GLTF2 Importer when a scene with dangling/uninitialized pointers gets deleted after an exception was thrown
* Fix crash in GLTF2 Importer when channel sampler is not set (negative index)
 2020-12-14 16:37:02 +00:00
Max Vollmer (Microsoft Havok)
0e939cc450 Merge pull request #1 from assimp/master 
Merge main into fork
 2020-12-14 16:12:45 +00:00
Kim Kulling
2f1ff974fd Merge pull request #3519 from MalcolmTyrrell/3dsMax2021PbrMaterials 
3ds Max 2021 PBR Materials in FBX
 2020-12-14 17:11:47 +01:00
wasd845
4e9176d2cd _dest may be destructed twice if _dest is not null in MergeScenes() 2020-12-14 19:16:29 +08:00
Jean-Louis Boudrand
922f874e78 Merge branch 'gltf2-exporter-crash' of https://github.com/JLouis-B/assimp into gltf2-exporter-crash 2020-12-13 17:03:09 +01:00
Jean-Louis Boudrand
d18fce3f06 Fix https://github.com/assimp/assimp/issues/3054 
Corrected the animation of each bone of an animation were exported in different animations (+tabs fixes)
 2020-12-13 17:02:50 +01:00
Jean-Louis Boudrand
33e7e2366c Merge branch 'master' into gltf2-exporter-crash 2020-12-13 16:48:40 +01:00
Biswapriyo Nath
c65f2cb3fb Remove extra semicolon while GCC being pedantic. 2020-12-13 00:12:44 +05:30
Biswapriyo Nath
e2af015a57 Common: Fix GCC error invalid conversion in MINGW. 2020-12-11 21:43:09 +05:30
Kim Kulling
7dd0596010 Merge branch 'master' into 3dsMax2021PbrMaterials 2020-12-11 14:31:00 +01:00
Kim Kulling
3d49d06bcc Merge pull request #3518 from Biswa96/add-msvc-check 
Check _MSC_VER for MSVC specific pragma directives.
 2020-12-11 14:30:25 +01:00
Kim Kulling
a2adef8726 Merge branch 'master' into add-msvc-check 2020-12-11 14:11:10 +01:00
Kim Kulling
80bb8ab726 Merge pull request #3521 from huiji12321/master 
Additional Compiler Options for mips64el
 2020-12-11 14:07:49 +01:00
Jean-Louis Boudrand
8701a86c9d Fixed a crash of the Gltf 2 exporter in the case of an animation without a translation, rotation or scale animation key. 2020-12-10 23:47:54 +01:00
huiji12321
db475e7d4a Merge branch 'master' into master 2020-12-10 09:04:24 +08:00
Kim Kulling
10092cd1ec Merge pull request #3515 from LoicFr/master 
glTF2Exporter: fix crash when exporting a scene with several meshes p…
 2020-12-09 21:14:51 +01:00
Kim Kulling
e4a1fb171e Merge branch 'master' into master 2020-12-09 17:58:18 +01:00
Kim Kulling
c168c4689e Merge branch 'master' into master 2020-12-09 13:59:27 +01:00
Kim Kulling
99e4a10dc3 Merge pull request #3528 from tellypresence/issue-3525_use_option_for_rapidjson_no_member_iterator 
Provide option for rapidjson no-member-iterator define
 2020-12-09 13:58:52 +01:00
tellypresence
6db5b7046f Provide option for rapidjson no-member-iterator define 
Originally added to fix warning on MSVC but breaks android build
 2020-12-09 20:21:43 +09:00
Kim Kulling
816bbc852c Merge branch 'master' into master 2020-12-08 19:54:04 +01:00
Kim Kulling
aee01e8345 Merge pull request #3514 from ms-maxvollmer/gltf_fixes 
GLTF: Fix crash on invalid base64 data + improved error messages
 2020-12-08 19:48:53 +01:00
Kim Kulling
233d834514 Merge branch 'master' into gltf_fixes 2020-12-07 20:36:53 +01:00
Kim Kulling
41904ad7ce Merge pull request #3516 from assimp/kimkulling-patch-8 
Update Readme.md
 2020-12-07 20:30:21 +01:00
Kim Kulling
1f8c75c871 Merge branch 'master' into kimkulling-patch-8 2020-12-07 16:55:07 +01:00
Kim Kulling
c0d7ea981a Merge branch 'master' into gltf_fixes 2020-12-04 16:02:16 +01:00
Kim Kulling
63f1b66224 Merge pull request #3512 from boguscoder/master 
Fix for 3489 | Preserve morph targets when splitting by bone count
 2020-12-04 15:58:22 +01:00
Kim Kulling
eccdc6dc96 Merge branch 'master' into master 2020-12-04 15:30:56 +01:00
Kim Kulling
f87ab4b4d7 Merge pull request #3506 from MalcolmTyrrell/fbxExceptionSafety 
Fbx exception safety
 2020-12-04 15:30:27 +01:00
Kim Kulling
5020a0aa33 Merge branch 'master' into fbxExceptionSafety 2020-12-04 11:01:56 +01:00
Max Vollmer (Microsoft Havok)
e737adde50 Merge branch 'master' into gltf_fixes 2020-12-04 08:58:52 +00:00
huiji12321
1910bbbdd9 Additional Compiler Options for mips64el 2020-12-04 16:47:43 +08:00
Kim Kulling
f67a9f253f Merge branch 'master' into 3dsMax2021PbrMaterials 2020-12-03 22:20:01 +01:00
Kim Kulling
00b626c3c5 Merge pull request #3505 from Neil-Clifford-FB/scenepreprocessor-memoryleak 
Sceneprecessor - potential memory leak
 2020-12-03 20:41:50 +01:00
Kim Kulling
c7aeb882e6 Update ScenePreprocessor.cpp 2020-12-03 17:28:51 +01:00
Malcolm Tyrrell
471d2acc92 Improvements & style 2020-12-03 11:17:45 +00:00