platform/upstream/assimp.git
6 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

6 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

6 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

6 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

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

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

6 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

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

6 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

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

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

6 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

6 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

6 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

6 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

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

6 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

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

6 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

6 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

6 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

6 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

6 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.

6 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

6 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.

6 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.

6 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.

6 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.

6 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.

6 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.

6 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.

6 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

6 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

6 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

6 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…

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

6 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.

6 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.

7 years agoMerge pull request #1397 from Arshia001/master
Kim Kulling [Fri, 18 Aug 2017 21:54:41 +0000 (23:54 +0200)]
Merge pull request #1397 from Arshia001/master

Fix OBJ discarding all material names if the material library is missing

7 years agoFix OBJ discarding all material names if the material library is missing
Arshia001 [Fri, 18 Aug 2017 13:10:07 +0000 (17:40 +0430)]
Fix OBJ discarding all material names if the material library is missing

7 years agoMerge pull request #1385 from gongminmin/FixForVS2017.3
Kim Kulling [Tue, 15 Aug 2017 19:27:38 +0000 (21:27 +0200)]
Merge pull request #1385 from gongminmin/FixForVS2017.3

Fix compiling problems under VS2017.3.

7 years agoFix compiling problems under VS2017.3.
Minmin Gong [Tue, 15 Aug 2017 04:51:59 +0000 (21:51 -0700)]
Fix compiling problems under VS2017.3.
1. WordIterator's operator== and operator!= must take const WordIterator& as parameter type.
2. OpenMP doesn't work with new two phase lookups. Need to disable twoPhase.

7 years agoassert: remove assert with more than one statement and use only ai_assert.
Kim Kulling [Mon, 14 Aug 2017 20:20:26 +0000 (22:20 +0200)]
assert: remove assert with more than one statement and use only ai_assert.

7 years agoMerge pull request #1383 from jeremyabel/patch-1
Kim Kulling [Sun, 13 Aug 2017 15:51:15 +0000 (17:51 +0200)]
Merge pull request #1383 from jeremyabel/patch-1

Replaced out-of-date old repo link with a wiki link to C4D file format build instructions

7 years agoAdded wiki link to C4D file format
Jeremy Abel [Sat, 12 Aug 2017 19:06:36 +0000 (15:06 -0400)]
Added wiki link to C4D file format

7 years agoMerge pull request #1382 from jeremyabel/master
Kim Kulling [Sat, 12 Aug 2017 18:40:28 +0000 (20:40 +0200)]
Merge pull request #1382 from jeremyabel/master

Fixes for C4D importer

7 years agoshould be map, not set
Jeremy Abel [Sat, 12 Aug 2017 04:16:00 +0000 (00:16 -0400)]
should be map, not set

7 years agochanged a few leftover asserts to ai_assert
Jeremy Abel [Sat, 12 Aug 2017 04:13:24 +0000 (00:13 -0400)]
changed a few leftover asserts to ai_assert

7 years agoMerge pull request #1378 from dhritzkiv/feature/gltf-version
Kim Kulling [Thu, 10 Aug 2017 18:50:15 +0000 (20:50 +0200)]
Merge pull request #1378 from dhritzkiv/feature/gltf-version

glTF version

7 years agoFormatting
Daniel Hritzkiv [Wed, 9 Aug 2017 15:36:22 +0000 (11:36 -0400)]
Formatting

7 years agoversion in glb header is stored as uint32_t
Daniel Hritzkiv [Wed, 9 Aug 2017 15:07:08 +0000 (11:07 -0400)]
version in glb header is stored as uint32_t

Validator complains about `1` not being a valid version, however.

7 years agoEnsure gltf asset version is printed as \d.0
Daniel Hritzkiv [Wed, 9 Aug 2017 14:45:54 +0000 (10:45 -0400)]
Ensure gltf asset version is printed as \d.0

