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

9295 Commits (eb9928e029cba6148aef0ff8bf2850264ce1eca3)

Author SHA1 Message Date
Hui.Du b62bd38c71 Fix: GLTF animation works on RTS not matrix; fix matrix related bug. 2020-02-14 02:11:12 +00:00
Adrian Iusca 56a71f22e1
Merge branch 'master' into master 2020-02-14 01:04:46 +02:00
Kim Kulling a4868a9530
Merge pull request #2985 from ms-maxvollmer/FBXMeshGeometry_checksizes_fix 
Fixed size check to use correct value
 2020-02-13 21:40:55 +01:00
iamAdrianIusca 25feb77982 more minor changes 2020-02-13 00:38:56 +02:00
iamAdrianIusca 6f1870681b reduced the scope of iStep variable 2020-02-13 00:27:30 +02:00
iamAdrianIusca 24cdb1f221 revert small change 2020-02-13 00:21:04 +02:00
Adrian Iusca 6f53e8b43b
Merge branch 'master' into master 2020-02-13 00:14:20 +02:00
iamAdrianIusca fc4dd6455a minor code improvements for the obj code 
- make use of range for loops
- make use of empty() method for the std::vector
- removed unnecessary std::string initialization
- use ' ' instead of " " for the find methods (should be "faster")
- simplified some function
- make use of emplace_back instead of push_back (should be "faster")
- other small changes
 2020-02-13 00:10:07 +02:00
Kim Kulling f5af791633
Merge branch 'master' into FBXMeshGeometry_checksizes_fix 2020-02-12 17:58:00 +01:00
Kim Kulling 58b9dcbdc7
Merge pull request #2973 from bztsrc/master 
Additional checks on invalid input
 2020-02-12 17:22:46 +01:00
Kim Kulling 47fc3f2627
Update M3DImporter.cpp 
Fix a memoryleak.
 2020-02-12 14:54:00 +01:00
Kim Kulling 1c13c793f0
Merge branch 'master' into master 2020-02-11 22:00:22 +01:00
Kim Kulling aed762acd7
Merge pull request #2971 from ms-maxvollmer/FBXParser_check_inputlength_fix 
Check input token length before copy
 2020-02-11 21:57:38 +01:00
Marc-Antoine Lortie 50334086cf Added missing texture types when searching for invalid textures. 2020-02-11 11:42:13 -05:00
Kim Kulling 58990d4e3f
Update FBXParser.cpp 
add missing brackets.
 2020-02-10 23:59:52 +01:00
Kim Kulling 5e979d72c9
Merge branch 'master' into FBXParser_check_inputlength_fix 2020-02-10 23:59:13 +01:00
Kim Kulling c722061f18
Merge pull request #2969 from LoicFr/master 
Import/export of embedded texture names for the glTF/glTF2 format
 2020-02-10 23:58:40 +01:00
Kim Kulling 471f9b23c9
Merge branch 'master' into master 2020-02-10 21:37:01 +01:00
Kim Kulling c6000db3be
Merge pull request #2994 from iamAdrianIusca/master 
Small changes in the CMake file
 2020-02-10 21:07:52 +01:00
Kim Kulling d38e541e89
Merge branch 'master' into master 2020-02-09 20:43:12 +01:00
Kim Kulling 91633dc437
Merge pull request #2987 from Frooxius/master 
Fixed population of bone armature and node fields for some meshes
 2020-02-09 20:42:30 +01:00
iamAdrianIusca ca08cbcb0c - don't include HunterGate.cmake if you don't enable HUNTER package manager 
- don't check for DirectX if you don't build the assimp tools or samples
 2020-02-09 20:31:06 +02:00
Kim Kulling 8fd053315c
Update ArmaturePopulate.cpp 
- Introduce tabs width of 4.
- Add missing brackets
- Use c++ comment blocks
 2020-02-09 11:14:42 +01:00
Kim Kulling 407c550240
Merge branch 'master' into master 2020-02-09 11:05:35 +01:00
Kim Kulling 5a674bb464
Merge pull request #2989 from malortie/multiple-texture-type-to-string-definitions 
Fixed TextureTypeToString defined multiple times.
 2020-02-09 11:05:08 +01:00
