v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,990 Commits
74 Branches
37 Tags
234 MiB
Commit Graph

6990 Commits (189bb2a2336828344051de8cad1ac73a1b535760)

Author SHA1 Message Date
Kim Kulling 71e6d733d0
Merge pull request #2253 from assimp/issue_2247 
closes https://github.com/assimp/assimp/issues/2247: change include f…
 2018-12-07 20:03:34 +01:00
Kim Kulling bf924e091d
Merge branch 'master' into issue_2247 2018-12-07 17:57:31 +01:00
Kim Kulling 2f09d7f670
Merge pull request #2263 from migenius/migenius-fix-nulltexcheck 
Add check for NULL texcoord values in glTF2.
 2018-12-07 17:57:03 +01:00
ardenpm fd75e4923c
Merge pull request #7 from migenius/migenius-rsws52 
Add check for NULL texcoord values.
 2018-12-07 09:38:41 +11:00
ardenpm 181d801c5a
Merge pull request #6 from assimp/master 
Merge changes from assimp master
 2018-12-07 09:34:55 +11:00
Kim Kulling 9d6e7b6076
Merge pull request #2257 from twhittock/collada-export 
collada export: Use Camera local coordinate system
 2018-12-06 21:47:22 +01:00
Paul Arden f63caf894e Add check for NULL texcoord values. 2018-12-06 12:56:02 +11:00
tirichards bb9e3c3593 Fix failed assimp validation for glTF2 sample animations 2018-12-05 14:46:56 -08:00
sfalexrog af323de741 Use ADD_ASSIMP_IMPORTER for STEP importer 2018-12-04 23:28:50 +03:00
twhittock 8b6c6613f9
collada export: Use Camera local coordinate system 
Fixes #2255
 2018-12-04 14:44:49 +00:00
Kim Kulling abbe3261b3
Merge branch 'master' into issue_2247 2018-12-04 13:08:51 +01:00
Kim Kulling d7eae5bb13
Merge pull request #2250 from assimp/OFF_Importer_Redesign_js_francal 
closes https://github.com/assimp/assimp/issues/2228: prepare pull-req…
 2018-12-04 13:08:34 +01:00
Kim Kulling 7b63efd690
Merge branch 'master' into issue_2247 2018-12-04 11:38:57 +01:00
Kim Kulling f49dbc8f62
Merge branch 'master' into OFF_Importer_Redesign_js_francal 2018-12-03 23:15:05 +01:00
Kim Kulling 0abacb6c94
Merge pull request #2252 from sfalexrog/fix_cmake_typo 
Fix CMake target alias typo
 2018-12-03 23:14:41 +01:00
Kim Kulling b506d35999 closes https://github.com/assimp/assimp/issues/2247: change include folder from debian package from /usr/lib/include to /usr/include 2018-12-03 21:53:54 +01:00
Kim Kulling ce91f5c888 Off-Importer: introduce unittest. 2018-12-03 21:24:06 +01:00
sfalexrog 30d3c8c6a3 Fix CMake target alias typo 2018-12-03 23:22:34 +03:00
Kim Kulling bb66af544a closes https://github.com/assimp/assimp/issues/2228: prepare pull-request. 2018-12-02 13:08:47 +01:00
Kim Kulling 831cbcf699
Merge pull request #2218 from assimp/kimkulling-patch-2-1 
Update Exporter.cpp
 2018-12-01 19:40:19 +01:00
Kim Kulling 117a2bc116
Merge branch 'master' into kimkulling-patch-2-1 2018-12-01 18:41:15 +01:00
Kim Kulling da0d49f751
Merge pull request #2244 from bubba/gltf2-anim-duration 
Calculate the mMaxDuration property based off of keyframes for GLTF2
 2018-12-01 18:40:45 +01:00
Kim Kulling aa0a5bb36f
Merge branch 'master' into gltf2-anim-duration 2018-12-01 13:41:54 +01:00
Kim Kulling 7e06c401f0
Merge pull request #2219 from assimp/kimkulling-issue_2212 
Update vector2.h
 2018-12-01 13:41:37 +01:00
Kim Kulling dd21e4023e
Merge branch 'master' into kimkulling-issue_2212 2018-12-01 09:49:03 +01:00
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