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

4503 Commits

Author SHA1 Message Date
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
4862d11807 Merge branch 'master' into FBXMeshGeometry_checksizes_fix 2020-02-01 13:25:32 +01: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
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
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
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
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
Kim Kulling
092883cf19 Merge branch 'master' into update-copyright-end-date 2020-01-22 18:03:43 +01:00
Marc-Antoine Lortie
11d98e7cf6 Merge branch 'master' into hl1-mdl-fix-texture-format 2020-01-22 10:47:34 -05:00
Marc-Antoine Lortie
3e8a33aae3 Fixed wrong texture format used in HL1 MDL loader. 2020-01-22 10:02:38 -05:00
Loïc
2ebafe0693 Fix version revision formatting in glTF metadata 2020-01-22 12:40:57 +01:00
Turo Lamminen
1edb52c0de ScenePreprocessor: Assert some properties about animation channels 2020-01-22 12:22:52 +02:00
Turo Lamminen
aee292e367 Whitespace 2020-01-22 12:22:52 +02:00
Turo Lamminen
288a638a83 X: Only create animation key arrays if there are some keys 2020-01-22 12:22:52 +02:00
Kim Kulling
3cf7d955f3 Update HL1MDLLoader.cpp 
Fix compiler warning
 2020-01-22 10:06:40 +01:00
Kim Kulling
6a5ab0381d Update HL1MDLLoader.cpp 
Add missing const
 2020-01-22 09:46:37 +01:00
Kim Kulling
e27b54f504 Update HL1MDLLoader.cpp 
Fix review findings.
 2020-01-21 19:39:29 +01:00
Marc-Antoine Lortie
caf9e31181 Merge branch 'master' into hl1-mdl-deletion-temp-nodes 2020-01-21 11:57:49 -05:00
Marc-Antoine Lortie
4e7e47bd43 Updated copyright dates. 
Changed copyright end year to 2020 in every reference "Copyright (c) 2006-XXXX, assimp team".

Changed copyright end year to 2020 in every reference "Copyright (c) 2006-XXXX, ASSIMP Development Team".

Changed copyright end year to 2020 in LICENCE.rtf.

Changed copyright end year in CMakeFiles.txt files and any other places referencing Assimp with a copyright start and end year.
 2020-01-20 08:53:12 -05:00
Kim Kulling
b7e51a38ef Update HL1MDLLoader.cpp 
Minor findings.
 2020-01-19 20:16:13 +01:00
Marc-Antoine Lortie
9deb8fb786 Fixed child nodes not deleted if the importer failed to add them to the scene root node. 2020-01-19 12:48:45 -05:00
Kim Kulling
41e594f7b1 Merge branch 'master' into master 2020-01-19 12:46:07 +01:00
Marc-Antoine Lortie
b74562f8a0 Fixed delete operator. 2020-01-18 15:16:03 -05:00
Marc-Antoine Lortie
247667233d Fixed memory leak in MDLLoader.cpp 
If one of the MDL importer implementations throw an exception, the memory allocated at mBuffer may never be freed. This fix should prevent further memory leaks.
 2020-01-18 14:58:19 -05:00
Matthias Moulin
cc40963e1a Removed name of unreferenced local variable in catch block 2020-01-17 16:07:50 +01:00
Marc-Antoine Lortie
6970e70dbb [MDL] Updated header to use when checking file size. (Redone) 
This is needed since it's possible to have an MDL sequence group file that has a size less than the Quake 1 MDL header.
 2020-01-17 08:27:52 -05:00
Kim Kulling
bdbe111abd Merge branch 'master' into master 2020-01-17 08:17:45 +01:00
Matthias Moulin
986c18501a Suppressed MSVC++ warning C4267 
'=': conversion from 'size_t' to 'ai_uint32', possible loss of data
 2020-01-16 18:31:44 +01:00
Matthias Moulin
bdc10aa336 Suppressed MSVC++ warning C4267 
'=': conversion from 'size_t' to 'ai_uint32', possible loss of data
 2020-01-16 18:30:11 +01:00
Matthias Moulin
784a05651b Suppressed MSVC++ warning C4267 
'=': conversion from 'size_t' to 'ai_uint32', possible loss of data
 2020-01-16 18:29:30 +01:00
Matthias Moulin
633a37512f Suppressed MSVC++ warning C4267 
'=': conversion from 'size_t' to 'ai_uint32', possible loss of data
 2020-01-16 18:28:45 +01:00
Matthias Moulin
91ecad5da8 Suppressed MSVC++ warning C4267 
'=': conversion from 'size_t' to 'ai_uint32', possible loss of data
 2020-01-16 18:28:04 +01:00
Matthias Moulin
3ab21c926c Suppressed MSVC++ warning C4267 
'=': conversion from 'size_t' to 'ai_uint32', possible loss of data
 2020-01-16 18:27:00 +01:00