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

4552 Commits

Author SHA1 Message Date
Kim Kulling
bdd5e52176 Merge branch 'master' into search-invalid-textures-missing-texture-types 2020-02-14 18:04:30 +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
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
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
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
bzt
e434c63c31 Fixed what kimkulling broke 2020-01-31 14:20:23 +01:00
Hanif Bin Ariffin
bbe6f7f213 Fixed a bunch of clang warnings 
1. Fix misleading indentation warnings.
2. Fix creating a temporary const copy when iterating over a map (thanks to range analysis warnings)
3. Fix creating a copy when iterating over a range without reference qualifier (also thanks to range analysis warnings)
 2020-01-30 18:42:30 -05:00
Marc-Antoine Lortie
2c1c1d846e Renamed WriteDumb.cpp to WriteDump.cpp 
This includes as well changes to places referencing WriteDumb.cpp.
 2020-01-30 16:40:34 -05:00
Kim Kulling
53c394179c Merge branch 'master' into refactor-assxml-and-xml-dump-writer 2020-01-30 16:33:24 +01:00
Max Vollmer (Microsoft Havok)
dc01f99fed Merge branch 'master' into FBXMeshGeometry_checksizes_fix 2020-01-30 09:20:14 +00:00
Max Vollmer (Microsoft Havok)
feeb875453 Merge branch 'master' into FBXParser_check_inputlength_fix 2020-01-30 09:20:08 +00:00
Kim Kulling
a2ef0b5bd5 Update M3DImporter.cpp 
Fix some review finding:
- Add missing brackets to make code more readable
- fix scope of variables
 2020-01-30 10:00:43 +01:00
Kim Kulling
605336832f Update M3DImporter.cpp 
Add missing brackets
 2020-01-30 09:47:39 +01:00
Kim Kulling
0273ffc367 Merge branch 'master' into master 2020-01-30 09:46:41 +01:00
Zoltan Baldaszti
cb623f8b74 Merge branch 'master' into master 2020-01-29 22:24:48 +01:00
bzt
398a8f757e Additional checks on invalid input 2020-01-29 22:08:34 +01:00
Marc-Antoine Lortie
ff168d7bc0 Refactored Assxml exporter and dump xml writer. 
- Moved AssxmlExporter serialization code in a new file AssxmlFileWriter.cpp/h
- Added new files to CMakeLists.txt
- Replaced string format specifiers %i by %u to match argument type.
- Made a few changes in WriteDumb.cpp to call the new DumpSceneToAssxml function.
 2020-01-29 13:44:51 -05:00
Max Vollmer
9e46fca9a9 Added missing checks for tempData and uvIndices sizes in all cases 2020-01-29 15:06:48 +00:00
Max Vollmer
0d672efa90 Check input token length before copy 2020-01-29 15:04:26 +00:00