platform/upstream/assimp.git
7 years agoRevert "Remove simple gltf2 export unit test"
Daniel Hritzkiv [Tue, 12 Sep 2017 13:57:58 +0000 (09:57 -0400)]
Revert "Remove simple gltf2 export unit test"

This reverts commit 4b01ecaf109ae1bbd3ae918e30abdc67d7448a5a.

7 years agoRemove simple gltf2 export unit test
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

7 years agoExclude glTF2 Exporter test when ASSIMP_BUILD_NO_EXPORT
Daniel Hritzkiv [Mon, 11 Sep 2017 01:04:28 +0000 (21:04 -0400)]
Exclude glTF2 Exporter test when ASSIMP_BUILD_NO_EXPORT

7 years agoFormatting
Daniel Hritzkiv [Fri, 8 Sep 2017 20:32:00 +0000 (16:32 -0400)]
Formatting

7 years agoUse `forceNumber` argument of `WriteAttrs` to write correct attribute names, instead
Daniel Hritzkiv [Fri, 8 Sep 2017 19:58:09 +0000 (15:58 -0400)]
Use `forceNumber` argument of `WriteAttrs` to write correct attribute names, instead

7 years agoFix mesh primitive’s attributes’ names
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

7 years agoRemove KHR_binary_glTF code
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

7 years agoRemove compresssed file format flag
Daniel Hritzkiv [Thu, 7 Sep 2017 21:15:05 +0000 (17:15 -0400)]
Remove compresssed file format flag

7 years agoAdd gltf2 basic unit test
Daniel Hritzkiv [Thu, 7 Sep 2017 19:50:35 +0000 (15:50 -0400)]
Add gltf2 basic unit test

7 years agomore specific token search for Collada Loader
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)

7 years agoLoad gltf .bin files from correct directory
Daniel Hritzkiv [Thu, 7 Sep 2017 18:55:44 +0000 (14:55 -0400)]
Load gltf .bin files from correct directory

7 years agoRemove premultipliedAlpha from gltf2
Daniel Hritzkiv [Thu, 7 Sep 2017 03:43:43 +0000 (23:43 -0400)]
Remove premultipliedAlpha from gltf2

7 years agoFix parsing of glTF version
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

7 years agoAdd support for importing both glTF and glTF2 files
John Senneker [Wed, 6 Sep 2017 18:50:02 +0000 (14:50 -0400)]
Add support for importing both glTF and glTF2 files

7 years agoRestrict search for OFF header to first 3 bytes
John Senneker [Wed, 6 Sep 2017 18:49:25 +0000 (14:49 -0400)]
Restrict search for OFF header to first 3 bytes

7 years agoRemove commented out code
Daniel Hritzkiv [Wed, 6 Sep 2017 18:17:37 +0000 (14:17 -0400)]
Remove commented out code

7 years agoSet alphaMode, baseColorFactor opacity when model’s opacity isn’t 1
Daniel Hritzkiv [Wed, 6 Sep 2017 18:17:24 +0000 (14:17 -0400)]
Set alphaMode, baseColorFactor opacity when model’s opacity isn’t 1

7 years agoSet the metallicFactor to 0 if source file doesn’t have metallicFactor
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

7 years agoFix METALLIC_FACTOR typo
Daniel Hritzkiv [Tue, 5 Sep 2017 22:06:59 +0000 (18:06 -0400)]
Fix METALLIC_FACTOR typo

7 years agoDefine gltf material property names as constants
Daniel Hritzkiv [Tue, 5 Sep 2017 22:04:09 +0000 (18:04 -0400)]
Define gltf material property names as constants

7 years agoFix indentation
Daniel Hritzkiv [Tue, 5 Sep 2017 20:39:34 +0000 (16:39 -0400)]
Fix indentation

7 years agoImplement pbrSpecularGlossiness property as Nullable
Daniel Hritzkiv [Tue, 5 Sep 2017 20:29:00 +0000 (16:29 -0400)]
Implement pbrSpecularGlossiness property as Nullable

7 years agoDefine default material values as static constants
Daniel Hritzkiv [Tue, 5 Sep 2017 19:45:32 +0000 (15:45 -0400)]
Define default material values as static constants

for reuse

7 years agoRemove need for Has by returning an empty Ref in Get
Daniel Hritzkiv [Tue, 5 Sep 2017 18:40:27 +0000 (14:40 -0400)]
Remove need for Has by returning an empty Ref in Get

