Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,783 Commits 19 Branches 43 Tags
bugfix/fix_copyrights_in_python
Commit Graph

6877 Commits

Author SHA1 Message Date
Kim Kulling
00a104efde Merge branch 'master' into master 2020-02-14 20:58:13 +01:00
Kim Kulling
bdd5e52176 Merge branch 'master' into search-invalid-textures-missing-texture-types 2020-02-14 18:04:30 +01:00
Kim Kulling
1473c6616b Merge branch 'master' into master 2020-02-14 12:56:14 +01:00
Adrian Iusca
d662b25b17 Merge branch 'master' into master 2020-02-14 13:40:15 +02:00
Inho Lee
d04df3e7c5 A bug when importing multiple gltf files 
meshOffsets are not cleared when importing multiple gltf files
 2020-02-14 08:41:55 +01:00
Kim Kulling
523e6c9f73 Merge branch 'master' into gltf-camera-pos 2020-02-14 08:21:54 +01:00
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
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
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
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
471f9b23c9 Merge branch 'master' into master 2020-02-10 21:37:01 +01: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
af9705e3d1 Merge branch 'master' into FBXParser_check_inputlength_fix 2020-02-07 11:52:00 +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
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
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
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
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
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
Kim Kulling
8e009c3d0c Update MDLLoader.cpp 
fix a tab.
 2020-02-03 19:06:36 +01:00
Kim Kulling
2d5c28ac46 Merge branch 'master' into scene-combiner-memory-leak 2020-02-02 20:43:52 +01:00
Kim Kulling
99175e3eaf Merge branch 'master' into master 2020-02-01 19:26:52 +01:00
Kim Kulling
4862d11807 Merge branch 'master' into FBXMeshGeometry_checksizes_fix 2020-02-01 13:25:32 +01:00
Marc-Antoine Lortie
d6567e606e Fixed wrong changes applied during merge. 2020-01-31 18:14:26 -05:00
Marc-Antoine Lortie
3386e9ea58 Merge branch 'master' into hl1-mdl-remove-texture-256-clamping-2 2020-01-31 16:55:45 -05:00
Marc-Antoine Lortie
ede860173e Fixed mValues allocated twice. 
mValues is already allocated in aiMetadata::Alloc().
 2020-01-31 16:43:20 -05:00
Kim Kulling
9a971ffeac Merge branch 'master' into master 2020-01-31 19:12:02 +01:00
Kim Kulling
0269000884 Update glTF2Exporter.cpp 
Replacing tabs by spaces.
 2020-01-31 19:11:36 +01:00
Kim Kulling
187b74355b Update glTFImporter.cpp 
Replace tabs by spaces.
 2020-01-31 19:08:04 +01:00
Kim Kulling
0af44fb3e8 Update glTFExporter.cpp 
Replacing tabs by spaces.
 2020-01-31 19:06:56 +01:00
Zoltan Baldaszti
ca614a7419 Merge branch 'master' into master 2020-01-31 14:29:39 +01:00