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
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
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
Matthias Moulin
e0e9ec720b
Suppressed MSVC++ warning C4267
...
'=': conversion from 'size_t' to 'ai_uint32', possible loss of data
2020-01-16 18:24:06 +01:00
Matthias Moulin
715337aa0b
Suppressed MSVC++ warning C4244
...
'return': conversion from '__int64' to 'int', possible loss of data
2020-01-16 18:21:28 +01:00
Kim Kulling
bd3118f896
Merge branch 'master' into misc-fixes
2020-01-16 13:50:25 +01:00
Turo Lamminen
89e622060b
Preserve more exceptions in Half-Life MDL loader
2020-01-16 14:02:04 +02:00
Hui.Du
1cae51615f
Fix: gltf exporting memory leak
2020-01-16 12:09:31 +13:00
Kim Kulling
88bb0bad6a
Merge branch 'master' into kimkulling-patch-1
2020-01-08 10:31:44 +01:00
Kim Kulling
37210372a8
Update VertexTriangleAdjacency.cpp
...
closes https://github.com/assimp/assimp/issues/2806 : calculate corret number of vertices.
2020-01-07 21:26:37 +01:00
Kim Kulling
9b8f2970c8
Update glTF2Importer.cpp
...
- fix compiler error: invalid == operator
- Fix compiler warning: conversion from double to ai_real
2020-01-07 21:22:41 +01:00
Kim Kulling
f04573984a
Update glTF2Importer.cpp
...
Remove dead code
2020-01-07 20:41:37 +01:00
Loïc
e3988cc066
Fix possible null pointer exception on scene metadata when exporting a glTF2 file
2020-01-07 16:20:33 +01:00
Dunni
52a7be775d
Fix PlyExporter to support faces with 0 vertices
2020-01-06 14:57:59 +01:00
Kim Kulling
cce77345e5
Update ColladaHelper.h
...
Add missing include.
2020-01-04 11:57:26 +01:00
Kim Kulling
12ee1a6776
Merge branch 'master' into fix/collada-combining-animations
2020-01-03 12:13:52 +01:00
RichardTea
ae7a0aa6ef
Merge branch 'master' into collada_modeller_metadata
2020-01-02 13:25:04 +00:00
RichardTea
4e50b05b85
Fix off-by-one error
2020-01-02 13:24:50 +00:00
RichardTea
ab50b5e181
Fix typo, fix GCC build
2020-01-02 13:02:40 +00:00
RichardTea
d11af753f2
Fix Codacity warnings, test Exporter metadata
...
Pass std::string around instead as need to create one anyway.
Use CamelCase version to avoid caseSensiTivity issues
as will usually want the camelcase edition anyway.
Not UTF-8 but the standard XML tags are ASCII anyway
2020-01-02 12:35:00 +00:00
Kim Kulling
6bdda42cd0
Merge branch 'master' into fix/collada-combining-animations
2020-01-02 00:40:03 +01:00
Marc-Antoine Lortie
1d8e854ba3
Merge branch 'master' into uv-coordinates-swapped-twice
2019-12-30 08:37:43 -05:00
Marc-Antoine Lortie
6de5ff8f7d
Fixed UV coordinate swapped twice in big endian.
2019-12-30 08:30:34 -05:00
Felipeek
5ce373c312
Don't combine Collada animations when channels are shared
2019-12-29 16:05:33 -03:00
Kim Kulling
c9d9f2077d
Merge branch 'master' into gltf-import-bug-fix
2019-12-27 16:35:09 +01:00
bill.shan
d2ed36756c
fix bug:Using custom IO logic in Android platform, importing from 'assets' dir,there comes to be one more '/', which makes the '.bin' file loads failed.
2019-12-27 11:21:05 +08:00
Marc-Antoine Lortie
2026d52df4
Improved comments in HL1MDLFile.h
2019-12-25 12:57:48 -05:00
Kim Kulling
1e29329a84
Merge branch 'master' into hl1-mdl-loader
2019-12-25 10:13:42 +01:00
Kim Kulling
97bc855e80
Merge branch 'master' into patch-1
2019-12-23 23:27:21 +01:00
Mateusz Paluch
ae92a34d91
Update SMDLoader.cpp
...
GCC compilation on windows was failing. Better to check for Visual c++ than Win32.
2019-12-22 09:57:02 +01:00
Kim Kulling
79aeb65ab4
Merge branch 'master' into master
2019-12-22 09:18:02 +01:00
Marc-Antoine Lortie
4050f7601f
Merge branch 'master' into hl1-mdl-loader
2019-12-19 09:47:19 -05:00
Malcolm Tyrrell
3b7e2bc3fa
Fix typos
2019-12-18 16:13:23 +00: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