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

4531 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
RichardTea
4337c07e4b Remove explicit setting of macos install_name 
Use CMake default behaviour for libassimp

Fixes #2961
 2020-01-27 17:08:56 +00:00
Marc-Antoine Lortie
5d5a4faf47 Merge branch 'master' into hl1-mdl-remove-texture-256-clamping-2 2020-01-25 13:35:14 -05:00
Marc-Antoine Lortie
5ab67f6491 Merge branch 'master' into hl1-mdl-fix-texture-format 2020-01-25 13:34:59 -05:00
Marc-Antoine Lortie
48bb2978af Added support to load HL1 MDL external texture files directly. 2020-01-24 13:14:37 -05:00
Marc-Antoine Lortie
e093066a2c Merge branch 'master' into hl1-mdl-remove-texture-256-clamping-2 2020-01-24 07:22:59 -05:00
Marc-Antoine Lortie
b9ae88f200 Merge branch 'master' into hl1-mdl-fix-texture-format 2020-01-24 07:20:03 -05:00
Kim Kulling
57c735cdca Merge branch 'master' into master 2020-01-24 11:30:59 +01:00
Marc-Antoine Lortie
770c822621 Updated places to achFormatHint referencing array size. 2020-01-23 15:26:49 -05:00
Kim Kulling
e569831253 Update HL1MDLLoader.cpp 
Fix possible x64 issue.
 2020-01-23 16:20:34 +01:00
Kim Kulling
b74b96fca4 Merge branch 'master' into hl1-mdl-deletion-temp-nodes 2020-01-23 15:17:19 +01:00
Kim Kulling
5b09758f15 Update HL1MDLLoader.cpp 
Fix compiler warning
 2020-01-23 15:04:07 +01:00
Kim Kulling
259d670f54 Merge branch 'master' into hl1-mdl-fix-texture-format 2020-01-23 11:14:05 +01:00