7 years agoUse different form of index accessor
Daniel Hritzkiv [Tue, 5 Sep 2017 18:39:52 +0000 (14:39 -0400)]
Use different form of index accessor

7 years agoExport material names properly
Daniel Hritzkiv [Mon, 4 Sep 2017 02:11:20 +0000 (22:11 -0400)]
Export material names properly

7 years agoSampler improvements; Add new LazyDict method
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

7 years agoSet default values on Sampler
Daniel Hritzkiv [Mon, 4 Sep 2017 02:03:02 +0000 (22:03 -0400)]
Set default values on Sampler

7 years agoFix unused CopyValue
Daniel Hritzkiv [Fri, 1 Sep 2017 22:29:30 +0000 (18:29 -0400)]
Fix unused CopyValue

7 years agoExport extensions
Daniel Hritzkiv [Fri, 1 Sep 2017 21:56:30 +0000 (17:56 -0400)]
Export extensions

7 years agoFormatting
Daniel Hritzkiv [Fri, 1 Sep 2017 21:56:48 +0000 (17:56 -0400)]
Formatting

7 years agoOnly export byteStride if not 0
Daniel Hritzkiv [Fri, 1 Sep 2017 21:56:42 +0000 (17:56 -0400)]
Only export byteStride if not 0

7 years agostore node mesh vs. meshes
Daniel Hritzkiv [Fri, 1 Sep 2017 21:56:13 +0000 (17:56 -0400)]
store node mesh vs. meshes

glTF nodes can only hold one mesh. this simply assigns to and check’s a Node’s Mesh

7 years agoreenable animation and skins exports
Daniel Hritzkiv [Fri, 1 Sep 2017 21:49:04 +0000 (17:49 -0400)]
reenable animation and skins exports

Currently incorrect, however. May need to be removed

7 years agoWrite specularGlossiness textures on the specularGlossiness object
Daniel Hritzkiv [Fri, 1 Sep 2017 06:42:26 +0000 (02:42 -0400)]
Write specularGlossiness textures on the specularGlossiness object

7 years agoMake sure `on` flag for specularGlossiness is being persisted
Daniel Hritzkiv [Fri, 1 Sep 2017 06:42:09 +0000 (02:42 -0400)]
Make sure `on` flag for specularGlossiness is being persisted

7 years agomention pbrSpecularGlossiness support
Daniel Hritzkiv [Fri, 1 Sep 2017 03:40:44 +0000 (23:40 -0400)]
mention pbrSpecularGlossiness support

7 years agoRemove OPEN3DGC and compression references
Daniel Hritzkiv [Fri, 1 Sep 2017 03:38:10 +0000 (23:38 -0400)]
Remove OPEN3DGC and compression references

7 years agoChanges to GLTF2 materials
Daniel Hritzkiv [Thu, 31 Aug 2017 22:30:43 +0000 (18:30 -0400)]
Changes to GLTF2 materials

pbrMetallicRoughness and pbrSpecularGlossiness as structs; persist textureinfo properties from start to finish; persist pbrSpecularGlossiness (via extensionsUsed) usage from start to finish

7 years agoRemove Light, Technique references
Daniel Hritzkiv [Thu, 31 Aug 2017 22:26:50 +0000 (18:26 -0400)]
Remove Light, Technique references

7 years agoStart removing materials common, and adding pbrSpecularGlossiness
Daniel Hritzkiv [Thu, 31 Aug 2017 05:35:10 +0000 (01:35 -0400)]
Start removing materials common, and adding pbrSpecularGlossiness

7 years agoRemove redundant function
Daniel Hritzkiv [Thu, 31 Aug 2017 03:51:52 +0000 (23:51 -0400)]
Remove redundant function

7 years agoUse `!ObjectEmpty()` vs. `MemberCount() > 0`
Daniel Hritzkiv [Thu, 31 Aug 2017 01:50:06 +0000 (21:50 -0400)]
Use `!ObjectEmpty()` vs. `MemberCount() > 0`

7 years agoWorking read, import, export, and write of gltf2 (pbr) material
Daniel Hritzkiv [Wed, 30 Aug 2017 21:25:11 +0000 (17:25 -0400)]
Working read, import, export, and write of gltf2 (pbr) material

7 years agocheck in gltf2 models to test directory
Daniel Hritzkiv [Mon, 28 Aug 2017 03:50:22 +0000 (23:50 -0400)]
check in gltf2 models to test directory
Remove un-needed test models

