Daniel Hritzkiv
798542d7bd
Formatting
2017-09-18 14:48:07 -04:00
Daniel Hritzkiv
de0bf2ea96
Fix alphaMode storage and reading
...
alphaMode is now converted from a std::string to an aiString and back to std::string, since aiString is easier to store and retrieve from aiMaterial properties than std::string
Fixes issues of alphaMode being written out as `\fOPAQUE\0\0\0\0\0\0…`
2017-09-18 12:19:55 -04:00
Daniel Hritzkiv
8743d28ec5
SImplify mesh merging code
...
My assumption that primitives of different types (modes) can’t be in the same mesh was incorrect.
2017-09-18 12:16:30 -04:00
Daniel Hritzkiv
2efd2cdef8
tweaks to primitive merging logic; comments + formatting
2017-09-18 11:16:05 -04:00
Daniel Hritzkiv
814e8b3f8e
Formatting
2017-09-18 11:16:05 -04:00
Daniel Hritzkiv
28523232cf
Merge multiple meshes in a node into one mesh with many primtives; write out only one mesh per node
...
To do:
- clean up MergeMeshes
- see if there’s a way to do this earlier in the flow
2017-09-18 11:16:05 -04:00
Daniel Hritzkiv
5147acfe65
Revert "store node mesh vs. meshes"
...
This reverts commit a0d97505e5
.
2017-09-18 11:16:04 -04:00
Kim Kulling
d473a49456
Merge pull request #1442 from jcowles/master
...
Fix glTF 2.0 multi-primitive support
2017-09-18 16:24:58 +02:00
Turo Lamminen
982430c3ce
BlenderDNA: Silence warning about inline function which is declared but not defined
...
It's a templated method which is meant to be specialized. The base version
is never called. Just remove 'inline' to make GCC shut up.
2017-09-18 15:21:51 +03:00
Turo Lamminen
40c308af44
glTF: Silence uninitialized variable warning
...
This is a false positive. 'jointNamesIndex' is either set by the loop
or the following conditional is false which also sets it. The undefined value
is never seen by the following code.
2017-09-18 15:18:45 +03:00
Turo Lamminen
b74fc9495a
PlyLoader: Fix operator precedence issue in header check
...
The previous version might read past end of buffer
2017-09-18 15:16:21 +03:00
Turo Lamminen
4652be8f18
FIReader: Silence uninitialized variable warning
...
This is a false positive. First time through the loop 'imod3' is always 0
so c1 is not used. It's also set so further iterations have a valid 'c1'.
If 'value' is empty the switch doesn't look at 'c1' either since 'imod3'
is still 0.
2017-09-18 14:59:55 +03:00
Turo Lamminen
41724ace2d
Collada: Silence uninitialized variable warning
...
This is a false positive. Value of 'method' is only used if 'targetMeshes'
contains something and all paths through the first loop which add stuff
to 'targetMeshes' also set 'method'.
2017-09-18 14:10:58 +03:00
Jeremy Cowles
c207e74534
Fix glTF 2.0 multi-primitive support
...
Previously, only one primitive was supported, in fact memory was corrupted
when more than one primitive was found per glTF mesh.
In this change, each primitive is unrolled as a new Assimp Mesh, resulting
in multiple Assimp meshes per node when multiple primitives exist per
glTF mesh. This is required in the general case, since glTF primitives can
have different material bindings and primitive modes.
2017-09-17 10:08:49 -07:00
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