5adc029225
Merge branch 'master' of https://github.com/assimp/assimp
2017-09-29 21:59:11 +02:00
c42589460d
closes https://github.com/assimp/assimp/issues/1459 : fix out-of-boundary access error
2017-09-29 21:58:58 +02:00
6ae35fb4d1
Merge pull request #1462 from jaredmulconry/issue_1330
...
Fully addressed identifiable build warnings on gcc
2017-09-29 16:48:30 +02:00
d28f45bfa8
Merge branch 'master' of github.com:assimp/assimp into issue_1330
2017-09-29 14:15:53 +10:00
87546ec54c
Merge pull request #1461 from jfaust/master
...
Fix possible infinite loop when exporting to gltf2
2017-09-28 21:21:56 +02:00
4feac1b1f9
Changed a couple more function interfaces to correct the input type.
2017-09-29 01:40:05 +10:00
12b6895f7b
Replaced unsigned long for the crc table to z_crc_t, to match what is returned by get-crc_table
2017-09-29 01:29:11 +10:00
febd611d48
Fix glTF2::Asset::FindUniqueID() when the input string is >= 256 chars
2017-09-27 18:41:35 -07:00
e77e89c8b7
Improved the naming of temporary file generator function. Replaced use of tmpnam in utIOStreamBuffer with this facility to addresssafety warning.
2017-09-26 22:41:20 +10:00
980d2b0eee
Added a header to hold the file generation code for unit testing purposes.
2017-09-26 22:08:52 +10:00
d0ca143a3b
Merge branch 'master' of github.com:assimp/assimp into issue_1330
2017-09-26 21:35:53 +10:00
e2ab3e0d29
Changed the method by which temporary files are created for unit the FileSizeTest. Will apply to other tests next.
2017-09-26 21:32:11 +10:00
b1410f8455
Merge pull request #1457 from jaredmulconry/issue_1330
...
Partially address issue #1330
2017-09-26 08:24:07 +02:00
4360267cb2
Replaced flakey macros with specific functions to serve the purpose
2017-09-25 22:58:47 +10:00
f6fc5a7a11
Changed the FileSizeTest to not rely on tmpnam to eliminate warning on gcc.
2017-09-25 22:07:01 +10:00
7e91ac3443
Suppressed warning on gcc caused by the 'visibility' attribute being ignored on types.
2017-09-25 20:22:06 +10:00
79a5165106
Fixed unused variable warning by replacing them with descriptive comments
2017-09-24 21:46:15 +10:00
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
539410d033
Fixed an error when compiling samples under MSVC that was caused by assuming including windows.h would pull in shellapi.h
2017-09-24 19:31:04 +10:00
059a32654e
Addressed warnings generated on MSVC across x86 and x64.
2017-09-24 19:29:43 +10:00
b5ac248703
Merge pull request #1444 from turol/warnings
...
Clean up some more GCC warnings
2017-09-20 22:18:21 +02:00
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
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
adec1b2175
Merge pull request #1446 from Matter-and-Form/feature/gltf2-primitives
...
glTF2 primitives fixes
2017-09-19 15:39:11 +02:00
d27e667f1e
Merge branch 'master' of https://github.com/assimp/assimp
2017-09-19 00:32:50 +02:00
af9596674d
FBX: add missing inversion of postrotation matrix for fbx.
2017-09-19 00:31:41 +02:00
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
798542d7bd
Formatting
2017-09-18 14:48:07 -04:00
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
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
2efd2cdef8
tweaks to primitive merging logic; comments + formatting
2017-09-18 11:16:05 -04:00
814e8b3f8e
Formatting
2017-09-18 11:16:05 -04:00
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
5147acfe65
Revert "store node mesh vs. meshes"
...
This reverts commit a0d97505e5
2017-09-18 11:16:04 -04:00
d473a49456
Merge pull request #1442 from jcowles/master
...
Fix glTF 2.0 multi-primitive support
2017-09-18 16:24:58 +02:00
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
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
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
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
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
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
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
69f8dc9b31
Travis: Disable OS X build since it doesn't do anything currently
2017-09-16 17:59:47 +03:00
62db02210a
Merge pull request #1440 from turol/travis
...
Travis cleanup
2017-09-16 16:30:07 +02:00
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
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
cf8453a21a
travis: Enable ccache
2017-09-16 16:04:08 +03:00
798d2d063c
travis: Only build with xcode 8.3
2017-09-16 15:52:18 +03:00
167fb7e250
travis: Correctly minimize build matrix
2017-09-16 15:52:00 +03:00
5478d4d4c7
travis: Move os declarations earlier
2017-09-16 15:22:37 +03:00
Kim Kulling
Kim Kulling
Jared Mulconry
Josh Faust
Daniel Hritzkiv
Turo Lamminen
Jeremy Cowles