7 years agoStart managing and importing gltf2 pbr materials
Daniel Hritzkiv [Mon, 28 Aug 2017 03:47:54 +0000 (23:47 -0400)]
Start managing and importing gltf2 pbr materials

7 years agotemporarily disable gltf exporting of animations and skins
Daniel Hritzkiv [Mon, 28 Aug 2017 03:47:31 +0000 (23:47 -0400)]
temporarily disable gltf exporting of animations and skins

7 years agoStart reading pbr materials
Daniel Hritzkiv [Fri, 25 Aug 2017 21:58:41 +0000 (17:58 -0400)]
Start reading pbr materials

7 years agoCache retrieved items via an original index map
Daniel Hritzkiv [Fri, 25 Aug 2017 20:52:44 +0000 (16:52 -0400)]
Cache retrieved items via an original index map

7 years agoDisambiguate Get methods
Daniel Hritzkiv [Fri, 25 Aug 2017 20:09:07 +0000 (16:09 -0400)]
Disambiguate Get methods

7 years agoUpdate glTF2 Asset to use indexes
Daniel Hritzkiv [Thu, 24 Aug 2017 21:31:33 +0000 (17:31 -0400)]
Update glTF2 Asset to use indexes

7 years agoDuplicate gltfImporter as gltf2Importer; Include glTF2 importer in CMake List
Daniel Hritzkiv [Thu, 24 Aug 2017 21:15:48 +0000 (17:15 -0400)]
Duplicate gltfImporter as gltf2Importer; Include glTF2 importer in CMake List

7 years agoMerge pull request #1425 from jaredmulconry/issue_1065
Kim Kulling [Mon, 11 Sep 2017 07:04:30 +0000 (09:04 +0200)]
Merge pull request #1425 from jaredmulconry/issue_1065

Issue 1065: Fix build warnings under x64 on MSVC

7 years agoMerge branch 'master' of github.com:assimp/assimp into issue_1065
Jared Mulconry [Sun, 10 Sep 2017 14:17:23 +0000 (00:17 +1000)]
Merge branch 'master' of github.com:assimp/assimp into issue_1065

7 years agoFixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3.
Jared Mulconry [Sun, 10 Sep 2017 14:16:26 +0000 (00:16 +1000)]
Fixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3.

7 years agoMerge pull request #1424 from samitc/feature/fix-mesh-name-lost-with-PreTransformVert...
Kim Kulling [Sun, 10 Sep 2017 14:13:12 +0000 (16:13 +0200)]
Merge pull request #1424 from samitc/feature/fix-mesh-name-lost-with-PreTransformVertices-flag

fix name lost when load with PreTransformVertices flag

7 years agoFixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3.
Jared Mulconry [Sun, 10 Sep 2017 14:09:40 +0000 (00:09 +1000)]
Fixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3.

7 years agoFixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3.
Jared Mulconry [Sun, 10 Sep 2017 14:09:35 +0000 (00:09 +1000)]
Fixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3.

7 years agoFixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3.
Jared Mulconry [Sun, 10 Sep 2017 09:13:12 +0000 (19:13 +1000)]
Fixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3.

7 years agoFixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3.
Jared Mulconry [Sun, 10 Sep 2017 09:10:59 +0000 (19:10 +1000)]
Fixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3.

7 years agoFixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3.
Jared Mulconry [Sun, 10 Sep 2017 09:07:37 +0000 (19:07 +1000)]
Fixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3.

7 years agoFixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3.
Jared Mulconry [Sun, 10 Sep 2017 09:04:44 +0000 (19:04 +1000)]
Fixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3.

7 years agoFixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3.
Jared Mulconry [Sun, 10 Sep 2017 08:47:24 +0000 (18:47 +1000)]
Fixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3.

7 years agoMerge pull request #1422 from elect86/patch-9
Kim Kulling [Sat, 9 Sep 2017 18:52:14 +0000 (20:52 +0200)]
Merge pull request #1422 from elect86/patch-9

Added a link to pure jvm assimp port

7 years agofix name lost in mesh and nodes when load with aiProcess_PreTransformVertices flag
Amit Cirt [Sat, 9 Sep 2017 16:04:15 +0000 (19:04 +0300)]
fix name lost in mesh and nodes when load with aiProcess_PreTransformVertices flag

7 years agoAdded a link to pure jvm assimp port
Giuseppe Barbieri [Fri, 8 Sep 2017 13:46:23 +0000 (15:46 +0200)]
Added a link to pure jvm assimp port

