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

7 years agoCHANGES: add documentation of featureset for 4.0.1
Kim Kulling [Fri, 28 Jul 2017 20:33:41 +0000 (22:33 +0200)]
CHANGES: add documentation of featureset for 4.0.1

7 years agonew release: update to 4.0.1.
Kim Kulling [Fri, 28 Jul 2017 20:27:36 +0000 (22:27 +0200)]
new release: update to 4.0.1.

7 years agoPPdPmdParser: fix compilation for clang.
Kim Kulling [Fri, 28 Jul 2017 20:23:08 +0000 (22:23 +0200)]
PPdPmdParser: fix compilation for clang.

7 years agoglTF2: Use better mipmap filter defaults
jamesgk [Thu, 27 Jul 2017 22:18:35 +0000 (15:18 -0700)]
glTF2: Use better mipmap filter defaults

7 years agoMerge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Thu, 27 Jul 2017 18:49:54 +0000 (20:49 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp

7 years agoStreamReader: fix out-of-range exception
Kim Kulling [Thu, 27 Jul 2017 18:49:49 +0000 (20:49 +0200)]
StreamReader: fix out-of-range exception

7 years agofix build second try
Kim Kulling [Thu, 27 Jul 2017 11:31:22 +0000 (13:31 +0200)]
fix build second try

7 years agofix build
Kim Kulling [Thu, 27 Jul 2017 11:07:26 +0000 (13:07 +0200)]
fix build

7 years agoAdded javadoc for the JassimpLibraryLoader
Jesper Smith [Wed, 26 Jul 2017 21:44:37 +0000 (16:44 -0500)]
Added javadoc for the JassimpLibraryLoader

7 years agoglTF2: export materials' normal maps
jamesgk [Wed, 26 Jul 2017 21:42:22 +0000 (14:42 -0700)]
glTF2: export materials' normal maps

7 years agoProvided access to the library loading code to allow custom library loaders
Jesper Smith [Wed, 26 Jul 2017 21:41:09 +0000 (16:41 -0500)]
Provided access to the library loading code to allow custom library loaders

7 years agoglTF2: use opacity for diffuse alpha + alphaMode
jamesgk [Wed, 26 Jul 2017 21:39:35 +0000 (14:39 -0700)]
glTF2: use opacity for diffuse alpha + alphaMode

The "transparency" attribute is unused in glTF2.

7 years agoglTF2: Fix animation export
jamesgk [Wed, 26 Jul 2017 21:20:53 +0000 (14:20 -0700)]
glTF2: Fix animation export

7 years agoAdded missing include to stdlib.h and remove load library call
Doug Stephen [Wed, 26 Jul 2017 20:48:42 +0000 (15:48 -0500)]
Added missing include to stdlib.h and remove load library call

7 years agoX3D importer: Workaround for buggy Android NDK (issue #1361)
Patrick Dähne [Wed, 26 Jul 2017 12:14:11 +0000 (14:14 +0200)]
X3D importer: Workaround for buggy Android NDK (issue #1361)

7 years agoExport glTF 2
jamesgk [Wed, 26 Jul 2017 00:26:18 +0000 (17:26 -0700)]
Export glTF 2

7 years agoCompile with glTF2 export option (currently same as glTF1 output)
jamesgk [Thu, 20 Jul 2017 17:59:21 +0000 (10:59 -0700)]
Compile with glTF2 export option (currently same as glTF1 output)

7 years agoglTF: start fork of files used in export, for glTF2
jamesgk [Wed, 19 Jul 2017 20:21:43 +0000 (13:21 -0700)]
glTF: start fork of files used in export, for glTF2

7 years agounittests: fix build.
Kim Kulling [Tue, 25 Jul 2017 07:46:54 +0000 (09:46 +0200)]
unittests: fix build.

7 years agounittests: add missing include to utProfiler.
Kim Kulling [Tue, 25 Jul 2017 07:38:35 +0000 (09:38 +0200)]
unittests: add missing include to utProfiler.

7 years agounittests: fix the build again.
Kim Kulling [Tue, 25 Jul 2017 07:37:28 +0000 (09:37 +0200)]
unittests: fix the build again.

7 years agoProfiler: fix invalid using statement.
Kim Kulling [Tue, 25 Jul 2017 06:54:29 +0000 (08:54 +0200)]
Profiler: fix invalid using statement.

7 years agoProfiler: add a unittest.
Kim Kulling [Mon, 24 Jul 2017 22:00:43 +0000 (00:00 +0200)]
Profiler: add a unittest.

7 years agoMerge pull request #1355 from RodrigoFigueroaM/patch-1
Alexander Gessler [Sat, 22 Jul 2017 23:57:57 +0000 (01:57 +0200)]
Merge pull request #1355 from RodrigoFigueroaM/patch-1

Added support for python3

7 years agoMerge pull request #1359 from sacereda/profilerLogging
Alexander Gessler [Sat, 22 Jul 2017 23:56:22 +0000 (01:56 +0200)]
Merge pull request #1359 from sacereda/profilerLogging

Elapsed seconds not shown correctly

7 years agoMerge pull request #1358 from sacereda/optimizeMeshes
Alexander Gessler [Sat, 22 Jul 2017 23:55:40 +0000 (01:55 +0200)]
Merge pull request #1358 from sacereda/optimizeMeshes

Low performance in OptimizeMeshesProcess with huge number of meshes

7 years agoElapsed seconds not shown correctly
Sergio Acereda [Sat, 22 Jul 2017 21:30:36 +0000 (23:30 +0200)]
Elapsed seconds not shown correctly

7 years agoLow performance in OptimizeMeshesProcess::ProcessNode with huge number of aiMeshes
Sergio Acereda [Sat, 22 Jul 2017 21:28:55 +0000 (23:28 +0200)]
Low performance in OptimizeMeshesProcess::ProcessNode with huge number of aiMeshes

7 years agoMerge pull request #1356 from assimp/fix_osx_travis
Kim Kulling [Fri, 21 Jul 2017 17:45:49 +0000 (19:45 +0200)]
Merge pull request #1356 from assimp/fix_osx_travis

travis: check if cmake is installed with brew.

7 years agotravis: next try.
Kim Kulling [Fri, 21 Jul 2017 17:10:32 +0000 (19:10 +0200)]
travis: next try.

7 years agotravis: fix dev/null access.
Kim Kulling [Fri, 21 Jul 2017 16:58:55 +0000 (18:58 +0200)]
travis: fix dev/null access.

7 years agotravis: fix brew ls command.
Kim Kulling [Fri, 21 Jul 2017 16:55:25 +0000 (18:55 +0200)]
travis: fix brew ls command.

7 years agotravis: add next missing selicolon.
Kim Kulling [Fri, 21 Jul 2017 12:37:42 +0000 (14:37 +0200)]
travis: add next missing selicolon.

7 years agotravis: add missing semicolon in if-then statement.
Kim Kulling [Fri, 21 Jul 2017 11:21:31 +0000 (13:21 +0200)]
travis: add missing semicolon in if-then statement.

7 years agotravis: add missing semicolons.
Kim Kulling [Fri, 21 Jul 2017 10:36:10 +0000 (12:36 +0200)]
travis: add missing semicolons.

7 years agotravis: check if cmake is installed with brew.
Kim Kulling [Fri, 21 Jul 2017 10:03:09 +0000 (12:03 +0200)]
travis: check if cmake is installed with brew.

7 years agoAdded support for python3
rodrigo figueroa [Fri, 21 Jul 2017 05:48:07 +0000 (22:48 -0700)]
Added support for python3

When using python3 and running any of the provided scripts I get:
NameError: name 'unicode' is not defined.  Python3 does not have unicode. Using try-except method helps to support python3

7 years agoMerge pull request #1352 from sacereda/master
Kim Kulling [Thu, 20 Jul 2017 16:48:32 +0000 (18:48 +0200)]
Merge pull request #1352 from sacereda/master

not compiling when using ASSIMP_DOUBLE_PRECISION

7 years agonot compiling when using ASSIMP_DOUBLE_PRECISION
Sergio Acereda [Wed, 19 Jul 2017 12:05:54 +0000 (14:05 +0200)]
not compiling when using ASSIMP_DOUBLE_PRECISION

7 years agounittests: fix typo.
Kim Kulling [Tue, 18 Jul 2017 18:53:47 +0000 (20:53 +0200)]
unittests: fix typo.

7 years agounittests: fix version test.
Kim Kulling [Tue, 18 Jul 2017 18:42:55 +0000 (20:42 +0200)]
unittests: fix version test.

7 years agoUpdate CHANGES
Kim Kulling [Tue, 18 Jul 2017 17:03:26 +0000 (19:03 +0200)]
Update CHANGES

7 years agoMerge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Tue, 18 Jul 2017 17:02:47 +0000 (19:02 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp

7 years agoUpdate version.
Kim Kulling [Tue, 18 Jul 2017 17:02:08 +0000 (19:02 +0200)]
Update version.

7 years agoMerge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Tue, 18 Jul 2017 15:03:45 +0000 (17:03 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp

7 years agoPlyLoader: fix out of bound access.
Kim Kulling [Tue, 18 Jul 2017 15:02:21 +0000 (17:02 +0200)]
PlyLoader: fix out of bound access.

7 years agoMerge pull request #1350 from Madrich/master
Kim Kulling [Mon, 17 Jul 2017 09:23:29 +0000 (11:23 +0200)]
Merge pull request #1350 from Madrich/master

Some fixes

7 years agoFix Collada export image tag
Madrich [Mon, 17 Jul 2017 07:42:26 +0000 (09:42 +0200)]
Fix Collada export image tag
Fix compiler double issues

7 years agoMerge pull request #13 from assimp/master
Madrich [Mon, 17 Jul 2017 07:07:41 +0000 (09:07 +0200)]
Merge pull request #13 from assimp/master

Update fork

7 years agofix compiler warnings.
Kim Kulling [Sat, 15 Jul 2017 23:02:33 +0000 (01:02 +0200)]
fix compiler warnings.

7 years agoMerge pull request #1347 from rickomax/master
Kim Kulling [Sat, 15 Jul 2017 18:55:57 +0000 (20:55 +0200)]
Merge pull request #1347 from rickomax/master

Fixed many FBX bugs

7 years agoMerge branch 'master' of https://github.com/assimp/assimp
rickomax [Sat, 15 Jul 2017 14:22:14 +0000 (11:22 -0300)]
Merge branch 'master' of https://github.com/assimp/assimp

7 years agoMerge pull request #1345 from jamesgk/master
Kim Kulling [Sat, 15 Jul 2017 09:08:59 +0000 (11:08 +0200)]
Merge pull request #1345 from jamesgk/master

Use unique node names when loading Collada files

7 years agoMerge pull request #1338 from pdaehne/master
Kim Kulling [Sat, 15 Jul 2017 09:08:08 +0000 (11:08 +0200)]
Merge pull request #1338 from pdaehne/master

X3D importer: Support for binary X3D files

7 years agoFixed many FBX bugs
rickomax [Sat, 15 Jul 2017 03:27:33 +0000 (00:27 -0300)]
Fixed many FBX bugs

Fixed a bug where FBX loader won´t load embedded textures that don´t have the Content data filled. Some FBX files only fill this data once, so any embedded texture with the same source filename, should use the pre-loaded data.

Fixed another bug where FBX Texture "Filename" field came different than  on some files than the one defined by the code. One suggestion is load all properties by the case-insensitive function created.

Added the "AI_CONFIG_IMPORT_FBX_SEARCH_EMBEDDED_TEXTURES" flag to tell the importer to load embedded texture data from already loaded ones.

7 years agoUse unique node names when loading Collada files
jamesgk [Fri, 14 Jul 2017 18:42:55 +0000 (11:42 -0700)]
Use unique node names when loading Collada files

7 years agoMerge pull request #1337 from terziman/master
Kim Kulling [Wed, 12 Jul 2017 19:28:37 +0000 (21:28 +0200)]
Merge pull request #1337 from terziman/master

Added support for metadata in assbin format

7 years agoX3D importer: Fixed iterator on MSVC 2015
Patrick Dähne [Wed, 12 Jul 2017 18:48:49 +0000 (20:48 +0200)]
X3D importer: Fixed iterator on MSVC 2015

7 years agoupdate python readme.
Kim Kulling [Wed, 12 Jul 2017 18:35:50 +0000 (20:35 +0200)]
update python readme.

7 years agoX3D importer: Fixed problems with auto, override and regex on older compilers
Patrick Dähne [Wed, 12 Jul 2017 17:57:10 +0000 (19:57 +0200)]
X3D importer: Fixed problems with auto, override and regex on older compilers

7 years agoX3D importer: Fixed missing header file
Patrick Dähne [Tue, 11 Jul 2017 19:32:47 +0000 (21:32 +0200)]
X3D importer: Fixed missing header file

7 years agoX3D importer: Fixed path handling
Patrick Dähne [Tue, 11 Jul 2017 17:41:24 +0000 (19:41 +0200)]
X3D importer: Fixed path handling

7 years agoX3D importer: Implemented support for binary X3D files
Patrick Dähne [Tue, 11 Jul 2017 17:28:40 +0000 (19:28 +0200)]
X3D importer: Implemented support for binary X3D files

7 years agoFixed bug in assbin metadata export when no metadata are defined
Leo Terziman [Tue, 11 Jul 2017 16:15:56 +0000 (18:15 +0200)]
Fixed bug in assbin metadata export when no metadata are defined

7 years agoAdded support for metadata in assbin format
Leo Terziman [Tue, 11 Jul 2017 15:39:36 +0000 (17:39 +0200)]
Added support for metadata in assbin format

7 years agoCollada: add workaround to deal with polygon with holes .
Kim Kulling [Tue, 11 Jul 2017 08:42:10 +0000 (10:42 +0200)]
Collada: add workaround to deal with polygon with holes .