Commit Graph

8096 Commits (b74562f8a08ab889e10b5f37cfac3b957cce52f8)

Author SHA1 Message Date
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
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 58647c8c2e
Merge pull request #2853 from yunqiangshanbill/gltf-import-bug-fix
Gltf import bug fix
2019-12-28 09:08:34 +01:00
Kim Kulling c9d9f2077d
Merge branch 'master' into gltf-import-bug-fix 2019-12-27 16:35:09 +01:00
Kim Kulling 04f7c5b67a
Merge pull request #2838 from malortie/hl1-mdl-loader
Added support to load Half-Life 1 MDL files.
2019-12-27 10:32:05 +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
yunqiangshanbill ab4166a279
Merge pull request #1 from assimp/master
sync all modify
2019-12-26 18:59:39 +08:00
Marc-Antoine Lortie 2026d52df4 Improved comments in HL1MDLFile.h 2019-12-25 12:57:48 -05:00
Marc-Antoine Lortie 7e957768db Removed dead code. 2019-12-25 08:13:20 -05:00
Kim Kulling 1e29329a84
Merge branch 'master' into hl1-mdl-loader 2019-12-25 10:13:42 +01:00
Kim Kulling 70f793f52e
Merge pull request #2843 from 9739654/patch-1
Update SMDLoader.cpp
2019-12-24 08:13:55 +01:00
Kim Kulling 97bc855e80
Merge branch 'master' into patch-1 2019-12-23 23:27:21 +01:00
Kim Kulling b9ac4c3fda
Merge pull request #2825 from bztsrc/master
MSVC workarounds
2019-12-23 23:26:52 +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
Kim Kulling 66750588cf
Merge pull request #2839 from apanteleev/vcruntime-fix
Made the CMake config more submodule friendly
2019-12-22 09:17:29 +01:00
Marc-Antoine Lortie 4050f7601f
Merge branch 'master' into hl1-mdl-loader 2019-12-19 09:47:19 -05:00
Kim Kulling e350650a93
Merge branch 'master' into vcruntime-fix 2019-12-19 14:26:26 +01:00
Kim Kulling 9f196f7d02
Merge pull request #2813 from umlaeute/python-fixes
Python fixes: ctypes declarations and cosmetics
2019-12-19 14:25:51 +01:00
Kim Kulling ce11ae2ec8
Merge branch 'master' into python-fixes 2019-12-19 10:41:00 +01:00
Kim Kulling 49839796e6
Merge pull request #2841 from MalcolmTyrrell/fixTypos
Fix typos
2019-12-18 20:18:16 +01:00
Marc-Antoine Lortie 6a3f2e89f3
Merge branch 'master' into hl1-mdl-loader 2019-12-18 12:40:59 -05:00
Malcolm Tyrrell 3b7e2bc3fa Fix typos 2019-12-18 16:13:23 +00:00
Marc-Antoine Lortie 607243448f Fixed int/unsigned int comparaisons. 2019-12-18 08:33:41 -05:00
Marc-Antoine Lortie 5d79639a8a Removed unused variable. 2019-12-18 08:10:12 -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
Alexey Panteleev 03a17f87fa Made the CMake config more submodule friendly. 2019-12-17 17:54:23 -08:00
Kim Kulling 03e6e0c69e
Merge pull request #2776 from dylankenneally/warning-level-max
Added CMake option to set the compiler warning to max (-Wall, /W4). Off by default
2019-12-18 01:00:29 +01:00