7 years agoMerge pull request #1421 from assimp/issue_1404
Kim Kulling [Thu, 7 Sep 2017 23:02:21 +0000 (01:02 +0200)]
Merge pull request #1421 from assimp/issue_1404

closes https://github.com/assimp/assimp/issues/1404: set name with me…

7 years agoTraivis: make build amtrix smaller.
Kim Kulling [Thu, 7 Sep 2017 20:02:09 +0000 (22:02 +0200)]
Traivis: make build amtrix smaller.

7 years agocloses https://github.com/assimp/assimp/issues/1404: set name with merged meshes...
Kim Kulling [Thu, 7 Sep 2017 18:30:17 +0000 (20:30 +0200)]
closes https://github.com/assimp/assimp/issues/1404: set name with merged meshes for output mesh.

7 years agoMerge pull request #1418 from umlaeute/debian-fixes-4.0.1
Kim Kulling [Tue, 5 Sep 2017 12:57:06 +0000 (14:57 +0200)]
Merge pull request #1418 from umlaeute/debian-fixes-4.0.1

Debian fixes 4.0.1

7 years agoexclude repository-settings from source-package generated via 'git archive'
IOhannes m zmölnig [Sun, 3 Sep 2017 21:03:48 +0000 (23:03 +0200)]
exclude repository-settings from source-package generated via 'git archive'

7 years agosplit setup.py into multiple lines
IOhannes m zmölnig [Sat, 2 Sep 2017 17:46:57 +0000 (19:46 +0200)]
split setup.py into multiple lines

to make it easier for patching in Debian...

7 years agofixed spelling error
IOhannes m zmölnig [Sat, 2 Sep 2017 17:44:51 +0000 (19:44 +0200)]
fixed spelling error

7 years agofix the buil
Kim Kulling [Thu, 31 Aug 2017 12:15:23 +0000 (14:15 +0200)]
fix the buil

7 years agofix the buil
Kim Kulling [Thu, 31 Aug 2017 12:06:56 +0000 (14:06 +0200)]
fix the buil

7 years agoFIx build
Kim Kulling [Thu, 31 Aug 2017 09:53:00 +0000 (11:53 +0200)]
FIx build

7 years agoTests: add 3D-importer test.
Kim Kulling [Thu, 31 Aug 2017 09:39:10 +0000 (11:39 +0200)]
Tests: add 3D-importer test.

7 years agoFix review findings: remove unused includes
Kim Kulling [Thu, 31 Aug 2017 09:30:31 +0000 (11:30 +0200)]
Fix review findings: remove unused includes

7 years agocloses https://github.com/assimp/assimp/issues/1406: fix merge issue + improve 3MF...
Kim Kulling [Thu, 31 Aug 2017 09:04:13 +0000 (11:04 +0200)]
closes https://github.com/assimp/assimp/issues/1406: fix merge issue + improve 3MF-tests

7 years agoMerge pull request #1410 from THISISAGOODNAME/master
Kim Kulling [Thu, 31 Aug 2017 07:52:35 +0000 (09:52 +0200)]
Merge pull request #1410 from THISISAGOODNAME/master

Fix assimp_qt_viewer build failed on OSX

7 years agoFix assimp_qt_viewer build failed on OSX
THISISAGOODNAME [Wed, 30 Aug 2017 15:18:36 +0000 (23:18 +0800)]
Fix assimp_qt_viewer build failed on OSX

7 years agoMerge pull request #1408 from assimp/acgessler-patch-4
Kim Kulling [Wed, 30 Aug 2017 07:22:29 +0000 (09:22 +0200)]
Merge pull request #1408 from assimp/acgessler-patch-4

Update version check in FBX reader to check for version >= 7500 inste…

7 years agoUpdate version check in FBX reader to check for version >= 7500 instead of exactly...
Alexander Gessler [Tue, 29 Aug 2017 13:41:25 +0000 (15:41 +0200)]
Update version check in FBX reader to check for version >= 7500 instead of exactly 7500.

7 years agoMerge pull request #1405 from assimp/rickomax-master
Kim Kulling [Mon, 28 Aug 2017 19:22:08 +0000 (21:22 +0200)]
Merge pull request #1405 from assimp/rickomax-master

Rickomax master

