Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,839 Commits 19 Branches 43 Tags
d1ef28fa523ee0a07628d9dec2494d5dfea8c209
Commit Graph
5318 Commits
Author SHA1 Message Date
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
Kim Kulling c4d98ced49 Merge branch 'master' into kimkulling_dev 2020-01-18 14:05:51 +01: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
Kim Kulling 40d882af4f fix irrreader leak. 2020-01-16 20:25:47 +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 d1abe68b93 Testcoverage improvements. 2020-01-14 21:44:45 +01:00
Kim Kulling 625357685c Update EmbedTexturesProcess.cpp 
closes https://github.com/assimp/assimp/issues/2874 : fix leaked texture buffer.
 2020-01-09 22:04:46 +01: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