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

5601 Commits

Author SHA1 Message Date
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
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
Kim Kulling
6c95ee145c Merge branch 'master' into kimkulling-patch-1 2020-01-29 14:37:32 +01:00
Loïc
194d31002d Import/export of embedded texture names for the glTF/glTF2 format 2020-01-29 14:04:41 +01:00
Kim Kulling
e40df80d0e Merge branch 'master' into master 2020-01-29 10:57:06 +01:00
Marc-Antoine Lortie
81bc7825d1 Potentially fixed strncpy warning by Coverity. 2020-01-28 14:02:09 -05:00
Marc-Antoine Lortie
5f30d4c0f8 Added missing cmd writting. 2020-01-28 12:30:09 -05:00
Marc-Antoine Lortie
20388d6a4f Refactored Assbin exporter and assimp_cmd binary serialization functions. 
- Renamed AssimpExport to AssimpFileWriter.
- Moved AssimpFileWriter to it's own file.
- Added a try catch in WriteBinaryDump to fix a case with memory leak.
- Replaced calls to WriteBinaryDump with AssimpFileWriter.
- Added new AssimpFileWriter files to CMakeLists.txt.
 2020-01-28 09:55:05 -05:00
Kim Kulling
27449f17ca Merge branch 'master' into master 2020-01-28 14:13:29 +01:00
Kim Kulling
02df65d541 Merge branch 'master' into pugi_xml 2020-01-28 13:13:47 +01:00
Marc-Antoine Lortie
21e4632b99 Merge branch 'master' into hl1-mdl-remove-texture-256-clamping-2 2020-01-27 18:01:24 -05:00
Marc-Antoine Lortie
16d71908d7 Merge branch 'master' into hl1-mdl-fix-texture-format 2020-01-27 18:01:03 -05:00
Kim Kulling
00ad892a49 xml: last changes. 2020-01-27 23:54:59 +01:00
Kim Kulling
0cb236bae3 next steps. 2020-01-27 22:18:48 +01:00