7 years agoMerge branch 'master' of https://github.com/rickomax/assimp into rickomax-master
Kim Kulling [Fri, 25 Aug 2017 14:47:08 +0000 (16:47 +0200)]
Merge branch 'master' of https://github.com/rickomax/assimp into rickomax-master

7 years agoMerge pull request #1403 from kebby/fbx_anim_fix
Kim Kulling [Fri, 25 Aug 2017 11:33:09 +0000 (13:33 +0200)]
Merge pull request #1403 from kebby/fbx_anim_fix

FBX importer: Use actual min/max of anim keys when start/stop time is missing

7 years agoMerge pull request #1401 from melMass/python3
Kim Kulling [Fri, 25 Aug 2017 10:23:24 +0000 (12:23 +0200)]
Merge pull request #1401 from melMass/python3

Detect if Anaconda and fixed 3d_viewer for Python 3

7 years agoFBX importer: try a constant again (ll suffix this time)
Tammo Hinrichs [Fri, 25 Aug 2017 10:14:03 +0000 (12:14 +0200)]
FBX importer: try a constant again (ll suffix this time)

7 years agoFBX importer: Back to INT64_MIN but include <stdint.h> also.
Tammo Hinrichs [Fri, 25 Aug 2017 09:17:07 +0000 (11:17 +0200)]
FBX importer: Back to INT64_MIN but include <stdint.h> also.

7 years agoMerge pull request #1400 from kebby/master
Kim Kulling [Fri, 25 Aug 2017 07:10:38 +0000 (09:10 +0200)]
Merge pull request #1400 from kebby/master

Collada importer: Add support for line strip primitives

7 years agoFBX importer: don't rely ont INT64_MIN / ..MAX macros
Tammo Hinrichs [Thu, 24 Aug 2017 15:18:54 +0000 (17:18 +0200)]
FBX importer: don't rely ont INT64_MIN / ..MAX macros

7 years agoUpdate Readme.md
Kim Kulling [Thu, 24 Aug 2017 15:03:41 +0000 (17:03 +0200)]
Update Readme.md

use new patreon badge.

7 years agoFBX importer: Use actual min/max of animation keyframes when start/stop time is missing
Tammo Hinrichs [Thu, 24 Aug 2017 12:40:53 +0000 (14:40 +0200)]
FBX importer: Use actual min/max of animation keyframes when start/stop time is missing

7 years agoMerge pull request #1399 from m4c0/master
Kim Kulling [Wed, 23 Aug 2017 19:11:45 +0000 (21:11 +0200)]
Merge pull request #1399 from m4c0/master

Re-enabling PACK_STRUCT for MDL files.

7 years agoMerge pull request #1398 from Eljay/fix-irrxml
Kim Kulling [Wed, 23 Aug 2017 19:10:22 +0000 (21:10 +0200)]
Merge pull request #1398 from Eljay/fix-irrxml

Fix linking issue with irrXML

7 years agocreated a python3 version of the 3dviewer and fixed the / = float in py3
Mel Massadian [Wed, 23 Aug 2017 18:02:58 +0000 (20:02 +0200)]
created a python3 version of the 3dviewer and fixed the / = float in py3

7 years agoCollada importer: Add support for line strip primitives
Tammo Hinrichs [Wed, 23 Aug 2017 15:52:53 +0000 (17:52 +0200)]
Collada importer: Add support for line strip primitives

7 years agoRe-enabling PACK_STRUCT for MDL files.
Eduardo Costa [Mon, 21 Aug 2017 08:27:40 +0000 (09:27 +0100)]
Re-enabling PACK_STRUCT for MDL files.

When using this compiler:

    Apple LLVM version 7.3.0 (clang-703.0.31)
    Target: x86_64-apple-darwin15.4.0
    Thread model: posix

The MDL::Frame is aligned in 8-byte boundaries instead of 4. This
generates this error when loading old Quake 1 MDL files:

    ERROR: Failed to load file: Invalid MDL file. The file is too small
    or contains invalid data (File: MDLLoader.cpp Line: 422)

It seems this error was introduced by commit
bd2af6591f20fd8777332d510056a037fbfa0df5 due to compilation warnings.

7 years agoFix linking issue with irrXML
Lee Jeffery [Sun, 20 Aug 2017 18:07:09 +0000 (19:07 +0100)]
Fix linking issue with irrXML

7 years agoReadme: add TriLib to the official list of supported ports.
Kim Kulling [Sat, 19 Aug 2017 20:09:30 +0000 (22:09 +0200)]
Readme: add TriLib to the official list of supported ports.