7 years ago§
Kim Kulling [Sat, 5 Aug 2017 16:54:17 +0000 (18:54 +0200)]
§

7 years agoMerge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Sat, 5 Aug 2017 16:46:56 +0000 (18:46 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp

7 years agounzip: latest greatest.
Kim Kulling [Sat, 5 Aug 2017 16:46:34 +0000 (18:46 +0200)]
unzip: latest greatest.

7 years agoMerge pull request #1370 from 0xcccc/master
Kim Kulling [Thu, 3 Aug 2017 14:40:32 +0000 (16:40 +0200)]
Merge pull request #1370 from 0xcccc/master

Fix android build issues

7 years agoply-loader: add brackets.
Kim Kulling [Thu, 3 Aug 2017 12:58:39 +0000 (14:58 +0200)]
ply-loader: add brackets.

7 years agoply-importer: fix creation of vertex attributes.
Kim Kulling [Thu, 3 Aug 2017 12:57:48 +0000 (14:57 +0200)]
ply-importer: fix creation of vertex attributes.

7 years agoPlyLoader: fix vertex attribute lookup.
Kim Kulling [Wed, 2 Aug 2017 12:24:53 +0000 (14:24 +0200)]
PlyLoader: fix vertex attribute lookup.

7 years agoFix android build issues
Knox Shao [Wed, 2 Aug 2017 11:15:07 +0000 (19:15 +0800)]
Fix android build issues

7 years agocloses https://github.com/assimp/assimp/issues/1270: use HasTexture for
Kim Kulling [Wed, 2 Aug 2017 09:35:57 +0000 (11:35 +0200)]
closes https://github.com/assimp/assimp/issues/1270: use HasTexture for
texture coordinates.

7 years agocmake cleanup.
Kim Kulling [Mon, 31 Jul 2017 12:25:00 +0000 (14:25 +0200)]
cmake cleanup.

7 years agoCommandline tool: fix url to project space.
Kim Kulling [Sun, 30 Jul 2017 19:21:51 +0000 (21:21 +0200)]
Commandline tool: fix url to project space.

7 years agoMerge pull request #1365 from ihmcrobotics/feature/custom-library-loader
Alexander Gessler [Sat, 29 Jul 2017 22:14:03 +0000 (00:14 +0200)]
Merge pull request #1365 from ihmcrobotics/feature/custom-library-loader

Feature/custom library loader

7 years agoMerge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Sat, 29 Jul 2017 14:45:56 +0000 (16:45 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp

7 years agoReadme: update list of supported file formats.
Kim Kulling [Sat, 29 Jul 2017 14:45:50 +0000 (16:45 +0200)]
Readme: update list of supported file formats.

7 years agoMerge pull request #1363 from jamesgk/gltf2
Kim Kulling [Sat, 29 Jul 2017 13:08:52 +0000 (15:08 +0200)]
Merge pull request #1363 from jamesgk/gltf2

glTF2 export support

7 years agoMerge pull request #1364 from pdaehne/master
Kim Kulling [Sat, 29 Jul 2017 13:07:38 +0000 (15:07 +0200)]
Merge pull request #1364 from pdaehne/master

X3D importer: Workaround for buggy Android NDK (issue #1361)

7 years agoMerge pull request #1366 from titorgalaxy/master
Kim Kulling [Sat, 29 Jul 2017 13:06:37 +0000 (15:06 +0200)]
Merge pull request #1366 from titorgalaxy/master

Fix install for builds with MSVC compiler and NMake.

7 years agoFix install for builds with MSVC compiler and NMake.
<SeanMooreSW@gmail.com> [Sat, 29 Jul 2017 11:45:25 +0000 (07:45 -0400)]
Fix install for builds with MSVC compiler and NMake.

The CMake variable "MSVC" and the related versioned variables indicate that the
Visual Studio compiler is used but when using that compiler and the "NMake
Makefiles JOM" build generator the files it tried to install weren't in the
expected Debug folder.