Commit Graph

4795 Commits (702bc6358eccd1ae16bf58220680c83c2e3991ce)

Author SHA1 Message Date
Kim Kulling 702bc6358e Merge pull request #1441 from turol/travis
Disable Travis OS X build since it doesn't do anything currently
2017-09-17 13:45:40 +02:00
Turo Lamminen 69f8dc9b31 Travis: Disable OS X build since it doesn't do anything currently 2017-09-16 17:59:47 +03:00
Kim Kulling 62db02210a Merge pull request #1440 from turol/travis
Travis cleanup
2017-09-16 16:30:07 +02:00
Kim Kulling d34895bf2c Merge pull request #1435 from jaredmulconry/issue_1065
Last remaining build warning emitted from MSVC for x64 builds
2017-09-16 16:28:51 +02:00
Kim Kulling 484f73b179 Merge pull request #1437 from rmitton/sib-version
Added support for SIB models from Silo 2.5
2017-09-16 16:27:38 +02:00
Turo Lamminen cf8453a21a travis: Enable ccache 2017-09-16 16:04:08 +03:00
Turo Lamminen 798d2d063c travis: Only build with xcode 8.3 2017-09-16 15:52:18 +03:00
Turo Lamminen 167fb7e250 travis: Correctly minimize build matrix 2017-09-16 15:52:00 +03:00
Turo Lamminen 5478d4d4c7 travis: Move os declarations earlier 2017-09-16 15:22:37 +03:00
Kim Kulling a77cbcf096 Merge pull request #1436 from turol/warnings
Clean up some GCC warnings
2017-09-16 09:13:43 +02:00
Richard Mitton f602055da5 Added Silo 2.5 support
Silo 2.5 bumps the version number of SIB files for no apparent reason. Doesn't appear to be any other changes to the file format.
2017-09-15 12:40:38 -07:00
Richard Mitton 234ffc0ad6 Fixed truncated material names
The previous Unicode library change accidentally trimmed off the last character of SIB material names.
2017-09-15 12:39:58 -07:00
Richard Mitton 2ab72816fb Merge pull request #1 from assimp/master
Merged from master
2017-09-15 11:57:49 -07:00
Turo Lamminen 01c50394ce FBXParser: Silence uninitialized variable warnings 2017-09-15 12:42:17 +03:00
Turo Lamminen f1998d52dc Importer: Whitespace cleanup to fix GCC misleading indentation warning 2017-09-15 12:41:53 +03:00
Turo Lamminen 046c229e48 AssbinExporter: Fix strict aliasing violation 2017-09-15 12:41:40 +03:00
Turo Lamminen f4a0ab81b1 AssbinExporter: Add Write specialization for aiColor3D 2017-09-15 12:41:13 +03:00
Turo Lamminen b9efc234d0 DefaultLogger: Whitespace cleanup to fix GCC misleading indentation warning 2017-09-15 12:40:07 +03:00
Turo Lamminen 0b140db0a4 glTFExporter: Silence uninitialized variable warning
This is a false positive, idx_srcdata_begin is only used if comp_allow
is true and in that case it's also initialized.
2017-09-15 12:39:58 +03:00
Turo Lamminen f2e2f74d73 Add CMake flag to treat warnings as errors 2017-09-15 12:32:34 +03:00
Jared Mulconry 94a6fc78f4 Addressed last remaining warning under MSVC caused by use of 'deprecated' fopen. 2017-09-15 18:27:59 +10:00
Kim Kulling dce39fdf43 Merge pull request #1433 from vkovalev123/patch-1
Update 3DSLoader.cpp
2017-09-15 09:37:57 +02:00
vkovalev123 58213804ff Update 3DSLoader.cpp
Fixed reading of CHINK_RGBF. If reading performs on x32 platform then reading will execute right, but on x64 it`s wrong because it will read 8 bytes instead 4.
2017-09-14 14:55:02 +03:00
Kim Kulling b9cfff8fac Merge pull request #1431 from assimp/revert-1427-asan
Revert "Asan"
2017-09-13 23:42:21 +02:00
Kim Kulling afd6c4d57d Revert "Asan" 2017-09-13 21:40:44 +02:00
Kim Kulling d139b4d180 Merge pull request #1423 from Matter-and-Form/feature/gltf2
glTF 2 Importer + glTF 2 Spec Conformity
2017-09-13 20:01:38 +02:00
Kim Kulling d49f86f1e7 Merge pull request #1427 from turol/asan
Asan
2017-09-13 19:38:44 +02:00
Daniel Hritzkiv 2cc0a378ed Update glTF in list of importers and exporters 2017-09-13 11:23:12 -04:00
Turo Lamminen b6f122ff2c Fix delete / delete[] mismatch in glTFAsset 2017-09-13 11:31:05 +03:00
Turo Lamminen 2938a259b8 Enable AddressSanitizer for Linux clang build 2017-09-13 11:31:05 +03:00
Kim Kulling 6a3b030094 MDP: fix encoding issues. 2017-09-12 21:16:59 +02:00
Kim Kulling b5f770e456 Merge branch 'master' of https://github.com/assimp/assimp 2017-09-12 19:07:21 +02:00
Kim Kulling e3163ec15e FBX: fix some minor findings. 2017-09-12 19:07:17 +02:00
Kim Kulling cbedc448c6 closes https://github.com/assimp/assimp/issues/1426: add Defines.h to include folder for install. 2017-09-12 18:59:38 +02:00
Turo Lamminen 190f034e38 Add AddressSanitizer option to CMake 2017-09-12 18:57:44 +03:00
John Senneker 933bbb4f1c Manually read alphaMode material property 2017-09-12 11:55:52 -04:00
John Senneker eca008d5ec Properly move string passed to JSON writer 2017-09-12 11:55:22 -04:00
Daniel Hritzkiv b0da0796c8
Fix Segfault caused by losing pointer to std::string
Keep std::string alive
2017-09-12 10:07:15 -04:00
Daniel Hritzkiv 023cb27784
Revert "Remove simple gltf2 export unit test"
This reverts commit 4b01ecaf10.
2017-09-12 09:57:58 -04:00
Daniel Hritzkiv 4b01ecaf10
Remove simple gltf2 export unit test
Segfaults on Linux for some reason. No other tests test exporting, so it’s fine
2017-09-11 16:31:40 -04:00
Daniel Hritzkiv 86a8a58d12
Exclude glTF2 Exporter test when ASSIMP_BUILD_NO_EXPORT 2017-09-11 11:02:16 -04:00
Daniel Hritzkiv cde29c937c
Formatting 2017-09-11 11:02:16 -04:00
Daniel Hritzkiv b1a5ca4516
Use `forceNumber` argument of `WriteAttrs` to write correct attribute names, instead 2017-09-11 11:02:16 -04:00
Daniel Hritzkiv 990fe143a1
Fix mesh primitive’s attributes’ names
Per spec

TEXCOORD -> TEXCOORD_0
COLOR -> COLOR_0
JOINTS -> JOINTS_0
WEIGHTS -> WEIGHTS_0

Remove JOINTMATRIX since it’s not supported (and doesn’t seem to be output, anyway)

TANGENT should be added at a later date
2017-09-11 11:02:16 -04:00
Daniel Hritzkiv 816e6909ca
Remove KHR_binary_glTF code
Binary glTF is now part of the glTF2 spec. However, it’s implemented incorrectly, so will be temporarily removed
2017-09-11 11:02:16 -04:00
Daniel Hritzkiv b4f5033d89
Remove compresssed file format flag 2017-09-11 11:02:16 -04:00
Daniel Hritzkiv ed2b699c4b
Add gltf2 basic unit test 2017-09-11 11:02:15 -04:00
Daniel Hritzkiv d518289e72
more specific token search for Collada Loader
collada can appear in many files, such as glTFs via the “generator” field (in the form of collada2gltf)
2017-09-11 11:02:15 -04:00
Daniel Hritzkiv 5cb13aa4b3
Load gltf .bin files from correct directory 2017-09-11 11:02:15 -04:00
Daniel Hritzkiv a438ece655
Remove premultipliedAlpha from gltf2 2017-09-11 11:02:15 -04:00