Commit Graph

4487 Commits (5860d63efcebdf650aef13757a6ac9b948ed8a8b)

Author SHA1 Message Date
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
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
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
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