platform/upstream/assimp.git
7 years agoAdded return statement to Write
Jesper Smith [Fri, 28 Jul 2017 20:08:59 +0000 (15:08 -0500)]
Added return statement to Write

7 years agoAdded supported for custom IO Systems in Java. Implemented ClassLoader IO System
Jesper Smith [Thu, 27 Jul 2017 22:42:01 +0000 (17:42 -0500)]
Added supported for custom IO Systems in Java. Implemented ClassLoader IO System

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

7 years agocloses https://github.com/assimp/assimp/issues/1335: use correct path
Kim Kulling [Mon, 10 Jul 2017 11:39:29 +0000 (13:39 +0200)]
closes https://github.com/assimp/assimp/issues/1335: use correct path
for compilers.

7 years agoFix compiler warnings + one review finding.
Kim Kulling [Sun, 9 Jul 2017 20:17:35 +0000 (22:17 +0200)]
Fix compiler warnings + one review finding.

7 years agoMerge pull request #1334 from assimp/x_deals_with_lines
Kim Kulling [Fri, 7 Jul 2017 16:38:51 +0000 (18:38 +0200)]
Merge pull request #1334 from assimp/x_deals_with_lines

X-Importer: make it deal with lines.

7 years agoX-Importer: make it deal with lines.
Kim Kulling [Fri, 7 Jul 2017 14:34:08 +0000 (16:34 +0200)]
X-Importer: make it deal with lines.

7 years agoMerge pull request #1333 from gongminmin/master
Kim Kulling [Thu, 6 Jul 2017 06:34:55 +0000 (08:34 +0200)]
Merge pull request #1333 from gongminmin/master

Remove std functions deprecated by C++11.

7 years agoRemove std functions deprecated by C++11.
Minmin Gong [Wed, 5 Jul 2017 00:01:03 +0000 (17:01 -0700)]
Remove std functions deprecated by C++11.

7 years agoadd missing coverity token.
Kim Kulling [Sat, 1 Jul 2017 08:42:47 +0000 (10:42 +0200)]
add missing coverity token.

7 years agocloses https://github.com/assimp/assimp/issues/1320: check if all
Kim Kulling [Wed, 28 Jun 2017 20:13:49 +0000 (22:13 +0200)]
closes https://github.com/assimp/assimp/issues/1320: check if all
exporters are disabled.

