Marco Di Benedetto [Sat, 7 Oct 2017 10:36:02 +0000 (12:36 +0200)]
added additional displacement texture token.
turol [Fri, 6 Oct 2017 15:19:54 +0000 (18:19 +0300)]
Merge pull request #1476 from assimp/revert-1471-clang
Revert "WIP: Enable Travis clang build"
Kim Kulling [Fri, 6 Oct 2017 13:42:05 +0000 (15:42 +0200)]
Revert "WIP: Enable Travis clang build"
Kim Kulling [Fri, 6 Oct 2017 13:40:36 +0000 (15:40 +0200)]
Merge pull request #1474 from jaredmulconry/issue_1470
Update zlib contribution
Kim Kulling [Fri, 6 Oct 2017 13:37:33 +0000 (15:37 +0200)]
Merge pull request #1475 from jaredmulconry/master
Fixed warning on clang 3.9 caused by static data member in class template
Kim Kulling [Fri, 6 Oct 2017 13:36:53 +0000 (15:36 +0200)]
Merge pull request #1471 from turol/clang
WIP: Enable Travis clang build
Jared Mulconry [Fri, 6 Oct 2017 09:32:33 +0000 (20:32 +1100)]
Fixed warnings on MSVC caused by implicit conversions from double to float.
Jared Mulconry [Thu, 5 Oct 2017 12:55:10 +0000 (23:55 +1100)]
Address warnings on Clang 3.9 caused by having a static data member in a class template.
Turo Lamminen [Thu, 5 Oct 2017 09:51:08 +0000 (12:51 +0300)]
OpenGEXImporter: Copy materials to scene
Turo Lamminen [Thu, 5 Oct 2017 09:43:49 +0000 (12:43 +0300)]
OpenGEXImporter: Store RefInfo in unique_ptr so they get automatically cleaned up
Turo Lamminen [Thu, 5 Oct 2017 09:38:44 +0000 (12:38 +0300)]
OpenGEXImporter: Fix IOStream leak
Turo Lamminen [Thu, 5 Oct 2017 09:35:17 +0000 (12:35 +0300)]
OpenGEXImporter: Store ChildInfo in unique_ptr so they get automatically cleaned up
Turo Lamminen [Thu, 5 Oct 2017 09:09:26 +0000 (12:09 +0300)]
AMFImporter: Fix memory leak
Turo Lamminen [Thu, 5 Oct 2017 08:56:13 +0000 (11:56 +0300)]
UnrealLoader: Fix IOStream leak
Turo Lamminen [Thu, 5 Oct 2017 08:55:58 +0000 (11:55 +0300)]
utRemoveVCProcess: Fix memory leak
Turo Lamminen [Thu, 5 Oct 2017 08:33:27 +0000 (11:33 +0300)]
utMetadata: Fix memory leak
Turo Lamminen [Thu, 5 Oct 2017 08:10:22 +0000 (11:10 +0300)]
Upgrade RapidJSON to get rid of a clang warning
Turo Lamminen [Thu, 5 Oct 2017 08:05:27 +0000 (11:05 +0300)]
FBXImporter: Add explicit instantiation of log_prefix so other FBX source files can see it
Turo Lamminen [Thu, 5 Oct 2017 07:51:48 +0000 (10:51 +0300)]
IFCImporter: Add explicit instantiation of log_prefix so IFCMaterial.cpp can see it
Jared Mulconry [Thu, 5 Oct 2017 09:11:18 +0000 (20:11 +1100)]
Removed unnecessary files from zlib contribution
Jared Mulconry [Thu, 5 Oct 2017 08:34:37 +0000 (19:34 +1100)]
Merge branch 'master' of github.com:assimp/assimp into issue_1470
Turo Lamminen [Thu, 5 Oct 2017 07:45:25 +0000 (10:45 +0300)]
Fix warning about non-constant array size
Turo Lamminen [Wed, 4 Oct 2017 18:21:36 +0000 (21:21 +0300)]
CMake: Remove OpenMP stuff, it's unused and breaks Travis clang build
Turo Lamminen [Wed, 4 Oct 2017 18:10:49 +0000 (21:10 +0300)]
Travis: Treat warnings as errors, without typos this time
Turo Lamminen [Wed, 4 Oct 2017 17:50:16 +0000 (20:50 +0300)]
Travis: Build with clang too
Kim Kulling [Wed, 4 Oct 2017 14:12:44 +0000 (16:12 +0200)]
Merge pull request #1432 from turol/asan
Asan
Kim Kulling [Wed, 4 Oct 2017 11:26:12 +0000 (13:26 +0200)]
Merge pull request #1469 from turol/warnings
Treat warnings as errors on Appveyor
Jared Mulconry [Wed, 4 Oct 2017 09:33:59 +0000 (20:33 +1100)]
Upgraded zlib to 1.2.11.1 from the develop branch.
Kim Kulling [Tue, 3 Oct 2017 07:58:56 +0000 (09:58 +0200)]
Merge pull request #1468 from assimp/issue_1467
closes https://github.com/assimp/assimp/issues/1467.
Turo Lamminen [Mon, 2 Oct 2017 10:08:20 +0000 (13:08 +0300)]
Disable warning 4351 on MSVC 2013
Turo Lamminen [Mon, 2 Oct 2017 08:43:29 +0000 (11:43 +0300)]
appveyor: Treat warnings as errors
Turo Lamminen [Mon, 2 Oct 2017 08:40:57 +0000 (11:40 +0300)]
Fix warnings-as-errors flag on MSVC
Jared Mulconry [Sun, 1 Oct 2017 06:51:13 +0000 (17:51 +1100)]
Addressed some mismatched news/deletes caused by the new glTF2 sources.
Jared Mulconry [Sun, 1 Oct 2017 12:16:21 +0000 (23:16 +1100)]
Addressed a number of memory leaks identified in unit tests by asan
Jared Mulconry [Sun, 1 Oct 2017 08:25:43 +0000 (19:25 +1100)]
Addressed asan failures caused by misuse of APIs within unit tests.
Turo Lamminen [Thu, 14 Sep 2017 07:34:16 +0000 (10:34 +0300)]
Fix delete / delete[] mismatches in glTF2 importer
Turo Lamminen [Thu, 14 Sep 2017 07:33:49 +0000 (10:33 +0300)]
Fix delete / delete[] mismatches in MakeVerboseFormat
Turo Lamminen [Thu, 14 Sep 2017 06:38:07 +0000 (09:38 +0300)]
Fix out-of-bounds read in MaterialSystem unit test
Turo Lamminen [Tue, 12 Sep 2017 16:00:44 +0000 (19:00 +0300)]
Fix delete / delete[] mismatch in glTFAsset
Turo Lamminen [Tue, 12 Sep 2017 16:09:22 +0000 (19:09 +0300)]
Enable AddressSanitizer for Linux clang build
Turo Lamminen [Tue, 12 Sep 2017 15:57:44 +0000 (18:57 +0300)]
Add AddressSanitizer option to CMake
Kim Kulling [Mon, 2 Oct 2017 07:41:01 +0000 (09:41 +0200)]
OpenGEX: improve logging to be able to detect error-prone situations.
Kim Kulling [Mon, 2 Oct 2017 07:33:51 +0000 (09:33 +0200)]
closes https://github.com/assimp/assimp/issues/1467.
Kim Kulling [Sun, 1 Oct 2017 18:03:30 +0000 (20:03 +0200)]
Merge pull request #1466 from jaredmulconry/issue_1330
Eliminated warnings when building the project with clang
Kim Kulling [Sun, 1 Oct 2017 18:01:24 +0000 (20:01 +0200)]
Merge pull request #1465 from turol/warnings
Make Travis treat warnings as errors
Turo Lamminen [Sat, 30 Sep 2017 13:35:41 +0000 (16:35 +0300)]
travis: Treat warnings as errors
Turo Lamminen [Sat, 30 Sep 2017 13:35:11 +0000 (16:35 +0300)]
Fix CMAKE option name
Turo Lamminen [Tue, 26 Sep 2017 15:33:00 +0000 (18:33 +0300)]
Open3DGC: Fix some uninitialized variable warnings
Jared Mulconry [Sat, 30 Sep 2017 13:29:56 +0000 (23:29 +1000)]
Eliminated all warnings under clang with default settings. One remains in the included zlib contrib project.
Jared Mulconry [Sat, 30 Sep 2017 13:28:02 +0000 (23:28 +1000)]
Added -fPIC flag to C compilers for GCC and clang. Removed -pedantic flag from some compilers.
Kim Kulling [Sat, 30 Sep 2017 08:47:23 +0000 (10:47 +0200)]
add some asserts.
Kim Kulling [Sat, 30 Sep 2017 07:38:13 +0000 (09:38 +0200)]
closes https://github.com/assimp/assimp/issues/1450: use correct name of exporter to gltf2
Kim Kulling [Sat, 30 Sep 2017 07:37:34 +0000 (09:37 +0200)]
Obj: rename attribute from exporter.
Kim Kulling [Fri, 29 Sep 2017 19:59:11 +0000 (21:59 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Fri, 29 Sep 2017 19:58:58 +0000 (21:58 +0200)]
closes https://github.com/assimp/assimp/issues/1459: fix out-of-boundary access error
Kim Kulling [Fri, 29 Sep 2017 14:48:30 +0000 (16:48 +0200)]
Merge pull request #1462 from jaredmulconry/issue_1330
Fully addressed identifiable build warnings on gcc
Jared Mulconry [Fri, 29 Sep 2017 04:15:53 +0000 (14:15 +1000)]
Merge branch 'master' of github.com:assimp/assimp into issue_1330
Kim Kulling [Thu, 28 Sep 2017 19:21:56 +0000 (21:21 +0200)]
Merge pull request #1461 from jfaust/master
Fix possible infinite loop when exporting to gltf2
Jared Mulconry [Thu, 28 Sep 2017 15:40:05 +0000 (01:40 +1000)]
Changed a couple more function interfaces to correct the input type.
Jared Mulconry [Thu, 28 Sep 2017 15:29:11 +0000 (01:29 +1000)]
Replaced unsigned long for the crc table to z_crc_t, to match what is returned by get-crc_table
Josh Faust [Thu, 28 Sep 2017 01:41:35 +0000 (18:41 -0700)]
Fix glTF2::Asset::FindUniqueID() when the input string is >= 256 chars
Jared Mulconry [Tue, 26 Sep 2017 12:41:20 +0000 (22:41 +1000)]
Improved the naming of temporary file generator function. Replaced use of tmpnam in utIOStreamBuffer with this facility to addresssafety warning.
Jared Mulconry [Tue, 26 Sep 2017 12:08:52 +0000 (22:08 +1000)]
Added a header to hold the file generation code for unit testing purposes.
Jared Mulconry [Tue, 26 Sep 2017 11:35:53 +0000 (21:35 +1000)]
Merge branch 'master' of github.com:assimp/assimp into issue_1330
Jared Mulconry [Tue, 26 Sep 2017 11:32:11 +0000 (21:32 +1000)]
Changed the method by which temporary files are created for unit the FileSizeTest. Will apply to other tests next.
Kim Kulling [Tue, 26 Sep 2017 06:24:07 +0000 (08:24 +0200)]
Merge pull request #1457 from jaredmulconry/issue_1330
Partially address issue #1330
Jared Mulconry [Mon, 25 Sep 2017 12:58:47 +0000 (22:58 +1000)]
Replaced flakey macros with specific functions to serve the purpose
Jared Mulconry [Mon, 25 Sep 2017 12:07:01 +0000 (22:07 +1000)]
Changed the FileSizeTest to not rely on tmpnam to eliminate warning on gcc.
Jared Mulconry [Mon, 25 Sep 2017 10:22:06 +0000 (20:22 +1000)]
Suppressed warning on gcc caused by the 'visibility' attribute being ignored on types.
Jared Mulconry [Sun, 24 Sep 2017 11:46:15 +0000 (21:46 +1000)]
Fixed unused variable warning by replacing them with descriptive comments
Jared Mulconry [Sun, 24 Sep 2017 11:19:03 +0000 (21:19 +1000)]
Fixed a warning caused by aiVector3D appearing in a packed struct, causing it to fail to pack as requested.
Jared Mulconry [Sun, 24 Sep 2017 09:31:04 +0000 (19:31 +1000)]
Fixed an error when compiling samples under MSVC that was caused by assuming including windows.h would pull in shellapi.h
Jared Mulconry [Sun, 24 Sep 2017 09:29:43 +0000 (19:29 +1000)]
Addressed warnings generated on MSVC across x86 and x64.
Kim Kulling [Wed, 20 Sep 2017 20:18:21 +0000 (22:18 +0200)]
Merge pull request #1444 from turol/warnings
Clean up some more GCC warnings
Kim Kulling [Tue, 19 Sep 2017 13:40:53 +0000 (15:40 +0200)]
Merge pull request #1445 from Matter-and-Form/gltf2-alphaMode-fix
Fix glTF2 alphaMode storage and reading
Kim Kulling [Tue, 19 Sep 2017 13:40:00 +0000 (15:40 +0200)]
Merge pull request #1447 from Matter-and-Form/gltf1-color-import-fix
[gltf1] Don’t ignore rgba(1,1,1,1) color properties
Kim Kulling [Tue, 19 Sep 2017 13:39:11 +0000 (15:39 +0200)]
Merge pull request #1446 from Matter-and-Form/feature/gltf2-primitives
glTF2 primitives fixes
Kim Kulling [Mon, 18 Sep 2017 22:32:50 +0000 (00:32 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Mon, 18 Sep 2017 22:31:41 +0000 (00:31 +0200)]
FBX: add missing inversion of postrotation matrix for fbx.
Daniel Hritzkiv [Mon, 18 Sep 2017 22:16:48 +0000 (18:16 -0400)]
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
Daniel Hritzkiv [Mon, 18 Sep 2017 18:48:07 +0000 (14:48 -0400)]
Formatting
Daniel Hritzkiv [Mon, 18 Sep 2017 16:19:55 +0000 (12:19 -0400)]
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…`
Daniel Hritzkiv [Mon, 18 Sep 2017 16:16:30 +0000 (12:16 -0400)]
SImplify mesh merging code
My assumption that primitives of different types (modes) can’t be in the same mesh was incorrect.
Daniel Hritzkiv [Mon, 18 Sep 2017 14:43:05 +0000 (10:43 -0400)]
tweaks to primitive merging logic; comments + formatting
Daniel Hritzkiv [Mon, 18 Sep 2017 14:20:02 +0000 (10:20 -0400)]
Formatting
Daniel Hritzkiv [Sun, 17 Sep 2017 21:00:57 +0000 (17:00 -0400)]
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
Daniel Hritzkiv [Sun, 17 Sep 2017 19:11:01 +0000 (15:11 -0400)]
Revert "store node mesh vs. meshes"
This reverts commit
a0d97505e5a53a9aa3a734d6bd3ad790234e6e09.
Kim Kulling [Mon, 18 Sep 2017 14:24:58 +0000 (16:24 +0200)]
Merge pull request #1442 from jcowles/master
Fix glTF 2.0 multi-primitive support
Turo Lamminen [Mon, 18 Sep 2017 12:21:51 +0000 (15:21 +0300)]
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.
Turo Lamminen [Mon, 18 Sep 2017 12:18:45 +0000 (15:18 +0300)]
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.
Turo Lamminen [Mon, 18 Sep 2017 12:13:19 +0000 (15:13 +0300)]
PlyLoader: Fix operator precedence issue in header check
The previous version might read past end of buffer
Turo Lamminen [Mon, 18 Sep 2017 11:59:55 +0000 (14:59 +0300)]
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.
Turo Lamminen [Mon, 18 Sep 2017 11:10:58 +0000 (14:10 +0300)]
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'.
Jeremy Cowles [Sun, 17 Sep 2017 17:06:57 +0000 (10:06 -0700)]
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.
Kim Kulling [Sun, 17 Sep 2017 11:45:40 +0000 (13:45 +0200)]
Merge pull request #1441 from turol/travis
Disable Travis OS X build since it doesn't do anything currently
Turo Lamminen [Sat, 16 Sep 2017 14:59:47 +0000 (17:59 +0300)]
Travis: Disable OS X build since it doesn't do anything currently
Kim Kulling [Sat, 16 Sep 2017 14:30:07 +0000 (16:30 +0200)]
Merge pull request #1440 from turol/travis
Travis cleanup
Kim Kulling [Sat, 16 Sep 2017 14:28:51 +0000 (16:28 +0200)]
Merge pull request #1435 from jaredmulconry/issue_1065
Last remaining build warning emitted from MSVC for x64 builds
Kim Kulling [Sat, 16 Sep 2017 14:27:38 +0000 (16:27 +0200)]
Merge pull request #1437 from rmitton/sib-version
Added support for SIB models from Silo 2.5
Turo Lamminen [Sat, 16 Sep 2017 12:53:02 +0000 (15:53 +0300)]
travis: Enable ccache