Commit Graph

36 Commits

Author SHA1 Message Date
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
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
Marc-Antoine Lortie
3e8a33aae3 Fixed wrong texture format used in HL1 MDL loader. 2020-01-22 10:02:38 -05: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
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
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
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
3ab21c926c Suppressed MSVC++ warning C4267
'=': conversion from 'size_t' to 'ai_uint32', possible loss of data
2020-01-16 18:27:00 +01:00
Matthias Moulin
fb5a30efd0 Suppressed MSVC++ warning C4267
'=': conversion from 'size_t' to 'ai_uint32', possible loss of data
2020-01-16 18:25:37 +01:00
Turo Lamminen
89e622060b Preserve more exceptions in Half-Life MDL loader 2020-01-16 14:02:04 +02:00
Marc-Antoine Lortie
2026d52df4 Improved comments in HL1MDLFile.h 2019-12-25 12:57:48 -05:00
Marc-Antoine Lortie
87de50e1f3 Added missing parentheses around assignment in while condition. 2019-12-18 07:51:45 -05:00
Marc-Antoine Lortie
02c2bfa2b8 Added missing member initializations. 2019-12-18 07:35:30 -05:00
Marc-Antoine Lortie
7c2cec2182 Fixed member initialization order.
anim_headers_ is declared before animbuffers_ in HL1MDLLoader.h.
2019-12-18 07:28:52 -05:00
Marc-Antoine Lortie
69902c99c8 Restored PACK_STRUCT on AnimValue_HL1 union and removed PACK_STRUCT on inner struct.
My apologies, as this was a mistake. I misread the problem and removed the wrong PACK_STRUCT.
2019-12-17 18:22:22 -05:00
Marc-Antoine Lortie
188ee6562e Moved/Added several includes to file HL1MDLLoader.h.
GCC says there are several class types such as DefaultIOSystem, std::unique_ptr that are undeclared. I moved several includes to this header and also added <string> and <assimp/types> because there are strings and Assimp types defined further down.
2019-12-17 17:47:26 -05:00
Marc-Antoine Lortie
fe2fdcf77c Removed unwanted PACK_STRUCT on union. 2019-12-17 17:27:21 -05:00
Marc-Antoine Lortie
330d9ca916 Replaced strncpy by individual character assigments. 2019-12-17 16:37:32 -05:00
Marc-Antoine Lortie
e85776aaab Added missing null terminator. 2019-12-17 16:16:18 -05:00
Marc-Antoine Lortie
a45e13b183 Fixed compilation issue.
"insert_or_assign" was not defined in the Visual Studio 2013 toolset.
2019-12-17 15:12:19 -05:00
Marc-Antoine Lortie
eed0bd3ef6 Added support to load Half-Life 1 MDL files.
Added code to use Half-Life 1 MDL loader in MDLLoader.cpp.
Added Half-Life 1 MDL loader files to CMakeLists.
Added new options in config.h to use with Half-Life 1 MDL loader.
2019-12-16 10:26:46 -05:00
kimkulling
33af183bb8 Cleanup the public headers. 2019-10-11 13:27:36 +02:00
Kim Kulling
2edcf82f5a add missing include. 2019-09-17 21:58:46 +02:00
Kim Kulling
2da3a38d60 Fix the compile pass, still unresolved symbols. 2019-06-10 23:26:00 +02:00
Kim Kulling
57c46db042 Reorg of code. 2019-06-06 14:45:43 +02:00