Kim Kulling
c3e9d6132c
Merge pull request #1468 from assimp/issue_1467
...
closes https://github.com/assimp/assimp/issues/1467 .
2017-10-03 09:58:56 +02:00
Kim Kulling
6ec25be0a6
OpenGEX: improve logging to be able to detect error-prone situations.
2017-10-02 09:41:01 +02:00
Kim Kulling
3f4663e369
closes https://github.com/assimp/assimp/issues/1467 .
2017-10-02 09:33:51 +02:00
Jared Mulconry
9088deeb1d
Eliminated all warnings under clang with default settings. One remains in the included zlib contrib project.
2017-09-30 23:29:56 +10:00
Kim Kulling
c4e91eb33f
add some asserts.
2017-09-30 10:47:23 +02:00
Kim Kulling
1c76962c98
closes https://github.com/assimp/assimp/issues/1450 : use correct name of exporter to gltf2
2017-09-30 09:38:13 +02:00
Kim Kulling
9033071237
Obj: rename attribute from exporter.
2017-09-30 09:37:34 +02:00
Kim Kulling
5adc029225
Merge branch 'master' of https://github.com/assimp/assimp
2017-09-29 21:59:11 +02:00
Kim Kulling
c42589460d
closes https://github.com/assimp/assimp/issues/1459 : fix out-of-boundary access error
2017-09-29 21:58:58 +02:00
Josh Faust
febd611d48
Fix glTF2::Asset::FindUniqueID() when the input string is >= 256 chars
2017-09-27 18:41:35 -07:00
Jared Mulconry
79a5165106
Fixed unused variable warning by replacing them with descriptive comments
2017-09-24 21:46:15 +10:00
Jared Mulconry
8dabd76e03
Fixed a warning caused by aiVector3D appearing in a packed struct, causing it to fail to pack as requested.
2017-09-24 21:19:03 +10:00
Jared Mulconry
059a32654e
Addressed warnings generated on MSVC across x86 and x64.
2017-09-24 19:29:43 +10:00
Kim Kulling
b5ac248703
Merge pull request #1444 from turol/warnings
...
Clean up some more GCC warnings
2017-09-20 22:18:21 +02:00
Kim Kulling
81b94a1dca
Merge pull request #1445 from Matter-and-Form/gltf2-alphaMode-fix
...
Fix glTF2 alphaMode storage and reading
2017-09-19 15:40:53 +02:00
Kim Kulling
5c44776532
Merge pull request #1447 from Matter-and-Form/gltf1-color-import-fix
...
[gltf1] Don’t ignore rgba(1,1,1,1) color properties
2017-09-19 15:40:00 +02:00
Kim Kulling
adec1b2175
Merge pull request #1446 from Matter-and-Form/feature/gltf2-primitives
...
glTF2 primitives fixes
2017-09-19 15:39:11 +02:00
Kim Kulling
d27e667f1e
Merge branch 'master' of https://github.com/assimp/assimp
2017-09-19 00:32:50 +02:00
Kim Kulling
af9596674d
FBX: add missing inversion of postrotation matrix for fbx.
2017-09-19 00:31:41 +02:00
Daniel Hritzkiv
3e8955faf5
Don’t ignore rgba(1,1,1,1) color properties
...
Do not ignore rgba(1,1,1,1) material properties when importing glTF1. While a white diffuse color may be the default value for a default assimp material, `1,1,1,1` is a very explicit color value for ambient/specular/emissive color properties.
Closes #1434
2017-09-18 18:16:48 -04:00
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
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
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
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
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
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
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
Turo Lamminen
b6f122ff2c
Fix delete / delete[] mismatch in glTFAsset
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