7 years agoMerge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Wed, 28 Jun 2017 20:09:53 +0000 (22:09 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp

7 years agoMerge pull request #1318 from rspencer01/master
Kim Kulling [Wed, 28 Jun 2017 20:09:20 +0000 (22:09 +0200)]
Merge pull request #1318 from rspencer01/master

Fixes parameters to pyassimp.load

7 years agoMerge pull request #1322 from assimp/issue_1319
Kim Kulling [Wed, 28 Jun 2017 20:08:44 +0000 (22:08 +0200)]
Merge pull request #1322 from assimp/issue_1319

closes https://github.com/assimp/assimp/issues/1319: fix build without

7 years agofix review findings.,
Kim Kulling [Wed, 28 Jun 2017 20:08:20 +0000 (22:08 +0200)]
fix review findings.,

7 years agoadd missing coverity scan token.
Kim Kulling [Wed, 28 Jun 2017 18:26:15 +0000 (20:26 +0200)]
add missing coverity scan token.

7 years agofix unittests.
Kim Kulling [Wed, 28 Jun 2017 18:11:13 +0000 (20:11 +0200)]
fix unittests.

7 years agoMerge pull request #1323 from vkovalev123/master
Kim Kulling [Tue, 27 Jun 2017 11:26:36 +0000 (13:26 +0200)]
Merge pull request #1323 from vkovalev123/master

Fixed texture bug due simultaneously using 'usemtl' and 'usemap' attr…

7 years agoFixed texture bug due simultaneously using 'usemtl' and 'usemap' attributes
Vitaly Kovalev [Tue, 27 Jun 2017 10:52:43 +0000 (13:52 +0300)]
Fixed texture bug due simultaneously using 'usemtl' and 'usemap' attributes

Signed-off-by: Vitaly Kovalev <vkovalev@gkmsoft.ru>
7 years agocloses https://github.com/assimp/assimp/issues/1319: fix build without
Kim Kulling [Mon, 26 Jun 2017 20:01:15 +0000 (22:01 +0200)]
closes https://github.com/assimp/assimp/issues/1319: fix build without
3DS.

7 years agoMerge pull request #1321 from pdaehne/master
Kim Kulling [Mon, 26 Jun 2017 19:04:25 +0000 (21:04 +0200)]
Merge pull request #1321 from pdaehne/master

Fixes for X3DImporter/X3DExporter

7 years agoFixed indices for IndexedTriangleFanSet, IndexedTriangleSet and IndexedTriangleStripSet
Patrick Dähne [Mon, 26 Jun 2017 13:25:15 +0000 (15:25 +0200)]
Fixed indices for IndexedTriangleFanSet, IndexedTriangleSet and IndexedTriangleStripSet

7 years agoFixes parameters to pyassimp.load
Robert Spencer [Sun, 25 Jun 2017 13:10:11 +0000 (15:10 +0200)]
Fixes parameters to pyassimp.load

Commit 704e57db4ee640262b8b20f4b687c15231d64354 changed the order
of the parameters to `pyassimp.load`.  The new order groups
`filename` and `file_type` which is preferable, but the samples and
other calls to `load` still point to the old order.  This fixes that
with named arguments where necessary.

7 years agoOpenDDLParser: latest greatest.
Kim Kulling [Sun, 25 Jun 2017 11:21:36 +0000 (13:21 +0200)]
OpenDDLParser: latest greatest.

7 years agoX3D importer: Added EXPORT and IMPORT to the list of ignored XML tags
Patrick Dähne [Fri, 23 Jun 2017 09:59:14 +0000 (11:59 +0200)]
X3D importer: Added EXPORT and IMPORT to the list of ignored XML tags

7 years agoX3D Exporter: fixed missing attributes
Patrick Dähne [Thu, 22 Jun 2017 18:48:33 +0000 (20:48 +0200)]
X3D Exporter: fixed missing attributes

7 years agoX3D importer: Fixed import of normals for the single index / normal per vertex case
Patrick Dähne [Thu, 22 Jun 2017 16:54:03 +0000 (18:54 +0200)]
X3D importer: Fixed import of normals for the single index / normal per vertex case

7 years agoX3D importer: Fixed handling of inlined files
Patrick Dähne [Thu, 22 Jun 2017 14:29:26 +0000 (16:29 +0200)]
X3D importer: Fixed handling of inlined files

7 years agoX3D importer: fixed whitespace handling (issue #1202)
Patrick Dähne [Thu, 22 Jun 2017 13:05:23 +0000 (15:05 +0200)]
X3D importer: fixed whitespace handling (issue #1202)

7 years agoUpdate Readme.md
Kim Kulling [Thu, 22 Jun 2017 08:11:54 +0000 (10:11 +0200)]
Update Readme.md

Inproved readme.

7 years agoUpdate Readme.md
Kim Kulling [Thu, 22 Jun 2017 08:07:02 +0000 (10:07 +0200)]
Update Readme.md

Add the donation button.

7 years agoMerge pull request #1314 from jamesgk/gltf-export
Kim Kulling [Thu, 22 Jun 2017 06:31:07 +0000 (08:31 +0200)]
Merge pull request #1314 from jamesgk/gltf-export

GLTF exporter: ensure buffer view byte offsets are correctly aligned

7 years agoMerge pull request #1311 from PetrPPetrov/master
Kim Kulling [Thu, 22 Jun 2017 06:30:11 +0000 (08:30 +0200)]
Merge pull request #1311 from PetrPPetrov/master

Fixed bug in material color processing

7 years agoLWO: use forward declaration in header.
Kim Kulling [Wed, 21 Jun 2017 21:06:53 +0000 (23:06 +0200)]
LWO: use forward declaration in header.

7 years agoFix compiler warnings.
Kim Kulling [Wed, 21 Jun 2017 21:02:46 +0000 (23:02 +0200)]
Fix compiler warnings.

7 years agounittest: fix compiler warning.
Kim Kulling [Wed, 21 Jun 2017 21:02:26 +0000 (23:02 +0200)]
unittest: fix compiler warning.

7 years agoGLTF exporter: ensure buffer view byte offsets are correctly aligned
jamesgk [Tue, 20 Jun 2017 21:15:41 +0000 (14:15 -0700)]
GLTF exporter: ensure buffer view byte offsets are correctly aligned

7 years agoMerge pull request #1313 from assimp/issue_586_make_scenecombiner_public
Kim Kulling [Wed, 21 Jun 2017 14:41:47 +0000 (16:41 +0200)]
Merge pull request #1313 from assimp/issue_586_make_scenecombiner_public

Issue 586 make scenecombiner public

7 years agoSceneCombiner: fix the build.
Kim Kulling [Wed, 21 Jun 2017 13:24:06 +0000 (15:24 +0200)]
SceneCombiner: fix the build.

7 years agoSceneCOmbiner: Fix the build.
Kim Kulling [Wed, 21 Jun 2017 12:31:37 +0000 (14:31 +0200)]
SceneCOmbiner: Fix the build.

7 years agoSceneCombiner: move header for scenecombiner to public folder.
Kim Kulling [Wed, 21 Jun 2017 12:21:16 +0000 (14:21 +0200)]
SceneCombiner: move header for scenecombiner to public folder.

7 years agoFixed bug in material color processing
Petr Petrovich Petrov [Tue, 20 Jun 2017 11:29:16 +0000 (14:29 +0300)]
Fixed bug in material color processing

Thanks to @evgeny-panasyuk

7 years agoopenddlparser: closes https://github.com/assimp/assimp/issues/1271.
Kim Kulling [Mon, 19 Jun 2017 19:07:18 +0000 (21:07 +0200)]
openddlparser: closes https://github.com/assimp/assimp/issues/1271.

7 years agoMerge pull request #12 from assimp/master
Madrich [Sun, 18 Jun 2017 21:16:00 +0000 (23:16 +0200)]
Merge pull request #12 from assimp/master

Update Fork

7 years agoMerge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Sat, 17 Jun 2017 19:17:39 +0000 (21:17 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp

7 years agoMerge pull request #1310 from assimp/new_cpputf8_issue_1309
Kim Kulling [Sat, 17 Jun 2017 19:17:05 +0000 (21:17 +0200)]
Merge pull request #1310 from assimp/new_cpputf8_issue_1309

New cpputf8 issue 1309

7 years agoremove dead code.
Kim Kulling [Sat, 17 Jun 2017 18:36:59 +0000 (20:36 +0200)]
remove dead code.

7 years agoUtf8: integrate new lib.
Kim Kulling [Sat, 17 Jun 2017 17:38:47 +0000 (19:38 +0200)]
Utf8: integrate new lib.

7 years agoUTF8Encoding: introduce new lib.
Kim Kulling [Fri, 16 Jun 2017 14:43:39 +0000 (16:43 +0200)]
UTF8Encoding: introduce new lib.

7 years agoObjImporter: remove dead code.
Kim Kulling [Thu, 15 Jun 2017 18:24:10 +0000 (20:24 +0200)]
ObjImporter: remove dead code.

7 years agounittest: Fix compiler warning
Kim Kulling [Thu, 15 Jun 2017 06:37:44 +0000 (08:37 +0200)]
unittest: Fix compiler warning

7 years agotravis ci: enable sudo support.
Kim Kulling [Tue, 13 Jun 2017 18:29:25 +0000 (20:29 +0200)]
travis ci: enable sudo support.

7 years agoMerge pull request #1304 from malytomas/master
Kim Kulling [Mon, 12 Jun 2017 07:12:49 +0000 (09:12 +0200)]
Merge pull request #1304 from malytomas/master

fixed CMAKE_MODULE_PATH overwriting previous values

7 years agofixed CMAKE_MODULE_PATH overwriting previous values
Tomas Maly [Sat, 10 Jun 2017 18:12:12 +0000 (20:12 +0200)]
fixed CMAKE_MODULE_PATH overwriting previous values

7 years agoMerge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Sat, 10 Jun 2017 09:19:25 +0000 (11:19 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp

7 years agoMerge pull request #1300 from assimp/ply_export_test
Kim Kulling [Fri, 9 Jun 2017 21:02:30 +0000 (23:02 +0200)]
Merge pull request #1300 from assimp/ply_export_test

ply-exporter: add unittest.

7 years agoUnittests: fix uppercase typo in export path for ply export test.
Kim Kulling [Fri, 9 Jun 2017 19:57:41 +0000 (21:57 +0200)]
Unittests: fix uppercase typo in export path for ply export test.

7 years agoMerge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Fri, 9 Jun 2017 18:24:31 +0000 (20:24 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp

7 years agoUnitetsts: reformats.
Kim Kulling [Fri, 9 Jun 2017 18:20:24 +0000 (20:20 +0200)]
Unitetsts: reformats.

7 years agoMerge pull request #1302 from terziman/master
Alexander Gessler [Fri, 9 Jun 2017 18:14:51 +0000 (20:14 +0200)]
Merge pull request #1302 from terziman/master

Fix IFC bug of partially imported models

7 years agoMerge remote-tracking branch 'github/master' into contrib
Leo Terziman [Thu, 8 Jun 2017 09:01:11 +0000 (11:01 +0200)]
Merge remote-tracking branch 'github/master' into contrib

7 years agoCreate .travis.yml
Kim Kulling [Thu, 8 Jun 2017 07:13:44 +0000 (09:13 +0200)]
Create .travis.yml

Fix build.

7 years agotravis: exclose some build env to avoid double tests.
Kim Kulling [Wed, 7 Jun 2017 19:10:52 +0000 (21:10 +0200)]
travis: exclose some build env to avoid double tests.

7 years agoMatrix: some reformattings.
Kim Kulling [Wed, 7 Jun 2017 18:23:50 +0000 (20:23 +0200)]
Matrix: some reformattings.

7 years agoMerge pull request #1298 from severin-lemaignan/master
Kim Kulling [Wed, 7 Jun 2017 12:41:52 +0000 (14:41 +0200)]
Merge pull request #1298 from severin-lemaignan/master

Revert "Installing assimp library as well"

7 years agoply-exporter: add unittest.
Kim Kulling [Wed, 7 Jun 2017 12:06:38 +0000 (14:06 +0200)]
ply-exporter: add unittest.

7 years agoMerge pull request #1299 from assimp/travis_osx_support
Kim Kulling [Wed, 7 Jun 2017 11:41:09 +0000 (13:41 +0200)]
Merge pull request #1299 from assimp/travis_osx_support

travis-ci: reenable osx.

7 years agotravis-ci: fix unittest executor.
Kim Kulling [Wed, 7 Jun 2017 09:48:00 +0000 (11:48 +0200)]
travis-ci: fix unittest executor.

7 years agotravis-ci: disable tests for osx.
Kim Kulling [Wed, 7 Jun 2017 08:30:40 +0000 (10:30 +0200)]
travis-ci: disable tests for osx.

7 years agotravis-ci: disable coverage test for osx.
Kim Kulling [Wed, 7 Jun 2017 07:32:48 +0000 (09:32 +0200)]
travis-ci: disable coverage test for osx.

7 years agotravis-ci: use correct package name.
Kim Kulling [Tue, 6 Jun 2017 21:58:00 +0000 (23:58 +0200)]
travis-ci: use correct package name.

7 years agotravis-ci: add missing close bracket for if block.
Kim Kulling [Tue, 6 Jun 2017 19:41:39 +0000 (21:41 +0200)]
travis-ci: add missing close bracket for if block.

7 years agotravis-ci: reenable osx.
Kim Kulling [Tue, 6 Jun 2017 14:57:19 +0000 (16:57 +0200)]
travis-ci: reenable osx.