Marc-Antoine Lortie 95a7772b5a
Merge branch 'master' into multiple-texture-type-to-string-definitions 2020-02-07 17:37:10 -05:00
Kim Kulling af9705e3d1
Merge branch 'master' into FBXParser_check_inputlength_fix 2020-02-07 11:52:00 +01:00
Kim Kulling 97a6d80cb1
Merge pull request #2990 from assimp/kimkulling-sponoring-update-1 
Update FUNDING.yml
 2020-02-07 11:51:37 +01:00
Kim Kulling d3a70c73c4
Update FUNDING.yml 
Add paypal sponsoring
 2020-02-07 10:58:56 +01:00
Tomas Mariancik acf57bdb13
Merge branch 'master' into master 2020-02-06 22:58:19 +01:00
Marc-Antoine Lortie 8c09cd2ef3 Fixed TextureTypeToString defined multiple times. 
- Moved TextureTypeToString to it's own file.
- Added new file to CMakeLists.txt.
- Added 6 missing values in TextureTypeToString.
- Added 6 missing aiTextureType enum values in assimp_cmd/Info.cpp.
 2020-02-06 13:19:01 -05:00
Kim Kulling 355131e261
Merge pull request #2942 from malortie/hl1-mdl-remove-texture-256-clamping-2 
[MDL HL1] Removed texture dimensions limitation.
 2020-02-06 17:24:01 +01:00
Kim Kulling b33272b1c8
Merge branch 'master' into hl1-mdl-remove-texture-256-clamping-2 2020-02-06 14:39:09 +01:00
Frooxius 29603128f4 Fixed invalid armature node population when there's mesh on a node with the same name as the bone 2020-02-06 10:28:38 +01:00
Tomas Mariancik cb02e2fc65
Merge pull request #4 from assimp/master 
Updating to the latest version from upstream
 2020-02-06 08:26:57 +01:00
Kim Kulling 979153522c xml-migration: migration of XGLImporter. 2020-02-05 22:51:39 +01:00
Luke Lau 18c01a023c Use the translation matrix in gltf2 cameras for aiCamera.mPosition 2020-02-05 21:24:54 +00:00
Kim Kulling fa60ae2885
Merge pull request #2974 from malortie/rename-writedumb-to-writedump 
Renamed WriteDumb.cpp to WriteDump.cpp
 2020-02-05 17:42:55 +01:00
Max Vollmer (Microsoft Havok) 7047d05bf0
Merge branch 'master' into FBXMeshGeometry_checksizes_fix 2020-02-05 14:43:03 +00:00
Max Vollmer 8af0229e0d In "ByVertice" case tempData.size() needs to be mapping_offsets.size(), not vertex_count 2020-02-05 14:40:35 +00:00
Kim Kulling f00256d185
Merge branch 'master' into rename-writedumb-to-writedump 2020-02-05 13:58:09 +01:00
Kim Kulling f7c59ace44
Merge pull request #2984 from ms-maxvollmer/FBXMeshGeometry_checksizes_fix 
Removed unnecessary checks that may result in false positives rejecting valid models.
 2020-02-05 13:57:40 +01:00
Max Vollmer (Microsoft Havok) eb1d25631b
Merge branch 'master' into FBXMeshGeometry_checksizes_fix 2020-02-05 11:12:57 +00:00
Max Vollmer ec024085ab Merge branch 'FBXMeshGeometry_checksizes_fix' of https://github.com/ms-maxvollmer/assimp into FBXMeshGeometry_checksizes_fix 2020-02-05 11:08:00 +00:00
Max Vollmer cb55e2658d Removed unnecessary checks that may result in false positives rejecting valid models 2020-02-05 11:07:39 +00:00
Kim Kulling 1a8d5667b6 xml-migration: migrate shared code from irr-loader. 2020-02-04 20:47:20 +01:00
Kim Kulling c9244a4ae3
Merge pull request #2976 from hbina/fix_clang_warnings 
Fixed a bunch of clang warnings
 2020-02-03 21:20:12 +01:00
Kim Kulling bd2ffc8d58 Merge branch 'pugi_xml' of https://github.com/assimp/assimp into pugi_xml 2020-02-03 21:19:30 +01:00
Kim Kulling c1fcee9c5a XMl-Migration: Migration of IrrMesh. 2020-02-03 21:19:03 +01:00
Kim Kulling ad286a8ab1
Merge branch 'master' into fix_clang_warnings 2020-02-03 19:07:02 +01:00