Commit Graph

8077 Commits (25a11ac10168c74a53495ff31691079f555dc757)

Author SHA1 Message Date
Kim Kulling 25a11ac101
Update appveyor.yml
Try to enable parallel build.
2020-01-17 13:33:50 +01:00
Kim Kulling 516f76645a
Merge branch 'master' into kimkulling-travis 2020-01-16 19:03:59 +01:00
Turo Lamminen e5864aaf5b
Merge pull request #2904 from turol/misc-fixes
Revert broken test files and improve error messages in Half-Life MDL loader
2020-01-16 19:54:00 +02:00
Kim Kulling bd3118f896
Merge branch 'master' into misc-fixes 2020-01-16 13:50:25 +01:00
Kim Kulling 651c2ef5fe
Merge pull request #2892 from runforu/gltf_memory_leak
Fix: gltf exporting memory leak
2020-01-16 13:25:46 +01:00
Turo Lamminen 89e622060b Preserve more exceptions in Half-Life MDL loader 2020-01-16 14:02:04 +02:00
Turo Lamminen 2a366388c2 Revert Wuson.ms3d to working version 2020-01-16 13:55:34 +02:00
Turo Lamminen 08110be9f7 Revert BoxTextured.glb to working version 2020-01-16 13:41:01 +02:00
Hui.Du 1cae51615f Fix: gltf exporting memory leak 2020-01-16 12:09:31 +13:00
Turo Lamminen 2e56450984
Merge pull request #2891 from turol/more-tests
Revert broken dwarf.cob test file and add MD5 and COB unit tests
2020-01-15 18:41:45 +02:00
Kim Kulling ce087fe6e2
Update appveyor.yml
Fix the build
2020-01-15 16:03:39 +01:00
Kim Kulling f7ca69c07e
Update appveyor.yml
Next try
2020-01-15 15:53:24 +01:00
Kim Kulling 9867bdd984
Update appveyor.yml
Fix the build script.
2020-01-15 15:08:35 +01:00
Kim Kulling 23e4dd8ae5
Update appveyor.yml
Use cmake for build.
2020-01-15 14:11:40 +01:00
Turo Lamminen 542b1f7688 Add more COB importer unit tests 2020-01-15 14:34:25 +02:00
Turo Lamminen 26a80bb019 Refactor COB import test to not use a class 2020-01-15 14:15:29 +02:00
Turo Lamminen a50b94dd63 Revert test model dwarf.cob to working version 2020-01-15 14:10:09 +02:00
Turo Lamminen d6e9a15b15 Add MD5 importer unit tests 2020-01-15 13:23:13 +02:00
Kim Kulling babf9eac0f
Update appveyor.yml
Enable git clone --depth 1
2020-01-15 10:39:48 +01:00
Kim Kulling 122667b2b2
Update .travis.yml
Set depth to 1 because we do not need the history.
2020-01-15 10:36:30 +01:00
Kim Kulling 388211474a
Merge pull request #2877 from turol/test-md2
Add MD2 importer unit tests
2020-01-13 17:19:39 +01:00
Turo Lamminen 7e140ff912 Add MD2 importer unit tests 2020-01-10 13:50:16 +02:00
Turo Lamminen e5db5e84e6
Merge pull request #2875 from turol/fix-models
Revert more broken test models to working versions
2020-01-10 10:39:47 +02:00
Turo Lamminen d372d28d2e Revert more broken test models to working versions
Was broken by a8a1ca9894.
Partially revert that commit.

Closes #2861
2020-01-09 21:56:39 +02:00
Kim Kulling cacab6bf0b
Merge pull request #2868 from assimp/kimkulling-doc-patch
Update Readme.md
2020-01-09 20:06:34 +01:00
Kim Kulling 2e6ebc40d4
Merge branch 'master' into kimkulling-doc-patch 2020-01-08 20:23:14 +01:00
Turo Lamminen 7b17cb8ddb
Merge pull request #2870 from turol/fix-amf-test
Revert 3_bananas.amf.7z to working version
2020-01-08 20:43:03 +02:00
Kim Kulling a69492753a
Merge branch 'master' into fix-amf-test 2020-01-08 14:29:41 +01:00
Kim Kulling df96f5a822
Merge pull request #2866 from assimp/kimkulling-patch-1
Update glTF2Importer.cpp
2020-01-08 14:29:13 +01:00
Turo Lamminen 7b7100a94b Revert 3_bananas.amf.7z to working version
Was broken by a8a1ca9894.
Partially revert that commit.

Closes #2857
2020-01-08 14:20:56 +02:00
Kim Kulling 88bb0bad6a
Merge branch 'master' into kimkulling-patch-1 2020-01-08 10:31:44 +01:00
Kim Kulling 001c66ec57
Merge pull request #2867 from assimp/kimkulling-issue_2806
Update VertexTriangleAdjacency.cpp
2020-01-08 10:31:13 +01:00
Kim Kulling 346ab9af35
Update Readme.md
Fix the assimp.net link, old repo was broken.
2020-01-08 08:35:06 +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 a62c44227a
Merge pull request #2865 from LoicFr/master
Fix possible null pointer exception on scene metadata when exporting a glTF2 file
2020-01-07 21:19:27 +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
Kim Kulling acb8addf7d
Merge pull request #2863 from Dunni/user/dunnia/ply-export-fix
Fix PlyExporter to support faces with 0 vertices
2020-01-06 21:14:59 +01:00
Dunni 52a7be775d
Fix PlyExporter to support faces with 0 vertices 2020-01-06 14:57:59 +01:00
Kim Kulling 185c2fde3c
Merge pull request #2855 from felipeek/fix/collada-combining-animations
fix: Don't combine Collada animations when channels are shared
2020-01-04 16:57:14 +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
Kim Kulling a01d7c4048
Merge pull request #2820 from RichardTea/collada_modeller_metadata
Collada and glTF modeller metadata
2020-01-02 20:40:41 +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
Kim Kulling 2620f4a536
Merge pull request #2858 from malortie/uv-coordinates-swapped-twice
Fixed UV coordinate swapped twice in big endian.
2020-01-01 14:03:52 +01:00