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
Turo Lamminen [Sat, 16 Sep 2017 12:52:18 +0000 (15:52 +0300)]
travis: Only build with xcode 8.3
Turo Lamminen [Sat, 16 Sep 2017 12:34:32 +0000 (15:34 +0300)]
travis: Correctly minimize build matrix
Turo Lamminen [Sat, 16 Sep 2017 12:22:37 +0000 (15:22 +0300)]
travis: Move os declarations earlier
Kim Kulling [Sat, 16 Sep 2017 07:13:43 +0000 (09:13 +0200)]
Merge pull request #1436 from turol/warnings
Clean up some GCC warnings
Richard Mitton [Fri, 15 Sep 2017 19:40:38 +0000 (12:40 -0700)]
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.
Richard Mitton [Fri, 15 Sep 2017 19:39:58 +0000 (12:39 -0700)]
Fixed truncated material names
The previous Unicode library change accidentally trimmed off the last character of SIB material names.
Richard Mitton [Fri, 15 Sep 2017 18:57:49 +0000 (11:57 -0700)]
Merge pull request #1 from assimp/master
Merged from master
Turo Lamminen [Fri, 15 Sep 2017 09:31:52 +0000 (12:31 +0300)]
FBXParser: Silence uninitialized variable warnings
Turo Lamminen [Thu, 14 Sep 2017 09:19:03 +0000 (12:19 +0300)]
Importer: Whitespace cleanup to fix GCC misleading indentation warning
Turo Lamminen [Fri, 15 Sep 2017 09:41:40 +0000 (12:41 +0300)]
AssbinExporter: Fix strict aliasing violation
Turo Lamminen [Thu, 14 Sep 2017 08:25:19 +0000 (11:25 +0300)]
AssbinExporter: Add Write specialization for aiColor3D
Turo Lamminen [Thu, 14 Sep 2017 08:22:32 +0000 (11:22 +0300)]
DefaultLogger: Whitespace cleanup to fix GCC misleading indentation warning
Turo Lamminen [Thu, 14 Sep 2017 08:18:02 +0000 (11:18 +0300)]
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.
Turo Lamminen [Thu, 14 Sep 2017 07:54:02 +0000 (10:54 +0300)]
Add CMake flag to treat warnings as errors
Jared Mulconry [Fri, 15 Sep 2017 08:27:59 +0000 (18:27 +1000)]
Addressed last remaining warning under MSVC caused by use of 'deprecated' fopen.
Kim Kulling [Fri, 15 Sep 2017 07:37:57 +0000 (09:37 +0200)]
Merge pull request #1433 from vkovalev123/patch-1
Update 3DSLoader.cpp
vkovalev123 [Thu, 14 Sep 2017 11:55:02 +0000 (14:55 +0300)]
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.
Kim Kulling [Wed, 13 Sep 2017 21:42:21 +0000 (23:42 +0200)]
Merge pull request #1431 from assimp/revert-1427-asan
Revert "Asan"
Kim Kulling [Wed, 13 Sep 2017 19:40:44 +0000 (21:40 +0200)]
Revert "Asan"
Kim Kulling [Wed, 13 Sep 2017 18:01:38 +0000 (20:01 +0200)]
Merge pull request #1423 from Matter-and-Form/feature/gltf2
glTF 2 Importer + glTF 2 Spec Conformity
Kim Kulling [Wed, 13 Sep 2017 17:38:44 +0000 (19:38 +0200)]
Merge pull request #1427 from turol/asan
Asan
Daniel Hritzkiv [Wed, 13 Sep 2017 15:23:12 +0000 (11:23 -0400)]
Update glTF in list of importers and exporters
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
Kim Kulling [Tue, 12 Sep 2017 19:16:59 +0000 (21:16 +0200)]
MDP: fix encoding issues.
Kim Kulling [Tue, 12 Sep 2017 17:07:21 +0000 (19:07 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Tue, 12 Sep 2017 17:07:17 +0000 (19:07 +0200)]
FBX: fix some minor findings.
Kim Kulling [Tue, 12 Sep 2017 16:59:38 +0000 (18:59 +0200)]
closes https://github.com/assimp/assimp/issues/1426: add Defines.h to include folder for install.
Turo Lamminen [Tue, 12 Sep 2017 15:57:44 +0000 (18:57 +0300)]
Add AddressSanitizer option to CMake
John Senneker [Tue, 12 Sep 2017 15:55:52 +0000 (11:55 -0400)]
Manually read alphaMode material property
John Senneker [Tue, 12 Sep 2017 15:55:22 +0000 (11:55 -0400)]
Properly move string passed to JSON writer
Daniel Hritzkiv [Tue, 12 Sep 2017 14:07:15 +0000 (10:07 -0400)]
Fix Segfault caused by losing pointer to std::string
Keep std::string alive
Daniel Hritzkiv [Tue, 12 Sep 2017 13:57:58 +0000 (09:57 -0400)]
Revert "Remove simple gltf2 export unit test"
This reverts commit
4b01ecaf109ae1bbd3ae918e30abdc67d7448a5a.
Daniel Hritzkiv [Mon, 11 Sep 2017 20:31:40 +0000 (16:31 -0400)]
Remove simple gltf2 export unit test
Segfaults on Linux for some reason. No other tests test exporting, so it’s fine
Daniel Hritzkiv [Mon, 11 Sep 2017 01:04:28 +0000 (21:04 -0400)]
Exclude glTF2 Exporter test when ASSIMP_BUILD_NO_EXPORT
Daniel Hritzkiv [Fri, 8 Sep 2017 20:32:00 +0000 (16:32 -0400)]
Formatting
Daniel Hritzkiv [Fri, 8 Sep 2017 19:58:09 +0000 (15:58 -0400)]
Use `forceNumber` argument of `WriteAttrs` to write correct attribute names, instead
Daniel Hritzkiv [Fri, 8 Sep 2017 19:54:03 +0000 (15:54 -0400)]
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
Daniel Hritzkiv [Thu, 7 Sep 2017 21:32:41 +0000 (17:32 -0400)]
Remove KHR_binary_glTF code
Binary glTF is now part of the glTF2 spec. However, it’s implemented incorrectly, so will be temporarily removed
Daniel Hritzkiv [Thu, 7 Sep 2017 21:15:05 +0000 (17:15 -0400)]
Remove compresssed file format flag
Daniel Hritzkiv [Thu, 7 Sep 2017 19:50:35 +0000 (15:50 -0400)]
Add gltf2 basic unit test
Daniel Hritzkiv [Thu, 7 Sep 2017 19:48:11 +0000 (15:48 -0400)]
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)
Daniel Hritzkiv [Thu, 7 Sep 2017 18:55:44 +0000 (14:55 -0400)]
Load gltf .bin files from correct directory
Daniel Hritzkiv [Thu, 7 Sep 2017 03:43:43 +0000 (23:43 -0400)]
Remove premultipliedAlpha from gltf2
John Senneker [Wed, 6 Sep 2017 19:32:44 +0000 (15:32 -0400)]
Fix parsing of glTF version
Handle version as int in gltf
Fix format specifiers in glTF version parser
John Senneker [Wed, 6 Sep 2017 18:50:02 +0000 (14:50 -0400)]
Add support for importing both glTF and glTF2 files
John Senneker [Wed, 6 Sep 2017 18:49:25 +0000 (14:49 -0400)]
Restrict search for OFF header to first 3 bytes
Daniel Hritzkiv [Wed, 6 Sep 2017 18:17:37 +0000 (14:17 -0400)]
Remove commented out code
Daniel Hritzkiv [Wed, 6 Sep 2017 18:17:24 +0000 (14:17 -0400)]
Set alphaMode, baseColorFactor opacity when model’s opacity isn’t 1
Daniel Hritzkiv [Wed, 6 Sep 2017 18:16:52 +0000 (14:16 -0400)]
Set the metallicFactor to 0 if source file doesn’t have metallicFactor
Otherwise, the models have full metallic materials and appear very dim
Daniel Hritzkiv [Tue, 5 Sep 2017 22:06:59 +0000 (18:06 -0400)]
Fix METALLIC_FACTOR typo
Daniel Hritzkiv [Tue, 5 Sep 2017 22:04:09 +0000 (18:04 -0400)]
Define gltf material property names as constants
Daniel Hritzkiv [Tue, 5 Sep 2017 20:39:34 +0000 (16:39 -0400)]
Fix indentation
Daniel Hritzkiv [Tue, 5 Sep 2017 20:29:00 +0000 (16:29 -0400)]
Implement pbrSpecularGlossiness property as Nullable
Daniel Hritzkiv [Tue, 5 Sep 2017 19:45:32 +0000 (15:45 -0400)]
Define default material values as static constants
for reuse
Daniel Hritzkiv [Tue, 5 Sep 2017 18:40:27 +0000 (14:40 -0400)]
Remove need for Has by returning an empty Ref in Get
Daniel Hritzkiv [Tue, 5 Sep 2017 18:39:52 +0000 (14:39 -0400)]
Use different form of index accessor
Daniel Hritzkiv [Mon, 4 Sep 2017 02:11:20 +0000 (22:11 -0400)]
Export material names properly
Daniel Hritzkiv [Mon, 4 Sep 2017 02:09:48 +0000 (22:09 -0400)]
Sampler improvements; Add new LazyDict method
Samplers are now imported into assimp internal format from textures;
Samplers have defaults as per spec;
Sampler enums are strongly typed with UNSET values;
Samplers are exported properly;
Sampler filters are exported as well;
Samplers are re-used across textures on export
Default sampler values are not written
Daniel Hritzkiv [Mon, 4 Sep 2017 02:03:02 +0000 (22:03 -0400)]
Set default values on Sampler
Daniel Hritzkiv [Fri, 1 Sep 2017 22:29:30 +0000 (18:29 -0400)]
Fix unused CopyValue
Daniel Hritzkiv [Fri, 1 Sep 2017 21:56:30 +0000 (17:56 -0400)]
Export extensions